summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Multiselect refactoringMiikka Heikkinen2016-06-149-224/+243
| | | | | | | | | Now store multiselection status and list on c++ side only to reduce problems from keeping them properly synchronized. Change-Id: If3277bb1eca5ffc7a7749e300e0cc6de4ccf9df2 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Duplicate under the same parent, not always under scene rootTomi Korpipää2016-06-141-1/+1
| | | | | | Change-Id: I6d29568d6c3f4cd5966012b5853182317f4ae884 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fixed context menu paste in 3D viewTomi Korpipää2016-06-142-13/+14
| | | | | | Change-Id: I2842079120aafa8046b96629acdb7b97d8762319 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide camera frustum if the last camera is deletedTomi Korpipää2016-06-141-0/+6
| | | | | Change-Id: I39ae97e2529193d1753713277968ff0a7953c474 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Default folder bug fixTomi Korpipää2016-06-132-4/+8
| | | | | | | | Property bindings always set all folders to default after restart. Now folders are reset to default only when default folder is changed. Change-Id: I8b067d64e3fecee414fdd9297fee1ad91eeee34f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update translationsTitta Heikkala2016-06-137-340/+379
| | | | | | | | Updated strings for unsaved changes dialogs. Also updated sentence case for Finnish. Change-Id: Iaae2918f6544937eea7291ecfbf109e4a0395a4d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Set FileDialog folderTomi Korpipää2016-06-135-14/+80
| | | | | | | | | Set default folder for file dialogs. There are be three folders dialogs should remember: save/load, import and texture. Change-Id: Id5acce311f1174188263684c80e15549a8310cd5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fix drag translating of camera that was broken by recent changesMiikka Heikkinen2016-06-131-9/+16
| | | | | Change-Id: I2b90fc69eb493c954528d9659c485db3aa7257c3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Persistent settings support addedTomi Korpipää2016-06-134-13/+64
| | | | | | | Note: The rest will be added in a separate task Change-Id: I0f6f0fb345e35d4fb97737d61a4c25f7aac48a11 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Show dialog on "new" and "open" if there are unsaved changesTomi Korpipää2016-06-101-4/+46
| | | | | | Change-Id: Id36f925f911e0c08feca7944e6874c4b8cc4679b Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Removed deselectionTomi Korpipää2016-06-101-18/+3
| | | | | Change-Id: I966ca8d7cd59c0510647252b0c1808e35e61df50 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change group box to always tightly contain group contentsMiikka Heikkinen2016-06-1013-20/+271
| | | | | | | | | | Added drag handle for actual group/mesh translation point for groups/meshes that are not centered around their translation point. For additional clarity, added a line between the selection box translation handle and group/mesh translation point handle. Change-Id: I25146a68472f3f1b3703cbbcc1a60464d4c87260 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Changed treeview branch indicatorTitta Heikkala2016-06-101-0/+15
| | | | | | Change-Id: I9e9ad5944f4973f6f0aec19238cc227b2ec9ffc3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Prevent multiselecting scene rootTomi Korpipää2016-06-101-2/+9
| | | | | | Change-Id: I141557a593a2a2e186ec4728fdeb90c6029f2c8e Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fixed selection handle updates after Qt3D signaling changeTomi Korpipää2016-06-101-7/+14
| | | | | | Change-Id: I311523afb31ca3afcdfe4516d286db1fca20bf63 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change ToolSeparator widthTitta Heikkala2016-06-101-1/+1
| | | | | Change-Id: I90cea047e6c01f054bcecf1f883318ad755070ac Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix camera projection type title appearanceTitta Heikkala2016-06-101-0/+14
| | | | | Change-Id: I1cc80eda2d635a6c0eb1d271fdc210240fe65229 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixed helper plane orientation on "new"Tomi Korpipää2016-06-101-2/+1
| | | | | Change-Id: I83dcb396823d901d27d62182cdbe1e8a82c71d95 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Make grouping work correctly with multiselected parents and childrenMiikka Heikkinen2016-06-092-5/+16
| | | | | Change-Id: Ie0a933d4ab2adf699ea2b343aa744e1b6d7a677c Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Add saved file to application titleTitta Heikkala2016-06-091-1/+8
| | | | | | Change-Id: Ic1b068425a075be1e927c93ab6d1d6559e106c5b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't change generic properties unnecessarilyMiikka Heikkinen2016-06-093-1/+12
| | | | | | | This fixes the issue of always prompting for save even when not needed. Change-Id: If8bce23b9e1a93075d3ab826f810232a7bd2e960 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support for copy, cut and paste in tree viewTomi Korpipää2016-06-099-35/+103
| | | | | Change-Id: Id9f42a3b2b190b6eab0506ff74030e959ef59731 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Optimize isDescendant functionMiikka Heikkinen2016-06-091-9/+7
| | | | | Change-Id: I6f07088c54420b06d7aa5bfa0bd43d62bf84da2e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixed deleting and duplicating multiselectionTomi Korpipää2016-06-094-6/+49
| | | | | Change-Id: I24f98923b518966a7b7571eed7194ae75ddbe6cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fixed group selection context menuTomi Korpipää2016-06-093-4/+2
| | | | | | Change-Id: I159df3add5a3bf4f6e6f46df65db573d3181e553 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make translate handle to be on top of scale handles alwaysMiikka Heikkinen2016-06-081-0/+1
| | | | | Change-Id: Idf21a8df5e3aad8457b29daa86951062d403866f Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Group box changed to encompass all grouped entitiesMiikka Heikkinen2016-06-088-32/+140
| | | | | | | | | | Related changes also included: - When grouping items, the new group will be centered to items - Fixes to missing drag handles on group box and extra selection boxes after multiselection. Change-Id: I323324d674021a5487fed0953bea67012cb73abf Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Update menusTitta Heikkala2016-06-087-12/+9
| | | | | | | New menu icons added. Removed unnecessary title from EntityMenu. Change-Id: I74697face4e65500bb1d33702798e233fe78cbc9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Open texture selection dialog also from texture imageTitta Heikkala2016-06-071-0/+4
| | | | | Change-Id: I7486e30aad664f8262fae95ce857c4cf9a002d6b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update translationsTitta Heikkala2016-06-075-1318/+473
| | | | | | | | Translation files updated. Default language set in EditorScene. Change-Id: Icd94f739f39a1b4f2334ff12dbf6db562fb51b7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support for copy, cut and paste in 3D viewTomi Korpipää2016-06-0711-6/+353
| | | | | | Change-Id: Ifb8ef79820aa5d25c25354ddcf6c3056777753f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fix selection box and drag scaling for off-center custom meshesMiikka Heikkinen2016-06-063-4/+13
| | | | | | Change-Id: Ic122846cdc7e82166a46e5846665f9fdf19821b5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* New toolbar buttons and settings dialogTitta Heikkala2016-06-068-191/+289
| | | | | | | | | | Introduced new settigs dialog that has some of the old menu items. Rest of the old menu items are moved to toolbar. The old menu is removed altogether. Change-Id: Idf8a9aab4217c9bc5b39890a3cca24cf9f35888c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix drag handle positioning after active camera changeMiikka Heikkinen2016-06-031-1/+5
| | | | | Change-Id: I4e5c14a3e1bf415751911fb088d4e856cd2902f4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Camera menu items replacedTitta Heikkala2016-06-036-71/+91
| | | | | | | Camera related menu items are moved to toolbar and ComponentMenu. Change-Id: Id66a23230b0d3f35215db722d6d337cf9b19fd57 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix various drag handle visibility issuesMiikka Heikkinen2016-06-036-19/+23
| | | | | | | | | | | | - Entity insert drag entity no longer remains visible if drag is canceled by alt-tabbing out of the editor while cursor is over the 3D viewport - Selection box drag handles no longer show through entity library - Selection box drag handles no longer show up if the box is behind the camera Change-Id: I3f4e7f4953e1526622579f743abae2336d317337 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Change translate handle to circle and color to match camera viewcenterMiikka Heikkinen2016-06-032-1/+3
| | | | | | Change-Id: I8f5b2358939c086640fb858363aa7cf22d5e6695 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make drag handles partially transparent when not dragging/hovered overMiikka Heikkinen2016-06-033-0/+24
| | | | | | Change-Id: I9e830e84084fd8fc92843fac6cf25c5601da348f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fix rotate handle position relative to selection box cornerMiikka Heikkinen2016-06-031-18/+28
| | | | | | Change-Id: I49b3d4983414ff574b708a401ef2a71fbf40a2e3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Anchor the opposite corner when drag-scalingMiikka Heikkinen2016-06-036-30/+120
| | | | | | Change-Id: Ifb6f3bb4882cc55104ccd6bce7ae1667e041708d Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Menu items to toolbarTitta Heikkala2016-06-0219-277/+402
| | | | | | | | | | Menu items from File and Edit menu are moved to toolbar. EditorToolbar now consists of toolbar elements and shortcuts. Actions and file dialogs are kept in mainwindow. Change-Id: Ib66622e76b145e81fc0bd68a8e5e0530df757331 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Changes to drag handle functionalityMiikka Heikkinen2016-06-028-96/+159
| | | | | | | | | | | - Added scale handle to every corner - Added proper icon for rotate handle - Rotate handle doesn't change corners while drag-rotating - Rotate handle is always positioned to upper right corner of the selection box as seen on screen. Change-Id: Iddb3684b4824a95613e9e91eeb522d9647d2282a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixes crash when loading scenesTomi Korpipää2016-06-021-3/+5
| | | | | Change-Id: I81c08727d9c28e7512e5b5a00a10777cf0cb8666 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Rename standalone executable sensiblyMiikka Heikkinen2016-06-011-0/+2
| | | | | Change-Id: I1289cef46857509f0d46708dd6758a5765a433bb Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Correct image namesTitta Heikkala2016-06-017-12/+12
| | | | | | Change-Id: I260a583893165a435526475b7aff9317bf8daefd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Added highlighting multiselected entitiesTomi Korpipää2016-06-015-11/+39
| | | | | | Change-Id: Iaa6b85851afd21b6c004e82fc8ba360ef0f8fece Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add wizard for creating scene filesMiikka Heikkinen2016-06-0117-48/+280
| | | | | | | | | | Scene files are now suffixed with .qt3d.qrc. Also refactored plugin to reduce redundancy in names. Change-Id: I988faa9fd87d2e454dfbe70fa3078ce71b1c3a54 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Restored missing custom mesh imageTitta Heikkala2016-06-011-0/+0
| | | | | Change-Id: Ia54cca57d3e6ce0550aa29605c8e587ccd4a01f3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Updated default textures to current Qt logoTomi Korpipää2016-05-313-0/+0
| | | | | Change-Id: I45cd5631e23b1996cfc077ee3fbf6172155843bc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Multiselection support in tree viewTomi Korpipää2016-05-314-38/+82
| | | | | Change-Id: Ic8ff4247465be9ef8418c798922bc9517ae2b296 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>