summaryrefslogtreecommitdiffstats
path: root/src/Runtime
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* 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>
* Add ignoredEvents into OpenGL RuntimeKaj Grönholm2019-06-022-46/+85
| | | | | | | | | | | | Add ignoredEvents property into OpenGL runtime Studio3D item. Implementation and behavior matches to Qt3D runtime. Also adding test case for it. Task-number: QT3DS-3546 Change-Id: I2c1ab7e08b0eecdf16a62ee7a4bb87dc1fa4c702 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>
* Move shader feature definitionJere Tuliniemi2019-06-031-24/+15
| | | | | | | | | | | Move the whole shader feature definition before other backwards compatibility definitions and remove the special case for NO_FRAG_OUTPUT. This fixes definition of fragOutput for OpenGL 3.2. Change-Id: I8daede272fa9ab62ead08ddd06a3436f66e96457 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>
* Move files required by OpenGL runtime within ogl-runtime directoryPasi Keränen2019-05-31986-757/+85344
| | | | | | | | | First step towards ejecting ogl-runtime in to its own repository. Task-number: QT3DS-3596 Change-Id: I8c551aef5f680d89221a8075bbeff8857ad2a318 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash in editor when using qmlstreamsAntti Määttä2019-05-291-3/+11
| | | | | | | | | | | | | Do not use filename as initial presentation id. It might be used by another presentation as an id like in this case. Instead use __initial as initial presentation id. In addition to asset map, also ordered assets need to update the presentation key. Task-number: QT3DS-3383 Change-Id: I40249f8fc496372637fd0018f43c2b29d986842b Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove extra reset method in SurfaceViewer APIJari Karppinen2019-05-293-30/+19
| | | | | | | | | Keep reset in the private implementation to properly handle sourceChanged. Rename shutdown to destroy to harmonize with RT2. Task-number: QT3DS-3535 Change-Id: Ib80f5455430b1586170c77f95a8aa6521a3769d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove utf8cpp 3rd party lib from Qt 3D StudioPasi Keränen2019-05-292-68/+6
| | | | | | | | | Replace with XML encoding from QString. Task-number: QT3DS-13 Change-Id: Ie58b5128296dd5e166189324f1641755d15e8ef4 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add initial documentation for 2.4 OpenGL RuntimePasi Keränen2019-05-2913-123/+1921
| | | | | | | | | | | | | Mostly copy paste of documentation from 2.3. Adds DataOutput documentation and recommendations to avoid APIs that require use of elementPath. Task-number: QT3DS-3529 Change-Id: I75878fc2cd0e101827ea02996d6df8a981afe4fc 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: Pasi Keränen <pasi.keranen@qt.io>
* Allow specifying range property precisionMahmoud Badri2019-05-281-1/+1
| | | | | | | | | | | | | - Add a new (optional) attribute "decimals" to range properties. If the decimals attribute is present, the property will show number of decimals as set, else the number of decimals will be calculated automatically. - Few tweaks. Task-number: QT3DS-3523 Change-Id: I7ebb5075253effe5d91a12c0b29127e6c5fb8b95 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make Datainput min and max read-onlyJanne Kangas2019-05-286-34/+20
| | | | | | | | | | | | | | | | Remove setters and change signals for datainput min and max properties. These properties are not intended to be changed at runtime, and asynchronous separation of QML client side and renderer does not allow trivial tracking of these values. Min and max are now initialized at UIA load. Also fix bug where QML side did not receive UIA-specified min/max values. Change-Id: Ie04e81ea55bc4f4159c9f6989660caf9c36c49ed Task-id: QT3DS-3578 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Define custom number types with standard Qt typesPasi Keränen2019-05-282-133/+26
| | | | | | | | | Define custom types with Qt types as first step towards reducing custom number type usage in OpenGL Runtime. Task-number: QT3DS-3338 Change-Id: I9a23e2ffac712177a8b6d1e489e96e3fe11a8196 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge branch 'master' into 2.4Miikka Heikkinen2019-05-283-7/+128
|\ | | | | | | Change-Id: I066a6ca00721dc7d578cea75c78736ae89f03451
| * Fix NO_FRAG_OUTPUT featureJere Tuliniemi2019-05-282-6/+21
| | | | | | | | | | | | | | | | | | | | NO_FRAG_OUTPUT definition was checked before any features were defined. This commit also adds the feature to cube shadow blur shaders, since those don't use fragOutput and thus don't compile on OpenGL ES. Change-Id: Ib1a16dd0fe2b19b13b91af057b1b0ed7ff0aa1c5 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix QMutableMapIterator usageJari Karppinen2019-05-281-1/+1
| | | | | | | | | | | | Task-number: QT3DS-3569 Change-Id: I2636a7eac1eebc47a4eb8c07cf7d7ff9b572e965 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
| * Add qDebug stream overrides for DataInput and Output defsPasi Keränen2019-05-271-0/+106
| | | | | | | | | | | | Task-number: QT3DS-3342 Change-Id: I26e64f6673e206085ca2c4deb118a7fd6a72f0b0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Remove Q3DSWidget from OpenGL runtimeKaj Grönholm2019-05-286-523/+1
|/ | | | | | | | | | | | | This QWidget based Q3DSWidget hasn't been tested or used in any examples, so remove it from OpenGL runtime API. Qt 3D based runtime contains still Q3DSWidget which can be used. Task-number: QT3DS-3577 Change-Id: If022e18b1285f9be78048cef3821e9f063c3c721 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make qml api headers privatev2.4.0-beta1Antti Määttä2019-05-278-12/+45
| | | | | | Task-number: QT3DS-3567 Change-Id: Ie093ae736b2fd9ff7d5d868196e6703f678df1b2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtime submoduleAntti Määttä2019-05-271-0/+0
| | | | | | Change-Id: I2eb08858c0d752dc37dd5d4fbdd08c11848444ee Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix creating elements in subpresentationsMiikka Heikkinen2019-05-272-48/+59
| | | | | | | | Task-number: QT3DS-3526 Change-Id: Ic22c1c8df61bc210250649ef59a1f56512807146 Reviewed-by: Antti Määttä <antti.maatta@qt.io> 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-05-10 00:38:29 +0000