summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disable 'make component' menu option for component elementsMiikka Heikkinen2018-02-161-0/+1
| | | | | | | | | | Making a component out of a component is redundant, so let's disable the option to do so. Task-number: QT3DS-1072 Change-Id: Ifdfba8d65b24fb9917d0f6d54dca5b8b1f33584e Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash undoing/redoing 'make component' actionMiikka Heikkinen2018-02-163-1/+17
| | | | | | | Task-number: QT3DS-1047 Change-Id: I1976f8b91fc1d48dafbae0f1d01367590cab6e92 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Document binary QML component and runtime setupMats Honkamaa2018-02-161-0/+34
| | | | | | | | | | Added documentation on how to setup the binary QML component and runtime. Task-number: QT3DS-470 Change-Id: Ief1e495bb657429781c05097fb4df6d9ff7b27c3 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix resetting type and ranges when editing data inputTomi Korpipaa2018-02-161-0/+4
| | | | | | Task-number: QT3DS-1054 Change-Id: I81c96833928b6eb5639f0da0dc56fd95b5266f02 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash in qmlstreamer in macosMäättä Antti2018-02-162-9/+10
| | | | | | | | | | Initialize can be called from two threads hence it needs to be synchronized. Task-number: QT3DS-1061 Change-Id: I6c6f1d27546b92c63b532a7a10b53fcee8615103 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix scene background clear and color inheritance for subpresentationJanne Kangas2018-02-1411-10/+78
| | | | | | | | | | | | | | | | | | Fix case where scene matte color was overridden with scene background color even if it was transparent, causing main render target to be never properly cleared with non-zero alpha and resulting in infinite tails for animating objects (in transparent layers). Fix case where a layer subpresentation having transparent scene color overrode parent layer color with RGBA 0000 instead of inheriting parent color. This fix sets the subpresentation scene color to be the same as parent layer background, if the subpresentation background color has not been explicitly defined as non-transparent. Change-Id: Ia7da65d52c1f43b64bf9cdfd88b290552efbda70 Task-id: QT3DS-851 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Correct links to Presentation QML ElementMats Honkamaa2018-02-144-3/+6
| | | | | | | | | Corrected links to Presentation QML Element in Qt3D Studio QML documentation. Task-number: QT3DS-853 Change-Id: Ie6d2b0213583e229fbc6b42c16115f040f11b7f1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix qmlstreamer some moreMäättä Antti2018-02-142-13/+11
| | | | | | | | | | | | -The qmlstreamer context must be created when the initialize gets called since its called from different thread than setItem. -Always render the qmlstreamer in render since layer subpresentations are not rendered to texture. Change-Id: Id0637b5fe577d1941b2f093d1c1cdcbb2ddcdc4f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow component to have datainput controlling slide transitionsJanne Kangas2018-02-141-7/+24
| | | | | | | | | Task-ID: QT3DS-1053 Change-Id: I4b729feeeb738ae1117c4d81c8554ccb9df95f02 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Modify the previous fix by just setting the pixel sizeAdam Treat2018-02-131-4/+2
| | | | | | | | This was recommended by Simon and I think it is a cleaner fix than the previous one. Change-Id: Ia3e16067559c6ee9e318352074cb4c258e38b859 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix image file names in documentationMats Honkamaa2018-02-132-2/+2
| | | | | | | | Two image file names were wrong. Corrected them. Task-number: QT3DS-1029 Change-Id: Ifbfa11cf7db769b4ff31d755cb9bb7306f13cbe7 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix text only layers rendering all whiteMäättä Antti2018-02-131-0/+2
| | | | | | | | | | | Force set clear color when context is initialized. The default clear color of the runtime context is not the same as default clear color of the opengl context so we must force it to opengl when the context is initialized. Task-number: QT3DS-1012 QT3DS-986 Change-Id: I3ffa81d62a258017cada57fdbb07f2b2b078bf2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix Rajdani font renderingMäättä Antti2018-02-131-2/+4
| | | | | | | | | | Apparently the Oblique style fonts should not set the type and weight to font when using Qt font engine. Task-number: QT3DS-1039 Change-Id: I3ef49ee2fcf70626c49e2b3c27dde010401300bb Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix qml streamer initializationMäättä Antti2018-02-122-18/+19
| | | | | | | | | | Render control can not be initialized before item has been set. Do the initialization only after we get the item. Task-number: QT3DS-1031 Change-Id: Ibeb999fe91b18f165d4e582bd762f99ca38222fc Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix advanced blending mode in runtimeMäättä Antti2018-02-123-2/+15
| | | | | | | | | | | Add * check to runtime as it is in studio. Reset blend mode to default in layer rendering since runtime assumes it is set elsewhere. Task-number: QT3DS-688 Change-Id: Iaa4d7c03d704481966df766dc9ac8b03d8d1bf86 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix scaling of fonts so that it is portable across screensAdam Treat2018-02-091-1/+4
| | | | | | | | | | | | | | | | Rendering fonts on screens with different logical dpi was resulting in inconsistent sizes of fonts in studio projects. This fixes an issue I was seeing where my Linux host was displaying fonts at seemingly normal size, but my QNX target with a different logical dpi had abnormally large fonts. With this change, the rendering of the fonts looks identical. Change-Id: Ide4f0b507e5839808b5ea185fe346613a54264a2 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix qml steamer initialization if item is set lateMäättä Antti2018-02-091-1/+19
| | | | | | Task-number: QT3DS-1022 Change-Id: I8dd7c818bf8d63903b8be6a6d90e35ebc76e63cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix project tree highlight problemsTomi Korpipaa2018-02-091-3/+5
| | | | | | | Task-number: QT3DS-997 Change-Id: If0545e8f8b5c704085cf5a7b4e6607a0016bd74c Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Rephrase too long material property namesTomi Korpipaa2018-02-0935-39/+39
| | | | | | | Task-number: QT3DS-1006 Change-Id: I7c32b4ae234e611f067db05f34e738d8e84caccf Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add ./ at the beginning for effects tooMäättä Antti2018-02-091-1/+2
| | | | | | Task-number: QT3DS-1011 Change-Id: Id37444b901ca739256ed2917883acdebc05de848 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix massive memory leak when dragging objectMäättä Antti2018-02-091-2/+7
| | | | | | | | | | | | Fix the memory leak that happens when object is dragged in view other than scene view. This is temporary fix since memory is still leaked if the active layer is changed while in view other than scene view. The core problem is in the engine, because it doesn't release allocated resources when the SEditCameraLayerTranslator is deallocated. Task-number: QT3DS-974 Change-Id: I70dc69ef6167027037b5c8e8d22360db350b0351 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Revert "Fix failing to clear frame correctly when subpresentations are rendered"Janne Kangas2018-02-084-6/+8
| | | | | | | | | | Change breaks Studio layer rendering due to changes in layer clear logic. This reverts commit 51271e3d54dbafd44e17abf4dfe5e1e5521fa208. Change-Id: I855b71b12fc5ef3fa3091d36fedfd2e84430cc28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix handling of projects with dots in the nameMiikka Heikkinen2018-02-081-1/+7
| | | | | | Task-number: QT3DS-989 Change-Id: I807ca66925f0772ee9588ed381a5b485f49ddbb7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix imported assert sorting for assets with upper case suffixesMiikka Heikkinen2018-02-081-1/+1
| | | | | | Task-number: QT3DS-1009 Change-Id: I879957ee1bb1661642946034fcf5609eb82237e6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Clean up Content folderMiikka Heikkinen2018-02-0810-0/+0
| | | | | | Task-number: QT3DS-1009 Change-Id: I85e872da820657974dadf3faec9e654daebab451 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix data input chooser hover and selection for macOSTomi Korpipaa2018-02-085-6/+10
| | | | | | Task-number: QT3DS-976 Change-Id: I439a8789fe0421772ae395ee58d14ad8b771e937 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix combobox style issueTomi Korpipaa2018-02-081-0/+4
| | | | | | | | When combobox is open, flip arrow. Task-number: QT3DS-1004 Change-Id: I75b486688156b44880cf95d80f0b7c9da8711076 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix data input and subpresentation dialog interactionMiikka Heikkinen2018-02-086-65/+166
| | | | | | | | | | | | Various fixes to selection and keyboard handling. Task-number: QT3DS-962 Task-number: QT3DS-963 Task-number: QT3DS-964 Task-number: QT3DS-965 Change-Id: Icabaf49ceb669e63a8f8fd8df5d8b7a65a470ae7 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Install the missing foldersMiikka Heikkinen2018-02-081-2/+5
| | | | | | | | | | | COPIES is necessary for finding content when running developer builds, but INSTALLS is needed for actual releases. Task-number: QT3DS-979 Change-Id: Id699ad1a08500236eb68c3692e69c10ab010de00 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix failing to clear frame correctly when subpresentations are renderedJanne Kangas2018-02-084-8/+6
| | | | | | | Change-Id: I54b15667f6e9701bf5dfb8a85a8c975e1839f4fe Task-Id: QT3DS-851 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add add-disabled imageMiikka Heikkinen2018-02-074-1/+3
| | | | | | Task-number: QT3DS-943 Change-Id: Ib47a3b0b88c651e3e253f7c408b86f6e80d35ffe Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix combobox coloringTomi Korpipaa2018-02-071-0/+4
| | | | | | Task-number: QT3DS-988 Change-Id: I3943d35ecff3741a8b2b78cc2af38964cce9ee1e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add ./ at the beginning of custom material urlsMäättä Antti2018-02-071-0/+12
| | | | | | Task-number: QT3DS-982 Change-Id: I056de86c082b785cf87bfb7042d74a6ae988ae7e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Correct shortcut keys for previewing in viewer in docsMats Honkamaa2018-02-062-2/+2
| | | | | | | | Corrected the shortcut key for remote viewing in the viewer from F12 to F5 in docs. Change-Id: Ifabd8db11804fafc3730cd18cca5c3dd99980cee Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when removing an object that is referenced in actionMiikka Heikkinen2018-02-061-43/+51
| | | | | | | | | | | | This fixes the editor crash, but viewer will still crash when loading the presentation if the action is not given a proper trigger/target object manually. That's a separate issue, though. Task-number: QT3DS-617 Change-Id: I206469ac03141c02084689d0349135ef422122ac Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix Qt3DViewer standalone buildTomi Korpipaa2018-02-065-4/+23
| | | | | | | Standalone build is needed to create Android apks, for example. Change-Id: I344fcf54e079375166861da4f6eb865f19095065 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Fix missing characters in 'optimizing images'Kai Koehne2018-02-061-2/+2
| | | | | | Change-Id: Ic03ac9dd1eddc7ee2cb28f6ab7fdf51eb4637ff1 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Add versioning to editor save state logicMiikka Heikkinen2018-02-063-11/+25
| | | | | | | | | | Now a fresh installation of new version of studio will start with default UI configuration instead of attempting to interpret potentially invalid state dump from previous version. Change-Id: I2227ba7fa16316ee0253cad6000c8b7d5ddfce9e Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make data input choosers act uniformlyTomi Korpipaa2018-02-069-16/+48
| | | | | | | | | | Inspector palette had a different look to its data input chooser than the other two. Also updated the look of the dialog, and now it is shown next to the data input icon, instead of in the middle of the screen. Task-number: QT3DS-950 Change-Id: I48e16c3b26066e06dba16c106e93f986e1523558 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve connection logic in viewerMiikka Heikkinen2018-02-065-12/+92
| | | | | | | | | | It is now more clear what is going on with the remote connection. Task-number: QT3DS-955 Change-Id: I687575589f734f6b355ee72c5dea74dd7d41ba1e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove nudging with arrow keys functionalityMiikka Heikkinen2018-02-0618-497/+14
| | | | | | | | | | | According to UX people, the nudge functionality is not desirable, so remove it. Task-number: QT3DS-954 Change-Id: Ie73ecec098c9d9215d95c7913ed153a6aaed2aa6 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add remote deployment documentationMats Honkamaa2018-02-064-4/+107
| | | | | | | | | Added remote deployment documentation. Additionally small restructure of command line usage documentation. Task-number: QT3DS-562 Change-Id: I9d5b9337883aca3657f5c189b52c9a7bb996a3a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clarify the use of Buffer type in docsMäättä Antti2018-02-061-3/+7
| | | | | | | | | Add note to Buffer property documentation to clarify that it can only be used with SSBO's and textures use other property type. Change-Id: Ifcf8d5b3d04b41cfce68e9ecc3c2e086090ccb8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix object deletion action panel crashMiikka Heikkinen2018-02-064-8/+83
| | | | | | | | | | | | | | | Crash was caused by trying to access a deleted action in action system when the delayed update to ui contents was handled. Shortened the delay to make it harder for user to interact with UI during the delay, and also made all action view operations check if item is actually still valid. Also added explicit deletion listener to catch deletions from undo/redo. Task-number: QT3DS-922 Change-Id: I469a33541af734f1565711b963100a2b99aa3992 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make data input tooltips multi-lineTomi Korpipaa2018-02-063-5/+5
| | | | | | | | | | | Especially slide palette needs this, as it is too narrow to show data input name on one line without it being cut. Task-number: QT3DS-949 Change-Id: I71efbffe4d2615e5d53d8760735b97d27646598f Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add tooltips to timeline toolbarTomi Korpipaa2018-02-062-2/+20
| | | | | | | | Task-number: QT3DS-511 Change-Id: Iba5d4da5717232d12f876479bff45825d4809a0e Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* [DataInput] Enable editor-side timeline and property control buttonsJanne Kangas2018-02-052-4/+1
| | | | | Change-Id: I4f05ed10b55845888e9af498eece5787c5a5d270 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add support for DXT decompression on GPU on IntelAdam Treat2018-02-022-2/+4
| | | | | | | Change-Id: Ic88c737bee526577c1cf71810ad2a4a8dcef9256 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix Slide and Project panel layout on resizeJanne Kangas2018-02-022-5/+12
| | | | | Change-Id: Iaa43aa57c058bdebe4d2b46139fa876966cb142a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* [DataInput] Add DataInput slide control buttonJanne Kangas2018-02-024-25/+288
| | | | | | | | Allows binding a DataInput as slide change controller. Also fix timeline control so that scene can have both slide and timeline controllers. Change-Id: I309c4229d5737d71b872c1e999240c9654dc6000 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 06:12:46 +0000