summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update ogl-submoduleMahmoud Badri2019-09-091-0/+0
| | | | | Change-Id: I51389a054973f4f7842a40fc89b86786e3ac22a3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update layer effect documentationMats Honkamaa2019-09-0910-120/+229
| | | | | | | | Mainly formatting but also adding and editing some content. Task-number: QT3DS-2055 Change-Id: Ie1ee9bfa12e40e66a1d49c79348265ea2ef10868 Reviewed-by: Tomi Korpipää <tomi.korpipaa@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 Blender export settings documentationMats Honkamaa2019-09-042-0/+3
| | | | | | Task-number: QT3DS-3920 Change-Id: If3fd07b5f5c6b0198b633672eca8dcc86e31d3e8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
* Improve orthographic clippingKaj Grönholm2019-09-031-0/+7
| | | | | | | Task-number: QT3DS-3801 Change-Id: If154be58d11e89dfd25b297570c9ff8b88c2258d Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update light and camera import documentationMats Honkamaa2019-09-032-2/+38
| | | | | | | Task-number: QT3DS-3918 Change-Id: Iccee3dc7d4ae6de0fc1ba665318f4667aebec2e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Maintain the property graph expand statusMahmoud Badri2019-09-026-8/+40
| | | | | | | | | ...when changing slides, animation state, etc. Task-number: QT3DS-3917 Change-Id: Ib65cf4cc0d1dc3d393305879256d3269f1045b87 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix camera clip plane import from Blender FBXTomi Korpipaa2019-09-021-1/+8
| | | | | | | Task-number: QT3DS-3361 Change-Id: Ieee2386972e4036a6f2bcb49882ff8b33bfbd08a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Indicate invalid import file paths in inspector panelJanne Kangas2019-09-028-9/+55
| | | | | | | | | | | Highlight a non-existing file with color and tooltip in inspector panel. Also adds m_valid flag to inspector items. Task-id QT3DS-3384 Change-Id: I348c388ff2b36158f341b44572aa4022873770bf Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix FBX light importTomi Korpipaa2019-09-023-32/+45
| | | | | | | | | | | Also change DAE import to match FBX import on Hemi lights. Task-number: QT3DS-3391 Change-Id: Ie1f36bd7a41f7ce461b2877a3664db27fd18e4fe 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>
* Timeline ruler and scaling enhancementsMahmoud Badri2019-09-0213-158/+170
| | | | | | | | | | | - Make timeline scaling smoother and allow further scale values. - Implement non linear scaling strategy which improve UX. - Double clicking the scale head resets the scale to the default value - Optimize drawing by only drawing the visible part of the ruler. - Other assorted small tweaks Change-Id: I5fbf729f3b5e098a60e26978af6bc82bb5f307ae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix light imports from ColladaTomi Korpipaa2019-08-303-11/+39
| | | | | | | | | | | | Lights exported from Blender did not get converted correctly in DAE. We need to dig the correct values from inside blender extras in the file. Task-number: QT3DS-3391 Change-Id: I16c6d3101b67eca38b7fe4473808257c3955cc64 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>
* Correct advance/reduce time data type in StudioAppMahmoud Badri2019-08-295-114/+49
| | | | | | | | Plus some relevant tweaks. Change-Id: I19b7f5deb5e6e1caee4724b2d1f1707740d388e0 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix showing warning if non-triangle geometriesTomi Korpipaa2019-08-293-32/+35
| | | | | | | | | | Also unify the warning message for missing material. Task-number: QT3DS-3907 Change-Id: Ia8748bc9a141f30bafecdbe0a64872431bf3f313 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add Support for disabling Frustum Culling on CameraAndy Nichols2019-08-291-0/+1
| | | | | | Change-Id: I9bd21d50d5a661b90bbace2a56b6ac566e30695d Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove OffsetKeyframesCommandHelper classMahmoud Badri2019-08-2811-149/+13
| | | | | | | Remove a useless class Change-Id: Ic011ff3f47ec6458c6645e2b364b699d2cd0aa87 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Correct color gradient when the timeline is scrolledMahmoud Badri2019-08-284-19/+19
| | | | | | | | | Also make the color gradient calculations completely accurate. Also remove one method and merge it into another. Change-Id: Ie097aa7afc5bb49f335b4756498fe7a1b11e7764 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Max animation times at one hourKaj Grönholm2019-08-281-3/+23
| | | | | | | | | | Enforce max timebar times to be 59:59:999 and assist users with filling these. Task-number: QT3DS-3909 Change-Id: I220bf2f16ae6d80977fa041b8d5db1ec266b4af3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix guide selection statusKaj Grönholm2019-08-283-5/+9
| | | | | | | | | | Match to scene object behavior where after delete -> undo restored item is not selected. Task-number: QT3DS-3223 Change-Id: Iedaca14c7df43b0dd44aeefb149a2dd0db56f724 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash after changing animation typeTomi Korpipaa2019-08-275-8/+12
| | | | | | | | | | | Keyframes were invalid in macOS and Linux after the animation type change unless property bindings were updated synchronously. Task-number: QT3DS-3871 Change-Id: I2e357897c5ed5b32d5be326ee743fe14113c93f1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleMahmoud Badri2019-08-271-0/+0
| | | | | Change-Id: I23714ad26ee97cf8e17621379a6b121fbe7b7342 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Unify Editor timeline unit to millisecondMahmoud Badri2019-08-2717-159/+129
| | | | | | | | | | | The studio has mixed timing units (seconds and milliseconds). This commit unifies the timings to milliseconds. The values are however kept saved in the UIP file in seconds for backward compatibility and also cause it is more compact (ex: 1 vs 1000). Change-Id: I906214dfbb4e666ee099b4055ef4c9aa98e91745 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix typo in shortcut keys documentationMats Honkamaa2019-08-271-1/+1
| | | | | | Task-number: QT3DS-3897 Change-Id: Id628f852a7211cda0958926b53c65a210cd8b872 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update animatons and timeline documentationMats Honkamaa2019-08-2710-13/+78
| | | | | | | | | | | Added new information about animation system as well as some minor fixes to timeline documentation. Task-number: QT3DS-3888 Change-Id: I5ba8350e4b3fa395e664deebf129002d3d4cf060 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix saving window geometry in restartsTomi Korpipaa2019-08-274-15/+11
| | | | | | | | Task-number: QT3DS-3892 Change-Id: I1808e3b1bec850016d7981a428187ad0eeccbc4f Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clear also effect system cache on presentation closeMiikka Heikkinen2019-08-231-2/+5
| | | | | | | | | | Uncleared caches can lead to crashes on next presentation. Task-number: QT3DS-3894 Change-Id: I7b8a052df4c3cbfd8bb9de3aca93cbd23a4eed84 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update ogl-runtime submoduleMiikka Heikkinen2019-08-231-0/+0
| | | | | Change-Id: I5993ecf5abfd2724fa7fdd467d85d9bb82ed76ef Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix black screen when refreshing import of a meshMiikka Heikkinen2019-08-231-0/+4
| | | | | | | | | | Ensure correct context when reacting to changing project files. Relevant to at least invalidating buffer when .mesh file changes. Change-Id: I71717c477b0b637a0f43da2f46468dcd2b3795ae Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io>
* Refresh import fixesMiikka Heikkinen2019-08-238-75/+128
| | | | | | | | | | | | | | | | | | | | | | | | | - Fixed various issues caused by refresh not being done inside transaction. - Added a confirmation prompt to refresh import to warn user about the operation not being undoable and resetting the undo stack. - Fixed issue where material class update was attempted even if just materialdef file was changed. This should only be done when shader is updated. - Fixed refreshing import that is not referenced currently. - Synced import images and meshes dir names given to ImportImpl constructor and saved to .import file, as the latter are used when refreshing import. "Meshes" vs "meshes" caused breakage of referred highlights and mesh visually updating on editor in some cases. - Fixed the material getting lost when refreshing import where the model name changes but the material stays the same. Task-number: QT3DS-3876 Task-number: QT3DS-3879 Task-number: QT3DS-3880 Change-Id: I65e59a570b01b58d3252457f590b9f4425758865 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Move the remaining QSettings to CStudioPreferencesTomi Korpipaa2019-08-236-90/+191
| | | | | | Task-number: QT3DS-3887 Change-Id: Ifebd29fbad932ad32b9aa78c0c9557cb6b941d93 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix remote preview button enabled stateTomi Korpipaa2019-08-221-3/+2
| | | | | | Task-number: QT3DS-3893 Change-Id: Ia1193c174e152324770472c7e8bb48d313c69c6e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Save preferences to QSettingsTomi Korpipaa2019-08-2251-1297/+536
| | | | | | | | | | | Remove the old xml preferences file and replace it with QSettings instead. Also divide all of the settings into logical groups. Task-number: QT3DS-777 Change-Id: I633a981c9fbcb838556b008b7361c5793027f57a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Differentiate between elements with common root in datainput dialogJanne Kangas2019-08-211-0/+4
| | | | | | | | | | Fixes bug where datainput dialog stuck in a loop due to string comparison not differentiating between two elements with common root path. Change-Id: Ibeea8614d8e36fe9d96df30734c6150368f8b8dc Task-id: QT3DS-3885 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide property graph channel buttons for single channel propertiesMahmoud Badri2019-08-211-2/+5
| | | | | | Task-number: QT3DS-3886 Change-Id: I5d4b9e574ad6940e309952fb90859d1bf0ae9faa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix change animation type for unlinked propertiesMahmoud Badri2019-08-212-25/+26
| | | | | | | | | Also show fit and maximize graph buttons for the 3 curve animation types Task-number: QT3DS-3884 Change-Id: I4f23156ac5a9c71afde1f29075351363daad794c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make timeline visibility filter icon follow datainput control changesJanne Kangas2019-08-211-6/+3
| | | | | | | | | | | Create a properly scoped transaction from datainput control removal through datainput management dialog, so that timeline widget also receives property changed notification. Change-Id: I1d39972e52da280a84b6c3ed3869b72ee6b92124 Task-id: QT3DS-3757 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix timeline row renamingMahmoud Badri2019-08-2111-69/+70
| | | | | | | | | | Row renaming broke after this commit: 1e49aba7070e8eeff8b0cc35113ccab2f37941e0 This commit fixes it. Also some relevant tweaks. Change-Id: Ib8d4fc28e351881ed87287124e57b11f760b098f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when undoing change animation typeMahmoud Badri2019-08-203-5/+14
| | | | | | | | | Also correct locked state for the curves Task-number: QT3DS-3881 Change-Id: Ia710d9735d6478f6a5307cb2736aeb12ca7f263f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Pivot property graph scaling to the mouse positionMahmoud Badri2019-08-193-10/+18
| | | | | | | | | | | - adjust scaling so that its pivoted to the current mouse y position - increase the top margin so that bezier keyframe is not hidden under the row keyframe when the curve is fitted - move the ruler text a bit to the right so it is not hidden under the row keyframe when a ruler's line happen to be under a row's keyframe Change-Id: I099d73ee0b93f6028121c428bcbbc94f6b76e083 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* update ogl-runtime repoMahmoud Badri2019-08-191-0/+0
| | | | | Change-Id: Ic246cff3f293872c434cace563191e7dfe3c383a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Cleanup Qt3DSDMAnimation.hMahmoud Badri2019-08-1910-34/+33
| | | | | | | | | | Some tweaks, method renamings. This should be merged after the ogl-runtime commit 3fd04bb21795172e1d4d05cd69546652e20b7317 Change-Id: Ie5c7c2690cf375c7f6a8f7ddaf088ee4c0d40dd6 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix visual aid widget positioning when light/camera is a childMiikka Heikkinen2019-08-191-4/+4
| | | | | | | | | | Widget transform needs to be calculated in global space. Task-number: QT3DS-3390 Task-number: QT3DS-3399 Change-Id: Id7cb21157e59fd62e313a023c11040cdab395e2d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Hide manipulator widgets when the selected object is behind cameraMiikka Heikkinen2019-08-196-1/+23
| | | | | | | | Task-number: QT3DS-3864 Change-Id: I1c1c7e22eef6905827243b449764cdca0c44932c Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Remove separator at the end of GetAbsolutePathAntti Määttä2019-08-161-1/+1
| | | | | | | | No usage expects the separator anymore. Task-number: QT3DS-485 Change-Id: Ib9bbb0180403468a609c2ff4a24e20cecc36edaf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve the timeline method getItemBelowType()Mahmoud Badri2019-08-153-49/+39
| | | | | | Change-Id: I19bb1bd063c5b411ab8e3d8dbf568c3a34d38640 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 21:17:48 +0000