summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 07:59:18 +0000