summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix inspector button positions when moving editor between screensMiikka Heikkinen2018-05-301-2/+2
| | | | | | | | | | We can't rely Image element's sourceSize, as it can change when pixelratio changes and @2x images are used. Now we hardcode space taken by the image. Change-Id: I62faeca8dd3ae22dc42af2ada593ba4dee7194d8 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update scene renderer display scaling factor when GL view rect changesJanne Kangas2018-05-302-12/+15
| | | | | | | | | | | | Get current display scaling factor when render rectangle changes size. Fixes incorrect mouse click coordinate mapping after rescaling (Studio window moved from one monitor to another, for example). Change-Id: Id9d82775e9c11fac308085b0a7891dfa610e8d05 Task-Id: QT3DS-1673 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow moving rows at the root level inside a componentMahmoud Badri2018-05-301-4/+12
| | | | | | | Task-number: QT3DS-1821 Change-Id: Ibbb8f56faec76c14eca54fc7d3414f1d18129119 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix context menu and mouse button handling in timelineMiikka Heikkinen2018-05-301-38/+54
| | | | | | | | | | | | | | - Context menu no longer opens when drag is happening. - Non-left button presses are ignored while drag is happening, as those caused hover events to trigger. - Non-left doubleclicks do not trigger any special handling. - Non-left click + mouse move no longer can mistakenly modify m_dragging. Task-number: QT3DS-1817 Change-Id: I2ea0353ad45b7567b5e23ac22ceda7707d6b5de0 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement tooltip showing timeline bar times when draggingMiikka Heikkinen2018-05-306-6/+88
| | | | | | | | Start time, end time, and duration are shown for the dragged bar Task-number: QT3DS-401 Change-Id: I6da60ca08579086d778d052015b18f37adaf34b7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update SampleProject to new UIP versionTomi Korpipaa2018-05-3010-1/+1
| | | | | | | | Task-number: QT3DS-1820 Change-Id: Ia8bf2374ccbee8c7bf1ebe2d62d8227398586233 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Bind new datainput directly when added from "Add new datainput"Janne Kangas2018-05-307-9/+39
| | | | | | | | | | Binds the newly created datainput directly as controller for slide or timeline, when datainput is created using "Add New Data Input" from datainput selector dialog. Also, use appropriate window titles. Change-Id: I288286d11f8a22f5a4d97183067c8e1412ba6002 Task-Id: QT3DS-1538 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update datainput usage during editingJanne Kangas2018-05-3012-86/+150
| | | | | | | | | | | | | Implements datainput usage tracking in order for UI to have access to up-to-date binding information when needed. Highlights datainputs that are currently bound in the datainput definition dialog. Shows "no undo" warning when a datainput is deleted. Task-ID: QT3DS-1659 Change-Id: I13d2bc1131ce6a1c78166f295291fc107395a247 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Block dragging objects under locked objectsMiikka Heikkinen2018-05-301-1/+2
| | | | | | | Task-number: QT3DS-1798 Change-Id: Iceacd7b6290397ac41fdc3dc5adff97bd6bba53f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* implement DnD auto scroll, expand, and collapse functionalitiesMahmoud Badri2018-05-298-39/+162
| | | | | | | | | | | | | - While Dragging a row, hover over a container row and it will auto expand. Hover out of it and it will auto collapse. - Hover over the top or the bottom of the tree list and it will auto scroll. - While DnD is active, currently hovered row is highlighted so that auto expand/collapse is more clear. Task-number: QT3DS-1711 Change-Id: I00680bb9e8b00530b257ca7a39a9789b7b040a5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make hide/unhide to work with multiselectionKaj Grönholm2018-05-291-9/+24
| | | | | | | Task-number: QT3DS-1818 Change-Id: I6416f9d4214a67623e60627f115dc4030901bf51 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix incorrect duration jump glitchMahmoud Badri2018-05-291-2/+4
| | | | | | | | | | While dragging a row duration, at the point when the horizontal scrollbar appears, the duration bar jumps far away for 1 frame. Task-number: QT3DS-1806 Change-Id: Ia6486c87fed891c2bf555ffd18d8bcc3f2566ec9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Adjust loading popupKaj Grönholm2018-05-293-6/+29
| | | | | | | | | | Change background color & add border. Also updates correct image path and changes filename label to word-wrap. Task-number: QT3DS-1788 Change-Id: Ief46b5110e9fc54994675e9cd821849502567266 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix the initial directory for opening a presentationMiikka Heikkinen2018-05-292-12/+19
| | | | | | | | | | | Now File/Open always shows the most recently opened presentation's directory. Task-number: QT3DS-1471 Change-Id: I4038528001bdc7e597b4b4cff3cde579815679bf Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clean up old mesh revisions from old presentationsTomi Korpipaa2018-05-295-59/+83
| | | | | | Task-number: QT3DS-1790 Change-Id: I988a3f09ee4a9daaa4ce3dd08e2ae56850964cb0 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Update qt3d-runtimeAndy Nichols2018-05-291-0/+0
| | | | | Change-Id: I1bd4fce3fe8296a3ce54ece52375d0a76a8cae22 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add tooltips in timeline palette iconsKaj Grönholm2018-05-293-1/+50
| | | | | | | | | Also show mouse hovering there for improved UX. Task-number: QT3DS-270 Change-Id: I78e5ac228031e28cbd15e7f20c546281c14abb62 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clarify how custom materials can implement main functionMäättä Antti2018-05-291-0/+52
| | | | | | | Task-number: QT3DS-1701 Change-Id: Ie41cb000d99875f740f376b795cd95c568fd1e44 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix double headers and remove unused from Qt3DStudio.proMäättä Antti2018-05-291-96/+0
| | | | | Change-Id: I4c98501ffb5dc89dab91d5f6b63c0968c7fd2014 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update qt3d-runtimeAndy Nichols2018-05-281-0/+0
| | | | | Change-Id: Id08fa1dfc573e1974b79914392a1a375a0bb6863 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Don't start drag or select the row when clicking on expansion arrowMiikka Heikkinen2018-05-281-1/+1
| | | | | | | Task-number: QT3DS-1797 Change-Id: I814ce0fba568ec52049905f8bb4d8e4d48d3189f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clear prev/next sibling when adding a child nodeMiikka Heikkinen2018-05-281-4/+6
| | | | | | | | | | | | | | Normally prev/next sibling are cleared when the node is removed from the previous parent, but apparently having layer as parent is indicated by a null parent, so the remove is not called when moving layer's direct children. They will retain old prev/next sibling information, which can corrupt other child nodes of the same parent when the original node is moved out in a future transaction. Task-number: QT3DS-1551 Change-Id: I6203789f1e7cf45d60a8358f3c71c2deff07fdd7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove redundant adds and removes from RearrangeObjectsMiikka Heikkinen2018-05-281-13/+0
| | | | | | | | | | According to the comment, the old timeline needed this redundancy, but the new timeline doesn't need it. Task-number: QT3DS-1722 Change-Id: I63c5bd2235f0e5e6516fafaf237d62ce69a77071 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix filteringMiikka Heikkinen2018-05-285-26/+60
| | | | | | | | | | | | Fixed various filtering issues: - Expansion arrow shouldn't show if no visible children - Filtering should be up-to-date when slide is changed - Expanding an item should not show filtered out children Task-number: QT3DS-1764 Change-Id: Ia5573a5dc0c5e5e0e7d6fa0a4b4d4913190301d6 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove some compile warningsMiikka Heikkinen2018-05-283-0/+9
| | | | | Change-Id: Icab92c578ec17331812fe3a1bc778bb8135692b2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Improve timeline row label handlingKaj Grönholm2018-05-283-52/+5
| | | | | | | | | | | | | Trim labels, inform when trying to use empty label and keep visible label always up-to-date. Default label names not needed, user can't change label to empty and if uip contains empty "name" parameter just show it empty so user knows what to correct. This matches to previous timeline behavior. Task-number: QT3DS-1746 Change-Id: Ibb065ee9cd0ba5d46f2cd15929c4eacfa4036855 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix ever-increasing mesh size on "Refresh Import"Tomi Korpipaa2018-05-283-11/+14
| | | | | | | Task-number: QT3DS-1779 Change-Id: I0c771e9b8617744d888c6296dd465e6c8c3371c7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix indent in best practices docsTomi Korpipaa2018-05-281-6/+8
| | | | | Change-Id: Ifaa2d15e64cc7b01a9d99784ec21dfce0c7bad64 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Keep ruler duration up-to-dateKaj Grönholm2018-05-253-3/+11
| | | | | | | | | | When user adjusts timebar time, make sure ruler duration is also updated so e.g. scrollbar appears as needed. Task-number: QT3DS-1786 Change-Id: I3b9a621920bd77b652ca76eda458e8ae335620a8 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Don't update expand state if it hasn't changedMiikka Heikkinen2018-05-251-0/+3
| | | | | | | | | Unnecessary expand state updates can cause property rows to be hidden when changing selection of other children of the object. Change-Id: I3014f039a3a956b383cb71c891886b1f9e3e29a9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make moving rows asynchronousMiikka Heikkinen2018-05-254-73/+64
| | | | | | | | | | | | | | | | | | | | This is the simplest way to ensure row indices stay in sync with asset graph indices in cases where multiple children are added to indices beyond the current child count (e.g. undoing a multiselection delete/move). This change also makes multiselection moves quite a bit more efficient, though in release builds the effect is barely noticeable. Also optimized a frequently used function getBindingForHandle to first look for the binding using the m_handlesMap as pretty much every time, except when called from onAssetCreated, the handle can be found from m_handlesMap. Task-number: QT3DS-1758 Change-Id: Ie95aef5f5f54c794db6a5d9c7515314b3182b65e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Shorten property name so it is not cut on macOSTomi Korpipaa2018-05-251-2/+2
| | | | | | | Task-number: QT3DS-670 Change-Id: Ibebbb5698e88affadba2676f822f05fa4e47c2f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Allow refresh import even if *.import is not referencedTomi Korpipaa2018-05-251-3/+3
| | | | | | Task-number: QT3DS-1735 Change-Id: I09a6ca84f458b95a6643891a8e55a4629f952723 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update data inputs to 2.0 format in SampleProjectv2.0.0-beta2Tomi Korpipaa2018-05-241-8/+8
| | | | | | Task-number: QT3DS-1770 Change-Id: Ide953a26c1e4c3644a5af74a2834221def04d1ad Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update Welcome screensKaj Grönholm2018-05-2419-0/+4
| | | | | | Task-number: QT3DS-1739 Change-Id: I36956010e3c80e7a8074ce1563ed49f3c92a9b6e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update qt3d-runtimeAndy Nichols2018-05-231-0/+0
| | | | | Change-Id: I436765380fd659c2f60ed18697c068f7797bffeb Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update build instructionsMarianne Yrjänä2018-05-231-8/+4
| | | | | | | Build instructions updated and renamed to README Change-Id: I0b5629007787207ba0bbdbfc057ede267fe9925c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't animate the parent's expand on selectionMiikka Heikkinen2018-05-231-1/+1
| | | | | | | | | | | Expand animation is meant for child items exposed or hidden by expand or collapse. Animating the initial expand of the parent makes parent vanish in case it is already expanded. Task-number: QT3DS-1769 Change-Id: I983831bf4d2891ce1f2a09dba170687159eed542 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix undo for property changes on timelineMiikka Heikkinen2018-05-231-1/+2
| | | | | | | | | | | Range-for on QMultiHash iterates over values instead of keys, which caused us to miss all asynchronous property updates. Changed m_dirtyProperties async handling to explicitly iterate over keys. Change-Id: Id5a09f2165475e7a9c04f3d6e1493b18aa7a7fc7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ColladaDOM submoduleJanne Kangas2018-05-231-0/+0
| | | | | | | Task-ID: QT3DS-614 Change-Id: Id92b67a5492239f57bc948a0d3edd7186f344578 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix index calculation typoJanne Kangas2018-05-231-2/+2
| | | | | Change-Id: I8532cf09df3cfabf933f7dd9b04cb988e3e6a700 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Prevent a layer from being pasted under any parent except the sceneMahmoud Badri2018-05-231-1/+3
| | | | | | Task-number: QT3DS-1763 Change-Id: I60cdad8e3b9868b758722d452fff185442e038b5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Expand parents of selected rows upon selectionMiikka Heikkinen2018-05-232-10/+16
| | | | | | | | | | | Previously dragging a new object form basic objects to scene view would not trigger parent expansion. Rather than make a special case about that, changed it so that all row selection triggers parental expansion. Change-Id: Iae38a8b462012c127ac22fb8bca07cfd4f8c36d3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make sure selections are correct when timeline rows are addedKaj Grönholm2018-05-231-0/+3
| | | | | | | Task-number: QT3DS-1757 Change-Id: I8c6d8454f8e2eda98601095a1dcd9e6327bdb60b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Check missing datainput definitions when opening a presentationJanne Kangas2018-05-2315-108/+331
| | | | | | | | | | | | Iterates through the presentation and checks if datainput control bindings are using a valid datainput. If datainput definitions are missing, shows a dialog that allows the user to automatically remove invalid bindings. Task-ID: QT3DS-1658 Change-Id: I11db40813c8a7368b05f0a8b377472a9e0b1db12 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix a crash when undoing a newly added row while timeline DnD is activeMahmoud Badri2018-05-233-1/+9
| | | | | | | Task-number: QT3DS-1755 Change-Id: I398cc607abf3f5002266cb56c2a4d0dc37617200 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Open "Import Assets" to the main asset folderTomi Korpipaa2018-05-231-3/+12
| | | | | | | | | Remember the last opened folder if browsing files outside the content library. Otherwise open to the main asset folder. Task-number: QT3DS-1727 Change-Id: I7c421539643a07ff936e2ecfd05721d40bdd034c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shortcut delete of slidesTomi Korpipaa2018-05-237-13/+31
| | | | | | | | Task-number: QT3DS-1747 Change-Id: I2139057dc505c82adda4278f292608b2513ef0c6 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update specular map documentationJere Tuliniemi2018-05-231-1/+1
| | | | | | | | | | | Update the docs to reflect that the color of the specular map is now used. Task-number: QT3DS-1707 Change-Id: I09b9e20124aadc7c57a30a8b073da8f96607580f Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make slide change and property change handling asynchronousMiikka Heikkinen2018-05-236-74/+170
| | | | | | | | | | | | | | | Slide change is an expensive operation that is often accompanied by multitude of property changes, which don't need to be processed, because we are already doing a full reset of the timeline. Changed slide change and property change handling to be done asynchronously. This enables us to ignore duplicate processing, leading to vastly improved slide change times. Task-number: QT3DS-1723 Change-Id: I611c66d42384b894d9a36a3d752c8fb139d50225 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 08:04:50 +0000