summaryrefslogtreecommitdiffstats
path: root/editorlib
Commit message (Collapse)AuthorAgeFilesLines
* Fix 'redo' tooltip on the tool barHEADmasterMegidd Git2018-08-071-1/+1
| | | | | | | | | The tool tip of the redo button is fixed by replacing the copy-&-pasted "undoText" identifier with "redoText". Change-Id: I34325ad700b9b88fb01111272664c368903a0ba7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change editor save format from QML to JSON + QGLTF when supportedMiikka Heikkinen2016-12-168-9/+376
| | | | | Change-Id: If2bf099b5e77b3350ee5670e968cfa9a96d563b2 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* GLTF exporter is now in 5.9, so uncomment the related defineMiikka Heikkinen2016-11-171-2/+1
| | | | | Change-Id: Ief4bdf654636c46d382fa915c46d03d1e9a0658a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Delay sceneloader delete to avoid random crashesMiikka Heikkinen2016-11-111-1/+2
| | | | | Change-Id: I4618069686327c68ec02db16d37908b99e45799f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add option to GLTF export selected entity instead of whole sceneMiikka Heikkinen2016-11-103-7/+35
| | | | | Change-Id: I1526c1cc17722eb1f4745b0ffd69fecdc6c9c9dd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Allow importing lights as part of a sceneMiikka Heikkinen2016-11-082-19/+19
| | | | | | | Also properly deletes loaded scene after making the duplicate. Change-Id: Ib55c1b42c3629c9cc8353510ff1e9e6471353c13 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* New export GLTF dialogMiikka Heikkinen2016-11-087-37/+265
| | | | | | | Allows setting export options and more intuitive scene name handling. Change-Id: Iad586760bcdb83ae24ef3118139fb20aac1a56d1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add ability to export the scene as a GLTF sceneMiikka Heikkinen2016-11-047-1/+105
| | | | | | | | | | This functionality requires GLTF exporter plugin support from Qt3D, which isn't yet available. Therefore it is ifdeffed out by default. Uncomment the relevant define in editorlib.pro to enable. Change-Id: Iad26d12cbb40c5ca366d98cd26e51786f21803fb Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Hide the original entity loaded by scene loaderMiikka Heikkinen2016-09-193-0/+15
| | | | | | | | This is only necessary, because deleting scene loader entity crashes and Qt3D doesn't propagate disabled status to child entities anymore. Change-Id: Icc630d9f65fb94b5fa5b2ebc7e58043d2b574303 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update icons and shortcutsMiikka Heikkinen2016-09-1510-120/+242
| | | | | Change-Id: Ibe9bdc5f44b6ad397397a2025adb867be54eb289 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable dragging via helper arrowsMiikka Heikkinen2016-09-1511-109/+211
| | | | | | | Also added local/global helper arrow toggle. Change-Id: I48552e06388ccc14a530acb8f719efa5c4fbfa0b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add a simple way to move and orient camera to six main axis pointsMiikka Heikkinen2016-09-149-1/+143
| | | | | | | | The selection affects the active camera, whether it is the freeview or a scene camera. Change-Id: I605696208443b5cf889e65c17d5e31fb28008ace Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix drag-translate offset from helper plane for off-center meshesMiikka Heikkinen2016-09-141-1/+1
| | | | | Change-Id: I56e59cd5f5c41c8e19d94e8b90d33d63d5e217d7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Display world coordinates of the mouse cursor on toolbarMiikka Heikkinen2016-09-099-25/+99
| | | | | | | | | If not drag scaling/rotating/translating an entity, shows the coordinate on helper plane. When dragging, shows the drag handle coordinate. Change-Id: I50fd226bfb323d0d4ed4df24efc61aacb98c4fd2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add local axes visualization for currently selected objectMiikka Heikkinen2016-09-076-6/+238
| | | | | Change-Id: Ib6e66c94630e662e5e2affedd17fc929643b72b9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add QtQuick import to exported sceneMiikka Heikkinen2016-08-151-0/+1
| | | | | Change-Id: If1477876746e141fa43c102e5c52530eefd0d5bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Ensure InputSettings and RenderSettings are exported in proper orderMiikka Heikkinen2016-08-111-2/+4
| | | | | | Change-Id: Ia933bac96654554e53fe299f5fce760b86f3a35e Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use new StateMask enum locationJanne Koskinen2016-08-011-19/+19
| | | | | | | StateMask was moved away from QRenderStatePrivate. Change-Id: Id565028fec879f4c047f802d1867f6387201d59f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use the imported file name as imported entity name, if it is valid nameMiikka Heikkinen2016-07-011-4/+20
| | | | | Change-Id: Ib5bed03c601aefb7b71ab24e4bcd40150d56100b Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Automatically add the wizard generated scene to RESOURCESMiikka Heikkinen2016-07-011-6/+3
| | | | | Change-Id: I8a6db83ed51fac9fee44f6acd8d81c2f6e68c804 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Don't save camera projection matrixMiikka Heikkinen2016-06-302-1/+19
| | | | | | | | | | Projection matrix can be calculated from other values, so storing it is unnecessary. Setting it explicitly changes the projection type to custom, which we don't support. Change-Id: Iec7f8b08f52c1693aa9e4dde4c896e994fc8b364 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Open the correct scene when opening the embedded editorMiikka Heikkinen2016-06-292-11/+23
| | | | | Change-Id: Ie308ea0bc5024c539caca4e4d514bbf214c9dc6e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash if user clicks on the editor before viewport is initializedMiikka Heikkinen2016-06-291-3/+3
| | | | | Change-Id: Icaf14a0f553487fffe0e25b45ddc6f07c9e9d7f2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Set dummy surface for rendererMiikka Heikkinen2016-06-282-3/+29
| | | | | | | | | | | This works around the crash reporeted in QTBUG-54318. Using a dummy surface instead of the proper one appears to have no negative side effects, probably because we draw to offscreen FBO anyway. Change-Id: I54e8c467cac8a6cf403a7aab1da17ba2141f83b8 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Creator plugin launches embedded editorMiikka Heikkinen2016-06-2845-971/+1081
| | | | | | | | There's not yet any interaction between embedded editor and creator, such as opening the correct file. Change-Id: I1b8507ca209ba2387e0c1dfa8657bd45560a671a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix the behavior of TextInput field inside treeviewMiikka Heikkinen2016-06-225-24/+28
| | | | | | | | | Now the TextInput field properly hides when it should. It also no longer hogs the focus when hidden. Change-Id: I634befb62af4ba7f8d5822d3128df36b54141f4e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fixed spotlight and directionallight mesh rotation after loadTomi Korpipää2016-06-211-0/+2
| | | | | | Change-Id: I25be94346fce967bea2e506d7a26d1c1bfe4aca6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Use QtQuick.Controls 2.0 ApplicationWindowMiikka Heikkinen2016-06-211-2/+3
| | | | | | | Now that menubar is gone, we don't need to use old version anymore. Change-Id: I104f877caa1bfb9a4abebb834ed2014fcfc877cb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove old image from resourcesTitta Heikkala2016-06-211-1/+0
| | | | | Change-Id: If4263c3cdfb60677405b2fe6bb38a41f22069c7b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Added new image for invalid drag and removed old unused imagesTitta Heikkala2016-06-2123-21/+2
| | | | | Change-Id: I2de6149d77f949cbc6ed43e7547021639881166f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when undo/redoing the deletion of the last cameraMiikka Heikkinen2016-06-201-1/+1
| | | | | | | | While redoing the camera deletion, a new command was pushed into the undo stack, which corrupted the stack. Change-Id: I0dd04a67f4811fc7a1dacdac3397e68f58ae48d3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Properly update group selection box in various undo/redo situationsMiikka Heikkinen2016-06-209-17/+58
| | | | | Change-Id: I1e950465c4e0fb0e2dd79d6eed5047266fd525d2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Don't display context menu after dragging camera aroundMiikka Heikkinen2016-06-201-3/+2
| | | | | Change-Id: I3d71fb094b5ab315add4f8d125cc69ebe6fc5b46 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Hide center line when drag handles are disabledMiikka Heikkinen2016-06-201-1/+2
| | | | | Change-Id: I09a2efc4fc0f4f2f6d58a290ee7c982be468ca92 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash at new sceneMiikka Heikkinen2016-06-201-6/+8
| | | | | Change-Id: Ibb3cc1444b66c56bf8142a07d0b6911ddbcbc7d8 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fix index corruption related to entity removalMiikka Heikkinen2016-06-206-57/+107
| | | | | | | | | | | The main problem was the selection that was done when the selected entity was removed. Now we change the selection asynchronously in that case, which ensures the selection model on the qml side won't try to access invalid indexes. Change-Id: Ieaf984eed5c74a5d3b595aeb04d23e26f66a0db9 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Keep tree view scroll position when model is resetMiikka Heikkinen2016-06-173-0/+10
| | | | | | Change-Id: Idf2adb94a1d80edba022545d7d1637c0c4cdd6e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Changed camera model to a custom mesh and enabled triangle pickingMiikka Heikkinen2016-06-166-79/+130
| | | | | | Change-Id: Ic12506a8ca2419a521dd2e88ce47d9db78c9cf2a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Fixed duplicate placement when item is scaledTomi Korpipää2016-06-161-2/+1
| | | | | Change-Id: Icbf28a76f7567f426baf585cd6b29c5d072760a1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fixed apply-cancel for languageTomi Korpipää2016-06-161-6/+12
| | | | | | Change-Id: Ib6be8884d5076a706092ded79469870a75fc0115 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Added missing includeMiikka Heikkinen2016-06-161-0/+2
| | | | | Change-Id: I2bf2522704d56a5756b44ea8926c651d18c54275 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Change selection box colorMiikka Heikkinen2016-06-162-7/+10
| | | | | | Change-Id: Id95b10fb81b0c21b77d374c6f4dafd739b675496 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Changed snap to grid to snap corners to the grid.Miikka Heikkinen2016-06-163-70/+151
| | | | | | | | | Mouse modifier keys ctrl and alt can now also be stacked on translate and scale. Change-Id: I5252b9d98482e7ea9ff7244e1a51239d68dbdf31 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Set default folders to dialogsTitta Heikkala2016-06-161-0/+2
| | | | | | | | The default folders need to be set also for dialogs opened after unsaved dialog. Change-Id: I476b1b09a84934c4a07727f0ec82a6548c73667d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Changed text alignment for texture selection buttonTitta Heikkala2016-06-161-0/+8
| | | | | Change-Id: I8e60b6ee1482c0b1fcb605251ac2bd5ded0dc8a7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fixed scene saving in linuxTomi Korpipää2016-06-151-1/+7
| | | | | | Change-Id: Id20bcdee1253648cf482caa273018d8448199de1 Reviewed-by: Titta Heikkala <titta.heikkala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Added autosave flag to persistent settingsTomi Korpipää2016-06-151-20/+53
| | | | | | | | Fixed apply-cancel functionality Change-Id: Ibc7838973e0fa509079b1fc47dffa6f355518b9d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
* Styled threeview's scrollbarTitta Heikkala2016-06-141-0/+30
| | | | | Change-Id: I9677ab85c0bb867442157ee516572be199928577 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 00:38:29 +0000