summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix undoing material type change doesn't update ref materials bugv2.2.0-rcv2.2.02.2Mahmoud Badri2018-12-1010-82/+54
| | | | | | | | | | Also removed a previous hot fix (QT3DS-2768) and some cleanups in the undo/redo system. Task-number: QT3DS-2827 Change-Id: Id1bb8e89c4121dd3cf447bf29c1a0d02d034e247 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Close active chooser dialog when it goes out of contextMiikka Heikkinen2018-12-106-9/+83
| | | | | | | | | | | | | | A chooser is considered out of context when the property the chooser was opened for no longer has visible control for it. This change should ensure that user can never interact with invalid properties via the chooser dialogs. Task-number: QT3DS-2836 Change-Id: I6fca811cfccda0b0b4fbc0feb17935c3949f4f9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change big time advance to half a second (i.e. medium ticks)Miikka Heikkinen2018-12-071-1/+1
| | | | | | | | Task-number: QT3DS-2834 Change-Id: Ie2cce950b4c3ad2b7138e6bdb94b5e70ab39d765 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Skip import of asset where source and target asset is the same fileMiikka Heikkinen2018-12-071-0/+2
| | | | | | | | Task-number: QT3DS-2832 Change-Id: I3f82a94a68684d53cc840b71f96f6f2bdff6ddc7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update inspector palette documentationMats Honkamaa2018-12-072-40/+36
| | | | | | | | | | Updated inspector palette documentation. Mainly updates regarding materials but also some other minor fixes. Task-number: QT3DS-2793 Change-Id: I5df54b2d368ac55dfdc1116c0dfa983e3065a64f Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix a bug where undoing material type change doesnt update in the sceneMahmoud Badri2018-12-072-4/+29
| | | | | | | | | Also prevent adding duplicates to the file change list Task-number: QT3DS-2768 Change-Id: I3e3f2869f6bb215ce86425a5ea25f7ea07fdffdc Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash on macOS when using menu during startup dialogTomi Korpipaa2018-12-051-16/+20
| | | | | | Task-number: QT3DS-2828 Change-Id: I5637d4b7acb3ea42bc872a4ef23e579d64ed1e15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when "Shadow Mapping" is chosenJere Tuliniemi2018-12-052-8/+4
| | | | | | | | | | A wrong-sized type was used to write over the old bool value. The change is to not write over the old address at all. Task-number: QT3DS-2767 Change-Id: Ie3140892362a54647d061a75eff8a5bc86de120b Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Refresh inspector when reference material changesJere Tuliniemi2018-12-052-2/+7
| | | | | | | | | Undoing a basic material change would still show the same material even after the undo. Task-number: QT3DS-2821 Change-Id: I37710afa1acb8aefbf6e53e94f2c3bd16e6bf2c2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix subpresentation changing in LinuxTomi Korpipaa2018-12-051-6/+5
| | | | | | | Task-number: QT3DS-2824 Change-Id: Ie21b5fb8382ebb36fbf886534713d1fa1a6f4e6b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove invalid "Failed to find file" logsTomi Korpipaa2018-12-052-7/+15
| | | | | | | | | | | | | This commit does nothing in regard to the crash mentioned in the Jira ticket, as that seems to be a completely different issue (probably the same root cause as in QT3DS-2791). Task-number: QT3DS-2810 Change-Id: Ie65cdc84acb93768373a65e20b4f6b04b0a877a8 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when undoing material type changev2.2.0-beta3Jere Tuliniemi2018-12-041-0/+3
| | | | | | | | | | Undoing a change from basic material to animatable material would crash because property wouldn't actually exist anymore. Task-number: QT3DS-2823 Change-Id: Iebb197ba2c26728d82af2c2c6a4458cb9baaaa87 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update qt3d-runtime submoduleMiikka Heikkinen2018-12-041-0/+0
| | | | | Change-Id: I7752da76e890485ed80d2c93a8db74d14b48d15d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Create pages for main categoriesMats Honkamaa2018-12-049-18/+337
| | | | | | | | | | | Created sub-pages for each of the 5 main categories. This is needed for the sidebar menu and also for unifying with i.e. creator and design studio manuals. Also needed to rename the quick start guide page. Task-number: QT3DS-2708 Change-Id: Icea5009857c21eb4f42aa18621630b7d389445a8 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Revert "Ignore matdef changes triggered by the editor"Jere Tuliniemi2018-12-043-25/+3
| | | | | | | | | | | This reverts commit 2ba5f4d873a1fb04b891238f78868778fd4bc20f. At least one place in the editor depends on reading the file again after saving. Since there might be more, revert this for now. Task-number: QT3DS-2822 Change-Id: I1737dd05de9a2402a6850b1eb5e1accd303316c2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix context menu position in slide viewMiikka Heikkinen2018-12-041-7/+11
| | | | | | | | | | | Mouse position mapping was done against incorrect object in case of clicking on master slide. Task-number: QT3DS-2820 Change-Id: Ic962eef50d18b8a97372a0de5ea6f62ee929abfe Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update UI images in documentationMats Honkamaa2018-12-0429-0/+0
| | | | | | | | Updated UI images in documentation to match 2.2 UI. Task-number: QT3DS-2696 Change-Id: Ia225475f1dd87d4e64f57d1e047252af764627b1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update viewer keyboard shortcuts documentationMats Honkamaa2018-12-041-7/+42
| | | | | | Task-number: QT3DS-2818 Change-Id: Ia25690658541fedc4161b8a2f326f50f969194dd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add tutorials pageMats Honkamaa2018-12-043-5/+58
| | | | | | | | | Added new tutorials page. Moved tutorial like content from best practice page to tutorial page. Task-number: QT3DS-2614 Change-Id: Iafee316c9bf6f901d0a11afeb2a4b92068a5185b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix editor subpresentation rendering for LinuxTomi Korpipaa2018-12-041-0/+10
| | | | | | | Task-number: QT3DS-2779 Change-Id: I38f7a287e27f4a5d7f96562f907c76ff6d84a54e Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix editor subpresentation rendering for macOSMäättä Antti2018-12-041-1/+1
| | | | | | Task-number: QT3DS-2779 Change-Id: I746366b3af919af39bc778567adc1c69b0386668 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix missing glsllib errorsTomi Korpipaa2018-12-043-42/+1
| | | | | | | | | | | | | The old system assumed the glsllibs are in the filesystem. Instead, we have them in a resource file. We do not have separate versions for different OpenGL versions, so we can get rid of the OpenGL version in the search path, hence allowing the glsllibs to be found in the resource file. Task-number: QT3DS-2798 Change-Id: I03cbb123cf4555456fc11423a82498703b07131d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't start playback when interacting with sceneKaj Grönholm2018-12-043-0/+14
| | | | | | | Task-number: QT3DS-2438 Change-Id: I0c6988ff5016dc0016a031d34a5758a624140458 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Do not assert on datainput bind type parsing on custom materialsJanne Kangas2018-12-042-3/+7
| | | | | | | | | | | | | | Editor attempts to parse datainput binding datatypes from other presentations in project to prevent changing datainput type to something incompatible. Custom properties are specific to current open project so there is no way to query datatype for custom property in another project. Therefore on unrecognizable property just return datatype none. Task-ID: QT3DS-2790 Change-Id: Ia90503fe2aade13a98dcd8501e864d8de9ae6513 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Ignore matdef changes triggered by the editorJere Tuliniemi2018-12-033-3/+25
| | | | | | | | After the editor saves a materialdef file, the editor doesn't need to react to that change. Change-Id: I4fa5fd79536388450ccb39d2ff55eab53f11a04b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Refresh material after setting valuesJere Tuliniemi2018-12-031-0/+2
| | | | | | | | The editor didn't show the most up to date changes to the material in the scene view after setting values read from the materialdef file. Change-Id: I8f9499d7250489168e177ab150acd7836041c07c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix property state after undoing shader selectionJere Tuliniemi2018-12-031-8/+15
| | | | | | | | | | | After setting a new shader, setPropertyValues would set the default values again to the material. These values would remain with the instance after an undo and would make the presentation unsaveable. This change makes it so that the default values are not set again. Task-number: QT3DS-2796 Change-Id: I2fa95e29b9f20da6a00ce71a81e3dd6956e7206b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix columns on index pageMats Honkamaa2018-12-031-15/+14
| | | | | | | | | | Table on index page is to narrow so images cuts off, I change it to use 3 columns instead of 4 to solve the problem. Task-number: QT3DS-2780 Change-Id: Ia296c166a30512843d3ebafadce2aa5fbedf1a1c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Check if a matdef file exists when renaming matdefJere Tuliniemi2018-12-031-2/+25
| | | | | | | | | | Materialdef shouldn't be able to be named the same as an unused materialdef. Previous checks only applied to matdefs used in the scene. Change-Id: Iab9882cdcc3b035dcbdfb480f33297330a258dfa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add missing material container checkJere Tuliniemi2018-12-031-3/+5
| | | | | | | | This name manipulation was only meant for objects inside the material container. The name was also meant to be searched from the right. Change-Id: I63860d9389baf9d7e62654c412b0f2714b61a64f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add documentation about materialsMats Honkamaa2018-12-039-0/+235
| | | | | | | | | Added page about materials and shaders Task-number: QT3DS-2618 Change-Id: I51cdeabfd017a0644b40c8c3975321757e902faa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Change .material to .shader in documentationMats Honkamaa2018-12-034-10/+10
| | | | | | Task-number: QT3DS-2787 Change-Id: Ic8c1048381683e2d2a4e1de11d93fa945599005f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Import data inputs when importing a presentationMiikka Heikkinen2018-12-036-39/+129
| | | | | | | | | | | Data inputs used by imported presentations are copied from source project. Duplicate inputs are ignored. Task-number: QT3DS-2742 Change-Id: Ia0162f3f91c78b35888e235b764985e09160498d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add materialdef iconsMiikka Heikkinen2018-12-036-0/+16
| | | | | | | | Task-number: QT3DS-2786 Change-Id: Ic0dedd658f9a9a951b7d3bbdb52056c0490bcc5b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update requirements documentationMats Honkamaa2018-12-031-31/+9
| | | | | | | | | | Updated requirements documentation with more OS that editor has been tested on. Also removed runtime related stuff. Task-number: QT3DS-2694 Change-Id: Ic320367baea29bed926335478337b7526d76ff70 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Check for datainput name uniqueness only at accept when adding new DIJanne Kangas2018-12-032-2/+12
| | | | | | | | | | | | | Also, in the datainput management dialog select the newly added DI to draw user attention to potential silent renaming (instead of a pop-up). For the case where user adds a datainput directly from datainput selector, we cannot highlight the row as dialog is closed immediately, though. Change-Id: Id52151445847a43bfe3c158dc4dac44d7d3db0ba Task-id: QT3DS-2784 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix case sensitive materialdef renamingJere Tuliniemi2018-11-302-8/+25
| | | | | | | | | | | Rename wouldn't occur since QFileInfo::exists() would pass due to case insensitivity. Fix also inspector checks for materialdef paths and names to be case insensitive. Task-number: QT3DS-2789 Change-Id: Ie6e9a0bea11f9eec4470714b2483b7c840cd2478 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix segfault on LinuxTomi Korpipaa2018-11-304-14/+4
| | | | | | Task-number: QT3DS-2675 Change-Id: Ie388cdd1f87efc97b1a0da7064851a0ad9054fca Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow .shader suffix for .material filesJere Tuliniemi2018-11-3043-16/+20
| | | | | | | | | Also renames *.material files to *.shader files inside the Material Library. Task-number: QT3DS-2787 Change-Id: Iaa3e64fae934b526ad0903c19d3cdb2b6923cc95 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make materialdef rename undoableJere Tuliniemi2018-11-303-62/+90
| | | | | | | | | | A materialdef rename would invalidate the undo stack as previous commands would refer to the old name. Task-number: QT3DS-2781 Change-Id: I9e86e67ce9412629f97c081e6368eb0d3ecc7227 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix issues with material renamingJere Tuliniemi2018-11-304-11/+32
| | | | | | | | | | | | | | | Disable basic material renaming by removing the name property from the inspector, disabling rename from the timeline context menu and disabling double clicking of the basic material in the timeline. Refresh the inspector after rename to fix reverting to previous value. Force a reference update after a rename by emitting assetNameChanged. Task-number: QT3DS-2774 Change-Id: I4c1658ee8a4f206db90c46878e75cc0bb690956b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update timeline time bar texts iconKaj Grönholm2018-11-307-2/+12
| | | | | | | | | Separate icons for active and inactive. Task-number: QT3DS-2772 Change-Id: I9fadff21405237db16dc8c9ec779dfee6547cef7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update shader list for all material typesJere Tuliniemi2018-11-292-8/+14
| | | | | | | | | | | | | Referenced materials now show the latest shaders if the inspector is open when the shaders are added to the project. Referenced materials also lose the ability to change the material type of the original material. Task-number: QT3DS-2776 Change-Id: I45b86abd5c9b54fd4e4c8c06979032feca6c34b2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add scene camera palette documentationMats Honkamaa2018-11-294-0/+87
| | | | | | | | | | Added documentation about the scene camera palette. Task-number: QT3DS-2589 Change-Id: I019a4f3362b5fb04f1e3740e5f3096a9a7a000ba Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add icons to index pageMats Honkamaa2018-11-297-0/+18
| | | | | | | | | | Add icons to main categories on the index page Task-number: QT3DS-2609 Change-Id: I3b3ae0c3e5d4c4fde5444e5a7e43bfb6ab9350bc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix inspector slider decimal places countMahmoud Badri2018-11-291-1/+9
| | | | | | | | | | | | With this patch inspector slider value shows only the needed amount of decimals. Redundant decimal 0s are removed. So slider properties can show 0 (like in the case of opacity), 1, 2, or 3 decimal places. Task-number: QT3DS-2769 Change-Id: I76accd4e7c4b1e66d7a9cc1a428b20ec32fd1112 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Import also unlinked assetsMiikka Heikkinen2018-11-291-88/+101
| | | | | | | | | | | Now we parse also <Set> nodes in addition to <Add> nodes when looking for either assets to import or presentation ids to update. Task-number: QT3DS-2751 Change-Id: I0a3cb4c43bb5acf1301fe52b3b1a3259090154d0 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix referenced assets importing when importing a presentationMiikka Heikkinen2018-11-294-57/+68
| | | | | | | | | | | | | | Fixes following issues when importing presentations: - Importing presentations with different relative path to project file caused some assets to be imported into wrong folders - Importing custom materials didn't import texture assets that didn't have a default asset set in .material file Task-number: QT3DS-2599 Change-Id: I38e2afa1fbf793f9808a0056529336f26e6cad7e Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide broken 'save as' and 'save copy' functionalityMiikka Heikkinen2018-11-294-5/+12
| | | | | | | | | | | | | This functionality requires redesign and reimplementation, as it is currently useless and broken. Disabling it until it can be properly fixed. Task-number: QT3DS-2749 Change-Id: I35698293e4fd91d3469fc75631a23054cf81b544 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when no texture selected for a texture samplerMiikka Heikkinen2018-11-291-3/+6
| | | | | | | | Task-number: QT3DS-2748 Change-Id: Ida98b12bac43be0e85b0e99fb5ee797049768a4e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 16:21:05 +0000