summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use correct icons in mesh selector1.1Kaj Grönholm2018-03-028-8/+31
| | | | | | | | | Allows setting custom icon for choosers. Task-number: QT3DS-195 Change-Id: Iec1d7fd3cf6ebcfaabba222609ec90d86069c9ab Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Slide view highlight to follow active slide #2Kaj Grönholm2018-03-022-7/+6
| | | | | | | | | | When fixing QT3DS-1195 didn't know this affects also undo. So highlight to follow all the time, not just during playback. Task-number: QT3DS-684 Change-Id: I186b07cac20332dc38ccb362b800e8a3f5a4a683 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix particles in qml streamerMäättä Antti2018-03-021-9/+11
| | | | | | | | The event handler must use default handler in default case. Task-number: QT3DS-1272 Change-Id: I8a9fe7d9032fd62e6bd0cae439f606515d1b0c7c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Handle boolean shader properties properlyKaj Grönholm2018-03-022-2/+16
| | | | | | | | | | | Boolean shader properties could not be set to false as "(GLint *)value" for booleans meant random number into uniform. Instead, cast booleans int to 0/1. Task-number: QT3DS-540 Change-Id: I3a10365c91e3c458a1591ca98fac4e6fb39e3295 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Enable pasting action without existing actionsJanne Kangas2018-03-024-12/+32
| | | | | | | | | | | In action panel, leaves some empty space to right-click and open context menu for copy-pasting an action without any existing actions in the list. Task-ID: QT3DS-956 Change-Id: I9cca3d5126c500cce5afdceec21e006615e50dcb Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix action panel references for relative pathsJanne Kangas2018-03-028-32/+90
| | | | | | | | | | | | | | | | | UI panel incorrectly showed absolute paths even if user selected relative path as reference type. Also, fixed references being reset from "Unknown" to action owner object after pasting an action, opening the object reference selector and closing it without making a selection. Fixed actionview not updating reference type when changed from object selector. Note that UIP file might still save path references in notation "#name" if the object name is unambiguous, regardless of what is shown in the object selector dialog. Change-Id: I68a79d2f52cc6b1ed04f2b5b60f10a057dc52360 Task-id: QT3DS-153 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Slide view highlight to follow active slidev1.1.0-rc3v1.1.0Kaj Grönholm2018-02-263-1/+21
| | | | | | | | During playback highlight to follow presentation active slide. Task-number: QT3DS-1195 Change-Id: I874227e4f91c32044b21edb7aee2227c2b494028 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove old DataInput proto codeJanne Kangas2018-02-2341-905/+20
| | | | | | | | | | | | | | | | Reverts some (not all) changes in commits: 935d8a983db25978b3e8f0dbe67323684ce4dd96 e3c6e9d38a5b6f729093fc0349784fa475af8f62 337aaa465ac78ac72ca748f0c2d4c3b6257829b8 0707c13c34653066c89d5b25abe60a779650ee27 c1fc5d13e3668a117b4f8470ecb87b77b145efb8 Task-ID: QT3DS-865 Change-Id: I6f2ce77b12e2930aee1ea3b62b34aabe10bc6d00 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix qmlstreamer in rc2Määttä Antti2018-02-231-4/+2
| | | | | | | | | Remove duplicate import path. Task-number: QT3DS-1212 Change-Id: Iab288fa848e801de15b99187410409034f73f0a1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix effect and custom material stringlist propertiesMäättä Antti2018-02-231-1/+4
| | | | | | | | | | | The current implementation appends ./ at the beginning of all string properties for effects and materials. Append it only for texture properties. Task-number: QT3DS-1193 Change-Id: Idf02ed0c42c1568b67b5bc57e1497836e94c67ef Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix remote deployment for main uipTomi Korpipaa2018-02-231-3/+15
| | | | | | Task-number: QT3DS-1194 Change-Id: I75c6fca664bfc43da400ec25bda201d5cb9a487a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clear data inputs and sub-presentations on creating new presentationTomi Korpipaa2018-02-231-0/+4
| | | | | | | Task-number: QT3DS-1188 Change-Id: I52a0bad6d89d6c42ff7acd562532d1b73ae97ee8 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix wrong colors in dockwidgets and tableviewsTomi Korpipaa2018-02-231-0/+7
| | | | | | | Task-number: QT3DS-1197 Change-Id: Idaa93ba99e034bd44eceb11943f7dc6610d15020 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crashes when editing behavior scriptMiikka Heikkinen2018-02-232-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues that caused crashes when editing behavior script that was included in a presentation that was currently edited: 1) File system watcher triggers multiple change events for each save due to how Qt Creator saves files via a temp file. Sending the event to show progress dialog causes these pending events to be handled while we are handling the previous event. This caused a crash because we were operating on a reference to a member vector whose contents could change in response to file change event. Fixed this issue by making a copy of the vector instead of working with a reference. 2) Message box that is shown when parsing of the changed behavior script fails used currently active window as parent. In this case, the active window was the progress dialog. When progress dialog was destroyed, the destruction of the modal message box caused a crash. Fixed this issue by correctly parenting all message boxes to application main window instead of the active window. Task-number: QT3DS-1162 Change-Id: Ic6306fcc86910c225fa8ec3503a5d5b350d61e5c Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Clean up old objects when updating inspector panelv1.1.0-rc2Miikka Heikkinen2018-02-212-2/+17
| | | | | | | | | | | | Old control elements were never deleted, which resulted in memory leak and more importantly signal connection leak. Obsolete connections of deleted objects could cause crashes. Task-number: QT3DS-1182 Change-Id: I24175dac3a78de77c5220d0837ec1c4b3dc480c0 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Show controlling datainput name in inspector panelv1.1.0-rcJanne Kangas2018-02-203-100/+120
| | | | | | | | | | | | Adds datainput name above text control in inspector panel. For now, this does not add excessive clutter in inspector panel. When datainput control is enabled for several properties, we might want to dynamically show controller name label only for properties that are actually controlled to keep inspector panel size smaller. Change-Id: I6ea0dee1c9bc7b30b6faa82acb68c2f5c338c62d Task-Id: QT3DS-1152 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove current presentation from possible subpresentationsMiikka Heikkinen2018-02-201-1/+8
| | | | | | | | Task-number: QT3DS-1147 Change-Id: I1c6c09a2660d2aabe8bc3229e9f8a04d0a334729 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 Datainput undo/redoJanne Kangas2018-02-197-113/+82
| | | | | | | | | | | Creates proper undo stack when datainput control is set on or off. Also, removes extra connection pointer and uses existing connection pointer list for inspector item. Only checks datainput control UI status for properties that are actually controllable (currently only textstring in Text element.) Change-Id: Iae35bed53f492a5ec25c66a50b40278830717ce9 Task-Id: QT3DS-1077 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix initial directory when doing save asMiikka Heikkinen2018-02-192-4/+6
| | | | | | | | | | | Save as and save copy functions do not create new directory, so lets not assume they do when saving the previous directory. Task-number: QT3DS-1160 Change-Id: Idbd7c07130df3405c938dd06ee3eccb1841058dd Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Make too long tooltips multi-lineTomi Korpipaa2018-02-1947-171/+174
| | | | | | Task-number: QT3DS-1154 Change-Id: I691667d1f7ffd709ee9537e4ad35bcf129c91fe6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix incorrect resource import error messageMiikka Heikkinen2018-02-191-0/+1
| | | | | | | | Need to register v1.1 of the Behavior API also on studio side. Task-number: QT3DS-1151 Change-Id: I540ccf8cbbc51c5c75b5d31e44424059350d1afd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Move playback control documentation to correct placeMats Honkamaa2018-02-193-28/+27
| | | | | | | | | Moved playback control documentation from toolbar section to timeline section. Updated related image. Task-number: QT3DS-1085 Change-Id: I9414a2b48429596c326971f1cd306de841a99665 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix error dialog textsTomi Korpipaa2018-02-195-22/+14
| | | | | | Task-number: QT3DS-1143 Change-Id: I73cc9e7c9244d8dc494bd4c994ac1f08e02c1e53 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update old imagesMats Honkamaa2018-02-197-0/+0
| | | | | | | | Updated old images in documentation. Task-number: QT3DS-977 Change-Id: I47f4e7ede0adafb7940e6dfb656960c7dd1782df Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Visualize datainput control status betterJanne Kangas2018-02-197-37/+95
| | | | | | | | | | Add label that shows the current controller and change dock title color when slide transitions or timeline is controlled. Task-ID: QT3DS-1051 Change-Id: I2faefb076fffab673640ce2d32b7c3ec0e31cdd7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix text area background height for Text element textstring fieldMiikka Heikkinen2018-02-191-0/+1
| | | | | | | | | Fixed by setting the background height explicitly. Task-number: QT3DS-1044 Change-Id: I1548813bd073933a95192bbe4a0d27c1ae8f9cc5 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when undoing element deleteMiikka Heikkinen2018-02-191-1/+3
| | | | | | | Task-number: QT3DS-1107 Change-Id: I8396036986ff6d3622260fba6ecb9d72c3975abf Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when changing datainput for text elementMiikka Heikkinen2018-02-197-13/+27
| | | | | | | | | | | | Data input connection always used the handle and instance values that were used when the connection was established. Also changed it so that callback from selection dialog only comes when user changes the selection instead of getting one during dialog setup. Task-number: QT3DS-1056 Change-Id: Ic4d6bf78ebba5859f55c69f946bc10d7b8154a06 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add deployqt targetMiikka Heikkinen2018-02-191-0/+27
| | | | | | | | | | | deployqt target provides a way to deploy all Qt dependencies of studio and viewer executables utilizing windeployqt and macdeployqt tools. Task-number: QT3DS-1057 Change-Id: I98087558ec7c37aaa43f84f6d93ca84fcb01868d Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix rendering same subpresentation to multiple layersMäättä Antti2018-02-1617-133/+191
| | | | | | | | | Add instancing support to layer rendering. Task-number: QT3DS-531 Change-Id: Ibb52951f0ae01c568d43d752b1f26ad49c626325 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix absolute args path with sub-presentationsTomi Korpipaa2018-02-161-4/+19
| | | | | | Task-number: QT3DS-1027 Change-Id: I2c5de6650939c89e1faaed89904b6ee452fb02f2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix inserting data inputs to presentation without .uiaTomi Korpipaa2018-02-161-4/+4
| | | | | | | | Task-number: QT3DS-1058 Change-Id: I6ef23e0851f4676b1b497f26e05ba63df715c871 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix broken undo/redo stackMiikka Heikkinen2018-02-162-24/+16
| | | | | | | | | | | Datainput controls for timeline and slides used transactions for querying values, which broke the undo stack. There is no need to use transaction for querying a value. Task-number: QT3DS-1074 Change-Id: I57a426c126b4638e858ef3256b64bd8494248e4a Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 09:20:13 +0000