summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove circular build dependencywip/qtifyJanne Kangas2019-05-0913-29/+38
| | | | | | | | | Duplicate enum defined in studio3d module on runtime side to avoid including the entire class from studio3d. Task-id: QT3DS-3396 Change-Id: I193b34614a8bbf991f717f8302061298b56e451e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add missing float4 types to Runtime data model datatypesMahmoud Badri2019-05-086-20/+64
| | | | | | | Task-number: QT3DS-3400 Change-Id: I17de1c3a1d6ba4a6877a9570ab9821523e345565 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix OpenGL runtime picking with scaled cameraKaj Grönholm2019-05-079-9/+44
| | | | | | | | | | | | When camera scale property has been modified, picking scale needs to be inverted or it scales into wrong direction. This affects both runtime viewer and editor in scene camera view. Task-number: QT3DS-3393 Change-Id: Ib643af22861b81fb0fc9e78ebfd2d724e765eff5 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>
* Add presentationLoaded to Q3DSSurfaceViewerAntti Määttä2019-05-072-0/+3
| | | | | | | Task-number: QT3DS-3260 Change-Id: I4db352a640d62fde91d113865a985386ba24c512 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add deleteElement to C++ APIMiikka Heikkinen2019-05-0716-21/+212
| | | | | | | | | Add possibility to delete elements that have been added with createElement. Task-number: QT3DS-3374 Change-Id: I701e565241d18294171cd63ef934083f627b89aa Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add dynamic object creation to presentation C++ APIMiikka Heikkinen2019-05-0727-174/+836
| | | | | | | | | | | | A new model element can be dynamically created into the scene. The slide and properties of the element can be specified at creation time. A material element is automatically created for each added model. The material is specified with a custom "material" property in the list of creation properties. Task-number: QT3DS-3209 Change-Id: I52b0e929023092110820405473a9399b67a305cd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix shader compilation errors in copies of VignetteEffect.effectJari Karppinen2019-05-072-12/+8
| | | | | | | | | | | | Apply updates from qt3d-runtime commit 6945d224433d731aaff1f83bf4d05ba812c8c36c to qt3dstudio files. Task-number: QT3DS-3387 Change-Id: I777ed67d53ece891d8d338732221de16c9019713 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> 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>
* Fix transparency check in editorAntti Määttä2019-05-073-12/+15
| | | | | | | | | | | | | The transparency check is not enabled for images used in material container due to previous change. Re-enable the check when presentation is saved. Task-number: QT3DS-3357 Change-Id: I55888df7b38d3f3b14dfb578b8ae14cafdf1c8e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make content library files visible from main projectPasi Keränen2019-05-071-0/+5
| | | | | | | | | Make text editable parts of content library visible directly in Qt Creator. Change-Id: I94a1adea42443b135a29e2e023a83ddaa058e93b Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add simple performance viewAntti Määttä2019-05-0716-44/+86
| | | | | | | | | The F7 button in the viewer now shows the render statistics as well as the layer profiling timers. Task-number: QT3DS-3211 Change-Id: I9553b9c522a9d16efd53b17c1f10538294b2b834 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix camera lookAt in OpenGL RuntimeJari Karppinen2019-05-071-5/+2
| | | | | | | | | | Convert radians to degrees as in Qt3D Runtime. Task-number: QT3DS-3349 Change-Id: Icc4935a07ce3b9e246b13b179646714267d23956 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove remaining state machine codePasi Keränen2019-05-064-30/+0
| | | | | | | | Remove state machine code and .uia file statemachine part. Task-number: QT3DS-2846 Change-Id: Id4b74c296f9be4067e78906937dcb9086e60b949 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Move CRenderString to foundation and rename to Qt3DSStringPasi Keränen2019-05-0621-132/+140
| | | | | | | | | | | | | CRenderString is no longer just the runtimerenderer or renderer. It is aimed to replace all the various string types and then pave the way for moving to QString from unified string class base. Better place for this class is in the foundation. Task-number: QT3DS-3370 Change-Id: I50c25aadddd39fba48451544509894c3e7ac89fc Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update custom material shaders to work with alpha channel colorsMahmoud Badri2019-05-0623-53/+53
| | | | | | | Task-number: QT3DS-3395 Change-Id: I462629e7c4b616fde7f7c9354477b2ab3f836fb9 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix AdditiveColorGradient, Corona, and LightTable shadersMahmoud Badri2019-05-063-3/+3
| | | | | | | | | | | Those shaders broke after adding an alpha channel to the color type. Task-number: QT3DS-3392 Change-Id: Icba8079e30a9a08398d80c197b397394e3491e89 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement fixes to the distance field rendererJere Tuliniemi2019-05-0621-78/+60
| | | | | | | | | | | | | | - Change modelView matrix to mvp for sharper texts - Support global opacity from parents - Allow changing alpha from the text color picker - Change shadow color to be the same as the text color Task-number: QT3DS-3343 Task-number: QT3DS-3363 Change-Id: I37178abe6c9239619a3f9de440d2b9245a138a82 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Change editor tooltip texts for OpenGL and Qt3D runtime viewersKimmo Leppälä2019-05-061-5/+5
| | | | | Change-Id: I5079fa0e133a47d8d6805aef9ee57a5a4611d7b8 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Convert CRenderString to be QString basedPasi Keränen2019-05-0313-124/+761
| | | | | | | | | Replaces QString as the implementation class of CRenderString instead of std::basic_string Task-number: QT3DS-3370 Change-Id: Ie1b9068bfdbf0ce05659f1ae83fe9243acdf7eee Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement dynamic loading of slide resourcesAntti Määttä2019-05-0339-274/+1019
| | | | | | | | | | | | | | | Implements loading of textures and images during runtime instead of load time. - Images which are not part of any slide are loaded at load time - Master slide images are always loaded at load time - Images used in a slide are loaded when the slide is entered - Images are unloaded when slide is exited and any other slide does not use them Task-number: QT3DS-3208 Change-Id: I7a827a5e828908efd2b104fe25374c66958319d2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 16:13:23 +0000