summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update ogl-runtime submodule with latest changes for 2.5 releasev2.5.02.5Antti Kokko2019-10-291-0/+0
| | | | | Change-Id: I472f312032484ee7fd6844bd294518733be8bc92 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Revert "Create a completely new instance when material type changes"v2.5.0-rc3Janne Kangas2019-10-241-4/+1
| | | | | | | | | | | This reverts commit 4a32c1e5a56dd7cfb193cf63870b4c57b8e635df. Reason for revert: Causes crashes elsewhere, and the case that this patch fixes is minor compared to those regressions. Change-Id: Id3afac63c1befe76ee5d9d2099d58694404b7bb2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submodule for 2.5 releasev2.5.0-rc2Antti Kokko2019-10-211-0/+0
| | | | | Change-Id: Ie84a127563b0311d425b000d857e001038c5063d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submodule for 2.5 RCv2.5.0-rcJukka Jokiniva2019-10-161-0/+0
| | | | | Change-Id: I0a602bcf8f2207a2ebd8217515b35b0176c5600b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Create a completely new instance when material type changesJanne Kangas2019-10-151-1/+4
| | | | | | | | | | | | Do not reuse instance id when changing shader (and triggering SetMaterialType). This avoids stale property handle references to properties whose name matches with names of previous material instance props. Change-Id: I0df750ddd84881297921266901b49c6dc59ff92b Task-id: QT3DS-3978 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Retain file id when changing material typeJere Tuliniemi2019-10-141-0/+4
| | | | | | | | | | | Custom shaders would copy the class file id to be the object file id, causing duplicate id errors upon saving. This is fixed by restoring the old file id after changing the material type. Task-number: QT3DS-3976 Change-Id: I2073fd6d7cc0bfbbd0e52ff6ab9b7d51206d7638 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix texture path corruptionTomi Korpipaa2019-10-141-2/+1
| | | | | | | | Task-number: QT3DS-3986 Change-Id: I41613e6761d15e299d995a529f2013240edefc25 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix duplicated material referencesJere Tuliniemi2019-10-141-3/+19
| | | | | | | | | | | If a material that is referenced by another is duplicated, the material and all the referenced materials are now changed to basic material that refer to the new duplicated file. Task-number: QT3DS-3977 Change-Id: Ia7cd19401b407138fe9b72a6a60394cdee01ed52 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update opengl runtime for Beta3 releasev2.5.0-beta3Jukka Jokiniva2019-10-091-0/+0
| | | | | | Change-Id: I451a993ca6e35213c420cbae595757e65532ef26 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Revert "Indicate shader errors in Editor" for branch 2.5Janne Kangas2019-10-089-55/+0
| | | | | | | | This reverts commit fdc856278f325a3a41f9db2f706df5332ebd4d5c. Change-Id: Iba1add3c3a5d4fc9e1cfd2fcddd5c7eb720c5fd8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix material duplication behaviorJere Tuliniemi2019-10-083-31/+40
| | | | | | | | | | | | | | | Disable copying of referenced material properties and if somehow the user is able to duplicate a referenced material that points to a referenced material, do a recursive lookup for the original material. If an animatable material is duplicated, it's type is changed to referenced material which points to the duplicated material in the container. Or in other words it is changed to a basic material. Task-number: QT3DS-3679 Task-number: QT3DS-3973 Change-Id: Ic09bb897d24f7c10984c5cc2f80556be844d9c51 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-10-071-0/+0
| | | | | Change-Id: Ieab8b2d48059c139ed5c2bc92db49c50baa219bd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix creating and duplicating material in inspectorTomi Korpipaa2019-10-071-5/+16
| | | | | | | | | | | | | Duplicating a custom material or a reference to a custom material crashes. There is a separate bug for that: QT3DS-3973. Duplicating material for those can be fixed only after the crash has been fixed first. Task-number: QT3DS-3679 Change-Id: I8cf5d95fd8ef4f070caf8f83f0fe3cdff2a47057 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>
* Fix duplicating materials using custom shadersJere Tuliniemi2019-10-071-11/+10
| | | | | | | | | | | Material type has to be set before copying properties. Task-number: QT3DS-3973 Change-Id: I3b79ee8bb03b9e8460183373dbd33f35b3163a74 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2019-10-041-0/+0
| | | | | Change-Id: I6b05548c38e2eb5e49b33e34026894e673bff6a8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix importing images with spaces in pathTomi Korpipaa2019-10-041-51/+75
| | | | | | | | | | | When importing Collada or FBX that have images including spaces in the path, we did not find them. Get rid of the percentage encoding to find the images. Task-number: QT3DS-3972 Change-Id: Ia433232a9bce99e93acceb83ed22d247d087b3ec Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when closing recent files dialogAntti Määttä2019-10-021-3/+5
| | | | | | | | | | Do not get client data model bridge in CanChangeTimeBarColor when the project is not open. The selected instance check handles this. Task-number: QT3DS-3967 Change-Id: I0c393e025520ad935b6d85c0ece93cd6a00fcd62 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2019-10-021-0/+0
| | | | | Change-Id: I4e2b37a8578d7bf6ef2166cb6afb6c74773cc1ac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shader file recompilationJere Tuliniemi2019-10-011-5/+4
| | | | | | | | | | Use source path instead of instance name as identifier for custom materials and effects. Task-number: QT3DS-3966 Change-Id: I0de0e38e7a65650c319bcf7c11a7638d175c92fe Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Indicate shader errors in EditorJanne Kangas2019-10-019-0/+55
| | | | | | | | | | | | Show a pop-up if a shader fails to compile. Compilation takes place when the effect is added to a object in timeline. Requires both editor and runtime commits. Task-id: QT3DS-3598 Change-Id: Icfd43cd77c72c929b0a88edf3655da818c78df5e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update opengl runtime for Beta2 releasev2.5.0-beta2Jukka Jokiniva2019-09-301-0/+0
| | | | | Change-Id: Iad12b7b15a215ba723c970064962a58d8d3415fa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix light and camera import from 3ds Max FBXTomi Korpipaa2019-09-301-7/+20
| | | | | | Task-number: QT3DS-3952 Change-Id: Ie1f1126199f0b01bba69288e248924c9a970399f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Preserve fileids when doing cut and pasteAntti Määttä2019-09-267-29/+51
| | | | | | | | | | | This will use the same fileids as the original object did for the first paste operation after cut operation, and subsequent paste operations generate new ids. Task-number: QT3DS-3883 Change-Id: Iedd5139e3acdffd87af68421fed9c5b94fe2f80f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Show angle text also with straight rotationsKaj Grönholm2019-09-261-0/+7
| | | | | | | | | When rotation widget circle direction is almost parallel to viewing camera, different code path is used. Show angle also then, but in this case draw angle in the middle of rotation widget. Task-number: QT3DS-3957 Change-Id: Idab36cc3e3c833aeeced6597a5190a60ae742c0a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove qt3d-runtime dependencies from studioMiikka Heikkinen2019-09-2510-103/+11
| | | | | | | Task-number: QT3DS-3958 Change-Id: I1542cf2c78eb54fcff42598118cf19acb5ad66d7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix duration dragJanne Kangas2019-09-251-14/+14
| | | | | | | | | | | Maintains the original time bar length during drag even if drag takes the start time to less than zero. Task-ID: QT3DS-2046 Change-Id: I45c81e7a62e081e9ed6861c064e164da75e14ad2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disable change time bar color for active componentTomi Korpipaa2019-09-241-8/+3
| | | | | | | | | | This disables setting the time bar color from menu when a component is opened and selected. Task-number: QT3DS-3956 Change-Id: Ibfd48d9640c3a5f3a07097c11379d24bf8426275 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update opengl runtime for Beta releasev2.5.0-beta1Jukka Jokiniva2019-09-201-0/+0
| | | | | Change-Id: I81b5019aca96703fd518fdf651a9c9152844a027 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add Transparency Mode property to the editorJere Tuliniemi2019-09-201-0/+1
| | | | | | | | | This property is added as a work-around for not being able to easily scan the transparency of an ASTC image file. Task-number: QT3DS-3904 Change-Id: I7048b778c1977d47ef2cfee71fcbfb2d160cd9f1 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add Vector4 to the data type drop down listJere Tuliniemi2019-09-182-1/+4
| | | | | | Task-number: QT3DS-3947 Change-Id: I8b5555869ba472e6310b61b4c12331bda2c773d7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix generating unique ids for objectsAntti Määttä2019-09-183-144/+205
| | | | | | | | Task-number: QT3DS-3816 Change-Id: I99c905d0b29db5d8a80f46992b3ade6a4b703dc5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add ASTC support to the editorJere Tuliniemi2019-09-181-2/+2
| | | | | | Task-number: QT3DS-3903 Change-Id: Icd1151d3c1938b8097b11b2078f342cf66b59271 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-09-181-0/+0
| | | | | Change-Id: I594c247a8ed042a63a66e41e384332ac2191a815 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Reset property bindings when closing projectKaj Grönholm2019-09-173-1/+11
| | | | | | | Task-number: QT3DS-3953 Change-Id: Ie4e1936a2b13db59292ced86830f2b2942bec970 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix animation tool tip textKaj Grönholm2019-09-171-1/+3
| | | | | | Task-number: QT3DS-3948 Change-Id: I2f0cd45510231918f4dead5b4121d7fa1b3157b9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix material import from 3ds Max FBXTomi Korpipaa2019-09-133-5/+68
| | | | | | | | Task-number: QT3DS-3942 Change-Id: Ibb26ed90562e612cdfcdbdc339a0b6ca0268a688 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Write hasOpaquePixels if image has transparencyAntti Määttä2019-09-131-0/+2
| | | | | | | | - Allows detecting in runtime if we need to use alphatest when rendering materials, which use this image Change-Id: Ia7c98d61d672a629cf339b384277bc9ab63bbe2a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-09-131-0/+0
| | | | | Change-Id: If90c074e86ba958eaac86a26c13c676ec9b95d5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve FBX import from 3ds MaxTomi Korpipaa2019-09-134-237/+231
| | | | | | | | | | | Also clean up code of the whole fbx importer. Task-number: QT3DS-3936 Change-Id: Ic6f58301eed415aea9ceccf8c622272eed4ab275 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Generate unique ids for objectsAntti Määttä2019-09-113-98/+167
| | | | | | | | | | | | Adds number between 0-65536 to each generated id with u at the beginning so that we can determine if the id is not saved with older studio version without unique ids, then generate new one for them. Task-number: QT3DS-3816 Change-Id: I780f5e377ef9e9c3108f91e754a9df7d40fa6a38 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Limit control points after a bezier keyframe is movedMahmoud Badri2019-09-102-20/+61
| | | | | | | | | | | For bezier keyframes check that control points of the moved keyframe and the keyframes before and after it don't go beyond its adjacent keyframes times. Task-number: QT3DS-3928 Change-Id: I957f15cf874a2de720ec21723bdf5076fae40caa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Improve property graph curve fittingMahmoud Badri2019-09-101-11/+23
| | | | | | | | | | | | - fit only selected (visible) bezier controls - fit based on mix/min points on the curve (which is different from keyframe values) - fit based on the visible part of the timeline only - center the curve in the view when its value range is very small (smaller than the min scale value) Change-Id: Ibb4d9b15c65937c35ffc20be1218d2cdd3af04b1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix imported assets animations not appearing bugMahmoud Badri2019-09-092-24/+37
| | | | | | | | | Imported keyframes times have to be convered from seconds to milliseconds to work correctly. Task-number: QT3DS-3921 Change-Id: I4a01ce548560bf35adae9e525bbe7d3aba9f8064 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-submoduleMahmoud Badri2019-09-091-0/+0
| | | | | Change-Id: I51389a054973f4f7842a40fc89b86786e3ac22a3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Limit timeline labels widthKaj Grönholm2019-09-042-0/+12
| | | | | | | | | | This avoids crash when selecting labels clipped with splitter. Also add default font size for labels. Task-number: QT3DS-3913 Change-Id: I89ff403634dedf6d83704c2dd25b8f22da8d8484 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix inspector corruption for referenced materialsJere Tuliniemi2019-09-041-2/+2
| | | | | | | | | Material type list would be populated by the shader list for referenced materials in some cases. Task-number: QT3DS-3889 Change-Id: Ic5364369ae19753ef5bb3d682122aa6d5bcea9c1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Show the alpha channel curve only for custom materialsMahmoud Badri2019-09-041-7/+14
| | | | | | | | | | | The property graph displays the alpha channel curve only for custom material color properties as it is not in use for other material types. Task-number: QT3DS-3919 Change-Id: If4974bfb00ee51547004b1e10c1311362a7dc6be Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
* Allow moving one or more curves keyframes verticallyMahmoud Badri2019-09-044-38/+65
| | | | | | | | | | | Also: - utilize an updatable editor to undo bezier curve editing - allow ctrl+click to deselect a selected keyframe on a curve Task-number: QT3DS-3922 Change-Id: Ie71034431e56fdf47ab12fc20f96455fba2d5314 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix light and camera import from Blender FBXTomi Korpipaa2019-09-032-3/+16
| | | | | | | | | | | | We may still get slightly different values sometimes, so it's best to leave the warning message in place. It should be noted that importing the same FBX back to Blender also results in slightly different values in some cases. Task-number: QT3DS-3368 Change-Id: I8cb772c6fa83ae0f15ca00dc5249ca90880ab483 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix camera fov import from Maya DAETomi Korpipaa2019-09-033-1/+20
| | | | | | | | Task-number: QT3DS-3915 Change-Id: Iead8b633711cbe2c3e6c0534fcd545383a64d67c Reviewed-by: Janne Kangas <janne.kangas@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 12:26:25 +0000