summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update ogl-runtime submoduleHEADmasterTomi Korpipaa2021-10-111-0/+0
| | | | | Change-Id: Ife1af15519147ba7f509c8cfd88554c76c68d005 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update dependencies SHATomi Korpipaa2021-10-111-1/+1
| | | | | Change-Id: I5ed723c3b70f49c66ece6793e06e79f16ad07e87 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2021-05-071-0/+0
| | | | | Change-Id: I4d0b3836ca6815af184a47637dca8684e73081b4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>
* Update ogl-runtime submoduleTomi Korpipaa2021-03-191-0/+0
| | | | | Change-Id: I6494c6f6a2c79d8b69569354ea58967ed4e361bd Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add product_dependencies.yamlTomi Korpipaa2021-03-191-0/+3
| | | | | | | | Use this file to define and track what content qt3dstudio is built against. Change-Id: Ie63a67c5c5f6c4d89689fdb393f52d9ff080f19b Reviewed-by: Antti Kokko <antti.kokko@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>
* Update ogl-runtime submoduleAntti Määttä2020-10-231-0/+0
| | | | | Change-Id: I0b647f982652ec030000f49ce89202f659805ba6 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update ogl-runtime submoduleAntti Määttä2020-10-221-0/+0
| | | | | Change-Id: Ic8185d4180383ce4adc06b7f88a96f6038962354 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>
* Update ogl-runtime submoduleTomi Korpipaa2020-10-211-0/+0
| | | | | Change-Id: I882d59b53a591f1c63fee9b035d728e847733f6b Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix glossaryTomi Korpipaa2020-10-202-103/+81
| | | | | | | Task-number: QT3DS-4193 Change-Id: Id1f88331852fca08c04349d25c07caeb7eee4a42 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update documentation for viewerTomi Korpipaa2020-10-204-70/+147
| | | | | | | Task-number: QT3DS-4191 Change-Id: Icd5bc406c247a78cf80b94fca475fc0902a33c86 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Remove capital letter from pathTomi Korpipaa2020-10-191-0/+0
| | | | | | Change-Id: Id1ddbf51922d9e9d68662d72bd5ba0906fe0b17c Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add documentation for ordered groupv2.8.0-rc2Tony Leinonen2020-10-163-0/+27
| | | | | | | | | Documentation added to quick start guide and inspector palette. Task-number: QT3DS-4186 Change-Id: I319e1553d151937d3638816848c686cdf63a1c8c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add signal to whats new docsAntti Määttä2020-10-161-4/+12
| | | | | | | | Also improve links. Change-Id: Ie11a76b1d261254ac5c4baaff77fd6e40f553c1b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2020-10-161-0/+0
| | | | | Change-Id: Icaeac8d29c9356cc8df18d5e906f329008cd892e Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Document custom material texture ImagesAntti Määttä2020-10-166-6/+86
| | | | | | | | Add documentation for the changed custom material images. Task-number: QT3DS-4187 Change-Id: I1075f58bd4000570641613b330971f4de6c1e832 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Document image filter modesAntti Määttä2020-10-161-0/+8
| | | | | | Task-number: QT3DS-4189 Change-Id: Icd550075bccfba6343c79ad7646d8ae0444aae13 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>
* Update ogl-runtime submoduleAntti Määttä2020-10-151-0/+0
| | | | | Change-Id: If4ce56405d76ab0957f69bd3912f3a6b101cd91a 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>
* Update ogl-runtime submodulev2.8.0-rcTomi Korpipaa2020-10-061-0/+0
| | | | | | Change-Id: Ib6280013790adafddc2e22a4820c679c6de45b99 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Antti Kokko <antti.kokko@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>
* Add more documentation for layer effectsTony Leinonen2020-10-0631-0/+702
| | | | | | | | | Added brush strokes, corona, dof bokeh, frame flipper, screenspace ao, sepia, stylize scatter, smaa1x and vignette. Task-number: QT3DS-3938 Change-Id: I8ef640e3f6cf81852ab14d2bde2d0589dfd58337 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add CullFace and Culling to effect docsAntti Määttä2020-10-061-0/+21
| | | | | Change-Id: I435ad2c22eeb69a98a8c02d1f161ec0312fa69a4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Document signal object and onActivate & onDeactivate actionsKaj Grönholm2020-09-304-0/+26
| | | | | | Task-number: QT3DS-4171 Change-Id: I1d9274846023a28aa1d0315a6df895fcad299c50 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>
* Update ogl-runtime submoduleTomi Korpipaa2020-09-251-0/+0
| | | | | Change-Id: I1f8ddc3ffd07e9124e9c539afe9314e2d9810d38 Reviewed-by: Antti Määttä <antti.maatta@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>
* Update ogl-runtime submoduleAntti Määttä2020-09-251-0/+0
| | | | | Change-Id: I771744212635faf6dca9db381964ab7389988a8e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2020-09-221-0/+0
| | | | | Change-Id: I450f36c9331aa881aed065b9170f1bd60f8dbccf Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2020-09-221-0/+0
| | | | | | Change-Id: Iba7321c42d23b5a3ff31d16a1fff809b0d73e5da Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 23:29:02 +0000