summaryrefslogtreecommitdiffstats
path: root/Studio/Content
Commit message (Collapse)AuthorAgeFilesLines
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-10441-25610/+0
| | | | | | | | Module config change so that ogl-runtime builds from submodule. Task-number: QT3DS-3600 Change-Id: Ib22fda6aed1cf9336f15b79256b5f9db8774159f Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix Torus Knot assets opacityKaj Grönholm2019-05-138-8/+8
| | | | | | | | | | Assets materials should have full opacity to import correctly and become visible. Task-number: QT3DS-3410 Change-Id: Ic68e1476b696a8f08a7a90b4d2370d9927e90261 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shader compilation errors in copies of VignetteEffect.effectJari Karppinen2019-05-071-6/+4
| | | | | | | | | | | | Apply updates from qt3d-runtime commit 6945d224433d731aaff1f83bf4d05ba812c8c36c to qt3dstudio files. Task-number: QT3DS-3387 Change-Id: I777ed67d53ece891d8d338732221de16c9019713 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update custom material shaders to work with alpha channel colorsMahmoud Badri2019-05-0623-53/+53
| | | | | | | Task-number: QT3DS-3395 Change-Id: I462629e7c4b616fde7f7c9354477b2ab3f836fb9 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix AdditiveColorGradient, Corona, and LightTable shadersMahmoud Badri2019-05-063-3/+3
| | | | | | | | | | | Those shaders broke after adding an alpha channel to the color type. Task-number: QT3DS-3392 Change-Id: Icba8079e30a9a08398d80c197b397394e3491e89 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow .shader suffix for .material filesJere Tuliniemi2018-11-3035-0/+0
| | | | | | | | | Also renames *.material files to *.shader files inside the Material Library. Task-number: QT3DS-2787 Change-Id: Iaa3e64fae934b526ad0903c19d3cdb2b6923cc95 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix two materials which were not workingAndy Nichols2018-06-052-3/+2
| | | | | | | | | Aluminum_emissive had a duplicate of the Emissive Mask Map property. Carpaint_color_peel_2 had two copies of orange peel size where as it should have had a peel amount property as well. Change-Id: I5b931560a8b911b57c5e531bd804eaeffb63d93d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Update behaviors for 2.0Jere Tuliniemi2018-05-172-256/+4
| | | | | | | | | Fixes CameraLookAt for 2.0 and removes CopyTransform due to lack of support in runtime 2.0. Change-Id: Ic88abf3263b29d0b1d95f492db984ec35da95d81 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Convert dds files to pngMäättä Antti2018-05-1112-4/+4
| | | | | | | | | | Leave the dds files in, but use the png files where they were used. Task-number: QT3DS-926 Change-Id: I0844833767c80ea1f3abd0c55b68596caedfc9fe Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix typo in VignetteEffectTomi Korpipaa2018-04-301-2/+2
| | | | | | | Change-Id: I16b340f1e80948d9023500b83a382b2750861ab9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* add cluster collada meshes to model libraryTeemu Tamminen2018-03-1545-0/+8523
| | | | | | Task-number: QT3DS-799 Change-Id: I32b2da62cbc11808bc1f0e6039b1179c7f77940b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make too long tooltips multi-lineTomi Korpipaa2018-02-1945-85/+85
| | | | | | Task-number: QT3DS-1154 Change-Id: I691667d1f7ffd709ee9537e4ad35bcf129c91fe6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rephrase too long material property namesTomi Korpipaa2018-02-0935-39/+39
| | | | | | | Task-number: QT3DS-1006 Change-Id: I7c32b4ae234e611f067db05f34e738d8e84caccf Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clean up Content folderMiikka Heikkinen2018-02-0810-0/+0
| | | | | | Task-number: QT3DS-1009 Change-Id: I85e872da820657974dadf3faec9e654daebab451 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix up SMAA1x.effectLaszlo Agocs2018-01-231-3/+3
| | | | | | | | | Discard in the vertex shader is often not valid, and the common glsllib snippet provides macros to avoid pulling in such code in the vertex shaders. However, the usage of these in SMAA1x.effect seems to be wrong. Change-Id: Ic1edd84a4a5b41449619c366e1c9f71f6b2d6abf Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Make Screen Space AO.effect compileLaszlo Agocs2018-01-231-2/+2
| | | | | | | getDepthValue takes two arguments. Other effects have this correct. Change-Id: If8bd89660bf17cdef3331b5f03250dc829e426da Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Improve custom material GLES2 supportMäättä Antti2018-01-1035-123/+123
| | | | | | | | | | Implement light shader property setting for custom materials when constant buffers are not supported. Remove floating point .f from glsllib. Task-number: QT3DS-36 Change-Id: I30df0ef8841daaa166910c2384613a1c9f4e6b46 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Rename Qt3DSBehavior to BehaviorMäättä Antti2017-11-232-2/+2
| | | | | | | Change-Id: I03591ac08b41772f11dd3d32bba4bdaa20d47ce7 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add behavior library folder and example behaviorsTeemu Tamminen2017-11-222-0/+368
| | | | | | | | Task-number: QT3DS-421 Change-Id: I77da75bce796f0049c51d5d2ad2e0b4cac11d330 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove nvidia logo modelTeemu Tamminen2017-11-211-139/+0
| | | | | | Task-number: QT3DS-481 Change-Id: Ied75f6cd7ef10e7ef3adda9306df49274bb9d376 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix faulty description in a materialTomi Korpipaa2017-10-271-1/+1
| | | | | Change-Id: Id2b232bc089f7ff40bfdaf7f647ab2a2d85b4351 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add descriptions to materialsTomi Korpipää2017-10-2635-1260/+1260
| | | | | | | | Some material properties were missing formal names and descriptions, causing bad tooltips and property names in the Inspector panel. Task-number: QT3DS-193 Change-Id: I1c79ecc9331bd7406ad4c7a143915f08ab059b8d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace UIC with QT3DS from materials and effectlibMäättä Antti2017-10-2435-368/+368
| | | | | Change-Id: Ifc5b409777a978401bd4179599b27fb4aa611844 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Initial importOswald Buddenhagen2017-10-06390-0/+17113
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 02:22:39 +0000