summaryrefslogtreecommitdiffstats
path: root/src/Runtime
Commit message (Collapse)AuthorAgeFilesLines
* Update ogl-runtime submodule with latest changes for 2.5 releasev2.5.02.5Antti Kokko2019-10-291-0/+0
| | | | | Change-Id: I472f312032484ee7fd6844bd294518733be8bc92 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submodule for 2.5 releasev2.5.0-rc2Antti Kokko2019-10-211-0/+0
| | | | | Change-Id: Ie84a127563b0311d425b000d857e001038c5063d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submodule for 2.5 RCv2.5.0-rcJukka Jokiniva2019-10-161-0/+0
| | | | | Change-Id: I0a602bcf8f2207a2ebd8217515b35b0176c5600b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update opengl runtime for Beta3 releasev2.5.0-beta3Jukka Jokiniva2019-10-091-0/+0
| | | | | | Change-Id: I451a993ca6e35213c420cbae595757e65532ef26 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-10-071-0/+0
| | | | | Change-Id: Ieab8b2d48059c139ed5c2bc92db49c50baa219bd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2019-10-041-0/+0
| | | | | Change-Id: I6b05548c38e2eb5e49b33e34026894e673bff6a8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleTomi Korpipaa2019-10-021-0/+0
| | | | | Change-Id: I4e2b37a8578d7bf6ef2166cb6afb6c74773cc1ac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update opengl runtime for Beta2 releasev2.5.0-beta2Jukka Jokiniva2019-09-301-0/+0
| | | | | Change-Id: Iad12b7b15a215ba723c970064962a58d8d3415fa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove qt3d-runtime dependencies from studioMiikka Heikkinen2019-09-252-19/+1
| | | | | | | Task-number: QT3DS-3958 Change-Id: I1542cf2c78eb54fcff42598118cf19acb5ad66d7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update opengl runtime for Beta releasev2.5.0-beta1Jukka Jokiniva2019-09-201-0/+0
| | | | | Change-Id: I81b5019aca96703fd518fdf651a9c9152844a027 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-09-181-0/+0
| | | | | Change-Id: I594c247a8ed042a63a66e41e384332ac2191a815 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-09-131-0/+0
| | | | | Change-Id: If90c074e86ba958eaac86a26c13c676ec9b95d5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-submoduleMahmoud Badri2019-09-091-0/+0
| | | | | Change-Id: I51389a054973f4f7842a40fc89b86786e3ac22a3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleMahmoud Badri2019-08-271-0/+0
| | | | | Change-Id: I23714ad26ee97cf8e17621379a6b121fbe7b7342 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleMiikka Heikkinen2019-08-231-0/+0
| | | | | Change-Id: I5993ecf5abfd2724fa7fdd467d85d9bb82ed76ef Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* update ogl-runtime repoMahmoud Badri2019-08-191-0/+0
| | | | | Change-Id: Ic246cff3f293872c434cace563191e7dfe3c383a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtimeJere Tuliniemi2019-08-141-0/+0
| | | | | Change-Id: Id30b848d0b0e8e23dede1ef3045e28b50da4d8d0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for Float4 in the inspectorJere Tuliniemi2019-08-121-0/+0
| | | | | | | | | | | | | Float4 support is added to the editor, so that the W coordinate can be edited like the X, Y and Z coordinates instead of using Color type. Alpha channel editing is enabled for Color properties in custom materials. Task-number: QT3DS-3824 Change-Id: I932354cc22bcda4d2c21db119ce51f44ca93db03 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Update ogl-runtimeMiikka Heikkinen2019-08-061-0/+0
| | | | | Change-Id: If7166509761f715b4226c2f07c71ddf63e8e44e7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement changing animation type and bezier curve editorMahmoud Badri2019-08-021-0/+0
| | | | | | | | | | | | - implement changing keyframe type (Linear, Ease, and Bezier) - implement panable, scalable, and resizable bezier curve editor - antialias and clip property graph - use channels colors from the studio preferences - relevant fixes and tweaks Task-number: QT3DS-704 Change-Id: Ifa532df69be20dbc7dd08cb0cffb68ca2db46d3e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ogl-runtime submoduleAntti Määttä2019-07-031-0/+0
| | | | | Change-Id: Iff456ef1a83439872663e084ae0fe0dd76db1969 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Update ogl-runtime submoduleMiikka Heikkinen2019-06-281-0/+0
| | | | | Change-Id: I981b004e30c1be819a858ffd36ba26fb2f23639e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update opengl runtime for releasev2.4.02.4Jukka Jokiniva2019-06-261-0/+0
| | | | | Change-Id: I84ec361532baf3ee3f23138d7543b97157b408af Reviewed-by: Antti Kokko <antti.kokko@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>
* 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>
* Update ogl-runtime submoduleAntti Määttä2019-06-121-0/+0
| | | | | | Change-Id: Ibfbc28c3b1d780b1876eefe89c2adb07e6b97221 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-101018-291349/+12
| | | | | | | | 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 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-062-5/+23
| | | | | | | | | | | | 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-051-10/+10
| | | | | | | | | 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-054-13/+144
| | | | | | | | | | | | 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-0510-84/+135
| | | | | | | | | | | | | | | | | 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>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 20:44:25 +0000