summaryrefslogtreecommitdiffstats
path: root/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Increment UIP versionMahmoud Badri2019-05-161-3/+0
| | | | | | | | | | | | - increment UIP version and show a warning if a UIP version is lower - remove 3 obsolete text shadow props - small update to checking for material container in the timeline - few cleanups Task-number: QT3DS-3366 Task-number: QT3DS-2903 Change-Id: Ib4d8c33e786001d0e5a18037a52303449630adf5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support variants property on Group typesMahmoud Badri2019-04-081-8/+3
| | | | | | | | | Also few usual cleanups. Task-number: QT3DS-3234 Change-Id: I4624aeac27ee512cdbe62677bb9469e2748cc58b Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for selecting shadow castersTomi Korpipaa2019-04-041-0/+1
| | | | | | | | | | Editor and OpenGL runtime implementation. Qt3D runtime implementation is done in a separate commit. Task-number: QT3DS-3269 Change-Id: I26e2aa3041acaaef36cc103cc4039a0c4ea1df73 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement variants UI on the timeline rowsMahmoud Badri2019-02-201-7/+8
| | | | | | | | | Also some related fixes and tweaks. Task-number: QT3DS-3081 Change-Id: I7fd86479500fbbca247fb8a6517165ff6d0f742a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add horizontal and vertical offsets for text drop shadowsTomi Korpipaa2019-01-161-3/+5
| | | | | | | | | Keep support for old style offset until UIP version is updated next time. This change is not critical enough to update the UIP version. Task-number: QT3DS-2755 Change-Id: I10085862df5a851ed75bc39a58f497ed096f18f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add elide property for text in EditorTomi Korpipaa2019-01-151-0/+1
| | | | | | Task-number: QT3DS-2707 Change-Id: I7a4e4161dbbf8b8e9f6d239f90221c51b269e48a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for fixed size text areasTomi Korpipaa2018-11-261-0/+2
| | | | | | | Task-number: QT3DS-2110 Change-Id: I5383303b089d5c6572120a4e4f7731d0c9b35ded Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add drop-shadow support to text elementsTomi Korpipaa2018-11-151-0/+5
| | | | | | | | | Task-number: QT3DS-2644 Change-Id: Ia2dbb52eb556bc8533b9b69862ea7b4c2432f225 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge branch '2.1' into masterMiikka Heikkinen2018-09-251-7/+8
|\ | | | | | | Change-Id: Idfecbefcf5c1e279093f250a4a46d57f2a518d25
| * Add fovhorizontal property to camerasMiikka Heikkinen2018-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | This is a boolean property. If it is true, the fov value will be interpreted as horizontal angle. Task-number: QT3DS-708 Change-Id: I5642c6cd2e32fb4d0872d0422b58077f0f8af2f7 Reviewed-by: Teemu Tamminen <teemu.tamminen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * Add Basic Properties to Material inspectorTomi Korpipaa2018-09-111-7/+7
| | | | | | | | | | | | | | Task-number: QT3DS-2256 Change-Id: I8105f5554894c381db6dc52b2c9b22caf5bf34c5 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix switch-cases not handling all possible valuesPasi Keränen2018-09-111-0/+9
|/ | | | | | | | | | Add default handling for switch cases missing it and remove the switch case related warning suppression with clang builds. Task-number: QT3DS-2243 Change-Id: Ib87d51468bbfa00284c6849363751ccb056f7eb7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add support for vertex colorsJere Tuliniemi2018-04-301-0/+1
| | | | | | | | | | | | Adds a check mark for vertex color use to the default material in the inspector. Adds vertex color parsing to the FBX and Collada importer. Changes default material shaders to use vertex colors if enabled. Task-number: QT3DS-1507 Change-Id: Ide4a9f0da1c4dabe4e9b573e4cb0a2aecf714398 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add roughness map to the standard materialJere Tuliniemi2018-04-161-0/+1
| | | | | | | | | | | The inspector for the standard material now has a selector for a roughness map and the shaders use the map for specular roughness. Task-number: QT3DS-1445 Change-Id: I0d31fb6d191583454ee5e20be683cf9ada093279 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove old DataInput proto codeJanne Kangas2018-02-231-7/+0
| | | | | | | | | | | | | | | | Reverts some (not all) changes in commits: 935d8a983db25978b3e8f0dbe67323684ce4dd96 e3c6e9d38a5b6f729093fc0349784fa475af8f62 337aaa465ac78ac72ca748f0c2d4c3b6257829b8 0707c13c34653066c89d5b25abe60a779650ee27 c1fc5d13e3668a117b4f8470ecb87b77b145efb8 Task-ID: QT3DS-865 Change-Id: I6f2ce77b12e2930aee1ea3b62b34aabe10bc6d00 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* [DataInput] Implement linking of Text element textstring to DataInputJanne Kangas2018-01-121-0/+1
| | | | | | | | | | | | | | | | | | Adds Text-element specific functionality that allows linking of text element(s) "textstring" property to DataInput. This link forwards any changes in DataInput valuestr property to linked element property. DataInput path is hardwired to "this.DataInput" in proto implementation. Future patches will integrate DataInput selection dialog that allows choosing controlling datainput from the ones currently in scene. User-visible DataInput functionality is still disabled from editor. Task-ID: QT3DS-338 Change-Id: I064c616f6cf651fc12f1e810c7b807ed5cc04555 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add Datainput part 1Janne Kangas2017-12-181-0/+7
| | | | | | | | | | | | Implements Datainput as graph object that can be parsed from UIP files and fed data from QML. Adding Datainput object from studio UI is disabled intentionally as functionality will be fleshed out in the following patches. Task-ID: QT3DS-2 Change-Id: I449087aa968ae2331f203c4cb6e41b8ac6eef5cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UICDM and UICIMP to QT3DSMäättä Antti2017-10-241-0/+562
Task-number: QT3DS-18 Change-Id: I3800cd72b449b033b0b42cf2dd9e9eccc4eb7f8f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>