summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update opengl runtime for releasev2.4.02.4Jukka Jokiniva2019-06-261-0/+0
| | | | | Change-Id: I84ec361532baf3ee3f23138d7543b97157b408af Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add links to OpenGL Runtime in the sidebarTopi Reinio2019-06-201-3/+24
| | | | | | | Change-Id: I68b67ed963f7b81e06f29c803ea6a2bbf0f81a61 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix editor mattecolor after matteEnabled changev2.4.0-rcAntti Määttä2019-06-201-0/+1
| | | | | | | | | | | | The matte is always enabled in the editor Task-number: QT3DS-3542 Change-Id: Ic148fb664aa9f8f213d26a75f7860374d981a334 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
* Update opengl runtime for rc releaseAntti Kokko2019-06-251-0/+0
| | | | | Change-Id: I87908ed36a791a784dfb4aa37efbc3f14831ef3c Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix invalid datainput type mismatch warnings for camera propertiesMiikka Heikkinen2019-06-241-0/+1
| | | | | | | | | Task-number: QT3DS-3694 Change-Id: Ie342da943d71f1c37eda48295689866eb3305d35 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Reconstruct inspector group on property group changeJanne Kangas2019-06-201-4/+21
| | | | | | | | | | | | Reconstruct the inspector group when the property list within group changes. This can happen when a property becomes conditionally (in)visible when another property changes. Change-Id: I6fad26b13401ed8d31efe91f4ecfefeb0ea16910 Task-id: QT3DS-3683 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submodulev2.4.0-beta4Antti Kokko2019-06-191-0/+0
| | | | | | | Change-Id: I122ec9e521773666fa89abd5c86ae569d4eb3ad1 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Import also variants when importing a presentationMiikka Heikkinen2019-06-181-0/+8
| | | | | | | | | Task-number: QT3DS-3684 Change-Id: I0d873b1daced28eca2519e64e42157ceee410ef2 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix launching viewer without having to install it during developmentMiikka Heikkinen2019-06-141-10/+18
| | | | | | | | | | Task-number: QT3DS-3661 Change-Id: Iad6eaff628627e3a760ed5c404f99682ada94008 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix isMaterialContainer check when there is no material containerMiikka Heikkinen2019-06-171-1/+1
| | | | | | | | | | | | | | | | | Checking if invalid instance is equal to material container returned true when material container didn't exist in the presentation. While technically correct, it is not what is expected by users of isMaterialContainer. Task-number: QT3DS-3668 Change-Id: I6bf73fd9aa39adfe25f4a89719c6ae31fe34119f Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix libinfix builds in CIMiikka Heikkinen2019-06-181-4/+4
| | | | | | Change-Id: I2c6bc05f9777cc33e5c923f500f2337245de10aa Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix editor build on mingwAntti Määttä2019-06-137-6/+43
| | | | | | | | | Editor part. Task-number: QT3DS-3659 Change-Id: I59a44e72d4de2d68466852dbf86398b42fc8d915 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
* Fix developer buildv2.4.0-beta3Antti Määttä2019-06-133-11/+11
| | | | | | | | | The wip/runtime2 branch already had the same problem. Copy the solution from there. Task-number: QT3DS-3660 Change-Id: I7d2440cac22dcb73515a687df008f50bc33b8d0c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-06-121-0/+0
| | | | | | Change-Id: Ibfbc28c3b1d780b1876eefe89c2adb07e6b97221 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Remove Qt3DSAssert from studioappAntti Määttä2019-06-131-11/+0
| | | | | | | This makes the submodule update to work. Change-Id: I2ba392d62a0120dbf491df89a6670c4bff792c26 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix memory leak in inspector and other tweaksMahmoud Badri2019-06-1210-168/+173
| | | | | | | | | | | - Fix a memory leak: inspector groups are never deleted, so each change of object selection will increment memory. - Remove all dynamic casts from InspectorControlModel.cpp - Other relevant tweaks Task-number: QT3DS-3639 Change-Id: I882ba6d42870a383c20d94247e1fc8690f5026f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make referenced and animatable material properties able to be unlinkedJanne Kangas2019-06-122-6/+8
| | | | | | | | | | | | | | Allow unlinking for properties other than ones referring to image instances. Unlinking image references is not trivial as slide ownership seems to mix up references, so disallow it for now. Also, fix QML property binding being broken at property link/unlink. Change-Id: I2d975511d19ca3a0330396a886b1151db1d4e090 Task-id: QT3DS-3339 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove autotests from qt3dstudio repositoryKaj Grönholm2019-06-1195-13187/+0
| | | | | | | | These have been now moved into ogl-runtime repository. Task-number: QT3DS-3627 Change-Id: I08ca9a203f18347a2f3d71d57609972ef024916e Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Remove qmake warningJari Karppinen2019-06-111-1/+3
| | | | | | | Checking existence of BREAKPAD_SOURCE_DIR is not needed if it is not set. Change-Id: I4d95afc50a3469019b0ed93fb477da75d9beb057 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ColladaDOM submoduleTomi Korpipaa2019-06-111-0/+0
| | | | | | Change-Id: I1175a7394c8e31dec114158bc89e06b71f6651bf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement QML code generator for Datainputs and -outputsJanne Kangas2019-06-113-3/+39
| | | | | | | | | Copy datainput and dataoutput QML declarations to clipboard. Task-id: QT3DS-2201 Change-Id: I496b2d9517875227bfd89b144025717d23ae35d0 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Add project directory into window titleKaj Grönholm2019-06-111-3/+13
| | | | | | | | | Window title to contain also directory name of project uia. Task-number: QT3DS-3504 Change-Id: Icba481d7808d93e691e548afdb90ecb4ab4a92 Change-Id: Icba481d7808d93e691e548afdb90ecb4ab4a9216 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-102210-316803/+121
| | | | | | | | Module config change so that ogl-runtime builds from submodule. Task-number: QT3DS-3600 Change-Id: Ib22fda6aed1cf9336f15b79256b5f9db8774159f Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix black screen after opening another presentationJere Tuliniemi2019-06-071-0/+5
| | | | | | | | | | When the clean up operations were done for the engine, the OpenGL context was wrong causing wrong vertex array objects to be deleted. This sets the context to be correct during the clean up. Task-number: QT3DS-3638 Change-Id: Id588c5b0513e44953df7164e7ef41ae66a668122 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Integrity build after type changesJanne Koskinen2019-06-051-1/+1
| | | | | | | | Same issue as with Android. long vs. long long. Change-Id: I35dc4e9183332b32afaad53003f434e0d093a52b Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Add examples from runtime 2Pasi Keränen2019-06-0633-1/+1276
| | | | | | | | Task-number: QT3DS-3599 Change-Id: I6339156f184c9f34f461bb0097404f4e680d1c7d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support datainput binding in createElementsJanne Kangas2019-06-064-5/+26
| | | | | | | | | | | | Allow setting custom property "controlledproperty" when creating element, enabling DI property control for new elements. Property string formatting follows UIA file conventions to allow parser code reuse. Change-Id: I187fc82542f81e095d0aa715da4d199305db57a3 Task-id: QT3DS-3380 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Copy memory leak fixes from Qt3D runtimeJere Tuliniemi2019-06-062-7/+15
| | | | | | | | | | Copies "Work around memory leak in QRawFont::setPixelSize()" and "Fix minor memory leak". Task-number: QT3DS-3617 Change-Id: I7e669a303fc1c2d099bc5383fdd78720f88a8f9e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix distance field shaders on OpenGL ESJere Tuliniemi2019-06-053-9/+5
| | | | | | | | The shaders contained unnecessary highps and declared fragColor even though the engine automatically adds fragOutput to internal shaders. Change-Id: Ic23b4741aa11e4d52c55fdd82ee79dd919919aeb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add Runtime 2 style surfaceFormat method to APIPasi Keränen2019-06-063-2/+148
| | | | | | | Task-number: QT3DS-3302 Change-Id: Iab3614d8a77a89588ed8dc2ffcd184a0539c31c7 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix autotestsKaj Grönholm2019-06-053-45/+21
| | | | | | | | | Fix building and running autotests after latest API & module changes. Task-number: QT3DS-3213 Change-Id: I15e3da941c499453021e87a574cfb888b87e6773 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix indentationAntti Määttä2019-06-051-1843/+1848
| | | | | | | Change-Id: I1046718d54f818f72be63dc2a795703d3f655d22 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix memory leak in OpenGL runtimeJere Tuliniemi2019-06-054-0/+22
| | | | | | | | | | glDeleteVertexArrays was never called by the runtime causing the buffers referenced by the vertex array object to never be removed from memory. Task-number: QT3DS-3617 Change-Id: Ifd437fb5790823096121b6f18c9a500252a31017 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support platform default fboAntti Määttä2019-06-055-9/+23
| | | | | | Task-number: QT3DS-3531 Change-Id: Icd362a4dd1623e474d84e5f0bc07147332d9aa4c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix simplewindow exampleAntti Määttä2019-06-051-14/+23
| | | | | | | | | | | The surface viewer tries to initialize the runtime before we have valid surface and context. Delay the initialization until they have been created. Task-number: QT3DS-3619 Change-Id: Ia427ce3af4e568be1b317bf798777c7eb3f773fc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Force path normalization to use forward slashesJari Karppinen2019-06-051-0/+5
| | | | | | | Task-number: QT3DS-3620 Change-Id: I34f30f890e5787325c592522a7d40ebc540045c1 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add accessors for lists of created elements/materials/meshesMiikka Heikkinen2019-06-055-25/+172
| | | | | | | | | | | | Task-number: QT3DS-3618 Change-Id: I3b58ac2d2099836f142ef1a3b25a333a1023582b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Clarify material creation/deletion APIMiikka Heikkinen2019-06-0511-91/+141
| | | | | | | | | | | | | | | | | Replaced element path with presentation ID in createMaterial, as that is what we are actually interested in. Removed element path from deleteMaterial, the presentation ID is expected in the name. The materialsCreated signal will now include the presentation ID in the material name if the material is in a subpresentation. Task-number: QT3DS-3623 Change-Id: I0c38c0eb52f85005256c3bf3dee45be384d66d37 Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
* Implement datainput metadata getterJanne Kangas2019-06-0513-8/+198
| | | | | | | | | | | Implement metadata for both C++ and QML APIs. As a basic rule, defer to viewer app as metadata source whenever possible. For QML side separated by asynchronous command queue, fetch metadata at UIA load and store it locally in datainput and/or presentation items. Task-id: QT3DS-3579 Change-Id: Ife323f427da301ee8e6bfe9a9dccfe599ee2e5dd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix compile warningsMiikka Heikkinen2019-06-041-3/+7
| | | | | | Change-Id: I1f5264b7e5395d5b27c0bfc3a52fc4c4bc0b04d0 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Properly detect and generate ibl image mipmapsAntti Määttä2019-06-049-158/+111
| | | | | | | | | | Also fix some warnings. Task-number: QT3DS-1470 Change-Id: I02891d1b7e690df56d91b1c87a043f0915cae734 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add missing documentation to Q3DSPresentationJari Karppinen2019-06-041-7/+4
| | | | | | | | | Task-number: QT3DS-3558 Task-number: QT3DS-3559 Change-Id: I52ddabe958d0470fa384cefdef20473115dcd21e 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>
* Bump EASTL to latest versionPasi Keränen2019-06-041-0/+0
| | | | | | Task-number: QT3DS-3622 Change-Id: Ia99bbd12905dbb165cfb79a56a10141a1811ea56 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add API documentation for dynamic element/material/mesh creationMiikka Heikkinen2019-06-041-48/+169
| | | | | | Task-number: QT3DS-3560 Change-Id: If34d059014a521c2f641846db2d069776b9ca216 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Assume QML streams have premultiplied alphaJere Tuliniemi2019-06-031-3/+1
| | | | | | | | | | | | | OpenGL runtime assumes qml streams are not premultiplied causing the streams to look different to the Qt3D runtime streams. This changes the behavior to match Qt3D runtime. Task-number: QT3DS-3568 Change-Id: I28b8479b366500c709eb8aaa1dca6e38df254ff0 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update documentation about 3D assetsv2.4.0-beta2Mats Honkamaa2019-05-249-178/+136
| | | | | | | | | | | Removed, added, edited, restructured content on the 3D Assets page to keep it updated. Renamed the paged and fixed links from other pages. Task-number: QT3DS-2616 Change-Id: I3aa77808c16b74cdda16c396f6fc61f1daceffa8 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>
* Remove Linux specific hacks in subpresentation updateJari Karppinen2019-05-311-10/+0
| | | | | | | Task-number: QT3DS-3522 Change-Id: I09916189ab4a2025e4c1944b92a295666a7a5dbf Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add missing error string to SurfaceViewer APIJari Karppinen2019-05-313-6/+31
| | | | | | | | Task-number: QT3DS-3532 Change-Id: Ia2f9f70daf55ac57e71c0941da8c510f1872cff5 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>
* Remove subPresentationSettings propertyAntti Määttä2019-06-032-6/+7
| | | | | | | Task-number: QT3DS-3547 Change-Id: I285839af0b42a057ad37d822bd3d208f4985634e Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disregard UIP -specified name for material references to imagesJanne Kangas2019-06-031-1/+7
| | | | | | | | | | | | Drop custom name attribute from image instances that are used as references in material properties (diffusemap etc.) and use material property name instead. This matches the object path given by Editor with the runtime elementpath, f.ex. "Scene.Layer.Rectangle.Material.diffusemap" Change-Id: I972dd0d79af6f4e2428f72906e8dc714c2a5b424 Task-id: QT3DS-3326 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 08:57:32 +0000