summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Allow subpresentations as textures for custom materials and effectsJere Tuliniemi2019-05-0212-34/+168
| | | | | | | | | | | | | | | | | Effects already supported taking the subpresentation as a texture in the runtime. That behavior is now copied by the custom materials. This also fixes a runtime bug where the subpresentation was rendered only if a default material already had the subpresentation as a texture. Now custom material and effect properties are iterated prior rendering If they contain subpresentations, those are added the to the render task list. Task-number: QT3DS-3165 Change-Id: I7bddec2fece442065d517320d0e381eba5f1b159 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove CTegraApplication to reduce intermediary classesAntti Määttä2019-05-028-399/+189
| | | | | | | | Use the INDDView in the ViewerApp directly. Change-Id: If502dd51d4ea87fc96d892cb9255df42b06fa4f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Support alpha channel initial workMahmoud Badri2019-05-0268-480/+570
| | | | | | | | | | | In this initial work, all (almost) color properties are converted into a new type (float4) to support an alpha channel. Alpha channel option is shown in the color dialog for Layer and Scene background properties only. The following is remaining: - Scene background alpha doesn't work in the editor (works in the viewer RT1) Task-number: QT3DS-3128 Change-Id: Ib5540ebc8e2ff68709473451e4a92bf66ddb8ad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Ctrl-deselect a single objectMahmoud Badri2019-05-023-27/+24
| | | | | | Task-number: QT3DS-3372 Change-Id: I572d57fe0cb0589d090c18123e8309bbd2d3344a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add customSignalEmittedAntti Määttä2019-04-308-0/+16
| | | | | | | Task-number: QT3DS-3215 Change-Id: If36cca0d864b8c2fa7fd6ec499ace678ecaa206a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix variants import issueMahmoud Badri2019-04-301-2/+2
| | | | | | | | | Fix this issue: When opening the variants import dialog and selecting a file but clicking cancel, the variants file is still imported. Task-number: QT3DS-3371 Change-Id: Ia8687027943915fbb8120e3d321723cd80a9af8a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Do not update behavior script properties alwaysAntti Määttä2019-04-301-1/+1
| | | | | | | | Only update them when they have changed. Change-Id: I77e87640c62e1289fec980a7d1737803d49e762a Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add SetAttribute with element variableAntti Määttä2019-04-303-1/+17
| | | | | | | This removes additional element fetch from the call. Change-Id: Iaf279769a040a0de350eab3bf3dcdf98751644d8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add clipping to distance field fontsJere Tuliniemi2019-04-292-38/+88
| | | | | | | | | | Removes fallback to the old text renderer and adds the clipping feature to the distance field font renderer. Task-number: QT3DS-3329 Change-Id: Ie41b93c9a9ed791297349007c7e2b3bf10c982b1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix build warningsAntti Määttä2019-04-291-1/+1
| | | | | | | | | | - Fix include paths in pro file - Fix includes in public headers Change-Id: Icbc2ff8d8eba76480f59ab975ee39f150c6f09e4 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Set presentation id only when availableKaj Grönholm2019-04-291-2/+2
| | | | | | | | | | | | Don't set any default presentation id for Q3DSSurfaceViewer. This way studio application uses filename as the presentation id like before, keeping surfaceviewer autotests passing. Task-number: QT3DS-3213 Change-Id: I461ec30fbf8e73b3b2f7fd433a849a2e600a74b8 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 unused codePasi Keränen2019-04-2981-25769/+119
| | | | | | | | | Remove stateapplication (Architect integration) code. Remove perflog code. Task-number: QT3DS-3331 Change-Id: I208cce7551b3d332fb7905ae7cd4151c883b3728 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Check inspector instances remain validKaj Grönholm2019-04-293-3/+12
| | | | | | | | | | Deleting slide makes instance not valid causing a crash. So continue checking runtime validity. Also fix null checking typo. Task-number: QT3DS-3344 Change-Id: I7d08a93212aeb59d3a3850ce6941172abf88ae75 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add qDebug stream overrides for render base typesPasi Keränen2019-04-263-17/+1070
| | | | | | | Task-number: QT3DS-3342 Change-Id: I649202fc96eb658f2da7647f7b722de8a25cced7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Convert RGBA64 images to RGBA8 when loadingAntti Määttä2019-04-261-0/+11
| | | | | | | Task-number: QT3DS-3354 Change-Id: I68396ec7ccf9a99820edd7b7501ee39191cbef63 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Application icons refreshAlessandro Portale2019-04-259-26/+0
| | | | | | | | | This change replaces the existing application icons with the newly designed ones. Task-number: QTBUG-70826 Change-Id: Id81a6864647db42d3f8f49a3d2b3fcf65a0f8af5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix distance field shaders for ES3.2Tomi Korpipää2019-04-252-2/+2
| | | | | | | Task-number: QT3DS-3352 Change-Id: Ic0d2e7910079a6c263f6e59b81ef0588a6455654 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix timeline component dnd crashKaj Grönholm2019-04-251-2/+6
| | | | | | | | | | | Don't move object into component when it's the root component. Also don't call setTimeRange() for Text objects as it isn't called for other objects either. Fixes a crash when dnd object into component with subcomponent as the first tree object. Task-number: QT3DS-3324 Change-Id: I3995494028b09e184970170a414a801a1e4a4075 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Use declared uniforms in all shaders by defaultJere Tuliniemi2019-04-241-40/+47
| | | | | | | | | | | Effects depend currently on both shaders having access to all uniforms by default. Copy this behavior to custom materials and fix issues in effects at the same time. Task-number: QT3DS-3347 Change-Id: Ic7163adfa646d166dfe9c053b86858cd35a80b95 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix crash in editor when using qml streamAntti Määttä2019-04-2410-3/+54
| | | | | | | | | | | | | | | | | | | | The crash occurs due to stack overflow due to recursive subpresentation initialization in runtime codes. This happens because the qml subpresentation has the same id as the presentation filename, which is assigned to default initial id from the presentation filename. When the layer, which is using the qml subpresentation, is initialized in the runtime, it gets the uip presentation instead of the qml subpresentation. The same begins to happen recursively. Add the ability to change the initial presentation id from the surface viewer api, which is used to render the subpresentations in the editor so that it gets valid id instead of the id from filename. Task-number: QT3DS-3345 Change-Id: I45f3a8ce9b5dc030f120baa1a8aed6c284ea7e3c Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix runtime autotests building after flatteningKaj Grönholm2019-04-174-4/+4
| | | | | | Task-number: QT3DS-3213 Change-Id: Ice6b012fb358dd4d2ff21a90ac42bdaf6e880c1e Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Implement datainput getter API for OpenGL runtimeJanne Kangas2019-04-1621-207/+527
| | | | | | | | | Partially implements RT2 feature parity for datainput getters. (Min/max property is not exposed to QML side.) Task-id: QT3DS-3258 Change-Id: I9cce3e98289c3cac8d2c774bb53eb75f445b6e17 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add distance field rendering to OpenGL runtimeJere Tuliniemi2019-04-1637-51/+2706
| | | | | | | | | | | | | | The old text rendering remains in the background and is used to render clipped text, since that feature is not yet implemented for distance field fonts. Building the runtime with Qt version older than 5.12.2 also causes a fallback to the old text rendering. Depth pass rendering also needs to be redone in the future to avoid another full render pass. Task-number: QT3DS-3210 Change-Id: Ib7666c437d23ae25e1872682f010df3721476a14 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix q3dssurfaceviewer datainput autotestsKaj Grönholm2019-04-162-5/+5
| | | | | | | | | | Presentation was using older datainput notation without '$' in property names. Now all q3dssurfaceviewer autotests are passing. Task-number: QT3DS-3213 Change-Id: I4d360cf6a3eece028bf418f41920b43094244200 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Change welcome screen guide button labelKaj Grönholm2019-04-151-1/+1
| | | | | | | Task-number: QT3DS-3263 Change-Id: I6223b418e55854cb56c32792ad207ae3b58a792d Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Flatten OpenGL source directory hierarchyPasi Keränen2019-04-15727-683/+674
| | | | | | | | | | Flatten Source,Include and PrivateInclude directories away. Replace camelcase directory names with lowercase names. Remove random Qt3DS prefixes from directory names. Task-number: QT3DS-16 Change-Id: I5b23349232c760afa9a8efcc5e8945ee19d2e31a Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix and extend viewer autotestsKaj Grönholm2019-04-154-17/+95
| | | | | | | | | | Fix viewer autotest to use opengl runtime import and extend tests to cover more Studio3D, Presentation and ViewerSettings API. Task-number: QT3DS-3213 Change-Id: I65ca87b6fdb90b9d90411011e5a1f665c1151e04 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix q3dssurfaceviewer autotestsKaj Grönholm2019-04-131-3/+3
| | | | | | | | | Slide index changes required due to QT3DS-3248 change. Task-number: QT3DS-3213 Change-Id: I4d23ac24bdc0f53d4f6d586fda94c87d579a0dd1 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* clean up and format MetaData.xmlMahmoud Badri2019-04-113-243/+281
| | | | | | | | | | | | | | Also: - Fix a crash when setting a standard material. - remove visible property from materials. - add an inspector group "camera properties" to the camera and move the orthogonal setting there. Task-number: QT3DS-3319 Change-Id: I5830248b4e610231124a6c588a2563c757b066c1 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>
* Support variants property on componentsMahmoud Badri2019-04-1136-1246/+535
| | | | | | | | | | | | | | | Also the following tasks are done in this commit: - show active root component properties in the inspector. - fix a crash when opening the light scope drop down. - remove a lot of dynamic casts and useless code and cleanups, mainly from the inspector classes. There is still more dynamic casts and memory leaks that should be tackled in another commit. - move a method to more appropriate place. Change-Id: I5bec3858ba34d307ab6236ee665f1474302c1f57 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add variant support to OpenGL runtimePasi Keränen2019-04-1126-260/+599
| | | | | | | Task-number: QT3DS-3193 Change-Id: I5606d452104659e60ecbc2e8e08ec3e6f5b15cbc Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Fix documentation warningsTopi Reinio2019-04-106-15/+38
| | | | | | | | | | | | Remove todo/hidden comment blocks from the documentation build as they cause warnings. Likewise, QDoc complained that it doesn't find a module header for this pure doc module; clear the 'moduleheader' variable. Fix incorrect usage of \badcode. Change-Id: I5bbb0b3c7d7cdba49fc5f5a1aa1bef7c33f69006 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix building opengl runtime autotestsKaj Grönholm2019-04-101-26/+7
| | | | | | | | | | IDynamicObjectSystem setShaderCodeLibraryVersion() was removed since ddcddb474c and Qt3DSAssert definition is required to link. Task-number: QT3DS-3213 Change-Id: Ibde89d64e1a04f48c0510de590a5211d71696e3c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update toolbar documentationMats Honkamaa2019-04-101-72/+40
| | | | | | | | Small fixes to errors and formatting. Task-number: QT3DS-3277 Change-Id: I38cf28f00d3cb166d63eac74ac2253adab426471 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* New version of SampleProjectTomi Korpipaa2019-04-1017-434/+325
| | | | | | Task-number: QT3DS-3281 Change-Id: I4c3896d1fc7a38e4b8e3eff38a4869197447a85e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix setting default startup viewMahmoud Badri2019-04-093-9/+8
| | | | | | | | It was not possible to set the scene camera as the start up view. This patch fixes that. Change-Id: I4a64c747c148481627403f980273b4f6fa879607 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Do not assert if Action is added into root SceneTomi Korpipaa2019-04-091-0/+2
| | | | | | Task-number: QT3DS-3298 Change-Id: Ic7eb9e4ecc10d827adf952a0d1484218be1d3a87 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for KTX texturesAntti Määttä2019-04-0914-66/+645
| | | | | | Task-number: QT3DS-3205 Change-Id: If54d1404b934c6ae7de704884ba0afdf71419170 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update text object documentationMats Honkamaa2019-04-088-61/+70
| | | | | | Task-number: QT3DS-3129 Change-Id: I7a3eb3b8d42ec728d95c10c53a75543e0fe83227 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support variants property on Group typesMahmoud Badri2019-04-089-89/+89
| | | | | | | | | Also few usual cleanups. Task-number: QT3DS-3234 Change-Id: I4624aeac27ee512cdbe62677bb9469e2748cc58b Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement variants support for ModelsMahmoud Badri2019-04-0521-464/+349
| | | | | | | | Also some relevant tweaks here and there. Next: supporting variants on Groups, then Components. Task-number: QT3DS-3234 Change-Id: I3943baef1118cecbcd4211b6eefca3d54b21a89e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for selecting shadow castersTomi Korpipaa2019-04-0415-5/+39
| | | | | | | | | | Editor and OpenGL runtime implementation. Qt3D runtime implementation is done in a separate commit. Task-number: QT3DS-3269 Change-Id: I26e2aa3041acaaef36cc103cc4039a0c4ea1df73 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename Slayer runtime moduleTomi Korpipaa2019-04-0415-54/+35
| | | | | | Task-number: QT3DS-3256 Change-Id: I813ad2e02c619754252a90ed150c12ebaeacc9ce Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix Viewers shortcut keys documentationMats Honkamaa2019-04-031-0/+5
| | | | | | | | Added missing shortcut key. Task-number: QT3DS-3265 Change-Id: I0382c3edcd3393bab93391b7aa72dc280b598e28 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shortcut keys documentationMats Honkamaa2019-04-022-1/+9
| | | | | | | | Added missing shortcut keys and corrected one. Task-number: QT3DS-3246 Change-Id: Iaea4a0c62a43d9e7235a8228b4f6aeb8a8904a6c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix visual aid widget camera frustrum when presentation size changesMiikka Heikkinen2019-04-022-1/+14
| | | | | | | Change-Id: Ifc0457be9e8af9963b24085ce03dc895c02ad441 Fixes: QT3DS-3252 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Disallow modifying default material by dragging things on itMiikka Heikkinen2019-04-029-16/+40
| | | | | | | | Task-number: QT3DS-3245 Change-Id: I0ef73c495522311527fce221fb996bdcd953353e Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge branch '2.3'Miikka Heikkinen2019-04-012-47/+52
|\ | | | | | | Change-Id: If005b2e6e32c3616152e3049dbfa934fb28005da
| * Fix crash when hovering over property row of a layerv2.3.02.3Mahmoud Badri2019-03-292-47/+52
| | | | | | | | | | | | Task-number: QT3DS-3251 Change-Id: Id46611e6d661b045aab3a9663ac5030709a4969c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix Objects-Image-Normal@2x.png nameMiikka Heikkinen2019-04-013-1/+1
| | | | | | | | | | | | | | | | | | Also remove unused autosaved icon. Change-Id: I645ea4dfe271abcbbfabb820e2700fe752626661 Fixes: QT3DS-3249 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 05:07:14 +0000