summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix rendering subpresentation to texturev2.1.02.1Tomi Korpipaa2018-09-281-2/+4
| | | | | | | | | | Clear flag was ignored when rendering a subpresentation with transparent background to a texture on an object. Task-number: QT3DS-2408 Change-Id: I7578e0e4446614d68613815c77f4f84b87d8bedb Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update datainput dialog internal map when renaming datainputsJanne Kangas2018-09-271-1/+9
| | | | | | | | | | | | | Dialog did not update the internal map when datainput name was changed. When the same datainput was edited again and map entry was queried with an incorrect name, dialog crashed. Change-Id: Ibe803cf20c0c42922d8622d21b33f885bfd82b2c Task-id: QT3DS-2406 Task-id: QT3DS-2405 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Use scene element as starting point for datainput map updateJanne Kangas2018-09-272-2/+2
| | | | | | | | | | | Code used active instance as recursion start point, resulting in only partial traversal of scene if user was currently editing component and made changes to datainputs or their bindings. Changed to always start recursion from main scene instance. Change-Id: I55ed480433acc4cda49c48233701125f7d642516 Task-Id: QT3DS-2407 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix constant CPU load when project contains qml filesMiikka Heikkinen2018-09-274-24/+29
| | | | | | | | | | | | Checking whether a file is a behavior or qml stream is expensive, and it was getting done continuously for some reason. Now we cache the result of the first check for each file. Task-number: QT3DS-2404 Change-Id: Iaf7fab48559790c6561ecf6b00d60febd68e6a08 Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix dragging binding loops and the subpresentation drag dialog issuesMiikka Heikkinen2018-09-275-52/+51
| | | | | | | | | | | | | | | | | Binding loops while dragging were caused by QML drag implementation that was unneeded since the drag is actually handled by C++ QDrag. Removed the superfluous QML drag things. This also seemed to fix the duplicate drag layer/texture/cancel dialog that sometimes happened. Additially, the layer/texture/cancel dialog was modified to use explicit layer and texture buttons instead of renamed standard buttons. Task-number: QT3DS-2397 Change-Id: I86c8ab61e4450b4aff3ef4bb9cae3776aa47959a Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix welcome screen glitchesMiikka Heikkinen2018-09-252-35/+41
| | | | | | | | | | | | | | The dummy label is needed to fix background quadrupling issue when dragging the welcome screen to another screen with different device pixel ratio. It is unclear why exactly it fixes it, and why it needs to be a label with some visible text to do so, instead of some other widget. It is somehow related to the layout handling on the dialog. Task-number: QT3DS-2392 Change-Id: I945d29e6d735d400c80668cab458bf46e9b57f0c Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update images in documentationMats Honkamaa2018-09-2516-0/+0
| | | | | | | | Updated old images and deleted obsolete images. Task-number: QT3DS-2273 Change-Id: Ie337c6bd78e562422e5d5b84dafecbea0acca858 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Ensure widget layer is reset at frame clearMiikka Heikkinen2018-09-251-0/+3
| | | | | | | | | | | When preview window is shown in perspective view and selection widget is also shown, things can get into a state where reset is not properly called for the layer that contains the widgets. Task-number: QT3DS-2387 Change-Id: I268003dcdbd22aa511f5b9f7c893b01cc0b26618 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update welcome screen dimensionsTomi Korpipaa2018-09-252-10/+10
| | | | | | Task-number: QT3DS-2380 Change-Id: I70ceec77bd26ffe159bcc0a9da14b97badb4fc3b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crashes when dealing with malformed qml filesv2.1.0-rcMiikka Heikkinen2018-09-214-23/+36
| | | | | | | | | | Attempting to determine the qml file type (script or qml-stream) assumed there was always a valid root object. If the qml file had a bug that caused loading it to fail, that assumption caused a crash. Task-number: QT3DS-2381 Change-Id: I7016540fe48593dff3f01107dc6826f1f6d3929f Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix editor crash if ktx textures are usedTomi Korpipaa2018-09-201-11/+11
| | | | | | Task-number: QT3DS-2374 Change-Id: Icec96f4322d4e52229bfe3d1ba522bb0b8809efa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Register needed Titilliumweb fontsMiikka Heikkinen2018-09-202-0/+7
| | | | | | Task-number: QT3DS-2373 Change-Id: Ib6f85ac884ee4a3a1424bc2db88fd2df5e7a924e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix font family in tutorial widgetTomi Korpipaa2018-09-201-0/+6
| | | | | | Task-number: QT3DS-2239 Change-Id: I84e3c3e09806e3d5815707ebd5ca6796fe93af5b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update getting started sectionMats Honkamaa2018-09-205-25/+74
| | | | | | | | | | Updated the information in the getting started section. Updated images where necessary. Added sections about sub-presentations and data input. Task-number: QT3DS-2365 Change-Id: I3be56acafd5180ee79e6a413f4cd3c9241519d54 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Document FOV horizontal propertyMats Honkamaa2018-09-201-5/+12
| | | | | | | | | Added description for FOV horizontal property. Task-number: QT3DS-2344 Change-Id: Ic6aff1c875cd0a35f2da06b0dccfb28c238a4712 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update welcome screenMiikka Heikkinen2018-09-2040-581/+456
| | | | | | | | | | Welcome screen is now simply a single screen instead of a multi-screen tutorial. A button was added to open getting started documentation. Note: Font family is not correct, to be fixed later. Task-number: QT3DS-2239 Change-Id: I98e8d07d72ce33c433a187d989f36d10d09a4ec8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update qt3d-runtimeLaszlo Agocs2018-09-191-0/+0
| | | | | Change-Id: I714062d77885ba04e3ee371be2fcaf08c1608a97 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Move turn signals in SampleProjectTomi Korpipaa2018-09-191-2/+2
| | | | | | Task-number: QT3DS-1918 Change-Id: I9f9e24822207e77fe689d05bc44dcd8599d5f087 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix updating project palette file referencesTomi Korpipaa2018-09-191-0/+1
| | | | | | | | | | File references of some texture assets, like the environment maps of custom materials, did not work. Task-number: QT3DS-2351 Change-Id: I545fc5dfca3bf4cb28ab1b987d0b1d86bd55bcbc Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Ensure selection change is sent at undo/redoMiikka Heikkinen2018-09-192-3/+6
| | | | | | | | | | | | | | Undo/redo temporarily clears selection without notifying anyone, and then sets the correct selection after operation is done. However, if the correct selection after the undo/redo operation was nothing, then the selection clear was never notified in account of selection not changing, leaving document and palettes in inconsistent selection state. Task-number: QT3DS-2359 Change-Id: Ifff25c54d72a0227e3370569f56989be9d64f299 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix toggle shy/locked for multiple selected objectsMiikka Heikkinen2018-09-196-44/+61
| | | | | | | | Task-number: QT3DS-2354 Change-Id: Ie108b336a24f889607e12d46984dcf686d099ee4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Preserve original start/end times when making objects into componentJanne Kangas2018-09-191-10/+20
| | | | | | | | | Store each individual start/end time before moving objects into a new component and reset the time range afterwards. Change-Id: I891a900640816f8ee9873a659ddc078830391048 Task-Id: QT3DS-2350 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update studio keyboard shortcuts documentationMats Honkamaa2018-09-191-7/+19
| | | | | | | | | Added new keyboard shortcuts and corrected errors. Task-number: QT3DS-2314 Change-Id: Ia4166615688d497314012e60389ab7003a3c1dd3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Go To Time shortcut keyMiikka Heikkinen2018-09-181-1/+6
| | | | | | | Task-number: QT3DS-2353 Change-Id: Ifed80d23e64a49dc64ba40f8738151b1ae73efa8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix environment map finding for custom materialsTomi Korpipaa2018-09-181-8/+31
| | | | | | | Task-number: QT3DS-2349 Change-Id: I607aafe086fb0349d3a44326594b5bbf68055645 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Revert "Update group pivot and position when adding objects to it"Tomi Korpipaa2018-09-181-46/+5
| | | | | | | | | | | The fix was incomplete and there is no time to implement it fully to 2.1. This reverts commits 1bc6fe6f10507a2bbcca744fe8b906bc89cfc396, 760d9cf2450198b79a4c4fe5b549bfc6826d0018. Change-Id: Id8088b34946c11cbb0dbfc22a74f41d0205e4787 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Disable IBL Override for reference materialsMahmoud Badri2018-09-184-4/+17
| | | | | | | | | Task-number: QT3DS-2274 Change-Id: I9ce72c094b54b66e6d8a4bcbfc85e89825aab2a3 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide manipulation widgets from inactive objectsMiikka Heikkinen2018-09-181-1/+9
| | | | | | | | | | | Manipulation widgets are hidden for items that are not currently active, i.e. their eyeball is off or playhead is outside their timeline bar. Bounding box is still shown also for hidden objects. Task-number: QT3DS-2341 Change-Id: Iaf0b7be158d76ddedb5e2216aa5f136d5a12c896 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix to object rotation using widgetMiikka Heikkinen2018-09-181-9/+11
| | | | | | | | | | | | | | Only check for plane coord values for validity if using rotation widget in 'angle' mode. If rotating in 'trackball' mode, they are recalculated, so validity check is unnecessary. Also fixed a regression caused by the previous rotation fix where 'angle' mode rotation would not work properly in orthographic views. Task-number: QT3DS-2332 Task-number: QT3DS-2343 Change-Id: I0ed57ff279e2212047af44b9b10ba82b4fc8dc70 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Properly initialize drag when dragging camera or lightsMiikka Heikkinen2018-09-181-2/+8
| | | | | | | Task-number: QT3DS-2294 Change-Id: I5f6d7f0a4d2a36e63103fd940c3bb67c5806242a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update group pivot and position when adding objects to itTomi Korpipaa2018-09-171-24/+46
| | | | | | Task-number: QT3DS-2338 Change-Id: I97aa425c94b714481ebea8657b920708a03e0053 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for importing *.ktx texturesTomi Korpipaa2018-09-171-2/+2
| | | | | | | | Task-number: QT3DS-2342 Change-Id: Ia6c27f69133bc8cbde41b4722c493d1667dbd808 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>
* Use no lod bump map shaders alwaysJere Tuliniemi2018-09-143-17/+59
| | | | | | | | | | | Textures don't have mipmapping so makes no sense to use Lod functions in shaders. This caused bump maps to render incorrectly. Task-number: QT3DS-2284 Change-Id: I1585fa3cab388ba568d90aaa2060120c4f685072 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Adjust pivot point and position of a new groupTomi Korpipaa2018-09-141-0/+18
| | | | | | | | | | | | When multiselecting objects and grouping them, calculate the center and adjust the pivot point and position of the created group accordingly. Task-number: QT3DS-2335 Change-Id: I70adefc1c712702425d0a2575144e452a59c27d9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix undo/redo not updating scene when animated property changesMiikka Heikkinen2018-09-144-0/+34
| | | | | | | | | | | | | Added a callback function to refresh the scene that is added to the transaction stack whenever animated property without automatic keyframe setting on is changed. Task-number: QT3DS-2333 Change-Id: I7ca2e2af2ad2dfc32959a3d8f8b2056785a841c4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disconnect action browser dialogs before initial selectionMiikka Heikkinen2018-09-141-7/+5
| | | | | | | | | | | | | | If the browser dialog had been shown to another instance previously, the selection change connection would still point to wrong instance at the time the initial selection was set to the shown dialog. This would either trigger property change on wrong instance or crash if the instance was no longer valid. Task-number: QT3DS-2318 Change-Id: Ia7afac2b25c4e389e1ced698486240ffdc65b7de Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Do not display rename notification on object duplication/addJanne Kangas2018-09-142-13/+18
| | | | | | | | | | | | Do not show "object was renamed" -warning on object duplication or add. Editor selects the new object by default, so the new object name is highlighted indirectly to the user. Warning is still shown for drag moves of objects already in scene. Change-Id: I6bb9ce733097b7b49802b717da27caf32fe15a4f Task-id: QT3DS-1734 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Do not query sibling timerange when creating new object by DnDJanne Kangas2018-09-133-13/+22
| | | | | | | | | | | | | | During object creation, to-be-siblings are queried for start/end times so that the new object start/end can be set to same values. For certain types of siblings (Component), these properties do not exist at this point of time. Fix moves time range setting to a later time when it can be queried from parent. Change-Id: If93465ba24784654533b0d0f126cc134ee41b988 Task-id: QT3DS-2320 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix rotation when rotation plane is close to perpendicular to cameraMiikka Heikkinen2018-09-131-7/+11
| | | | | | | | | | The erroneous rotation happened when the mouse cursor projected on the rotation plane resulted in a point behind the camera. Task-number: QT3DS-2319 Change-Id: Ic043f8a6e48db2fa82590c6eb6797b38a35ccf54 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update qt3d-runtimeMiikka Heikkinen2018-09-121-0/+0
| | | | | Change-Id: I36def1f76a1cabf7a2f9b0f5dc676630ae3d3589 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add fovhorizontal property to camerasMiikka Heikkinen2018-09-1214-6/+36
| | | | | | | | | | | This is a boolean property. If it is true, the fov value will be interpreted as horizontal angle. Task-number: QT3DS-708 Change-Id: I5642c6cd2e32fb4d0872d0422b58077f0f8af2f7 Reviewed-by: Teemu Tamminen <teemu.tamminen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Check for name uniqueness when dragging objects into a componentMiikka Heikkinen2018-09-121-5/+19
| | | | | | | Task-number: QT3DS-2305 Change-Id: Iff636074edae93eec9175d4d771c43065e35da98 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix shift & cmd button modifiers in float fields for macOSTomi Korpipaa2018-09-121-2/+2
| | | | | | Task-number: QT3DS-2323 Change-Id: I6065221e06906918ae464fe6a2f37de3044ff35e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix style issue with timeline time labelTomi Korpipaa2018-09-126-172/+14
| | | | | | | | | Also removed obsolete styles from style.qss, as it was being edited anyway. Task-number: QT3DS-1928 Change-Id: Iec7bf2bc47202cada7de2cf613b1c740586b9dd2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix scale and rotate shortcutsTomi Korpipaa2018-09-121-5/+5
| | | | | | | | | | This is how it's done in Maya etc. and how it is specified in the UX design. Change-Id: Iff6db3bb4996d43445182a098374e9fe49810fca Reviewed-by: Teemu Tamminen <teemu.tamminen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash related to moving objects into componentsMiikka Heikkinen2018-09-121-5/+15
| | | | | | | | | | | | The crash was caused by invoking cut/paste style move unnecessarily when rearranging objects inside a component. Task-number: QT3DS-2303 Task-number: QT3DS-2304 Change-Id: I962f7f3493e09e7e123265d0de2c34f3705b5aa2 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix scale and rotate shortcutsMahmoud Badri2018-09-111-4/+4
| | | | | | | | Rotate and Scale shortcuts were reversed. Now Scale is E and Rotate is R. Change-Id: I9b0cb4b97610ac39cad1824c9dc1346f781510a8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add Basic Properties to Material inspectorTomi Korpipaa2018-09-113-27/+24
| | | | | | | Task-number: QT3DS-2256 Change-Id: I8105f5554894c381db6dc52b2c9b22caf5bf34c5 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix focusing non-physical objectsMiikka Heikkinen2018-09-111-3/+19
| | | | | | | | | | | Fake a bounding box when focusing a camera, a light, or an empty group in perspective view. Task-number: QT3DS-2282 Change-Id: Ia9fe83233e3d45ff480a8311bd4aa6a4430cf6b9 Reviewed-by: Teemu Tamminen <teemu.tamminen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Match rotation widget angle to actual angleTomi Korpipaa2018-09-111-1/+1
| | | | | | Task-number: QT3DS-2264 Change-Id: I3a9514b8ddb8339a91443463e9bc4541991412cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 08:11:27 +0000