summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Qt3DStudio/Palettes
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 crash and assertionsAntti Määttä2020-10-151-1/+1
| | | | | | | | 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 issues in dynamic object texture changeAntti Määttä2020-10-151-4/+7
| | | | | | | | | | | | | | | | | -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>
* Use images with dynamic object texturesAntti Määttä2020-10-155-33/+72
| | | | | | Task-number: QT3DS-4063 Change-Id: I32b4b1892f064311e5896ebc1ebdc087598135d1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Improve timeline signal actionsv2.8.0-beta1Kaj Grönholm2020-09-2513-3/+102
| | | | | | | | | | | | | | | | - 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>
* 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>
* Save relative instead of absolute paths to materialdefsv2.7.0-rc2Jere Tuliniemi2020-05-141-6/+14
| | | | | | | Task-number: QT3DS-4089 Change-Id: Ib880bc2da4a5b7e77efa96114ca283410240afb5 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Force immediate render after files changeJanne Kangas2020-03-242-3/+5
| | | | | | | | | | | | | 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>
* Fix inspector undo and redo for float fieldsTomi Korpipaa2019-12-3110-0/+84
| | | | | | | Fixes: QT3DS-4000 Change-Id: I0bb5d230ac0a2dc7e968e406275707197bb03d8e Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Indicate shader errors in EditorJanne Kangas2019-11-088-25/+107
| | | | | | | | | | Show shader errors with highlighting and tooltip in Project panel. Also indicate error in Inspector panel with highlighting. Change-Id: Ic601474d40058723872339f746165868307c596b Task-id: QT3DS-3598 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow keyboard navigation and asset deletion in project panelJanne Kangas2019-11-045-0/+38
| | | | | | | Change-Id: Iad722b2a95ba85c405820a35e9b4149b5959556a Task-id: QT3DS-3980 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
* Revert "Indicate shader errors in Editor" for branch 2.5Janne Kangas2019-10-081-11/+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-082-28/+35
| | | | | | | | | | | | | | | 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>
* 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>
* Indicate shader errors in EditorJanne Kangas2019-10-011-0/+11
| | | | | | | | | | | | 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>
* 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>
* Add Vector4 to the data type drop down listJere Tuliniemi2019-09-181-1/+1
| | | | | | Task-number: QT3DS-3947 Change-Id: I8b5555869ba472e6310b61b4c12331bda2c773d7 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>
* Limit control points after a bezier keyframe is movedMahmoud Badri2019-09-101-1/+0
| | | | | | | | | | | 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-091-15/+18
| | | | | | | | | 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>
* 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>
* 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>
* Indicate invalid import file paths in inspector panelJanne Kangas2019-09-025-3/+47
| | | | | | | | | | | 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>
* 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>
* Correct advance/reduce time data type in StudioAppMahmoud Badri2019-08-291-1/+0
| | | | | | | | Plus some relevant tweaks. Change-Id: I19b7f5deb5e6e1caee4724b2d1f1707740d388e0 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove OffsetKeyframesCommandHelper classMahmoud Badri2019-08-2810-148/+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>
* 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>
* Unify Editor timeline unit to millisecondMahmoud Badri2019-08-278-75/+47
| | | | | | | | | | | 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>
* Refresh import fixesMiikka Heikkinen2019-08-231-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* Save preferences to QSettingsTomi Korpipaa2019-08-2214-36/+36
| | | | | | | | | | | 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>
* 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>
* Fix timeline row renamingMahmoud Badri2019-08-218-67/+53
| | | | | | | | | | 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>
* Cleanup Qt3DSDMAnimation.hMahmoud Badri2019-08-195-26/+25
| | | | | | | | | | 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>
* 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>
* highlight toggled curve editor controlsMahmoud Badri2019-08-151-1/+8
| | | | | | | | | | Add a 'toggled' visual (different border color) to the 'maximize graph' and 'toggle gradient color' buttons. Task-number: QT3DS-3855 Change-Id: I4189c5fc2fb26431dce9361b624e38273e6d3d0f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 14:49:21 +0000