summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix updating action signal nameKaj Grönholm2020-09-172-1/+5
| | | | | | | Task-number: QT3DS-4164 Change-Id: I742917f043421bdb5f15c03153672d047aa1e1fb Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Bump version to 2.8Tomi Korpipaa2020-09-142-74/+74
| | | | | | Change-Id: I162026108b7551015de077e1ddb32aaf5f17a2ed Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Set zero initialization for vectorTony Leinonen2020-09-071-2/+1
| | | | | | | | | | | data was uninitialized which wrote random bytes to rotations position on gcc compiler Task-number: QT3DS-4118 Change-Id: I2d5a4a053e1a3ab4a41f3c181f2a4440416a57ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
* Update ogl-runtime submoduleAntti Määttä2020-08-211-0/+0
| | | | | Change-Id: I3b64fcace36e7db9594785a5c7a5d20cd825491c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submoduleAntti Määttä2020-08-121-0/+0
| | | | | Change-Id: I50bc28603d039b04b3104f3e26ae0de184f1244b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Optimize studio performanceAntti Määttä2020-08-124-83/+197
| | | | | | | | | | | - Cache image parents - Optimize getting source paths from the data model Task-number: QT3DS-4151 Change-Id: I2b109f0e074736153837fe699833c20df7b7becd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Prevent crash if duplicating a slide with actionsTomi Korpipaa2020-08-121-1/+2
| | | | | | | Fixes: QT3DS-4148 Change-Id: I48f22ba34aab42aa9d42d7b6b57ff8fe7a2e38d6 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix and enable axis helperKaj Grönholm2020-06-293-9/+3
| | | | | | | | | | | | | Don't build the whole node tree into axis helper widget, but make sure its childred are updated. This fixes freezing when switching between presentations and adding more layers into presentation. Also enable axis helper again. Task-number: QT3DS-4122 Task-number: QT3DS-4117 Task-number: QT3DS-4124 Change-Id: Ie2727b15b30409035295517456012ddebe6f4b82 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/2.7'Tomi Korpipaa2020-06-2922-54/+375
|\ | | | | | | Change-Id: I86e5766624fecb436157f6f44393bea36cd99c82
| * Doc: Move source qdoc files to correct directory2.7Topi Reinio2020-06-034-0/+0
| | | | | | | | | | | | | | | | QDoc configuration is case-sensitive, and the capitalized 'Src' directory was not picked up. Change-Id: I0b93f3542ba6118314a5d37423f8f6402c9e7d60 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Disable axis helperv2.7.0Tomi Korpipaa2020-06-012-1/+8
| | | | | | | | | | | | | | | | | | | | Enabling axis helper causes a number of blocker bugs, so it is too risky to include it this close to release. Change-Id: Ic58922484228949ab9cf2f94c1ba536d7ab5e3ea Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
| * Fix crash when changing projectKaj Grönholm2020-05-291-0/+1
| | | | | | | | | | | | | | | | Build render graph after appending axis helper. Task-number: QT3DS-4117 Change-Id: I347063f217322949b44bbf119744046400d2df90 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix crash when changing projectAntti Määttä2020-05-281-2/+0
| | | | | | | | | | | | | | | | Remove erronious node management code. Task-number: QT3DS-4117 Change-Id: I8d25d876d0d4362adadf0b4ca6cdeee5fea8e954 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Re-add removed images to the right folderTomi Korpipää2020-05-282-0/+0
| | | | | | | | | | Change-Id: I2261b50203bbe03e6d0d8324478325e33b79885f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Remove images from the wrong folderTomi Korpipaa2020-05-272-0/+0
| | | | | | | | | | | | | | They should be in doc/src, not doc/Src folder. Change-Id: I0c6bf797faea22f5a1b69480fb777e45833293ff Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Update ogl-runtime submoduleTomi Korpipaa2020-05-251-0/+0
| | | | | | | | | | Change-Id: I7aaa9f65131e91df87678b93ce41219c104fead4 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Add documentation for controlling custom material propertiesTomi Korpipaa2020-05-251-0/+32
| | | | | | | | | | | | | | | | Fixes: QT3DS-4111 Change-Id: I880282c44c13f71c2861fe2aa932d0d921fd8a36 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Add documentation for the category propertyTomi Korpipaa2020-05-153-0/+42
| | | | | | | | | | | | | | Fixes: QT3DS-4112 Change-Id: I810496fea93e98bee849a73833456b5b7e7e2fcd Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Save relative instead of absolute paths to materialdefsv2.7.0-rc2Jere Tuliniemi2020-05-142-7/+16
| | | | | | | | | | | | | | Task-number: QT3DS-4089 Change-Id: Ib880bc2da4a5b7e77efa96114ca283410240afb5 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Update ogl-runtime submoduleTomi Korpipaa2020-05-141-0/+0
| | | | | | | | | | Change-Id: I93d12ad1d0b348152218e343231f811ae188edc5 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Fix scene view rendering when scene camera is visibleAntti Määttä2020-05-082-16/+1
| | | | | | | | | | | | | | | | Remove unnecessary viewport setting calls. Task-number: QT3DS-4103 Change-Id: I8e483e21a906b7cb84a8c3264d28e4c6e917f224 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Update ogl-runtime submoduleAntti Määttä2020-05-081-0/+0
| | | | | | | | | | Change-Id: I8e1ae8575555c97b059457c5de9c7ac0174c44d0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix scene rendering when changing view modeAntti Määttä2020-05-051-3/+4
| | | | | | | | | | | | | | | | | | | | The viewport is not set to correct size when changing the view mode, because the recalculating of the size is done before setting the view mode. Move the viewmode setting before recalculating viewport. Task-number: QT3DS-4106 Change-Id: I7a7a24ee0bfe508d3df9390befdcffe64e748604 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Remove scale and position of axis helper cameraAntti Määttä2020-04-303-6/+10
| | | | | | | | | | | | | | | | Only rotation should be applied to the axis camera. Task-number: QT3DS-4104 Change-Id: Ifbc01c0931d7d3edfc4210644d46c53380ef0980 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Update ogl-runtime submoduleTomi Korpipaa2020-04-281-0/+0
| | | | | | | | | | Change-Id: Iddc3feb6ed89123404a8351ce298843911ab5161 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Store dynamic object default texture paths to the UIPAntti Määttä2020-04-271-0/+11
| | | | | | | | | | | | | | | | | | | | Set the default texture path from effects/materials to the graph object so that they are read by the runtime during initial loading. Task-number: QT3DS-4037 Change-Id: I61df38223d003102e6b82bc27f6885493c88f9f4 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Update ogl-runtime submoduleAntti Määttä2020-04-271-0/+0
| | | | | | | | | | Change-Id: I55d189439d57ef09b5b7bf9bf5dc7a32f6ae4a6c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Implement axis helper widgetJanne Kangas2020-04-2111-26/+257
| | | | | | | | | | | | | | | | | | | | Implements axis direction indicator viewport corner that shows the orientation of world axes. Adds menu toggle for switching the widget on/off. Task-id: QT3DS-373 Change-Id: I5b095ced11ef1b7ea1378457c1376dd2f6b94868 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Update ogl-runtime submoduleTomi Korpipaa2020-04-071-0/+0
|/ | | | | Change-Id: Iebd2d0c6f089b8c41ebebccdffcfd4673d8fd12a Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Force immediate render after files changeJanne Kangas2020-03-246-11/+17
| | | | | | | | | | | | | Force rendering to keep edit camera view and scene camera views in sync after shader recompilation. Also only clear shader error if object has valid translation. Task-id: QT3DS-4045 Change-Id: I5f3e6feab41f56c00c9bb8190263e73510c04309 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement delayed shader compilation success updateJanne Kangas2020-03-116-7/+29
| | | | | | | | | | | | | | Update the results of shader compilation in Editor panels with a small delay, after an effect or a material file has been changed. This is a simpler alternative to implementing a dedicated signaling channel from GL backend to Editor, just for the purpose of indicating that a compilation result is ready. Task-id: QT3DS-4065 Change-Id: I3d77d789196906954cdd0ff3d5e9e5b06772d5fb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make non-masterslide element names unique on slide duplicationJanne Kangas2020-03-091-0/+11
| | | | | | | | Task-id: QT3DS-4069 Change-Id: Ie624fa05bace80c8d30014e42dba86e2dc514229 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Document depth function in custom shadersJere Tuliniemi2020-03-092-0/+39
| | | | | | | | | | | | Also links different custom shader documents that all provide different related information. Task-number: QT3DS-3821 Change-Id: Ifa4765aee25bada3f4b988abfb7c2becb692623c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Document dynamic layer resizingJere Tuliniemi2020-02-282-0/+28
| | | | | | | Task-number: QT3DS-4077 Change-Id: Ia045725d76811554a2f1dc7f630abbaed5fcfe74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add dynamic resize properties to the editorJere Tuliniemi2020-02-281-0/+4
| | | | | | Task-number: QT3DS-4030 Change-Id: Ic2af57a3fbcc1692bb056e3ac7236fb65a3f500d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleJere Tuliniemi2020-02-281-0/+0
| | | | | Change-Id: I417b2b2902a98df13960577cd0e4f4f8829f8ae2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix unique id creationJanne Kangas2020-02-281-1/+0
| | | | | | | | | | | Do not strip away the characters after underscore, when creating a new unique id. Task-id: QT3DS-3979 Change-Id: Icf45feee1a22efe0ae25976a3d779a1271c92336 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove evaluator type datainput dead codeJanne Kangas2020-02-216-56/+2
| | | | | | | Task-id: QT3DS-3912 Change-Id: Ice71372eae17bd01da1f2f15f9cce70ff47c7186 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Bump MODULE_VERSION to 2.7.0Tomi Korpipaa2020-02-211-1/+1
| | | | | Change-Id: Ibfe5d544357a7eaf8c65872ab2ac0eea00bc0c98 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update version string for macOSTomi Korpipaa2020-02-101-3/+3
| | | | | | Fixes: QT3DS-2869 Change-Id: Id86802fd2cee1e3aacc3befa6a7ff2e44b57764a Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update and fix documentationJanne Kangas2020-02-063-6/+8
| | | | | | | Task-id: QT3DS-4050 Change-Id: I1261e963ead07849429a3fa1f3b46cc73c039bd3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Update ogl-runtime submoduleJere Tuliniemi2020-01-301-0/+0
| | | | | Change-Id: I8b8e2956cc42e132ba26375663f4efcea0646865 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2020-01-241-0/+0
| | | | | Change-Id: Ibe08354c6992c48344c3f9fb206f4043f9533e9f Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add CullingMode for materialAntti Määttä2020-01-211-0/+1
| | | | | | Task-number: QT3DS-1627 Change-Id: I97abc69672312381b1ac523f4854cdfed42ee65c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleAntti Määttä2020-01-211-0/+0
| | | | | Change-Id: I40e87459a8f5d2418d3eab54bba514587b29830b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add ordered property to groupAntti Määttä2020-01-161-0/+3
| | | | | | Task-number: QT3DS-3820 Change-Id: Icc1a497d5e7308e4e1a89e777b4ee21f2a790e98 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime moduleJanne Kangas2020-01-151-0/+0
| | | | | Change-Id: I62113098ef3431de6f9be109f7de69cfc382cf84 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add toggle for disabling ambient occlusionJanne Kangas2020-01-152-7/+11
| | | | | | | Task-id: QT3DS-4032 Change-Id: Idaf915ab09b11eeb8a96e580ad6599fc047b0bf1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Always write BufferData elementsAntti Määttä2020-01-101-8/+6
| | | | | | | | | | | This prevents scanning opaque textures for transparency in runtime. Task-number: QT3DS-4026 Change-Id: I4e4971aa63218151200a187269c84366656d3022 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix inspector undo and redo for float fieldsTomi Korpipaa2019-12-3110-0/+84
| | | | | | | Fixes: QT3DS-4000 Change-Id: I0bb5d230ac0a2dc7e968e406275707197bb03d8e Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>