summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Copy distance field shader changes to OpenGL runtimeJere Tuliniemi2019-05-2010-117/+114
| | | | | | | | | | | Also fixes the OpenGL runtime to use alpha channel for the glyph texture when using ES2. Task-number: QT3DS-3343 Change-Id: Ia37c341802e504da21ebeaff6f3f1f5b50bd1bfe Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Some Doc class clean ups (non exhaustive)Mahmoud Badri2019-05-1820-417/+232
| | | | | | Change-Id: I98554bdb805df0e2418f44f8c9d6e0040b160f8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update presentation id into assetmapKaj Grönholm2019-05-171-10/+24
| | | | | | | | | | | Updating id into assetmap is required for GetPresentationById() and GetPresentationList() to work after presention id is modified during runtime. Also rename variable as id isn't only initial now. Task-number: QT3DS-3383 Change-Id: I9022ccde25ae65f972a0ace0399d85d975c4f45e Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add possibility of creating groups to createElementMiikka Heikkinen2019-05-173-82/+141
| | | | | | | Task-number: QT3DS-3381 Change-Id: I4fc5c009d6cf4720867282f12a870074b17c0f66 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add methods to create/delete multiple elements/materials at onceMiikka Heikkinen2019-05-1717-775/+929
| | | | | | | | | | Also modified the notification signals to notify multiple creations with a single signal. Task-number: QT3DS-3376 Change-Id: I75bc867601d3f7943733b451ddfad18fab9383ea Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Increment UIP versionMahmoud Badri2019-05-1620-96/+32
| | | | | | | | | | | | - increment UIP version and show a warning if a UIP version is lower - remove 3 obsolete text shadow props - small update to checking for material container in the timeline - few cleanups Task-number: QT3DS-3366 Task-number: QT3DS-2903 Change-Id: Ib4d8c33e786001d0e5a18037a52303449630adf5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make API related classes easier to findPasi Keränen2019-05-1653-114/+115
| | | | | | | | | | | Make files defining the API and API implementation more visible by moving them to separate folder, just like in Qt 3D Runtime. Rename to be more in line with Qt 3D Runtime similar classes (and also make filename match class name). Task-number: QT3DS-3478 Change-Id: Ie7b91ab7c1dce09c3a07b9f385af8e7ed24c536a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix image loading when using Q3DSSurfaceViewerJere Tuliniemi2019-05-162-0/+2
| | | | | | | | | | | Delayed loading bool was never properly propagated to the runtime. A pointer was instead converted to a bool value and was always true causing delayed loading to be enabled and images not be loaded. Task-number: QT3DS-3411 Change-Id: I4b328077625942e846d08129313ef21e6d0c5a45 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Expose presentationLoaded signal to QMLJanne Kangas2019-05-162-0/+3
| | | | | | | | | | | | | | In addition to presentationReady, expose presentationLoaded to QML. These signal namings were previously used interchangeably in runtime, with presentationLoaded signal from engine being used to trigger presentationReady in surfaceviewer. This caused eg. Homeautomation demo to stop working with recent signal changes, as presentationReady is never emitted during splash screen. Task-ID: QT3DS-3507 Change-Id: Ia392b4651b68571df59ee8895fed42643e419fba Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix wrong timeline rows placement after a Layer copy/pasteMahmoud Badri2019-05-167-169/+55
| | | | | | | | | | | | - Material container is part of the scene graph but not the timeline. This caused wrong index to be sent from the graph to the timeline when an object is added. Fixed by keeping the material container in the timeline but hiding it. - Few relevant clean ups and removing useless code. Task-number: QT3DS-3406 Change-Id: I9ed8da3db4d935269650c00fc5b0a92349cf6fa3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix compiler error in Qt3DRuntimeView.cppAntti Määttä2019-05-162-96/+0
| | | | | | | | | Doesn't compile with latest 5.12 because the Q_OS_WINDOWS is not defined. Remove the include since it is not used. Change-Id: I9506bca4e9ae3ec140d4da878e8fafbf473a31d9 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement Q3DSSurfaceViewer::presentationReady in OpenGL RuntimeJanne Kangas2019-05-1510-3/+30
| | | | | | | | | | | | | New signal fixes the issue where setAttribute calls triggered at presentationLoaded() were lost as the runtime overrode attribute values with initial values in UIP file. presentationReady signal is triggered when the initial property values are set, and setAttribute can be safely called to update properties. Task-id: QT3DS-3398 Change-Id: Id605ddeb92766da11e0280a276ffc5e36c57b931 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update filter variants button state after importKaj Grönholm2019-05-152-1/+3
| | | | | | | | | | Fixes enabling button after importing tags and disabling it when starting a new project. Task-number: QT3DS-3336 Change-Id: Ic369aa16953afbdf7e452684338beeaa31a2158f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update variant filtering documentationMats Honkamaa2019-05-151-11/+12
| | | | | | | | | | | Added information that variant filtering can be used on components, groups, models and text objects. Task-number: Qt3DS-3502 Change-Id: I2b24fb4ec406992f9376a832152952ddcf621601 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Assume project fonts are in a subdirectory relative to project or presentationJari Karppinen2019-05-145-11/+16
| | | | | | | Task-number: QT3DS-3353 Change-Id: Iee9719c00b0da9d6e28b0baade9fd26b35f88d79 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add elementCreated signalMiikka Heikkinen2019-05-1413-89/+182
| | | | | | | | | | Also unified elementCreated and materialCreated signals to include error string to indicate failure. Task-number: QT3DS-3418 Change-Id: I4b60b1e32594b2993a5a421ac1ce66d33b521a05 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add material creation to runtime C++ APIMiikka Heikkinen2019-05-1435-330/+1330
| | | | | | | | | | | | | | Materials can only be created into the material container, animatable materials are not supported. Elements using new created materials should not be created before Q3DSPresentation::materialCreated signal is received. Task-number: QT3DS-3377 Change-Id: I782f09094d5f7151d7e1dab28b76fbbfdfcb6066 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add information about possibility to import lights and camerasMats Honkamaa2019-05-142-6/+35
| | | | | | | | | | | Added information about the support for importing lights and cameras to 3D Studio. Added it in general section and Blender section, will be mentioned in the other DCC tools sections once they are updated/created. Task-number: QT3DS-2905 Change-Id: I0c3bf9eebe64b492b60553382bd6b5d2b14e92e6 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Autogenerate mipmaps for texturesAntti Määttä2019-05-145-3/+23
| | | | | | | | | | Generate mipmaps if they are missing using QT3DS_GENERATE_MIPMAPS. Also enable anisotropic filtering and allow setting the value with QT3DS_ANISOTROPIC_VALUE env variable. Change-Id: I53f7ed6ec0e3ee511b4d605ba8a76d1177ced966 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Ignore default materials in material file handlingKaj Grönholm2019-05-141-0/+4
| | | | | | | Task-number: QT3DS-3351 Change-Id: I1b39bfdf777d11c45e212463d3dcc773aa4585da Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support variants tags on Text objectsMahmoud Badri2019-05-145-8/+16
| | | | | | Task-number: QT3DS-3415 Change-Id: I6897133273a0c43fade6f564f4ea8d2e0347138d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Torus Knot assets opacityKaj Grönholm2019-05-138-8/+8
| | | | | | | | | | Assets materials should have full opacity to import correctly and become visible. Task-number: QT3DS-3410 Change-Id: Ic68e1476b696a8f08a7a90b4d2370d9927e90261 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add missing vec4 for datainput parsingMahmoud Badri2019-05-133-0/+24
| | | | | | Task-number: QT3DS-3394 Change-Id: Ib99a65285b248e4efe623a8aba7d7b784b9fa611 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash in editor when changing presentationsAntti Määttä2019-05-131-0/+1
| | | | | | | | | | Reloadable textures must be cleared when buffer manager is cleared. Task-number: QT3DS-3403 Change-Id: Ia0bd6e08fbf50d527a9e8ab2d4a4336c891229b5 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when opening a color picker while renaming a materialMahmoud Badri2019-05-133-3/+15
| | | | | | | Task-number: QT3DS-3407 Change-Id: Ia8048e7816933736b9be9dea35721821099a9342 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix visibility toggle using data inputAntti Määttä2019-05-101-1/+1
| | | | | | Task-number: QT3DS-3358 Change-Id: I615e179d7eadfca01be516d8abe0d6b4efb6a211 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Optimize behavior scriptsAntti Määttä2019-05-105-41/+407
| | | | | | | | | | | | | | - setAttribute accepts vector parameters. This reduces setter calls from the script - updateProperties caches the properties so that they are updated more quickly and also it doesn't set unused parameters anymore - Also fixes data input metatypes for vector types - Allow getAttribute to return static properties as well Task-number: QT3DS-3414 Change-Id: I4508d8b2f57facf855662bb89bfeea0487bd4a6f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Avoid crashing on exit while previewingKaj Grönholm2019-05-102-1/+6
| | | | | | | Task-number: QT3DS-3408 Change-Id: I78adc5a561d20f4148704684983d02f7244b1575 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Only utilize active camerasKaj Grönholm2019-05-101-7/+12
| | | | | | | | | This avoids different cameras being used for rendering and picking. Task-number: QT3DS-3360 Change-Id: I14b9730388ffdc2e11df0f1b0d9a6e29e37edc3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add vector4 support for datainputsMahmoud Badri2019-05-095-31/+35
| | | | | | | | | Task-number: QT3DS-3394 Change-Id: I2e0bea3e4b4e1490e33bc747d809779cd1228fe5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add a missing float4 parsing methodMahmoud Badri2019-05-091-0/+4
| | | | | | | Task-number: QT3DS-3400 Change-Id: I384a8d7fea24d7b8c489e2775dcab5544a238453 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:04:19 +0000