summaryrefslogtreecommitdiffstats
path: root/src/Authoring
Commit message (Collapse)AuthorAgeFilesLines
* Prevent crashing with latest ogl-runtimeTomi Korpipaa2021-03-191-1/+1
| | | | | | | | | Add nullptr as signalProxy to make it compile. Requires ogl-runtime submodule bump first. Task-number: QT3DS-4223 Change-Id: I4968bc4fef0b874c059f28bdb152615529d31866 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix crash when opening texture comboboxTomi Korpipaa2020-11-231-1/+1
| | | | | | | | | Custom materials still used TextureChooser for populating the combobox instead of ImageChooser. Task-number: QT3DS-4208 Change-Id: I696cc819df8f46ba40008f734bfcfd9990b2f551 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Filter action event list for signal objectsv2.8.0Tony Leinonen2020-10-261-0/+16
| | | | | | | | | | Signals can only use onactivate and deactivate events so filter everything else out from the list. Task-number: QT3DS-4198 Change-Id: I46587b76e54ce4d0ecf3f8d532258080ea11870a Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix recursive installTomi Korpipaa2020-10-261-2/+2
| | | | | | | | | We do not want to recursively copy everything to the bin folder, only the 2 folders. Change-Id: I07a6ac1d56baeab8589e6febe5dfbba28f3656ff Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix crash when effect is deleted outside projectAntti Määttä2020-10-224-15/+41
| | | | | | | | | Fix crash when saving a project which has effect that was deleted outside the project. Task-number: QT3DS-4194 Change-Id: I787c713b8a32b217b96abc1e8a987d3a4cf33ade Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix inspector controls for 5.15Tomi Korpipaa2020-10-213-4/+3
| | | | | | Change-Id: Ifc8fe6520c15f54325fecc55741ce23d94c0a056 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix 5.15 build on WindowsJanne Koskinen2020-10-211-5/+5
| | | | | | | | | Use $$files, * wildcard returns empty on 5.15 qmake resulting "Error: cycle in targets detected" in makefile generation. Change-Id: I9bd2cdef7c35493949f34849c51c077734adc8d2 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Handle editor preview depth prepass betterTony Leinonen2020-10-151-3/+12
| | | | | | | | | | | Editor now shows everything with depth prepass enabled. Scene camera shows layers how depth prepass was set in their advanced properties. Task-number: QT3DS-4174 Change-Id: I93259fb26a4932b96729442d924e0685ee33562c Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix custom materials not showing before reloadAntti Määttä2020-10-151-8/+1
| | | | | | | | | Use the parameter name instead of image id since the id is not available before serialization. Change-Id: Ic5bf2b8f4dafb3231d2b369c85d53bc2b8ef4be5 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash and assertionsAntti Määttä2020-10-153-7/+16
| | | | | | | | Fix crash when deleting custom material immediately after creating it. Fix assertions from getting incorrect datatype. Change-Id: I020b8397de13fb88f594fe85ec1da66dd999f97b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix copy object path for dynamic object imagesAntti Määttä2020-10-151-3/+7
| | | | | | Task-number: QT3DS-4184 Change-Id: I7f1aa708616785ad872338a6d73ad36bf8ae1bfb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix issues in dynamic object texture changeAntti Määttä2020-10-156-31/+180
| | | | | | | | | | | | | | | | | -Apply texture filter and repeat mode to the created image. -Set the image names so that they work with setAttribute. -Do not show default texture parameters in inspector. -When dynamic object texture is set after being cleared, reset the texture parameters from the default parameters. -Ensure that the conversion of old-style dynamic objects is only done when the UIP file version is old so that it happens only once. We do not wan't to apply the default values for later sessions. Do not serialize dynamic object default textures. Task-number: QT3DS-4063 Change-Id: I5c9eed110999430ad95cda2354dbcc4b7795c136 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement image filteringAntti Määttä2020-10-151-0/+2
| | | | | | | | | Studio side changes Task-number: QT3DS-4183 Change-Id: I0d2ea62b05bb158b9ffead2080c5ba7b7f790bb1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
* Use images with dynamic object texturesAntti Määttä2020-10-1511-63/+230
| | | | | | Task-number: QT3DS-4063 Change-Id: I32b4b1892f064311e5896ebc1ebdc087598135d1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Split SDynamicObject from Graph objects to own classAntti Määttä2020-10-151-11/+12
| | | | | | | | Then add SDynamicGraphObject, which uses it. Change-Id: I6a3cb29391bbf3c351d6a03baf0682b6fb1e1758 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove string conversion due to runtime api changeAntti Määttä2020-10-061-4/+2
| | | | | | Task-number: QT3DS-4177 Change-Id: Ie14ff94f6ebc584f22cc711ccfdc0d8e26657f40 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix the axis helper scalingKaj Grönholm2020-09-281-2/+1
| | | | | | | | The devicePixelRatio is already factor in viewport.m_Width so remove double scaling. Task-number: QT3DS-4173 Change-Id: I10b96e5acf3f4be4a91e393888dee92d2f4025a7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove unused functionAntti Määttä2020-09-281-12/+0
| | | | | | Change-Id: Idbb56129aa185c7bc8f30c432f9cc7605c2119b1 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make editor window use depth prepassTony Leinonen2020-09-281-0/+7
| | | | | | | | | | | If a layers depth prepass is disabled the selection box will show on top of the object. Enabling it for the editor only makes it render with depth. Task-number: QT3DS-4174 Change-Id: I8c2164ee8a1b23d2bbd528f589e946d7971c4644 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Reset layer after adding/duplicating slideKaj Grönholm2020-09-251-0/+4
| | | | | | | | | Not doing this caused issues in axis helper and also in other cases. Task-number: QT3DS-4170 Change-Id: Ib095a205205c88e9239aacffbf1a33c6ad08b136 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix the axis helper scaling in Fit Selected modeTomi Korpipaa2020-09-251-1/+4
| | | | | | | Task-number: QT3DS-4173 Change-Id: I1ba0f83ff930cf3477898a171ff2d1ff2c6a9329 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Improve timeline signal actionsv2.8.0-beta1Kaj Grönholm2020-09-2532-6/+170
| | | | | | | | | | | | | | | | - Support new signal type object with icons. Bump generated UIP version to 7. - When creating a signal, also create initial onActivate action. - Don't show basic node properties for signals, only the name. - When adding new action to signal, default to onActivate and emit signal. - Show small ticks on timeline bar if onActivate or onDeactivate actions have been set to the object. Task-number: QT3DS-4165 Change-Id: I16d1129536ac4d22c23c27bbc95741aa66adf597 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix image loading after runtime changesAntti Määttä2020-09-251-2/+5
| | | | | | Task-number: QT3DS-4162 Change-Id: Ic5feede4635100b1bc8c539ab902f8c7da4c6648 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove ability to add dots to object nameTony Leinonen2020-09-223-5/+9
| | | | | | | | | | | | A name that contains dots will not work with DataInputs. If a dot is added to the name a warning window will pop up and alert the user. Task-number: QT3DS-4099 Change-Id: I8cb1bf7b835fcea3f79bae6b326cffbf989e738c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix color on actionTony Leinonen2020-09-184-1/+20
| | | | | | | | | | ActionView was missing required functions to change the color. showColorDialog does not seem to require instance and handle which arent available in ActionView.cpp so call the function without them Task-number: QT3DS-4163 Change-Id: I135e75f22104e0c7addb203a52846e84c52db8de Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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-141-73/+73
| | | | | | 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* Add toggle for disabling ambient occlusionJanne Kangas2020-01-151-0/+1
| | | | | | | Task-id: QT3DS-4032 Change-Id: Idaf915ab09b11eeb8a96e580ad6599fc047b0bf1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 07:51:53 +0000