summaryrefslogtreecommitdiffstats
path: root/src/runtime/aping/q3dsstudio3dengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix documentation issuesTopi Reinio2019-04-101-2/+2
| | | | | | | | | | | | | | | | | | This commit fixes multiple documentation warnings and problems: - Add missing documentation for Presentation. - Add missing 'QT += 3dstudioruntime2' class info by introducing a \module page. - Add missing import statements info for QML types by introducing a \qmlmodule page. - Make the documented QML import statements follow module versioning. - Add missing documentation dependencies. - Omit internal classes/orphaned doc comments from the build. - Fix minor language issues. Change-Id: I854fc0646bfed9282c9a4159890b5fa6f40d46d0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix old style cast warningsChristian Strømme2018-08-281-1/+1
| | | | | Change-Id: If61edae02b54e1504a48e28c6a19d9e2c15ca901 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Enable MSAA and SSAA for Layer3DLaszlo Agocs2018-08-221-4/+15
| | | | | Change-Id: I26b8e731af7869199d7225263ac05bef42380df8 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Move and share the Studio3D scenegraph node implementationLaszlo Agocs2018-08-201-3/+2
| | | | | | | | | | | | The material and node implementation is now shared between Studio3D, View3D and Layer3D. By not relying on QSGImageNode in View3D (and Layer3D), we have better control and can eventually implement support for things like multisample textures. Change-Id: I34a3a590a3ec6cdccbdd8ffd4fec40fb3750a972 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Improve frame rate reporting in profileuiLaszlo Agocs2018-08-201-0/+7
| | | | | | | Show something from the Qt Quick render thread too. Change-Id: Id62cc6835baa06f367e324baafdc029ad25be71e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Port some threading logic fixes to View3DLaszlo Agocs2018-08-171-1/+2
| | | | | | | | ...and fix also a small potential issue in Studio3DEngine (let's not access m_engine in the assert) Change-Id: If4768a3b9e203a754e25bfa3cbee45f33699295d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add Object3D infraLaszlo Agocs2018-08-171-8/+9
| | | | | | | | | | | | | Use Group (and Node) to crystalize the concepts. Fix also some issues in Studio3DEngine. Also changes the pureqml example to a manual test since Studio3DEngine and friends are marked as internal for now, so shipping examples for them along with the regular examples is not desirable yet. Change-Id: I8ab0ad50d1b846cadb6927fcb38afe9dff576c2e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Fix Layer3D with dpr > 1Laszlo Agocs2018-08-151-5/+6
| | | | | Change-Id: I87120087fb73d8fad416a7b04e4250ca37ed388f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Make compilers happyLaszlo Agocs2018-08-141-1/+2
| | | | | Change-Id: Ib120fb42b7f38b7ff3f82ee7dbb82ed037c59852 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Introduce Studio3DEngine and Layer3DLaszlo Agocs2018-08-141-0/+540
...and the ImGui integration for Qt Quick since in the new world Qt 3D is not used to create the final, composited image and therefore the profile ui must be moved over to be rendered by Qt Quick. Each Layer3D has hard-coded content for now (a camera, a light, and a sphere model). The new types are marked as internal for the time being. Change-Id: I9cc7cff4d8252f6dbd344fc972fef31f0db6da73 Reviewed-by: Christian Stromme <christian.stromme@qt.io>