summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update qt3d-runtime submodule2.0.1Miikka Heikkinen2018-06-191-0/+0
| | | | | | Task-number: QT3DS-1941 Change-Id: I4789f5b1c1801b675eb0c253ebcedd0fc6d793d6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix editor crash at shutdownMiikka Heikkinen2018-06-185-5/+17
| | | | | | | | | | | When building against Qt 5.11.1, deleting the CMainFrame is apparently no longer doable while handling the CMainFrame::closeEvent, as it will queue a close event for the underlying QWindow. We need to perform shutdown asynchronously from the close event. Task-number: QT3DS-1922 Change-Id: I6e056fad60aa6d91eef8dcd4c147c6b47d80b220 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update version to 2.0.1Miikka Heikkinen2018-06-181-1/+1
| | | | | | Task-number: QT3DS-1931 Change-Id: Ied2777eb40f7be494e6c69f088e54fc96d077ca3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix datainput type issuesv2.0.0-rc2v2.0.0Miikka Heikkinen2018-06-127-18/+73
| | | | | | | | | | | | | | | - When adding a new data input the type is set correctly even if you don't touch the type combo. - When adding a new data input from popup menu for property, timeline, or slide panel, the corresponding data input is not changed if the new data input is of unsuitable type. - Correct default type is shown for each property when setting data input from inspector panel. Task-number: QT3DS-1913 Change-Id: I704cb704fb1ec9aca916ed7f7542ace404bba77c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update qt3d-runtime submoduleMiikka Heikkinen2018-06-121-0/+0
| | | | | Change-Id: If6e63d9c9198e97027890d1854bab2bc4858ba17 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove non-existent items from recent files listMiikka Heikkinen2018-06-112-17/+20
| | | | | | | | | | Avoids crash when trying to load such a presentation. Task-number: QT3DS-1903 Change-Id: Ic0fdd00243aed2656df248901ebbc444d829dcdd 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>
* Fix backward compatibility for datainputsMäättä Antti2018-06-111-1/+1
| | | | | | | Task-number: QT3DS-1908 Change-Id: I9c855c905538920a7ef7cd75f49712a47298d4f3 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix startup dialog flickering when dragging to another screenMiikka Heikkinen2018-06-112-214/+370
| | | | | | | | | | | | | | | | It's still unclear what the actual issue was, but copying paintEvent handling from about dialog, and making the dialog form more like about dialog, i.e. adding a layout to the dialog and setting one of the QLabels to have word wrap fixes the flickering. The fact that word wrap makes a difference likely means that the root cause is some Qt bug and this might break again when Qt version changes. Task-number: QT3DS-939 Change-Id: If75f5e1d9ed57e3f72b13209a9d5fe6878371b34 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix tutorial dialog flickering when dragging to another screenMiikka Heikkinen2018-06-112-216/+248
| | | | | | | | | | | | | | | | | | | | It's still unclear what the actual issue was, but copying paintEvent handling from about dialog, and making the dialog form more like about dialog, i.e. adding a layout to the dialog and setting one of the QLabels to have word wrap fixes the flickering. The fact that word wrap makes a difference likely means that the root cause is some Qt bug and this might break again when Qt version changes. Since tutorial dialog didn't have QLabel originally, removed text from checkbox and added a separate label for it. Task-number: QT3DS-939 Change-Id: If39d73851c5f7095bf630d4fe46446b81b9b4100 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtimeMiikka Heikkinen2018-06-111-0/+0
| | | | | Change-Id: I18e816f45f02049068184a674816950545b00874 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix broken link in docsMats Honkamaa2018-06-081-2/+1
| | | | | | | | Removing this link for now Task-number: QT3DS-1907 Change-Id: I9758ca833110646506cee304945a69f26b98c958 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix editor copyright yearMiikka Heikkinen2018-06-081-1/+1
| | | | | | | Task-number: QT3DS-1904 Change-Id: Ia4fec2598459923c5f8cc5c2cb28a67d409584af Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Use the existing list of subpresentations to create renderable itemsMäättä Antti2018-06-081-50/+4
| | | | | | | | Task-number: QT3DS-1901 Change-Id: I3c48b9dfbfefdb8f46636e7d3f38d3585241fe55 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update timeline images in documentationMats Honkamaa2018-06-085-0/+0
| | | | | | Task-number: QT3DS-1760 Change-Id: I8069b5f8634ec71f57e0df353129e22d4245e287 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update AO documentationMats Honkamaa2018-06-072-0/+12
| | | | | | | | | Updated AO documentation to make the AO threshold property more clear. Task-number: QT3DS-61 Change-Id: I57422c79bfae6cd215f6bedb0f077b139a8da369 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix image probe FOV calculationJanne Kangas2018-06-071-3/+9
| | | | | | | | | | | | | | | | | | Fix FOV equations. Also, fix case for FOV of 180 degrees where image lighting map was used in wrong orientation. With this fix, the negative z axis passes through the center of the lighting map, with edges of the image wrapped around the scene, i.e. with default camera settings the center of image is in the direction of camera. This holds true for both cases of FOV = 180 and FOV < 180 degrees. This fix must be replicated on runtime side for results to match. Task-ID: QT3DS-154 Change-Id: I917f4f1897e59294aa369933fc9b10ae849952e6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Make sure timeline context menu appearMahmoud Badri2018-06-071-1/+1
| | | | | | | | This bug was caused by the parent commit. Task-number: QT3DS-1892 Change-Id: I15fbe4580ba676968c65afbb61bdb50f4d31d4fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update data input documentationMats Honkamaa2018-06-072-18/+75
| | | | | | | Task-number: QT3DS-1534 Change-Id: I47c26f273e44115feeb1e2973e9fb46e5f6b7222 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix some property graph expansion issuesMahmoud Badri2018-06-078-103/+42
| | | | | | | | | | | | | | | Fixed the following 2 issues which happen when one or more property rows graphs are expanded: - selecting keyframes by selection rectangle - tree rows context menu targeting the correct row Also got rid of the correctIndex() method (and some related methods) which caused some limitations. Task-number: QT3DS-1892 Change-Id: I64b817d54da4a471c0ada8e74a13b61b44f5820f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Open the correct uia file for sub-presentation and data input parsingTomi Korpipaa2018-06-071-5/+13
| | | | | | Task-number: QT3DS-1890 Change-Id: Ie12ce196ea283299c830fc938eb5e6840e0647b7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide shadow map FOV controlTomi Korpipaa2018-06-071-1/+1
| | | | | | | | Task-number: QT3DS-1891 Change-Id: Idff2c8650f32b03c7537396f33a2513edf2f104c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix component/group name uniqueness checkJanne Kangas2018-06-072-16/+25
| | | | | | | | | | | | Check new component or group name uniqueness based on the original object name, not based on default "Group" or "Component" that is temporarily assigned to the newly created object. Task-ID: QT3DS-1831 Change-Id: I23138f92cb573eca861d494403371795dfaeec1b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove ignoreHotkeys property from some control typesMiikka Heikkinen2018-06-073-5/+0
| | | | | | | | | | | | | | | | | QML Sliders and combo boxes were really only ignoring hotkeys because of arrow keys can be used to adjust them. However, arrows are no longer used as global hotkeys since the nudge functionality has been removed. It's unclear why QML toolbuttons were ever ignoring the hotkeys - only key they seem to be responding to is space, and that still works even if ignoreHotkeys is removed. Perhaps it worked differently in Qt versions prior 5.11. Task-number: QT3DS-445 Change-Id: I19d74a792d593355684f6794f377dc4c826d4733 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Autoscroll timeline tree when dragging from basic objects/projectMiikka Heikkinen2018-06-072-1/+3
| | | | | | | Task-number: QT3DS-1889 Change-Id: Ie905b74d97590c0f08fea2555a5d14c807728436 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clip RowTree icons that would overlap filter buttonsMiikka Heikkinen2018-06-071-56/+61
| | | | | | | Task-number: QT3DS-1882 Change-Id: Ia1e7c767bfdeb7763aa9fd7ce66ed418212957e2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Allow drag-select keyframes from an object rowMahmoud Badri2018-06-063-18/+6
| | | | | | | | Currently only possible to drag-select keyframes from property rows Task-number: QT3DS-1886 Change-Id: I6673e5ec52a73d48f0c9cd98abc7a53a63915ee0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix adjusting timebar by dragging start/end handlesMiikka Heikkinen2018-06-062-12/+19
| | | | | | | | | | | | | In case of overlapping start and end handles, now choose the handle depending on the click position relative to start of the bar. Never select start handle if end time is zero. Also allow adjusting the duration to actual zero instead of just very close to it. Task-number: QT3DS-1869 Change-Id: I57d06c6e70bb22fd320bcd01adf021a15f13caf6 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Small tweaks to snappingMahmoud Badri2018-06-061-2/+5
| | | | | | | | | - Fixed some cases where snap doesn't work correctly - Update snapping after row filtering happens Task-number: QT3DS-1877 Change-Id: If92a7acef2772cade0d3140040e27c5515fadb03 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtimeAndy Nichols2018-06-061-0/+0
| | | | | Change-Id: I589da726cdf103d60ed18bf5dab27d745e6ad24e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update Tutorial imagesMarianne Yrjänä2018-06-054-0/+0
| | | | | | | Task-number: QT3DS-1857 Task-number: QT3DS-1858 Change-Id: Ie86ab9464709a907b1e04eca4e9161929a643527 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix two materials which were not workingAndy Nichols2018-06-052-3/+2
| | | | | | | | | Aluminum_emissive had a duplicate of the Emissive Mask Map property. Carpaint_color_peel_2 had two copies of orange peel size where as it should have had a peel amount property as well. Change-Id: I5b931560a8b911b57c5e531bd804eaeffb63d93d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Cancel DnD when Escape key is pressedMahmoud Badri2018-06-053-2/+30
| | | | | | | | | When pressing Escape key while DnD is active, it is cancelled Task-number: QT3DS-1842 Change-Id: I74fd371844617757fcdc22603cf4cf5605fe1c33 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add behavior script to update date and time in SampleProjectTomi Korpipaa2018-06-053-0/+156
| | | | | | | Task-number: QT3DS-1855 Change-Id: I8173829e093a3ca772306ced7ad46bda30e09b88 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtimev2.0.0-rcAndy Nichols2018-06-041-0/+0
| | | | | | Change-Id: I1279e89703ee9fec80c6127d11a242384066cb46 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix corrupted blank cursor during drag-adjusting floatsMiikka Heikkinen2018-06-011-2/+13
| | | | | | | | | This works around QTBUG-61678, where the blank cursor gets corrupted in multimonitor setups. Use a custom empty bitmap cursor instead. Change-Id: I629265663ec5a6074e5e58ab978dc607fae735c8 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix other mouse buttons from interfering with drag-adjust of floatsMiikka Heikkinen2018-06-013-0/+34
| | | | | | | | | | | Install an event filter that blocks all mouse button events for other buttons than the left button for the duration of the drag. Key events and shortcut overrides are also blocked. Task-number: QT3DS-565 Change-Id: Idbc03eae5e4e4e0718ebdd43066f58275bd5f44f Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Handle trivial timeline TODOsMiikka Heikkinen2018-06-0113-339/+6
| | | | | | | | | | | Went through timeline TODOs and removed ones that are no longer valid and did trivial ones. Task-number: QT3DS-1828 Change-Id: I717c4fae21bd2d95136c0cec63e4b304bbb3d24d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when the return-from-master slide is deleted while in masterMiikka Heikkinen2018-06-011-4/+4
| | | | | | | | | Need to check for slide validity before attempting to change to it. Task-number: QT3DS-1750 Change-Id: I77e93f8f8398169dd9ebf54a8fb281b16407d055 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update project palette imagesMats Honkamaa2018-06-012-0/+0
| | | | | | Task-number: QT3DS-1784 Change-Id: I4985018f1cac712400550df2c86012419636e50e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Prevent timer-triggered property update when value is already committedJanne Kangas2018-06-011-1/+5
| | | | | | | | | | | | Stop slider rate-limiting timer when user releases mouse button and value is committed to property system, to prevent timer triggering an unnecessary non-committing property change. Instead at button release just update the associated text field to reflect the committed value. Change-Id: Ia0587b1fa1c3860b0d07bd653d91e7dc2240c293 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix slides getting stuck on master slideMiikka Heikkinen2018-06-012-16/+11
| | | | | | | | | | | | Updating the return slide when the slide change was caused by the engine rather than user would update the return slide to the master slide itself. Changed it so that the return slide is updated every time we change to non-master slide. Task-number: QT3DS-1750 Change-Id: I105d2996265cc152782f8b1ec9fb9a5f02adf4b3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clean up old controlsMiikka Heikkinen2018-06-0196-17280/+20
| | | | | | | | | | Remove unused controls from Authoring/Studio/Controls and some ancillary files elsewhere. Task-number: QT3DS-1828 Change-Id: I6461112a02cc24ef0c169b3a99de26b034065040 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix lighting with custom material and shadowsMäättä Antti2018-06-019-71/+266
| | | | | | | | | | | | | | | | | | There are two problems with the shadows. 1. The shader cache key for default materials is not properly initialized, which causes invalid shader being used for the material. 2. Custom material shadow cubes and maps uniforms are not set correctly. Only first element in those sampler arrays were set, so when custom material lighting had more then 1 light and shadows, only one light affected the rendered result. Fixed the default material key and implemented proper setters for sampler uniforms. Task-number: QT3DS-1824 Change-Id: I0b97a4642410f37011392adf1020bc1d2bd21bb3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Correct timeline toolbar icon sizeKaj Grönholm2018-05-311-2/+2
| | | | | | | | Icons were a bit blurry, change layer icon and use 16x16 which is native resolution of all these toolbar icons. Change-Id: I9c869c5c86cd91a190ba59eb04c3d67ad266007c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove old timeline codeMiikka Heikkinen2018-05-3190-10842/+27
| | | | | | | | | | | | Remove unused files and unused functionality from remaining files. Moved some still used functionality to better places. It is likely that a lot of unnecessary code still remains. Task-number: QT3DS-1828 Change-Id: I199f67e7d34acbc4d707b75502a4b54e0f9a7d02 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Only clean up meshes if they have more than 1 revisionTomi Korpipaa2018-05-313-10/+22
| | | | | | | | Task-number: QT3DS-1832 Change-Id: I35d75928fe49a82609801d7f2a7581482921d9d1 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Document possible revision issue with old UIPsTomi Korpipaa2018-05-312-0/+17
| | | | | | | | Task-number: QT3DS-1835 Change-Id: I4a56e29383c0985549eae0b83f8f9cb48347a0ff Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Avoid SceneView flashing at wrong position during startupKaj Grönholm2018-05-311-1/+1
| | | | | | Task-number: QT3DS-1748 Change-Id: Iea9fd71c3c2ff1dc1cfa0d6b083ca4b90b76a89d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix some DnD insertion issuesMahmoud Badri2018-05-314-18/+49
| | | | | | | | | Fix some cases where the DnD insertion mark doesn't appear although the insertion position is valid. Task-number: QT3DS-1829 Change-Id: If6ca415158282a625e57cc0ae23a8c33bd518c5a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtimeAndy Nichols2018-05-301-0/+0
| | | | | Change-Id: I0525cb2cdf9cc0594a83150b6cb4a9c42442313d Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 16:26:57 +0000