diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-18 09:58:19 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-19 10:51:25 +0000 |
| commit | 18964d9ebed281a72506eccdf26319ce18be46d7 (patch) | |
| tree | 9c184a8645f0d3ea72fc692f84332fc9be01bf2e | |
| parent | d9ae5577ea87ae23731fe54dd79fd80ecd1de1fa (diff) | |
Rename Renderer -> Render throughout
This is for consistency between the C++ namespaces and QML imports and
with the other aspects.
Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
623 files changed, 1565 insertions, 1565 deletions
diff --git a/examples/qt3d/anaglyph-rendering/StereoCamera.qml b/examples/qt3d/anaglyph-rendering/StereoCamera.qml index aaa8641fc..4e0433883 100644 --- a/examples/qt3d/anaglyph-rendering/StereoCamera.qml +++ b/examples/qt3d/anaglyph-rendering/StereoCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml index 455f3bf93..1d6a5a222 100644 --- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml +++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Viewport { diff --git a/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro b/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro index 2762ec21a..436b6dc35 100644 --- a/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro +++ b/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro @@ -4,7 +4,7 @@ SOURCE += main.cpp -QT += qml quick 3dcore 3drenderer 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick OTHER_FILES += *.qml diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp index e0907e307..281f69dd8 100644 --- a/examples/qt3d/anaglyph-rendering/main.cpp +++ b/examples/qt3d/anaglyph-rendering/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/anaglyph-rendering/main.qml b/examples/qt3d/anaglyph-rendering/main.qml index 6bf6fef1a..533b1118c 100644 --- a/examples/qt3d/anaglyph-rendering/main.qml +++ b/examples/qt3d/anaglyph-rendering/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.4 as QQ2 Entity { diff --git a/examples/qt3d/assimp-cpp/assimp-cpp.pro b/examples/qt3d/assimp-cpp/assimp-cpp.pro index 00d19a1dd..f8b8ba7f2 100644 --- a/examples/qt3d/assimp-cpp/assimp-cpp.pro +++ b/examples/qt3d/assimp-cpp/assimp-cpp.pro @@ -6,6 +6,6 @@ android|ios|winrt { error( "Couldn't find the examples.pri file!" ) } -QT += widgets 3dcore 3drenderer 3dinput +QT += widgets 3dcore 3drender 3dinput SOURCES += main.cpp diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp index b23b22958..f1349bda2 100644 --- a/examples/qt3d/assimp-cpp/main.cpp +++ b/examples/qt3d/assimp-cpp/main.cpp @@ -42,10 +42,10 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QAspectEngine> #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QSceneLoader> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QForwardRenderer> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QSceneLoader> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QForwardRenderer> class SceneWalker : public QObject { diff --git a/examples/qt3d/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro index 65dd19d11..02eac7dc9 100644 --- a/examples/qt3d/assimp/assimp.pro +++ b/examples/qt3d/assimp/assimp.pro @@ -4,7 +4,7 @@ SOURCE += main.cpp -QT += qml quick 3dcore 3drenderer 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick OTHER_FILES += main.qml diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index e8389bf33..f0b8b6fbc 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QSceneLoader> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QSceneLoader> #include <Qt3DCore/QEntity> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index f0965ac04..2b5f953ea 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Examples 2.0 import QtQuick 2.0 as Quick diff --git a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro index d1f3f8aaa..da83571fb 100644 --- a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro +++ b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro @@ -6,7 +6,7 @@ android|ios|winrt { error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput QT += widgets SOURCES += main.cpp \ diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index 9bddbd314..b34a3a18c 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -52,14 +52,14 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/qtorusmesh.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qsceneloader.h> +#include <Qt3DRender/qtorusmesh.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qsceneloader.h> #include <Qt3DCore/qscaletransform.h> #include <Qt3DCore/qrotatetransform.h> @@ -67,9 +67,9 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qaspectengine.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qforwardrenderer.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qforwardrenderer.h> int main(int argc, char **argv) { diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h index f108298ac..fa1fc20b6 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.h +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h @@ -45,11 +45,11 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QTorusMesh> -#include <Qt3DRenderer/QCylinderMesh> -#include <Qt3DRenderer/QCuboidMesh> -#include <Qt3DRenderer/QSphereMesh> -#include <Qt3DRenderer/QPhongMaterial> +#include <Qt3DRender/QTorusMesh> +#include <Qt3DRender/QCylinderMesh> +#include <Qt3DRender/QCuboidMesh> +#include <Qt3DRender/QSphereMesh> +#include <Qt3DRender/QPhongMaterial> class SceneModifier : public QObject { diff --git a/examples/qt3d/bigmodel-qml/MyEntity.qml b/examples/qt3d/bigmodel-qml/MyEntity.qml index 4cee86603..3e30b2fd3 100644 --- a/examples/qt3d/bigmodel-qml/MyEntity.qml +++ b/examples/qt3d/bigmodel-qml/MyEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/bigmodel-qml/bigmodel-qml.pro b/examples/qt3d/bigmodel-qml/bigmodel-qml.pro index 3e5555122..d183530e5 100644 --- a/examples/qt3d/bigmodel-qml/bigmodel-qml.pro +++ b/examples/qt3d/bigmodel-qml/bigmodel-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp index 9c1dd91a4..9629097fc 100644 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ b/examples/qt3d/bigmodel-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml index 7eaeff68b..efb82375a 100644 --- a/examples/qt3d/bigmodel-qml/main.qml +++ b/examples/qt3d/bigmodel-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/bigscene-cpp/bigscene-cpp.pro b/examples/qt3d/bigscene-cpp/bigscene-cpp.pro index 9620d485d..640c9f5fc 100644 --- a/examples/qt3d/bigscene-cpp/bigscene-cpp.pro +++ b/examples/qt3d/bigscene-cpp/bigscene-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput SOURCES += \ main.cpp diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp index ceedf91a7..e0dfee255 100644 --- a/examples/qt3d/bigscene-cpp/main.cpp +++ b/examples/qt3d/bigscene-cpp/main.cpp @@ -48,13 +48,13 @@ #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/qaspectengine.h> #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QParameter> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QCylinderMesh> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QCameraSelector> -#include <Qt3DRenderer/QPhongMaterial> -#include <Qt3DRenderer/QForwardRenderer> +#include <Qt3DRender/QParameter> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QCylinderMesh> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QCameraSelector> +#include <Qt3DRender/QPhongMaterial> +#include <Qt3DRender/QForwardRenderer> #include <qmath.h> using namespace Qt3DCore; diff --git a/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro index b08e85654..78c0e6927 100644 --- a/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro +++ b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drenderer 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick SOURCES += \ main.cpp diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp index 44a5d672b..a7112627b 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.cpp +++ b/examples/qt3d/bigscene-instanced-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml index bff2d9b24..c1ff7ff2f 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.qml +++ b/examples/qt3d/bigscene-instanced-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml index de92b5274..a50818be8 100644 --- a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml +++ b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml index 1a8bfa6f2..3fdc226a1 100644 --- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml +++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Viewport { property alias camera: cameraSelector.camera diff --git a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml index e31419c53..27468af8f 100644 --- a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml +++ b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { diff --git a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml index 3f2dba431..fdd3f803e 100644 --- a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml +++ b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml index 325056569..a5525f667 100644 --- a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml +++ b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.4 as QQ2 Entity { diff --git a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml index 4c1aff7ea..78d5f478d 100644 --- a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml +++ b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/examples/qt3d/clip-planes-qml/clip-planes-qml.pro b/examples/qt3d/clip-planes-qml/clip-planes-qml.pro index 2f0a0500a..5ecc28ca7 100644 --- a/examples/qt3d/clip-planes-qml/clip-planes-qml.pro +++ b/examples/qt3d/clip-planes-qml/clip-planes-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drenderer 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick SOURCES += main.cpp diff --git a/examples/qt3d/clip-planes-qml/main.cpp b/examples/qt3d/clip-planes-qml/main.cpp index ac3da63cc..d33b2a690 100644 --- a/examples/qt3d/clip-planes-qml/main.cpp +++ b/examples/qt3d/clip-planes-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/clip-planes-qml/main.qml b/examples/qt3d/clip-planes-qml/main.qml index 6ac0e492c..c4436a2df 100644 --- a/examples/qt3d/clip-planes-qml/main.qml +++ b/examples/qt3d/clip-planes-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml index a61e85298..1fe45340b 100644 --- a/examples/qt3d/controls/Logo.qml +++ b/examples/qt3d/controls/Logo.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.0 Entity { diff --git a/examples/qt3d/cpp_example/cpp_example.pro b/examples/qt3d/cpp_example/cpp_example.pro index f84366baf..f78ec0860 100644 --- a/examples/qt3d/cpp_example/cpp_example.pro +++ b/examples/qt3d/cpp_example/cpp_example.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput SOURCES += main.cpp diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index 7d2bbeb78..f02d716cc 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -44,14 +44,14 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/qtorusmesh.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qsceneloader.h> +#include <Qt3DRender/qtorusmesh.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qsceneloader.h> #include <Qt3DCore/qtranslatetransform.h> #include <Qt3DCore/qmatrixtransform.h> @@ -59,13 +59,13 @@ #include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DRenderer/qcameraselector.h> -#include <Qt3DRenderer/qrenderpassfilter.h> -#include <Qt3DRenderer/qtechniquefilter.h> -#include <Qt3DRenderer/qviewport.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qclearbuffer.h> +#include <Qt3DRender/qcameraselector.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qviewport.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qclearbuffer.h> int main(int ac, char **av) { diff --git a/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro b/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro index 0097f0cf2..e562663bd 100644 --- a/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro +++ b/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput SOURCES += \ main.cpp diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index 665446669..61be657a4 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -49,16 +49,16 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QStateSet> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QForwardRenderer> -#include <Qt3DRenderer/QPerVertexColorMaterial> - -#include <Qt3DRenderer/QGeometryRenderer> -#include <Qt3DRenderer/QGeometry> -#include <Qt3DRenderer/QAttribute> -#include <Qt3DRenderer/QBuffer> +#include <Qt3DRender/QStateSet> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QForwardRenderer> +#include <Qt3DRender/QPerVertexColorMaterial> + +#include <Qt3DRender/QGeometryRenderer> +#include <Qt3DRender/QGeometry> +#include <Qt3DRender/QAttribute> +#include <Qt3DRender/QBuffer> #include <QPropertyAnimation> diff --git a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro b/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro index f87c7b1da..111d0ef40 100644 --- a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro +++ b/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick quick +QT += 3dcore 3drender 3dinput 3dquick quick SOURCES += \ main.cpp diff --git a/examples/qt3d/custom-mesh-qml/main.cpp b/examples/qt3d/custom-mesh-qml/main.cpp index e8d7a8565..41e7f51ff 100644 --- a/examples/qt3d/custom-mesh-qml/main.cpp +++ b/examples/qt3d/custom-mesh-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/custom-mesh-qml/main.qml b/examples/qt3d/custom-mesh-qml/main.qml index 290a08ded..34d14aa5f 100644 --- a/examples/qt3d/custom-mesh-qml/main.qml +++ b/examples/qt3d/custom-mesh-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/cylinder-cpp/cylinder-cpp.pro b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro index eeefc5c22..ef2da4ed6 100644 --- a/examples/qt3d/cylinder-cpp/cylinder-cpp.pro +++ b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput SOURCES += main.cpp diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index 028834779..e65554f92 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -43,13 +43,13 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/qcylindermesh.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qrenderpass.h> +#include <Qt3DRender/qcylindermesh.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qrenderpass.h> #include <Qt3DCore/qscaletransform.h> #include <Qt3DCore/qrotatetransform.h> @@ -57,9 +57,9 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qaspectengine.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qforwardrenderer.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qforwardrenderer.h> int main(int argc, char **argv) { diff --git a/examples/qt3d/cylinder-qml/cylinder-qml.pro b/examples/qt3d/cylinder-qml/cylinder-qml.pro index 0514d67de..5658d30ff 100644 --- a/examples/qt3d/cylinder-qml/cylinder-qml.pro +++ b/examples/qt3d/cylinder-qml/cylinder-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp index d28d9c68b..6c0fead34 100644 --- a/examples/qt3d/cylinder-qml/main.cpp +++ b/examples/qt3d/cylinder-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml index ebb3bf208..2eda44a26 100644 --- a/examples/qt3d/cylinder-qml/main.qml +++ b/examples/qt3d/cylinder-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro index 5f26c32c9..261d893ce 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro +++ b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput HEADERS += \ gbuffer.h \ diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h index 0f75d669d..902d2654d 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h +++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h @@ -37,13 +37,13 @@ #ifndef DEFERREDRENDERER_H #define DEFERREDRENDERER_H -#include <Qt3DRenderer/QViewport> -#include <Qt3DRenderer/QClearBuffer> -#include <Qt3DRenderer/QLayerFilter> -#include <Qt3DRenderer/QRenderPassFilter> -#include <Qt3DRenderer/QRenderTargetSelector> -#include <Qt3DRenderer/QCameraSelector> -#include <Qt3DRenderer/QAnnotation> +#include <Qt3DRender/QViewport> +#include <Qt3DRender/QClearBuffer> +#include <Qt3DRender/QLayerFilter> +#include <Qt3DRender/QRenderPassFilter> +#include <Qt3DRender/QRenderTargetSelector> +#include <Qt3DRender/QCameraSelector> +#include <Qt3DRender/QAnnotation> class DeferredRenderer : public Qt3DRender::QViewport { diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp index 9be53d6a1..fae61c78d 100644 --- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp +++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp @@ -36,8 +36,8 @@ #include "finaleffect.h" -#include <Qt3DRenderer/QOpenGLFilter> -#include <Qt3DRenderer/QShaderProgram> +#include <Qt3DRender/QOpenGLFilter> +#include <Qt3DRender/QShaderProgram> #include <QUrl> FinalEffect::FinalEffect(Qt3DCore::QNode *parent) diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h index e99276c1b..cdfdfaf0e 100644 --- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h +++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h @@ -37,8 +37,8 @@ #ifndef FINALEFFECT_H #define FINALEFFECT_H -#include <Qt3DRenderer/QEffect> -#include <Qt3DRenderer/QTechnique> +#include <Qt3DRender/QEffect> +#include <Qt3DRender/QTechnique> class FinalEffect : public Qt3DRender::QEffect { diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h index 86412c482..3ea57da7f 100644 --- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h +++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h @@ -37,9 +37,9 @@ #ifndef GBUFFER_H #define GBUFFER_H -#include <Qt3DRenderer/QRenderTarget> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/QRenderAttachment> +#include <Qt3DRender/QRenderTarget> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/QRenderAttachment> class GBuffer : public Qt3DRender::QRenderTarget { diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index 625c320c9..086ba6677 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -39,21 +39,21 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QSphereMesh> -#include <Qt3DRenderer/QPlaneMesh> -#include <Qt3DRenderer/QLayer> -#include <Qt3DRenderer/QParameter> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QSphereMesh> +#include <Qt3DRender/QPlaneMesh> +#include <Qt3DRender/QLayer> +#include <Qt3DRender/QParameter> #include <Qt3DCore/QCamera> #include <Qt3DCore/QCameraLens> #include <Qt3DCore/QTransform> #include <Qt3DCore/QLookAtTransform> #include <Qt3DCore/QRotateTransform> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QPointLight> -#include <Qt3DRenderer/QWindow> +#include <Qt3DRender/QPointLight> +#include <Qt3DRender/QWindow> #include <Qt3DCore/qaspectengine.h> #include <QGuiApplication> diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h index 1364189c2..c9dd3f267 100644 --- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h +++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h @@ -37,7 +37,7 @@ #ifndef POINTLIGHTBLOCK_H #define POINTLIGHTBLOCK_H -#include <Qt3DRenderer/QShaderData> +#include <Qt3DRender/QShaderData> class PointLightBlock : public Qt3DRender::QShaderData { diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp index 99517c68d..64add3ef7 100644 --- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp +++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp @@ -36,8 +36,8 @@ #include "sceneeffect.h" -#include <Qt3DRenderer/QOpenGLFilter> -#include <Qt3DRenderer/QShaderProgram> +#include <Qt3DRender/QOpenGLFilter> +#include <Qt3DRender/QShaderProgram> #include <QUrl> SceneEffect::SceneEffect(Qt3DCore::QNode *parent) diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h index 6d17c8de5..e5f0dba33 100644 --- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h +++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h @@ -37,8 +37,8 @@ #ifndef SCENEEFFECT_H #define SCENEEFFECT_H -#include <Qt3DRenderer/QEffect> -#include <Qt3DRenderer/QTechnique> +#include <Qt3DRender/QEffect> +#include <Qt3DRender/QTechnique> class SceneEffect : public Qt3DRender::QEffect { diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml index cc7dd39d7..75c169f9e 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Viewport { rect : Qt.rect(0.0, 0.0, 1.0, 1.0) diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml index 8e9e3363e..d754597c8 100644 --- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml +++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { techniques : [ diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml index f82cb9fbe..c2d4ed35f 100644 --- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml +++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 RenderTarget { diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml index f23b8cc6b..1e4e9f450 100644 --- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml +++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id : sceneMaterialEffect diff --git a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro index 92e55cdb0..b16b57d7f 100644 --- a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro +++ b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick HEADERS += \ diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp index 2276f3ad5..7b003ebcc 100644 --- a/examples/qt3d/deferred-renderer-qml/main.cpp +++ b/examples/qt3d/deferred-renderer-qml/main.cpp @@ -36,7 +36,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/deferred-renderer-qml/main.qml b/examples/qt3d/deferred-renderer-qml/main.qml index bc5886ac2..d58bb6fab 100644 --- a/examples/qt3d/deferred-renderer-qml/main.qml +++ b/examples/qt3d/deferred-renderer-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.0 as QQ2 Entity { diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h index dd2a3e1ac..53253d038 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.h +++ b/examples/qt3d/dynamicscene-cpp/boxentity.h @@ -41,8 +41,8 @@ #include <Qt3DCore/QTransform> #include <Qt3DCore/QTranslateTransform> #include <Qt3DCore/QScaleTransform> -#include <Qt3DRenderer/QCuboidMesh> -#include <Qt3DRenderer/QPhongMaterial> +#include <Qt3DRender/QCuboidMesh> +#include <Qt3DRender/QPhongMaterial> class BoxEntity : public Qt3DCore::QEntity { diff --git a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro index 543ee8557..ec8f7e624 100644 --- a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro +++ b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput SOURCES += \ main.cpp \ diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h index bcaed64d9..a5f3443b8 100644 --- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h +++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h @@ -37,10 +37,10 @@ #ifndef FORWARDRENDERER_H #define FORWARDRENDERER_H -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QViewport> -#include <Qt3DRenderer/QCameraSelector> -#include <Qt3DRenderer/QClearBuffer> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QViewport> +#include <Qt3DRender/QCameraSelector> +#include <Qt3DRender/QClearBuffer> class ForwardRenderer : public Qt3DRender::QFrameGraph { diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 78cdb379e..3435c79fa 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -42,9 +42,9 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QForwardRenderer> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QForwardRenderer> #include "forwardrenderer.h" #include "examplescene.h" diff --git a/examples/qt3d/enabled-qml/enabled-qml.pro b/examples/qt3d/enabled-qml/enabled-qml.pro index ec733fd90..a1f83a2f4 100644 --- a/examples/qt3d/enabled-qml/enabled-qml.pro +++ b/examples/qt3d/enabled-qml/enabled-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dquick qml +QT += 3dcore 3drender 3dquick qml SOURCES += \ main.cpp diff --git a/examples/qt3d/enabled-qml/main.cpp b/examples/qt3d/enabled-qml/main.cpp index b2ba61324..ca4d4c63c 100644 --- a/examples/qt3d/enabled-qml/main.cpp +++ b/examples/qt3d/enabled-qml/main.cpp @@ -40,9 +40,9 @@ #include <Qt3DCore/QCamera> #include <Qt3DQuick/QQmlAspectEngine> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QForwardRenderer> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QForwardRenderer> int main(int argc, char *argv[]) { diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml index 3367a3748..379c00d36 100644 --- a/examples/qt3d/enabled-qml/main.qml +++ b/examples/qt3d/enabled-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.0 as QQ2 Entity { diff --git a/examples/qt3d/gltf/Wine.qml b/examples/qt3d/gltf/Wine.qml index 2a5eb0a93..6e9b1a4c9 100644 --- a/examples/qt3d/gltf/Wine.qml +++ b/examples/qt3d/gltf/Wine.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/gltf/gltf.pro b/examples/qt3d/gltf/gltf.pro index 7f65358d5..8a79ab06c 100644 --- a/examples/qt3d/gltf/gltf.pro +++ b/examples/qt3d/gltf/gltf.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick HEADERS += \ diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp index 7d85b0ad6..75c8f7db7 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/examples/qt3d/gltf/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml index 059141ef9..6a833bde8 100644 --- a/examples/qt3d/gltf/main.qml +++ b/examples/qt3d/gltf/main.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/gooch-qml/MyEntity.qml b/examples/qt3d/gooch-qml/MyEntity.qml index 875da96f4..49c5cf143 100644 --- a/examples/qt3d/gooch-qml/MyEntity.qml +++ b/examples/qt3d/gooch-qml/MyEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/gooch-qml/gooch-qml.pro b/examples/qt3d/gooch-qml/gooch-qml.pro index 7c3e962c1..c5ead19d8 100644 --- a/examples/qt3d/gooch-qml/gooch-qml.pro +++ b/examples/qt3d/gooch-qml/gooch-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dquick 3dinput qml quick +QT += 3dcore 3drender 3dquick 3dinput qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/gooch-qml/main.cpp b/examples/qt3d/gooch-qml/main.cpp index e945f254c..5c7390d10 100644 --- a/examples/qt3d/gooch-qml/main.cpp +++ b/examples/qt3d/gooch-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DQuick/QQmlAspectEngine> #include <Qt3DInput/QInputAspect> diff --git a/examples/qt3d/gooch-qml/main.qml b/examples/qt3d/gooch-qml/main.qml index 60b722403..a3c340501 100644 --- a/examples/qt3d/gooch-qml/main.qml +++ b/examples/qt3d/gooch-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/instanced-arrays-qml/instancebuffer.h b/examples/qt3d/instanced-arrays-qml/instancebuffer.h index 6bea7ca97..6ff61d47c 100644 --- a/examples/qt3d/instanced-arrays-qml/instancebuffer.h +++ b/examples/qt3d/instanced-arrays-qml/instancebuffer.h @@ -37,7 +37,7 @@ #ifndef INSTANCEBUFFER_H #define INSTANCEBUFFER_H -#include <Qt3DRenderer/QBuffer> +#include <Qt3DRender/QBuffer> class InstanceBuffer : public Qt3DRender::QBuffer { diff --git a/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro b/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro index a6f569ffc..d15f5ad56 100644 --- a/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro +++ b/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drenderer 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick SOURCES += \ main.cpp \ diff --git a/examples/qt3d/instanced-arrays-qml/main.cpp b/examples/qt3d/instanced-arrays-qml/main.cpp index 4638d910f..cbadc0f88 100644 --- a/examples/qt3d/instanced-arrays-qml/main.cpp +++ b/examples/qt3d/instanced-arrays-qml/main.cpp @@ -36,7 +36,7 @@ #include "instancebuffer.h" #include <window.h> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> #include <QtQml> diff --git a/examples/qt3d/instanced-arrays-qml/main.qml b/examples/qt3d/instanced-arrays-qml/main.qml index 6f16af66e..7f944a8fe 100644 --- a/examples/qt3d/instanced-arrays-qml/main.qml +++ b/examples/qt3d/instanced-arrays-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/keyboardinput-qml/SphereEntity.qml b/examples/qt3d/keyboardinput-qml/SphereEntity.qml index 7aaade62f..4ed05dcd8 100644 --- a/examples/qt3d/keyboardinput-qml/SphereEntity.qml +++ b/examples/qt3d/keyboardinput-qml/SphereEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Input 2.0 import QtQuick 2.3 as QQ2 diff --git a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro index 6224af554..5ebea8962 100644 --- a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro +++ b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dquick 3dinput quick qml +QT += 3dcore 3drender 3dquick 3dinput quick qml SOURCES += \ main.cpp diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp index 7efb66471..8cd37750d 100644 --- a/examples/qt3d/keyboardinput-qml/main.cpp +++ b/examples/qt3d/keyboardinput-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml index 5b4d56fca..65fbfe1f9 100644 --- a/examples/qt3d/keyboardinput-qml/main.qml +++ b/examples/qt3d/keyboardinput-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Input 2.0 Entity { diff --git a/examples/qt3d/loader-qml/CuboidEntity.qml b/examples/qt3d/loader-qml/CuboidEntity.qml index 0ef6890d6..71858e0f9 100644 --- a/examples/qt3d/loader-qml/CuboidEntity.qml +++ b/examples/qt3d/loader-qml/CuboidEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.4 as QQ2 Entity { diff --git a/examples/qt3d/loader-qml/SphereEntity.qml b/examples/qt3d/loader-qml/SphereEntity.qml index 076d157b8..9bad4c3a6 100644 --- a/examples/qt3d/loader-qml/SphereEntity.qml +++ b/examples/qt3d/loader-qml/SphereEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.4 as QQ2 Entity { diff --git a/examples/qt3d/loader-qml/loader-qml.pro b/examples/qt3d/loader-qml/loader-qml.pro index 2e99deb91..ed74a300a 100644 --- a/examples/qt3d/loader-qml/loader-qml.pro +++ b/examples/qt3d/loader-qml/loader-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp index 44a5d672b..a7112627b 100644 --- a/examples/qt3d/loader-qml/main.cpp +++ b/examples/qt3d/loader-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/loader-qml/main.qml b/examples/qt3d/loader-qml/main.qml index c0138d268..ee1efaf4f 100644 --- a/examples/qt3d/loader-qml/main.qml +++ b/examples/qt3d/loader-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h index c439d1a85..f4ba576bc 100644 --- a/examples/qt3d/materials-cpp/barrel.h +++ b/examples/qt3d/materials-cpp/barrel.h @@ -37,8 +37,8 @@ #ifndef BARREL_H #define BARREL_H -#include <Qt3DRenderer/QNormalDiffuseSpecularMapMaterial> -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DRender/qtexture.h> #include "renderableentity.h" class Barrel : public RenderableEntity diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp index 81d0ab0d2..55ee27c2c 100644 --- a/examples/qt3d/materials-cpp/houseplant.cpp +++ b/examples/qt3d/materials-cpp/houseplant.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "houseplant.h" -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/qtexture.h> const char *potNames[] = { "cross", diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index b2e08b7fa..41fcf563e 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -43,12 +43,12 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QPhongMaterial> -#include <Qt3DRenderer/QDiffuseMapMaterial> -#include <Qt3DRenderer/QForwardRenderer> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QTextureImage> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QPhongMaterial> +#include <Qt3DRender/QDiffuseMapMaterial> +#include <Qt3DRender/QForwardRenderer> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QTextureImage> #include "planeentity.h" #include "rotatingtrefoilknot.h" diff --git a/examples/qt3d/materials-cpp/materials-cpp.pro b/examples/qt3d/materials-cpp/materials-cpp.pro index 47dee515d..8cdffd313 100644 --- a/examples/qt3d/materials-cpp/materials-cpp.pro +++ b/examples/qt3d/materials-cpp/materials-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput HEADERS += \ planeentity.h \ diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp index b8a400232..5faa2186e 100644 --- a/examples/qt3d/materials-cpp/planeentity.cpp +++ b/examples/qt3d/materials-cpp/planeentity.cpp @@ -36,7 +36,7 @@ #include "planeentity.h" -#include <Qt3DRenderer/QPlaneMesh> +#include <Qt3DRender/QPlaneMesh> #include <Qt3DCore/QTransform> #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QTranslateTransform> diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h index 1b6f49d69..83f6b0213 100644 --- a/examples/qt3d/materials-cpp/planeentity.h +++ b/examples/qt3d/materials-cpp/planeentity.h @@ -41,7 +41,7 @@ #include <Qt3DCore/QTransform> #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QPlaneMesh> +#include <Qt3DRender/QPlaneMesh> class PlaneEntity : public Qt3DCore::QEntity { diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h index 4a6397f9d..8d0b75215 100644 --- a/examples/qt3d/materials-cpp/renderableentity.h +++ b/examples/qt3d/materials-cpp/renderableentity.h @@ -42,7 +42,7 @@ #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QRotateTransform> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QMesh> +#include <Qt3DRender/QMesh> class RenderableEntity : public Qt3DCore::QEntity { diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h index bac6e59b0..1ffd1baf1 100644 --- a/examples/qt3d/materials-cpp/trefoilknot.h +++ b/examples/qt3d/materials-cpp/trefoilknot.h @@ -42,7 +42,7 @@ #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QRotateTransform> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QMesh> +#include <Qt3DRender/QMesh> class TrefoilKnot : public Qt3DCore::QEntity { diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml index 55d2ee403..ba703a998 100644 --- a/examples/qt3d/materials/Barrel.qml +++ b/examples/qt3d/materials/Barrel.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/BasicCamera.qml b/examples/qt3d/materials/BasicCamera.qml index 5e251ee4d..d89de8b73 100644 --- a/examples/qt3d/materials/BasicCamera.qml +++ b/examples/qt3d/materials/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Camera { id: mainCamera diff --git a/examples/qt3d/materials/Chest.qml b/examples/qt3d/materials/Chest.qml index a578328f7..bc3fcd838 100644 --- a/examples/qt3d/materials/Chest.qml +++ b/examples/qt3d/materials/Chest.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml index 3df036675..9ed378e6a 100644 --- a/examples/qt3d/materials/HousePlant.qml +++ b/examples/qt3d/materials/HousePlant.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/PlaneEntity.qml b/examples/qt3d/materials/PlaneEntity.qml index 57a925622..e02318597 100644 --- a/examples/qt3d/materials/PlaneEntity.qml +++ b/examples/qt3d/materials/PlaneEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/RenderableEntity.qml b/examples/qt3d/materials/RenderableEntity.qml index f11d28272..093ba24e5 100644 --- a/examples/qt3d/materials/RenderableEntity.qml +++ b/examples/qt3d/materials/RenderableEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index a48db2567..9d09f0a29 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 TechniqueFilter { id: root diff --git a/examples/qt3d/materials/TrefoilKnot.qml b/examples/qt3d/materials/TrefoilKnot.qml index b0cd508d4..762ae5398 100644 --- a/examples/qt3d/materials/TrefoilKnot.qml +++ b/examples/qt3d/materials/TrefoilKnot.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp index e40da9894..885d51803 100644 --- a/examples/qt3d/materials/main.cpp +++ b/examples/qt3d/materials/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml index 3fa870d74..c41126efa 100644 --- a/examples/qt3d/materials/main.qml +++ b/examples/qt3d/materials/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/materials/materials.pro b/examples/qt3d/materials/materials.pro index d8b5f1b88..a5c892fe8 100644 --- a/examples/qt3d/materials/materials.pro +++ b/examples/qt3d/materials/materials.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick HEADERS += \ diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp index 7dcb541b1..2ec7d4560 100644 --- a/examples/qt3d/mouseinput-qml/main.cpp +++ b/examples/qt3d/mouseinput-qml/main.cpp @@ -37,7 +37,7 @@ #include <QGuiApplication> #include <window.h> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/mouseinput-qml/main.qml b/examples/qt3d/mouseinput-qml/main.qml index 55c51fa9d..e05359ebf 100644 --- a/examples/qt3d/mouseinput-qml/main.qml +++ b/examples/qt3d/mouseinput-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Input 2.0 Entity { diff --git a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro b/examples/qt3d/mouseinput-qml/mouseinput-qml.pro index 190662372..8d72e3a8b 100644 --- a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro +++ b/examples/qt3d/mouseinput-qml/mouseinput-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += main.cpp diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp index e9a741d9c..01cb089a6 100644 --- a/examples/qt3d/multiviewport/main.cpp +++ b/examples/qt3d/multiviewport/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/multiviewport/main.qml b/examples/qt3d/multiviewport/main.qml index dc0357e02..69d6b98ca 100644 --- a/examples/qt3d/multiviewport/main.qml +++ b/examples/qt3d/multiviewport/main.qml @@ -36,7 +36,7 @@ import QtQuick 2.0 import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { diff --git a/examples/qt3d/multiviewport/multiviewport.pro b/examples/qt3d/multiviewport/multiviewport.pro index 93b678598..12b30ad50 100644 --- a/examples/qt3d/multiviewport/multiviewport.pro +++ b/examples/qt3d/multiviewport/multiviewport.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick HEADERS += \ diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml index e2afd3f93..8d51440a6 100644 --- a/examples/qt3d/planets-qml/CloudEffectDS.qml +++ b/examples/qt3d/planets-qml/CloudEffectDS.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/Light.qml b/examples/qt3d/planets-qml/Light.qml index 5a4fc4c39..d904d2cff 100644 --- a/examples/qt3d/planets-qml/Light.qml +++ b/examples/qt3d/planets-qml/Light.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/planets-qml/Planet.qml b/examples/qt3d/planets-qml/Planet.qml index 4381ebdb1..005312b5d 100644 --- a/examples/qt3d/planets-qml/Planet.qml +++ b/examples/qt3d/planets-qml/Planet.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 SphereMesh { property real r: 0 diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml index 55690d259..eb0ecd2ba 100644 --- a/examples/qt3d/planets-qml/PlanetEffectD.qml +++ b/examples/qt3d/planets-qml/PlanetEffectD.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml index 22337ba66..7c5c1931a 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml index f70a46f25..e3f6a39c0 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml index edb128f1b..cf5d0937f 100644 --- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml +++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 FrameGraph { id: root diff --git a/examples/qt3d/planets-qml/PlanetMaterial.qml b/examples/qt3d/planets-qml/PlanetMaterial.qml index 087fb5d24..cdeb0b93e 100644 --- a/examples/qt3d/planets-qml/PlanetMaterial.qml +++ b/examples/qt3d/planets-qml/PlanetMaterial.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 Material { diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml index 0899e1593..8698ca6ec 100644 --- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml +++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/Ring.qml b/examples/qt3d/planets-qml/Ring.qml index 1dcb59618..7bf585805 100644 --- a/examples/qt3d/planets-qml/Ring.qml +++ b/examples/qt3d/planets-qml/Ring.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 // TODO: Once support for meshes from arrays is implemented, replace ring.obj with that Mesh { diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml index 8351845f1..bef982803 100644 --- a/examples/qt3d/planets-qml/SolarSystem.qml +++ b/examples/qt3d/planets-qml/SolarSystem.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.0 as QQ2 import "planets.js" as Planets diff --git a/examples/qt3d/plasma/main.cpp b/examples/qt3d/plasma/main.cpp index f89c4f298..a159c4c6d 100644 --- a/examples/qt3d/plasma/main.cpp +++ b/examples/qt3d/plasma/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> diff --git a/examples/qt3d/plasma/main.qml b/examples/qt3d/plasma/main.qml index 69cb16fa5..7f37ea344 100644 --- a/examples/qt3d/plasma/main.qml +++ b/examples/qt3d/plasma/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { diff --git a/examples/qt3d/plasma/plasma.pro b/examples/qt3d/plasma/plasma.pro index 8d659df7d..dbd221b40 100644 --- a/examples/qt3d/plasma/plasma.pro +++ b/examples/qt3d/plasma/plasma.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dquick qml quick +QT += 3dcore 3drender 3dquick qml quick HEADERS += \ diff --git a/examples/qt3d/playground-qml/AdsEffect.qml b/examples/qt3d/playground-qml/AdsEffect.qml index 20fa62817..3e48d2b80 100644 --- a/examples/qt3d/playground-qml/AdsEffect.qml +++ b/examples/qt3d/playground-qml/AdsEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 // For Qt.vector3d() and friends. For some reason this is provided by // QQuickValueTypeProvider in QtQuick rather than the default value diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml index eb4e94d03..172b7ade8 100644 --- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml +++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Material { diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml index fce358f73..6b4b3210c 100644 --- a/examples/qt3d/playground-qml/ComplexTechnique.qml +++ b/examples/qt3d/playground-qml/ComplexTechnique.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Technique { annotations : [ diff --git a/examples/qt3d/playground-qml/DetailView.qml b/examples/qt3d/playground-qml/DetailView.qml index 9717c5377..aa442278b 100644 --- a/examples/qt3d/playground-qml/DetailView.qml +++ b/examples/qt3d/playground-qml/DetailView.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { diff --git a/examples/qt3d/playground-qml/MainView.qml b/examples/qt3d/playground-qml/MainView.qml index 02f6e2ea9..9cfab2900 100644 --- a/examples/qt3d/playground-qml/MainView.qml +++ b/examples/qt3d/playground-qml/MainView.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.0 as QQ2 Entity { diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml index 1dc316760..8ed767e84 100644 --- a/examples/qt3d/playground-qml/MyForwardRenderer.qml +++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 TechniqueFilter { id: root diff --git a/examples/qt3d/playground-qml/RenderableEntity.qml b/examples/qt3d/playground-qml/RenderableEntity.qml index d305d413e..0cb44fafe 100644 --- a/examples/qt3d/playground-qml/RenderableEntity.qml +++ b/examples/qt3d/playground-qml/RenderableEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { property Transform transform; diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp index 4e93fd1bf..b7fef41e8 100644 --- a/examples/qt3d/playground-qml/main.cpp +++ b/examples/qt3d/playground-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/playground-qml/main.qml b/examples/qt3d/playground-qml/main.qml index d4495c24e..86cb0f03d 100644 --- a/examples/qt3d/playground-qml/main.qml +++ b/examples/qt3d/playground-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Input 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/playground-qml/playground-qml.pro b/examples/qt3d/playground-qml/playground-qml.pro index 5a8a8d5f8..bbd16e027 100644 --- a/examples/qt3d/playground-qml/playground-qml.pro +++ b/examples/qt3d/playground-qml/playground-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dquick qml quick 3dinput +QT += 3dcore 3drender 3dquick qml quick 3dinput HEADERS += \ diff --git a/examples/qt3d/scene3d-loader/AnimatedEntity.qml b/examples/qt3d/scene3d-loader/AnimatedEntity.qml index b98bbf8ab..bf73d6df4 100644 --- a/examples/qt3d/scene3d-loader/AnimatedEntity.qml +++ b/examples/qt3d/scene3d-loader/AnimatedEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/scene3d-loader/Scene2.qml b/examples/qt3d/scene3d-loader/Scene2.qml index a3afae363..34e339395 100644 --- a/examples/qt3d/scene3d-loader/Scene2.qml +++ b/examples/qt3d/scene3d-loader/Scene2.qml @@ -37,7 +37,7 @@ import QtQuick 2.0 import QtQuick.Scene3D 2.0 import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Scene3D { focus: true diff --git a/examples/qt3d/scene3d-loader/scene3d-loader.pro b/examples/qt3d/scene3d-loader/scene3d-loader.pro index d2c5f786d..7a1efd955 100644 --- a/examples/qt3d/scene3d-loader/scene3d-loader.pro +++ b/examples/qt3d/scene3d-loader/scene3d-loader.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drenderer 3dinput +QT += qml quick 3dcore 3drender 3dinput SOURCES += \ main.cpp diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml index d958d8d88..b0070db68 100644 --- a/examples/qt3d/scene3d/AnimatedEntity.qml +++ b/examples/qt3d/scene3d/AnimatedEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml index beda086f7..79d76232f 100644 --- a/examples/qt3d/shadow-map-qml/AdsEffect.qml +++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/shadow-map-qml/AdsMaterial.qml b/examples/qt3d/shadow-map-qml/AdsMaterial.qml index 4756f0960..4e02e23e6 100644 --- a/examples/qt3d/shadow-map-qml/AdsMaterial.qml +++ b/examples/qt3d/shadow-map-qml/AdsMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 Material { diff --git a/examples/qt3d/shadow-map-qml/GroundPlane.qml b/examples/qt3d/shadow-map-qml/GroundPlane.qml index 72b34a760..6ccef86ae 100644 --- a/examples/qt3d/shadow-map-qml/GroundPlane.qml +++ b/examples/qt3d/shadow-map-qml/GroundPlane.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/shadow-map-qml/Light.qml b/examples/qt3d/shadow-map-qml/Light.qml index 1490330b2..493cf6acf 100644 --- a/examples/qt3d/shadow-map-qml/Light.qml +++ b/examples/qt3d/shadow-map-qml/Light.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index 5d549bf67..2038d9f9c 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 FrameGraph { diff --git a/examples/qt3d/shadow-map-qml/Toyplane.qml b/examples/qt3d/shadow-map-qml/Toyplane.qml index fd2a92fcb..3bc1c0d53 100644 --- a/examples/qt3d/shadow-map-qml/Toyplane.qml +++ b/examples/qt3d/shadow-map-qml/Toyplane.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/shadow-map-qml/Trefoil.qml b/examples/qt3d/shadow-map-qml/Trefoil.qml index 865632f57..68a334ef8 100644 --- a/examples/qt3d/shadow-map-qml/Trefoil.qml +++ b/examples/qt3d/shadow-map-qml/Trefoil.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp index fd296aa62..7c575293a 100644 --- a/examples/qt3d/shadow-map-qml/main.cpp +++ b/examples/qt3d/shadow-map-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/shadow-map-qml/main.qml b/examples/qt3d/shadow-map-qml/main.qml index ba2e17255..3b79213a8 100644 --- a/examples/qt3d/shadow-map-qml/main.qml +++ b/examples/qt3d/shadow-map-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/shadow-map-qml/shadow-map-qml.pro b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro index 1ae0cb409..2988f563d 100644 --- a/examples/qt3d/shadow-map-qml/shadow-map-qml.pro +++ b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 73c29c8f4..cb01cac8a 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -48,15 +48,15 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QForwardRenderer> -#include <Qt3DRenderer/QPhongMaterial> - -#include <Qt3DRenderer/QCylinderMesh> -#include <Qt3DRenderer/QSphereMesh> -#include <Qt3DRenderer/QTorusMesh> -#include <Qt3DRenderer/QWindow> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QForwardRenderer> +#include <Qt3DRender/QPhongMaterial> + +#include <Qt3DRender/QCylinderMesh> +#include <Qt3DRender/QSphereMesh> +#include <Qt3DRender/QTorusMesh> +#include <Qt3DRender/QWindow> #include <QPropertyAnimation> diff --git a/examples/qt3d/simple-cpp/simple-cpp.pro b/examples/qt3d/simple-cpp/simple-cpp.pro index 0097f0cf2..e562663bd 100644 --- a/examples/qt3d/simple-cpp/simple-cpp.pro +++ b/examples/qt3d/simple-cpp/simple-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput SOURCES += \ main.cpp diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp index 44a5d672b..a7112627b 100644 --- a/examples/qt3d/simple-qml/main.cpp +++ b/examples/qt3d/simple-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml index 11dd5b6f3..517ffa3a5 100644 --- a/examples/qt3d/simple-qml/main.qml +++ b/examples/qt3d/simple-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/simple-qml/simple-qml.pro b/examples/qt3d/simple-qml/simple-qml.pro index fb9c491ed..7eb857a32 100644 --- a/examples/qt3d/simple-qml/simple-qml.pro +++ b/examples/qt3d/simple-qml/simple-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp index e8d7a8565..41e7f51ff 100644 --- a/examples/qt3d/simple-shaders-qml/main.cpp +++ b/examples/qt3d/simple-shaders-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml index 4d8a9d294..e92d0fe7e 100644 --- a/examples/qt3d/simple-shaders-qml/main.qml +++ b/examples/qt3d/simple-shaders-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro b/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro index 97242a3f8..6da510e50 100644 --- a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro +++ b/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml index 7416d8206..0bf560cce 100644 --- a/examples/qt3d/skybox/Skybox.qml +++ b/examples/qt3d/skybox/Skybox.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp index d09bea087..5a676ed2b 100644 --- a/examples/qt3d/skybox/main.cpp +++ b/examples/qt3d/skybox/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/skybox/main.qml b/examples/qt3d/skybox/main.qml index ed5adc2cd..b8a202970 100644 --- a/examples/qt3d/skybox/main.qml +++ b/examples/qt3d/skybox/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/skybox/skybox.pro b/examples/qt3d/skybox/skybox.pro index faedf35b9..919858d35 100644 --- a/examples/qt3d/skybox/skybox.pro +++ b/examples/qt3d/skybox/skybox.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick RESOURCES += \ skybox.qrc \ diff --git a/examples/qt3d/tessellation-modes/BasicCamera.qml b/examples/qt3d/tessellation-modes/BasicCamera.qml index 7460ecb70..a06f1562c 100644 --- a/examples/qt3d/tessellation-modes/BasicCamera.qml +++ b/examples/qt3d/tessellation-modes/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Camera { diff --git a/examples/qt3d/tessellation-modes/TessellatedQuad.qml b/examples/qt3d/tessellation-modes/TessellatedQuad.qml index 264ab6abb..63962edb9 100644 --- a/examples/qt3d/tessellation-modes/TessellatedQuad.qml +++ b/examples/qt3d/tessellation-modes/TessellatedQuad.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Examples 1.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml index 9f6e4eb6b..3ed399d51 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 Effect { diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml index a7624f8a6..fcaa37d58 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Material { diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp index 231702d4b..cd7240080 100644 --- a/examples/qt3d/tessellation-modes/main.cpp +++ b/examples/qt3d/tessellation-modes/main.cpp @@ -37,7 +37,7 @@ #include "tessellatedquadmesh.h" #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/tessellation-modes/main.qml b/examples/qt3d/tessellation-modes/main.qml index e52623d31..33cfd3732 100644 --- a/examples/qt3d/tessellation-modes/main.qml +++ b/examples/qt3d/tessellation-modes/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp index 42583c92d..b86a57a72 100644 --- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp +++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp @@ -36,9 +36,9 @@ #include "tessellatedquadmesh.h" -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qgeometry.h> class TessellatedGeometry : public Qt3DRender::QGeometry { diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h index 8b1276af8..0d95a8298 100644 --- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h +++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h @@ -37,7 +37,7 @@ #ifndef TESSELLATEDQUAD_H #define TESSELLATEDQUAD_H -#include <Qt3DRenderer/qgeometryrenderer.h> +#include <Qt3DRender/qgeometryrenderer.h> class TessellatedQuadMesh : public Qt3DRender::QGeometryRenderer { diff --git a/examples/qt3d/tessellation-modes/tessellation-modes.pro b/examples/qt3d/tessellation-modes/tessellation-modes.pro index e26560a25..e6c758577 100644 --- a/examples/qt3d/tessellation-modes/tessellation-modes.pro +++ b/examples/qt3d/tessellation-modes/tessellation-modes.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick HEADERS += \ tessellatedquadmesh.h diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp index d2537bd8d..b6e04b8da 100644 --- a/examples/qt3d/torus-qml/main.cpp +++ b/examples/qt3d/torus-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/torus-qml/main.qml b/examples/qt3d/torus-qml/main.qml index a980d1094..e7c4cc32e 100644 --- a/examples/qt3d/torus-qml/main.qml +++ b/examples/qt3d/torus-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/torus-qml/torus-qml.pro b/examples/qt3d/torus-qml/torus-qml.pro index ebe943ae5..dddcd9aad 100644 --- a/examples/qt3d/torus-qml/torus-qml.pro +++ b/examples/qt3d/torus-qml/torus-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml index 923f5b049..6aac9a243 100644 --- a/examples/qt3d/transparency-qml-scene3d/Scene.qml +++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/transparency-qml-scene3d/transparency-qml-scene3d.pro b/examples/qt3d/transparency-qml-scene3d/transparency-qml-scene3d.pro index 6762812ba..063b44d00 100644 --- a/examples/qt3d/transparency-qml-scene3d/transparency-qml-scene3d.pro +++ b/examples/qt3d/transparency-qml-scene3d/transparency-qml-scene3d.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drenderer 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick SOURCES += main.cpp diff --git a/examples/qt3d/transparency-qml/main.cpp b/examples/qt3d/transparency-qml/main.cpp index 6cce64b3a..5850736ba 100644 --- a/examples/qt3d/transparency-qml/main.cpp +++ b/examples/qt3d/transparency-qml/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml index f0db963c7..f702bd2de 100644 --- a/examples/qt3d/transparency-qml/main.qml +++ b/examples/qt3d/transparency-qml/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.4 as QQ2 Entity { diff --git a/examples/qt3d/transparency-qml/transparency-qml.pro b/examples/qt3d/transparency-qml/transparency-qml.pro index cd2571cf7..e39694137 100644 --- a/examples/qt3d/transparency-qml/transparency-qml.pro +++ b/examples/qt3d/transparency-qml/transparency-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drenderer 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick SOURCES += main.cpp diff --git a/examples/qt3d/wave/Background.qml b/examples/qt3d/wave/Background.qml index 7dc69003d..64468209b 100644 --- a/examples/qt3d/wave/Background.qml +++ b/examples/qt3d/wave/Background.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml index 1859c2ee0..ffd670d54 100644 --- a/examples/qt3d/wave/BackgroundEffect.qml +++ b/examples/qt3d/wave/BackgroundEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/wave/BasicCamera.qml b/examples/qt3d/wave/BasicCamera.qml index b2dbd10b8..ab84dfe6a 100644 --- a/examples/qt3d/wave/BasicCamera.qml +++ b/examples/qt3d/wave/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Camera { id: mainCamera diff --git a/examples/qt3d/wave/Wave.qml b/examples/qt3d/wave/Wave.qml index af7e57e4c..708e35775 100644 --- a/examples/qt3d/wave/Wave.qml +++ b/examples/qt3d/wave/Wave.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml index 0675e542c..58483a7d3 100644 --- a/examples/qt3d/wave/WaveEffect.qml +++ b/examples/qt3d/wave/WaveEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml index d55232de3..32a1b77c3 100644 --- a/examples/qt3d/wave/WaveForwardRenderer.qml +++ b/examples/qt3d/wave/WaveForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 TechniqueFilter { id: root diff --git a/examples/qt3d/wave/WaveMaterial.qml b/examples/qt3d/wave/WaveMaterial.qml index 5eab12bf5..fadae7c84 100644 --- a/examples/qt3d/wave/WaveMaterial.qml +++ b/examples/qt3d/wave/WaveMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp index aaebf9182..eb6830b8f 100644 --- a/examples/qt3d/wave/main.cpp +++ b/examples/qt3d/wave/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/wave/main.qml b/examples/qt3d/wave/main.qml index 23e92beae..a81a6c38a 100644 --- a/examples/qt3d/wave/main.qml +++ b/examples/qt3d/wave/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Input 2.0 Entity { diff --git a/examples/qt3d/wave/wave.pro b/examples/qt3d/wave/wave.pro index a3ce0989e..f07c740f9 100644 --- a/examples/qt3d/wave/wave.pro +++ b/examples/qt3d/wave/wave.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dquick 3dinput qml quick +QT += 3dcore 3drender 3dquick 3dinput qml quick HEADERS += \ diff --git a/examples/qt3d/wireframe/BasicCamera.qml b/examples/qt3d/wireframe/BasicCamera.qml index b2dbd10b8..ab84dfe6a 100644 --- a/examples/qt3d/wireframe/BasicCamera.qml +++ b/examples/qt3d/wireframe/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Camera { id: mainCamera diff --git a/examples/qt3d/wireframe/TrefoilKnot.qml b/examples/qt3d/wireframe/TrefoilKnot.qml index e1a340947..8b05c8ab9 100644 --- a/examples/qt3d/wireframe/TrefoilKnot.qml +++ b/examples/qt3d/wireframe/TrefoilKnot.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml index 2f98a529f..653798428 100644 --- a/examples/qt3d/wireframe/WireframeEffect.qml +++ b/examples/qt3d/wireframe/WireframeEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/wireframe/WireframeMaterial.qml b/examples/qt3d/wireframe/WireframeMaterial.qml index c20f75446..26bdb8f7e 100644 --- a/examples/qt3d/wireframe/WireframeMaterial.qml +++ b/examples/qt3d/wireframe/WireframeMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp index eb7827bcb..c466283de 100644 --- a/examples/qt3d/wireframe/main.cpp +++ b/examples/qt3d/wireframe/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <window.h> -#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> diff --git a/examples/qt3d/wireframe/main.qml b/examples/qt3d/wireframe/main.qml index 4f40292bc..8e06a8b19 100644 --- a/examples/qt3d/wireframe/main.qml +++ b/examples/qt3d/wireframe/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/wireframe/wireframe.pro b/examples/qt3d/wireframe/wireframe.pro index c7276a095..6aeb7a5ae 100644 --- a/examples/qt3d/wireframe/wireframe.pro +++ b/examples/qt3d/wireframe/wireframe.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick HEADERS += \ diff --git a/src/input/input.pro b/src/input/input.pro index 619477a4c..84bbbc3a2 100644 --- a/src/input/input.pro +++ b/src/input/input.pro @@ -1,6 +1,6 @@ TARGET = Qt3DInput -QT += core core-private 3dcore 3dcore-private 3drenderer +QT += core core-private 3dcore 3dcore-private 3drender DEFINES += QT3DINPUT_LIBRARY diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro index fe834252b..a7607cb73 100644 --- a/src/plugins/sceneparsers/assimp/assimp.pro +++ b/src/plugins/sceneparsers/assimp/assimp.pro @@ -1,5 +1,5 @@ TARGET = assimpsceneparser -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private +QT += core-private 3dcore 3dcore-private 3drender 3drender-private PLUGIN_TYPE = sceneparsers PLUGIN_CLASS_NAME = AssimpParser diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 4036fd7d3..35437ff07 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -41,23 +41,23 @@ #include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qmatrixtransform.h> #include <Qt3DCore/qcameralens.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qdiffusemapmaterial.h> -#include <Qt3DRenderer/qdiffusespecularmapmaterial.h> -#include <Qt3DRenderer/qphongmaterial.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qdiffusemapmaterial.h> +#include <Qt3DRender/qdiffusespecularmapmaterial.h> +#include <Qt3DRender/qphongmaterial.h> #include <QFileInfo> #include <QColor> #include <qmath.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/private/qurlhelper_p.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h index 00304b262..33bcf1831 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser_p.h +++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h @@ -53,7 +53,7 @@ #include <assimp/scene.h> #include <assimp/postprocess.h> #include <assimp/DefaultLogger.hpp> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> #include "assimphelpers_p.h" #include <QMap> diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro index bf289372d..100140f97 100644 --- a/src/plugins/sceneparsers/gltf/gltf.pro +++ b/src/plugins/sceneparsers/gltf/gltf.pro @@ -1,5 +1,5 @@ TARGET = gltfsceneparser -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private +QT += core-private 3dcore 3dcore-private 3drender 3drender-private PLUGIN_TYPE = sceneparsers PLUGIN_CLASS_NAME = GLTFParser diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp index 61f040ca4..7fbbd7933 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser.cpp +++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp @@ -51,27 +51,27 @@ #include <Qt3DCore/private/qurlhelper_p.h> -#include <Qt3DRenderer/QAlphaCoverage> -#include <Qt3DRenderer/QBlendEquation> -#include <Qt3DRenderer/QBlendStateSeparate> -#include <Qt3DRenderer/QColorMask> -#include <Qt3DRenderer/QCullFace> -#include <Qt3DRenderer/QDepthMask> -#include <Qt3DRenderer/QDepthTest> -#include <Qt3DRenderer/QEffect> -#include <Qt3DRenderer/QFrontFace> -#include <Qt3DRenderer/QGeometry> -#include <Qt3DRenderer/QGeometryRenderer> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QOpenGLFilter> -#include <Qt3DRenderer/QParameter> -#include <Qt3DRenderer/QParameterMapping> -#include <Qt3DRenderer/QPolygonOffset> -#include <Qt3DRenderer/QRenderState> -#include <Qt3DRenderer/QScissorTest> -#include <Qt3DRenderer/QShaderProgram> -#include <Qt3DRenderer/QTechnique> -#include <Qt3DRenderer/QTexture> +#include <Qt3DRender/QAlphaCoverage> +#include <Qt3DRender/QBlendEquation> +#include <Qt3DRender/QBlendStateSeparate> +#include <Qt3DRender/QColorMask> +#include <Qt3DRender/QCullFace> +#include <Qt3DRender/QDepthMask> +#include <Qt3DRender/QDepthTest> +#include <Qt3DRender/QEffect> +#include <Qt3DRender/QFrontFace> +#include <Qt3DRender/QGeometry> +#include <Qt3DRender/QGeometryRenderer> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QOpenGLFilter> +#include <Qt3DRender/QParameter> +#include <Qt3DRender/QParameterMapping> +#include <Qt3DRender/QPolygonOffset> +#include <Qt3DRender/QRenderState> +#include <Qt3DRender/QScissorTest> +#include <Qt3DRender/QShaderProgram> +#include <Qt3DRender/QTechnique> +#include <Qt3DRender/QTexture> QT_BEGIN_NAMESPACE diff --git a/src/plugins/sceneparsers/gltf/gltfparser_p.h b/src/plugins/sceneparsers/gltf/gltfparser_p.h index 448fc900e..5ce69ebc5 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser_p.h +++ b/src/plugins/sceneparsers/gltf/gltfparser_p.h @@ -52,10 +52,10 @@ #include <QtCore/QJsonDocument> #include <QtCore/QMultiHash> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/render/defaults/defaults.pri b/src/quick3d/imports/render/defaults/defaults.pri index cd658cf2a..5487dac49 100644 --- a/src/quick3d/imports/render/defaults/defaults.pri +++ b/src/quick3d/imports/render/defaults/defaults.pri @@ -3,7 +3,7 @@ # resource file. # # To have the plugin register them as types, add an entries to the -# qmldir array in qt3dquick3drendererplugin.cpp +# qmldir array in qt3dquick3drenderplugin.cpp QML_FILES = \ $$PWD/qml/PhongMaterial.qml \ $$PWD/qml/DiffuseMapMaterial.qml \ diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml index d6d543ba2..ef5cf5aba 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml index 9be6951d6..c93618f3c 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml index 6c2b4f923..cdad6bb2d 100644 --- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml +++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 TechniqueFilter { // Expose camera to allow user to choose which camera to use for rendering diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml index 7128701e7..a12754506 100644 --- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml index 9981f4b30..2d028bce6 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml index f30f46452..719ac90e7 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml index bc60ade6a..42302f32f 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml index d891b5671..6b8cd57cc 100644 --- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml index d930561e7..13e4b6f33 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml index a7d5c85fe..99fa247bb 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml index 1c6571b09..9763a321a 100644 --- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml +++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml index ce04f60ee..0b7661aff 100644 --- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro index 00f0538d0..4326356d4 100644 --- a/src/quick3d/imports/render/importsrender.pro +++ b/src/quick3d/imports/render/importsrender.pro @@ -1,14 +1,14 @@ CXX_MODULE = qml -TARGET = quick3drendererplugin -TARGETPATH = Qt3D/Renderer +TARGET = quick3drenderplugin +TARGETPATH = Qt3D/Render -QT += core-private qml qml-private 3dcore 3drenderer 3dquick 3dquickrenderer-private +QT += core-private qml qml-private 3dcore 3drender 3dquick 3dquickrender-private HEADERS += \ - qt3dquick3drendererplugin.h + qt3dquick3drenderplugin.h SOURCES += \ - qt3dquick3drendererplugin.cpp + qt3dquick3drenderplugin.cpp OTHER_FILES += qmldir diff --git a/src/quick3d/imports/render/qmldir b/src/quick3d/imports/render/qmldir index 27e4826df..6654a6a50 100644 --- a/src/quick3d/imports/render/qmldir +++ b/src/quick3d/imports/render/qmldir @@ -1,3 +1,3 @@ -module Qt3D.Renderer -plugin quick3drendererplugin -classname Qt3DQuick3DRendererPlugin +module Qt3D.Render +plugin quick3drenderplugin +classname Qt3DQuick3DRenderPlugin diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index d5b6e7d37..2225b18d8 100644 --- a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -35,89 +35,89 @@ ** ****************************************************************************/ -#include "qt3dquick3drendererplugin.h" -#include <Qt3DRenderer/qabstractsceneloader.h> -#include <Qt3DRenderer/qsceneloader.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qviewport.h> -#include <Qt3DRenderer/qrenderpassfilter.h> -#include <Qt3DRenderer/qtechniquefilter.h> -#include <Qt3DRenderer/qrendertargetselector.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qcameraselector.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qannotation.h> -#include <Qt3DRenderer/qparametermapping.h> -#include <Qt3DRenderer/qcuboidmesh.h> -#include <Qt3DRenderer/qcylindermesh.h> -#include <Qt3DRenderer/qplanemesh.h> -#include <Qt3DRenderer/qspheremesh.h> -#include <Qt3DRenderer/qtorusmesh.h> -#include <Qt3DRenderer/qlayer.h> -#include <Qt3DRenderer/qlayerfilter.h> -#include <Qt3DRenderer/qabstractlight.h> -#include <Qt3DRenderer/qspotlight.h> -#include <Qt3DRenderer/qdirectionallight.h> -#include <Qt3DRenderer/qpointlight.h> -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/qrenderstate.h> -#include <Qt3DRenderer/qblendstate.h> -#include <Qt3DRenderer/qblendequation.h> -#include <Qt3DRenderer/qalphatest.h> -#include <Qt3DRenderer/qdepthtest.h> -#include <Qt3DRenderer/qdepthmask.h> -#include <Qt3DRenderer/qcullface.h> -#include <Qt3DRenderer/qfrontface.h> -#include <Qt3DRenderer/qstenciltest.h> -#include <Qt3DRenderer/qstenciltestseparate.h> -#include <Qt3DRenderer/qscissortest.h> -#include <Qt3DRenderer/qdithering.h> -#include <Qt3DRenderer/qrenderattachment.h> -#include <Qt3DRenderer/qclearbuffer.h> -#include <Qt3DRenderer/qsortcriterion.h> -#include <Qt3DRenderer/qalphacoverage.h> -#include <Qt3DRenderer/qpolygonoffset.h> -#include <Qt3DRenderer/qcolormask.h> -#include <Qt3DRenderer/qshaderdata.h> -#include <Qt3DRenderer/qnodraw.h> -#include <Qt3DRenderer/qclipplane.h> -#include <Qt3DRenderer/qstencilop.h> -#include <Qt3DRenderer/qstencilopseparate.h> -#include <Qt3DRenderer/qstencilmask.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qtorusgeometry.h> -#include <Qt3DRenderer/qspheregeometry.h> -#include <Qt3DRenderer/qcuboidgeometry.h> -#include <Qt3DRenderer/qplanegeometry.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qcylindergeometry.h> -#include <Qt3DQuickRenderer/quick3dtechnique.h> -#include <Qt3DQuickRenderer/quick3dmaterial.h> -#include <Qt3DQuickRenderer/quick3dtechniquefilter.h> -#include <Qt3DQuickRenderer/quick3dviewport.h> -#include <Qt3DQuickRenderer/quick3drenderpassfilter.h> -#include <Qt3DQuickRenderer/quick3drendertarget.h> -#include <Qt3DQuickRenderer/quick3deffect.h> -#include <Qt3DQuickRenderer/quick3dscene.h> -#include <Qt3DQuickRenderer/quick3dtexture.h> -#include <Qt3DQuickRenderer/private/shaderpropertyparser_p.h> -#include <Qt3DQuickRenderer/quick3drenderpass.h> -#include <Qt3DQuickRenderer/quick3dsortmethod.h> -#include <Qt3DQuickRenderer/quick3dparameter.h> -#include <Qt3DQuickRenderer/quick3dshaderdata.h> -#include <Qt3DQuickRenderer/quick3dshaderdataarray.h> -#include <Qt3DQuickRenderer/quick3dstateset.h> -#include <Qt3DQuickRenderer/quick3drendertargetselector.h> -#include <Qt3DQuickRenderer/quick3dgeometry.h> -#include <Qt3DQuickRenderer/quick3dbuffer.h> -#include <Qt3DQuickRenderer/private/qt3dquickrenderer_global_p.h> +#include "qt3dquick3drenderplugin.h" +#include <Qt3DRender/qabstractsceneloader.h> +#include <Qt3DRender/qsceneloader.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qviewport.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qrendertargetselector.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qcameraselector.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qparametermapping.h> +#include <Qt3DRender/qcuboidmesh.h> +#include <Qt3DRender/qcylindermesh.h> +#include <Qt3DRender/qplanemesh.h> +#include <Qt3DRender/qspheremesh.h> +#include <Qt3DRender/qtorusmesh.h> +#include <Qt3DRender/qlayer.h> +#include <Qt3DRender/qlayerfilter.h> +#include <Qt3DRender/qabstractlight.h> +#include <Qt3DRender/qspotlight.h> +#include <Qt3DRender/qdirectionallight.h> +#include <Qt3DRender/qpointlight.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/qrenderstate.h> +#include <Qt3DRender/qblendstate.h> +#include <Qt3DRender/qblendequation.h> +#include <Qt3DRender/qalphatest.h> +#include <Qt3DRender/qdepthtest.h> +#include <Qt3DRender/qdepthmask.h> +#include <Qt3DRender/qcullface.h> +#include <Qt3DRender/qfrontface.h> +#include <Qt3DRender/qstenciltest.h> +#include <Qt3DRender/qstenciltestseparate.h> +#include <Qt3DRender/qscissortest.h> +#include <Qt3DRender/qdithering.h> +#include <Qt3DRender/qrenderattachment.h> +#include <Qt3DRender/qclearbuffer.h> +#include <Qt3DRender/qsortcriterion.h> +#include <Qt3DRender/qalphacoverage.h> +#include <Qt3DRender/qpolygonoffset.h> +#include <Qt3DRender/qcolormask.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/qnodraw.h> +#include <Qt3DRender/qclipplane.h> +#include <Qt3DRender/qstencilop.h> +#include <Qt3DRender/qstencilopseparate.h> +#include <Qt3DRender/qstencilmask.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qtorusgeometry.h> +#include <Qt3DRender/qspheregeometry.h> +#include <Qt3DRender/qcuboidgeometry.h> +#include <Qt3DRender/qplanegeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qcylindergeometry.h> +#include <Qt3DQuickRender/quick3dtechnique.h> +#include <Qt3DQuickRender/quick3dmaterial.h> +#include <Qt3DQuickRender/quick3dtechniquefilter.h> +#include <Qt3DQuickRender/quick3dviewport.h> +#include <Qt3DQuickRender/quick3drenderpassfilter.h> +#include <Qt3DQuickRender/quick3drendertarget.h> +#include <Qt3DQuickRender/quick3deffect.h> +#include <Qt3DQuickRender/quick3dscene.h> +#include <Qt3DQuickRender/quick3dtexture.h> +#include <Qt3DQuickRender/private/shaderpropertyparser_p.h> +#include <Qt3DQuickRender/quick3drenderpass.h> +#include <Qt3DQuickRender/quick3dsortmethod.h> +#include <Qt3DQuickRender/quick3dparameter.h> +#include <Qt3DQuickRender/quick3dshaderdata.h> +#include <Qt3DQuickRender/quick3dshaderdataarray.h> +#include <Qt3DQuickRender/quick3dstateset.h> +#include <Qt3DQuickRender/quick3drendertargetselector.h> +#include <Qt3DQuickRender/quick3dgeometry.h> +#include <Qt3DQuickRender/quick3dbuffer.h> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> static void initResources() { @@ -157,7 +157,7 @@ QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3DRender::Render::Qu return values; } -void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri) +void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) { // Init resources for defaults QML files initResources(); diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.h b/src/quick3d/imports/render/qt3dquick3drenderplugin.h index 50105d5ae..05aceab7f 100644 --- a/src/quick3d/imports/render/qt3dquick3drendererplugin.h +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -class Qt3DQuick3DRendererPlugin : public QQmlExtensionPlugin +class Qt3DQuick3DRenderPlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro index a2ccf25af..4c0724e20 100644 --- a/src/quick3d/imports/scene3d/importsscene3d.pro +++ b/src/quick3d/imports/scene3d/importsscene3d.pro @@ -2,7 +2,7 @@ CXX_MODULE = qml TARGET = qtquickscene3dplugin TARGETPATH = QtQuick/Scene3D -QT += qml quick 3dcore 3drenderer 3dinput +QT += qml quick 3dcore 3drender 3dinput HEADERS += \ qtquickscene3dplugin.h \ diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 840da7a0d..70866e385 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -38,7 +38,7 @@ #include "scene3dlogging_p.h" #include <Qt3DCore/QAspectEngine> -#include <Qt3DRenderer/QRenderAspect> +#include <Qt3DRender/QRenderAspect> #include <Qt3DInput/QInputAspect> #include <QOpenGLContext> diff --git a/src/quick3d/quick3drenderer/items/items.pri b/src/quick3d/quick3drender/items/items.pri index 881923b59..881923b59 100644 --- a/src/quick3d/quick3drenderer/items/items.pri +++ b/src/quick3d/quick3drender/items/items.pri diff --git a/src/quick3d/quick3drenderer/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp index aaa3645c1..aaa3645c1 100644 --- a/src/quick3d/quick3drenderer/items/quick3dbuffer.cpp +++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dbuffer.h b/src/quick3d/quick3drender/items/quick3dbuffer.h index 7fa3ad8cf..edebb1454 100644 --- a/src/quick3d/quick3drenderer/items/quick3dbuffer.h +++ b/src/quick3d/quick3drender/items/quick3dbuffer.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_H #define QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/QBuffer> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/QBuffer> QT_BEGIN_NAMESPACE @@ -55,7 +55,7 @@ namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DBuffer : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DBuffer : public QObject { Q_OBJECT Q_PROPERTY(QVariant data READ bufferData WRITE setBufferData NOTIFY bufferDataChanged) diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp index 435514bd7..b7f6cbed6 100644 --- a/src/quick3d/quick3drenderer/items/quick3deffect.cpp +++ b/src/quick3d/quick3drender/items/quick3deffect.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "quick3deffect.h" -#include <Qt3DRenderer/qeffect.h> +#include <Qt3DRender/qeffect.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.h b/src/quick3d/quick3drender/items/quick3deffect.h index f7089cfa5..2d4b7a023 100644 --- a/src/quick3d/quick3drenderer/items/quick3deffect.h +++ b/src/quick3d/quick3drender/items/quick3deffect.h @@ -37,10 +37,10 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H #define QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> #include <QQmlListProperty> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtechnique.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtechnique.h> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DEffect : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DEffect : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QTechnique> techniques READ techniqueList) diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp index b2af9763b..b2af9763b 100644 --- a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp +++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.h b/src/quick3d/quick3drender/items/quick3dgeometry.h index 48aee631f..bb95be1d0 100644 --- a/src/quick3d/quick3drenderer/items/quick3dgeometry.h +++ b/src/quick3d/quick3drender/items/quick3dgeometry.h @@ -37,9 +37,9 @@ #ifndef QT3D_QUICK3DGEOMETRY_H #define QT3D_QUICK3DGEOMETRY_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> #include <QQmlListProperty> -#include <Qt3DRenderer/QGeometry> +#include <Qt3DRender/QGeometry> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DGeometry : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DGeometry : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList) diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp index 9546e56c9..d66d1b21c 100644 --- a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp +++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "quick3dmaterial.h" -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/qtexture.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.h b/src/quick3d/quick3drender/items/quick3dmaterial.h index 19c060308..76838418b 100644 --- a/src/quick3d/quick3drenderer/items/quick3dmaterial.h +++ b/src/quick3d/quick3drender/items/quick3dmaterial.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H #define QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qparameter.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -51,7 +51,7 @@ namespace Quick { // FIXME - write a custom QML parser and stop mis-using Tag // Tags could be replaced by Parameters directly -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DMaterial : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DMaterial : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ qmlParameters) diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp index fe3e497a3..fe3e497a3 100644 --- a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp +++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.h b/src/quick3d/quick3drender/items/quick3dparameter.h index 064f21d6f..cb1ccd057 100644 --- a/src/quick3d/quick3drenderer/items/quick3dparameter.h +++ b/src/quick3d/quick3drender/items/quick3dparameter.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H #define QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qparameter.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Quick { class Quick3DParameterPrivate; -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DParameter : public QParameter +class QT3DQUICKRENDERSHARED_EXPORT Quick3DParameter : public QParameter { Q_OBJECT public: diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h index e4c7874d3..56c1fa6a6 100644 --- a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h +++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qparameter_p.h> +#include <Qt3DRender/private/qparameter_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp index 3c8f9322d..ff8089f4f 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp @@ -36,7 +36,7 @@ ****************************************************************************/ #include "quick3drenderpass.h" -#include <Qt3DRenderer/qparametermapping.h> +#include <Qt3DRender/qparametermapping.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drender/items/quick3drenderpass.h index 12f1e829c..384d38486 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h +++ b/src/quick3d/quick3drender/items/quick3drenderpass.h @@ -38,8 +38,8 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qrenderpass.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qrenderpass.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderPass : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList) diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp index d0dbf7dab..d0dbf7dab 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter.h index aefdd8e33..bf98dbdd5 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.h @@ -38,9 +38,9 @@ #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H #include <Qt3DQuick/quick3dnode.h> -#include <Qt3DRenderer/qrenderpassfilter.h> -#include <Qt3DRenderer/qannotation.h> -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qannotation.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPassFilter : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderPassFilter : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> includes READ includeList) diff --git a/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp b/src/quick3d/quick3drender/items/quick3drendertarget.cpp index 2bd4cfe5b..2bd4cfe5b 100644 --- a/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp +++ b/src/quick3d/quick3drender/items/quick3drendertarget.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3drendertarget.h b/src/quick3d/quick3drender/items/quick3drendertarget.h index e494b9895..d61b0ef8b 100644 --- a/src/quick3d/quick3drenderer/items/quick3drendertarget.h +++ b/src/quick3d/quick3drender/items/quick3drendertarget.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qrendertarget.h> -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qrendertarget.h> +#include <Qt3DRender/qrenderattachment.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderTarget : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderTarget : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderAttachment> attachments READ qmlAttachments) diff --git a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp index e09bfd8f5..e09bfd8f5 100644 --- a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp +++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h b/src/quick3d/quick3drender/items/quick3drendertargetselector.h index 07a725fe8..65bd93eb4 100644 --- a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h +++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qrenderattachment.h> -#include <Qt3DRenderer/qrendertargetselector.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qrenderattachment.h> +#include <Qt3DRender/qrendertargetselector.h> #include <QQmlListProperty> #include <QVariantList> @@ -49,7 +49,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderTargetSelector : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderTargetSelector : public QObject { Q_OBJECT Q_PROPERTY(QVariantList drawBuffers READ drawBuffers WRITE setDrawBuffers NOTIFY drawBuffersChanged) diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.cpp b/src/quick3d/quick3drender/items/quick3dscene.cpp index b28487829..b28487829 100644 --- a/src/quick3d/quick3drenderer/items/quick3dscene.cpp +++ b/src/quick3d/quick3drender/items/quick3dscene.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.h b/src/quick3d/quick3drender/items/quick3dscene.h index dfe7cbb17..4795de844 100644 --- a/src/quick3d/quick3drenderer/items/quick3dscene.h +++ b/src/quick3d/quick3drender/items/quick3dscene.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H #define QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> #include <Qt3DQuick/quick3dentity.h> -#include <Qt3DRenderer/qabstractsceneloader.h> +#include <Qt3DRender/qabstractsceneloader.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DScene : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DScene : public QObject { Q_OBJECT public: diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp index ebc99e93e..714f0fed9 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp @@ -37,7 +37,7 @@ #include "quick3dshaderdata.h" #include <private/qshaderdata_p.h> -#include <Qt3DQuickRenderer/quick3dshaderdataarray.h> +#include <Qt3DQuickRender/quick3dshaderdataarray.h> #include <QMetaProperty> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drender/items/quick3dshaderdata.h index 4bc40ad98..fc8f5e18b 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdata.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H #define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qshaderdata.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qshaderdata.h> #include <QJSValue> #include <QJSValueIterator> @@ -49,7 +49,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderData : public QShaderData +class QT3DQUICKRENDERSHARED_EXPORT Quick3DShaderData : public QShaderData { Q_OBJECT public: diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp index 3b863b35e..3b863b35e 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray.h index dfe1a2cb0..82bdee7c2 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.h @@ -38,8 +38,8 @@ #define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H #include <Qt3DCore/qnode.h> -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DQuickRenderer/quick3dshaderdata.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DQuickRender/quick3dshaderdata.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -54,7 +54,7 @@ namespace Quick { class Quick3DShaderDataArrayPrivate; class Quick3DShaderData; -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode +class QT3DQUICKRENDERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList) diff --git a/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp b/src/quick3d/quick3drender/items/quick3dsortmethod.cpp index 2c04b054f..2c04b054f 100644 --- a/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp +++ b/src/quick3d/quick3drender/items/quick3dsortmethod.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dsortmethod.h b/src/quick3d/quick3drender/items/quick3dsortmethod.h index 17bc73f8e..672f13703 100644 --- a/src/quick3d/quick3drenderer/items/quick3dsortmethod.h +++ b/src/quick3d/quick3drender/items/quick3dsortmethod.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H #define QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qsortmethod.h> -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qsortmethod.h> +#include <Qt3DRender/qsortcriterion.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DSortMethod : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DSortMethod : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QSortCriterion> criteria READ criteriaList) diff --git a/src/quick3d/quick3drenderer/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp index c6acec6a7..c6acec6a7 100644 --- a/src/quick3d/quick3drenderer/items/quick3dstateset.cpp +++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dstateset.h b/src/quick3d/quick3drender/items/quick3dstateset.h index 3be605922..bae3bb3d5 100644 --- a/src/quick3d/quick3drenderer/items/quick3dstateset.h +++ b/src/quick3d/quick3drender/items/quick3dstateset.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H #define QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qstateset.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qstateset.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DStateSet : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DStateSet : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList CONSTANT) diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp index 21690e6fe..21690e6fe 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.h b/src/quick3d/quick3drender/items/quick3dtechnique.h index f44bdcf98..75de6d530 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtechnique.h +++ b/src/quick3d/quick3drender/items/quick3dtechnique.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H #define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qtechnique.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qtechnique.h> #include <QQmlListProperty> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechnique : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DTechnique : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList) diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp index 936efc738..936efc738 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter.h index 2c4483fb4..489a70c25 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H #define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> -#include <Qt3DRenderer/qtechniquefilter.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qannotation.h> #include <Qt3DQuick/quick3dnode.h> #include <QQmlListProperty> @@ -49,7 +49,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechniqueFilter : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DTechniqueFilter : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> requires READ requireList) diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp index bfe899802..bfe899802 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp +++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drender/items/quick3dtexture.h index dcc060203..1369b1610 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtexture.h +++ b/src/quick3d/quick3drender/items/quick3dtexture.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H #define QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> #include <Qt3DQuick/quick3dnode.h> -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/qtexture.h> #include <QQmlListProperty> #include <QUrl> @@ -50,7 +50,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureExtension : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DTextureExtension : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractTextureImage> textureImages READ textureImages) diff --git a/src/quick3d/quick3drenderer/items/quick3dviewport.cpp b/src/quick3d/quick3drender/items/quick3dviewport.cpp index 0383c578b..0383c578b 100644 --- a/src/quick3d/quick3drenderer/items/quick3dviewport.cpp +++ b/src/quick3d/quick3drender/items/quick3dviewport.cpp diff --git a/src/quick3d/quick3drenderer/items/quick3dviewport.h b/src/quick3d/quick3drender/items/quick3dviewport.h index acef80284..046c67223 100644 --- a/src/quick3d/quick3drenderer/items/quick3dviewport.h +++ b/src/quick3d/quick3drender/items/quick3dviewport.h @@ -37,9 +37,9 @@ #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H #define QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> #include <Qt3DQuick/quick3dnode.h> -#include <Qt3DRenderer/qviewport.h> +#include <Qt3DRender/qviewport.h> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ namespace Quick { // TO DO : Check if this is required or if this might as well be removed -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DViewport : public QObject +class QT3DQUICKRENDERSHARED_EXPORT Quick3DViewport : public QObject { Q_OBJECT public: diff --git a/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp b/src/quick3d/quick3drender/items/shaderpropertyparser.cpp index a467cf678..a467cf678 100644 --- a/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp +++ b/src/quick3d/quick3drender/items/shaderpropertyparser.cpp diff --git a/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h b/src/quick3d/quick3drender/items/shaderpropertyparser_p.h index 077696cdd..431c2e4b5 100644 --- a/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h +++ b/src/quick3d/quick3drender/items/shaderpropertyparser_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> #include <QtQml/private/qqmlcustomparser_p.h> #include <QtQml/private/qv4compileddata_p.h> @@ -58,7 +58,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT ShaderPropertyParser : public QQmlCustomParser +class QT3DQUICKRENDERSHARED_EXPORT ShaderPropertyParser : public QQmlCustomParser { public: ShaderPropertyParser(); diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp b/src/quick3d/quick3drender/qt3dquickrender_global.cpp index bc46386e2..d1563c691 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp +++ b/src/quick3d/quick3drender/qt3dquickrender_global.cpp @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#include "qt3dquickrenderer_global_p.h" -#include "qt3dquickrenderernodefactory_p.h" +#include "qt3dquickrender_global_p.h" +#include "qt3dquickrendernodefactory_p.h" QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h b/src/quick3d/quick3drender/qt3dquickrender_global.h index f4e053c69..2d0d77a6f 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h +++ b/src/quick3d/quick3drender/qt3dquickrender_global.h @@ -34,23 +34,23 @@ ** ****************************************************************************/ -#ifndef QT3DQUICKRENDERER_GLOBAL_H -#define QT3DQUICKRENDERER_GLOBAL_H +#ifndef QT3DQUICKRENDER_GLOBAL_H +#define QT3DQUICKRENDER_GLOBAL_H #include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DQUICKRENDERER_LIBRARY) -# define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_EXPORT +# if defined(QT3DQUICKRENDER_LIBRARY) +# define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_IMPORT +# define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DQUICKRENDERERSHARED_EXPORT +# define QT3DQUICKRENDERSHARED_EXPORT #endif QT_END_NAMESPACE -#endif // QT3DQUICKRENDERER_GLOBAL_H +#endif // QT3DQUICKRENDER_GLOBAL_H diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h b/src/quick3d/quick3drender/qt3dquickrender_global_p.h index be925917e..3ee49561b 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h +++ b/src/quick3d/quick3drender/qt3dquickrender_global_p.h @@ -35,8 +35,8 @@ ** ****************************************************************************/ -#ifndef QT3DQUICKRENDERER_GLOBAL_P_H -#define QT3DQUICKRENDERER_GLOBAL_P_H +#ifndef QT3DQUICKRENDER_GLOBAL_P_H +#define QT3DQUICKRENDER_GLOBAL_P_H // // W A R N I N G @@ -49,10 +49,10 @@ // We mean it. // -#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h> +#include <Qt3DQuickRender/qt3dquickrender_global.h> #include <QtQml/qqml.h> -#define QT3DQUICKSHARED_PRIVATE_EXPORT QT3DQUICKRENDERERSHARED_EXPORT +#define QT3DQUICKSHARED_PRIVATE_EXPORT QT3DQUICKRENDERSHARED_EXPORT QT_BEGIN_NAMESPACE @@ -76,4 +76,4 @@ template<class T, class E> void registerExtendedType(const char *className, cons QT_END_NAMESPACE -#endif // QT3DQUICKRENDERER_GLOBAL_P_H +#endif // QT3DQUICKRENDER_GLOBAL_P_H diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp index 1123062cc..52e9f646e 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qt3dquickrenderernodefactory_p.h" +#include "qt3dquickrendernodefactory_p.h" #include <QtQml/private/qqmlmetatype_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h index 7d9f49c7e..7d9f49c7e 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h diff --git a/src/quick3d/quick3drenderer/quick3drenderer.pro b/src/quick3d/quick3drender/quick3drender.pro index b6a9e52ed..ebd332c4e 100644 --- a/src/quick3d/quick3drenderer/quick3drenderer.pro +++ b/src/quick3d/quick3drender/quick3drender.pro @@ -1,11 +1,11 @@ -TARGET = Qt3DQuickRenderer +TARGET = Qt3DQuickRender -QT += core core-private qml qml-private 3dcore 3drenderer 3dquick 3dcore-private 3drenderer-private +QT += core core-private qml qml-private 3dcore 3drender 3dquick 3dcore-private 3drender-private CONFIG -= precompile_header -DEFINES += QT3DQUICKRENDERER_LIBRARY +DEFINES += QT3DQUICKRENDER_LIBRARY -MODULE = 3dquickrenderer +MODULE = 3dquickrender load(qt_module) @@ -16,13 +16,13 @@ gcov { } SOURCES += \ - qt3dquickrenderer_global.cpp \ - qt3dquickrenderernodefactory.cpp + qt3dquickrender_global.cpp \ + qt3dquickrendernodefactory.cpp HEADERS += \ - qt3dquickrenderer_global.h \ - qt3dquickrenderer_global_p.h \ - qt3dquickrenderernodefactory_p.h + qt3dquickrendernodefactory_p.h \ + qt3dquickrender_global_p.h \ + qt3dquickrender_global.h !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL diff --git a/src/render/backend/attachmentpack_p.h b/src/render/backend/attachmentpack_p.h index cbf96cc99..317e86ae9 100644 --- a/src/render/backend/attachmentpack_p.h +++ b/src/render/backend/attachmentpack_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DRender/qrenderattachment.h> #include <QVector> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index 72a392277..d2b72656e 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "cameralens_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qcameralens.h> diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index a0f8d4c98..aca931217 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -35,17 +35,17 @@ ****************************************************************************/ #include "entity_p.h" -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/qabstractlight.h> -#include <Qt3DRenderer/qlayer.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/sphere.h> -#include <Qt3DRenderer/qshaderdata.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/private/geometryrenderermanager_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/qabstractlight.h> +#include <Qt3DRender/qlayer.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/sphere.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qentity.h> diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index 74c8e1b51..a127c8f45 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -49,8 +49,8 @@ // We mean it. // -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/handle_types_p.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qhandle.h> diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h index 2e7b23f42..ec558d3a7 100644 --- a/src/render/backend/handle_types_p.h +++ b/src/render/backend/handle_types_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qhandle.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/layer_p.h b/src/render/backend/layer_p.h index d75e7164c..23351e5f9 100644 --- a/src/render/backend/layer_p.h +++ b/src/render/backend/layer_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qbackendnode.h> #include <QStringList> diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 1c4e9d86e..5baada03d 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -49,27 +49,27 @@ // #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRenderer/private/renderattachment_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/annotation_p.h> -#include <Qt3DRenderer/private/effect_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/layer_p.h> -#include <Qt3DRenderer/private/material_p.h> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/private/sortcriterion_p.h> -#include <Qt3DRenderer/private/technique_p.h> -#include <Qt3DRenderer/private/texture_p.h> -#include <Qt3DRenderer/private/transform_p.h> -#include <Qt3DRenderer/private/rendertarget_p.h> -#include <Qt3DRenderer/private/renderpass_p.h> -#include <Qt3DRenderer/private/parameter_p.h> -#include <Qt3DRenderer/private/shaderdata_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> -#include <Qt3DRenderer/private/uniformbuffer_p.h> -#include <Qt3DRenderer/private/textureimage_p.h> -#include <Qt3DRenderer/private/attribute_p.h> -#include <Qt3DRenderer/private/geometry_p.h> +#include <Qt3DRender/private/renderattachment_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/annotation_p.h> +#include <Qt3DRender/private/effect_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/layer_p.h> +#include <Qt3DRender/private/material_p.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/private/sortcriterion_p.h> +#include <Qt3DRender/private/technique_p.h> +#include <Qt3DRender/private/texture_p.h> +#include <Qt3DRender/private/transform_p.h> +#include <Qt3DRender/private/rendertarget_p.h> +#include <Qt3DRender/private/renderpass_p.h> +#include <Qt3DRender/private/parameter_p.h> +#include <Qt3DRender/private/shaderdata_p.h> +#include <Qt3DRender/private/handle_types_p.h> +#include <Qt3DRender/private/uniformbuffer_p.h> +#include <Qt3DRender/private/textureimage_p.h> +#include <Qt3DRender/private/attribute_p.h> +#include <Qt3DRender/private/geometry_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/platformsurfacefilter.cpp b/src/render/backend/platformsurfacefilter.cpp index fec56ee3e..6e7e1a21c 100644 --- a/src/render/backend/platformsurfacefilter.cpp +++ b/src/render/backend/platformsurfacefilter.cpp @@ -36,7 +36,7 @@ #include "platformsurfacefilter_p.h" -#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRender/private/renderer_p.h> #include <QMetaObject> #include <QPlatformSurfaceEvent> diff --git a/src/render/backend/qgraphicsutils_p.h b/src/render/backend/qgraphicsutils_p.h index f705d4ae4..7b88a7691 100644 --- a/src/render/backend/qgraphicsutils_p.h +++ b/src/render/backend/qgraphicsutils_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/private/shadervariables_p.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/private/shadervariables_p.h> #include <QMatrix2x2> #include <QMatrix3x3> #include <QMatrix4x4> diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index df25fb466..00fea7011 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -36,8 +36,8 @@ #include "quniformvalue_p.h" -#include <Qt3DRenderer/private/graphicscontext_p.h> -#include <Qt3DRenderer/private/texture_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/texture_p.h> #include <Qt3DCore/qframeallocator.h> @@ -45,7 +45,7 @@ #include <QDebug> #include <QColor> #include <QQuaternion> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index 51bb2fc29..9f0381200 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -53,9 +53,9 @@ #include <QVector> #include <QOpenGLShaderProgram> #include <Qt3DCore/qnodeid.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> -#include <Qt3DRenderer/private/shadervariables_p.h> +#include <Qt3DRender/private/shadervariables_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp index 92436a217..231a19254 100644 --- a/src/render/backend/renderattachment.cpp +++ b/src/render/backend/renderattachment.cpp @@ -34,9 +34,9 @@ ** ****************************************************************************/ -#include <Qt3DRenderer/private/renderattachment_p.h> +#include <Qt3DRender/private/renderattachment_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/qtexture.h> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderattachment_p.h b/src/render/backend/renderattachment_p.h index d2c4487c0..9b6c5f8bf 100644 --- a/src/render/backend/renderattachment_p.h +++ b/src/render/backend/renderattachment_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/qrenderattachment.h> -#include <Qt3DRenderer/private/attachmentpack_p.h> +#include <Qt3DRender/qrenderattachment.h> +#include <Qt3DRender/private/attachmentpack_p.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> diff --git a/src/render/backend/rendercommand.cpp b/src/render/backend/rendercommand.cpp index 8f748ac27..a3e971fd2 100644 --- a/src/render/backend/rendercommand.cpp +++ b/src/render/backend/rendercommand.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "rendercommand_p.h" -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h index f2a18226c..4c0abe0eb 100644 --- a/src/render/backend/rendercommand_p.h +++ b/src/render/backend/rendercommand_p.h @@ -50,8 +50,8 @@ // #include <qglobal.h> -#include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/private/quniformvalue_p.h> +#include <Qt3DRender/private/handle_types_p.h> #include <QOpenGLShaderProgram> #include <QOpenGLTexture> #include <QMatrix4x4> diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 651f7c323..859f24dbf 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -40,42 +40,42 @@ #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qparametermapping.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qeffect.h> - -#include <Qt3DRenderer/private/renderviewjob_p.h> -#include <Qt3DRenderer/private/renderstates_p.h> -#include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/framegraphvisitor_p.h> -#include <Qt3DRenderer/private/graphicscontext_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/rendercommand_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/material_p.h> -#include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderqueue_p.h> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> -#include <Qt3DRenderer/private/technique_p.h> -#include <Qt3DRenderer/private/renderthread_p.h> -#include <Qt3DRenderer/private/renderview_p.h> -#include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/texturedatamanager_p.h> -#include <Qt3DRenderer/private/scenemanager_p.h> -#include <Qt3DRenderer/private/viewportnode_p.h> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> -#include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h> -#include <Qt3DRenderer/private/buffermanager_p.h> -#include <Qt3DRenderer/private/loadbufferjob_p.h> -#include <Qt3DRenderer/private/loadgeometryjob_p.h> -#include <Qt3DRenderer/private/geometryrenderermanager_p.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qparametermapping.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qeffect.h> + +#include <Qt3DRender/private/renderviewjob_p.h> +#include <Qt3DRender/private/renderstates_p.h> +#include <Qt3DRender/private/cameraselectornode_p.h> +#include <Qt3DRender/private/framegraphvisitor_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/rendercommand_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/material_p.h> +#include <Qt3DRender/private/renderpassfilternode_p.h> +#include <Qt3DRender/private/renderqueue_p.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/private/renderstateset_p.h> +#include <Qt3DRender/private/technique_p.h> +#include <Qt3DRender/private/renderthread_p.h> +#include <Qt3DRender/private/renderview_p.h> +#include <Qt3DRender/private/techniquefilternode_p.h> +#include <Qt3DRender/private/texturedatamanager_p.h> +#include <Qt3DRender/private/scenemanager_p.h> +#include <Qt3DRender/private/viewportnode_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/vsyncframeadvanceservice_p.h> +#include <Qt3DRender/private/buffermanager_p.h> +#include <Qt3DRender/private/loadbufferjob_p.h> +#include <Qt3DRender/private/loadgeometryjob_p.h> +#include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/private/qaspectmanager_p.h> diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index f272de2ed..21749b69a 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -49,10 +49,10 @@ // We mean it. // -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/private/quniformvalue_p.h> +#include <Qt3DRender/private/handle_types_p.h> #include <Qt3DCore/qaspectjob.h> #include <QHash> diff --git a/src/render/backend/renderqueue.cpp b/src/render/backend/renderqueue.cpp index 1cdb8f96f..fd68b1bc0 100644 --- a/src/render/backend/renderqueue.cpp +++ b/src/render/backend/renderqueue.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "renderqueue_p.h" -#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRender/private/renderview_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index dc528349c..44570449e 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -34,10 +34,10 @@ ** ****************************************************************************/ -#include <Qt3DRenderer/private/rendertarget_p.h> +#include <Qt3DRender/private/rendertarget_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qrendertarget.h> -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DRender/qrendertarget.h> +#include <Qt3DRender/qrenderattachment.h> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp index e899d0057..5738fc0ec 100644 --- a/src/render/backend/renderthread.cpp +++ b/src/render/backend/renderthread.cpp @@ -35,10 +35,10 @@ ****************************************************************************/ #include "renderthread_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/renderview_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QEventLoop> #include <QTime> #include <QMutexLocker> diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 8583aed99..f509f645c 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -36,30 +36,30 @@ ****************************************************************************/ #include "renderview_p.h" -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qrendertarget.h> -#include <Qt3DRenderer/sphere.h> - -#include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/layerfilternode_p.h> -#include <Qt3DRenderer/private/qparameter_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/rendercommand_p.h> -#include <Qt3DRenderer/private/effect_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/layer_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderpass_p.h> -#include <Qt3DRenderer/private/geometryrenderer_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> -#include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/viewportnode_p.h> - -#include <Qt3DRenderer/qparametermapping.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qrendertarget.h> +#include <Qt3DRender/sphere.h> + +#include <Qt3DRender/private/cameraselectornode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/private/layerfilternode_p.h> +#include <Qt3DRender/private/qparameter_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/rendercommand_p.h> +#include <Qt3DRender/private/effect_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/layer_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/renderpassfilternode_p.h> +#include <Qt3DRender/private/renderpass_p.h> +#include <Qt3DRender/private/geometryrenderer_p.h> +#include <Qt3DRender/private/renderstateset_p.h> +#include <Qt3DRender/private/techniquefilternode_p.h> +#include <Qt3DRender/private/viewportnode_p.h> + +#include <Qt3DRender/qparametermapping.h> #include <Qt3DCore/qentity.h> diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index 6cf7a308c..67bed52a3 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -49,18 +49,18 @@ // We mean it. // -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qclearbuffer.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/cameralens_p.h> -#include <Qt3DRenderer/private/attachmentpack_p.h> -#include <Qt3DRenderer/private/handle_types_p.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qclearbuffer.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/cameralens_p.h> +#include <Qt3DRender/private/attachmentpack_p.h> +#include <Qt3DRender/private/handle_types_p.h> +#include <Qt3DRender/qparameter.h> #include <Qt3DCore/qframeallocator.h> // TODO: Move out once this is all refactored -#include <Qt3DRenderer/private/renderviewjobutils_p.h> +#include <Qt3DRender/private/renderviewjobutils_p.h> #include <QVector> #include <QMutex> diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index a21ebad09..619547bcf 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -36,14 +36,14 @@ #include "qdiffusemapmaterial.h" #include "qdiffusemapmaterial_p.h" -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> #include <QUrl> #include <QVector3D> #include <QVector4D> diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index b1a6471aa..2f91b4efc 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H #define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H -#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QDiffuseMapMaterialPrivate; class QAbstractTextureProvider; -class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial +class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h index 68beff5c5..0badb01ff 100644 --- a/src/render/defaults/qdiffusemapmaterial_p.h +++ b/src/render/defaults/qdiffusemapmaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qmaterial_p.h> +#include <Qt3DRender/private/qmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 542cb202d..2a1c759d9 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -37,14 +37,14 @@ #include "qdiffusespecularmapmaterial.h" #include "qdiffusespecularmapmaterial_p.h" -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> #include <QUrl> #include <QVector3D> #include <QVector4D> diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h index f49341e9f..51544babf 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.h +++ b/src/render/defaults/qdiffusespecularmapmaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H #define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H -#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QAbstractTextureProvider; class QDiffuseSpecularMapMaterialPrivate; -class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial +class QT3DRENDERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h index 1affe1f93..8d049305c 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qmaterial_p.h> +#include <Qt3DRender/private/qmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp index 2ff2d6784..14e623251 100644 --- a/src/render/defaults/qforwardrenderer.cpp +++ b/src/render/defaults/qforwardrenderer.cpp @@ -37,10 +37,10 @@ #include "qforwardrenderer.h" #include "qforwardrenderer_p.h" -#include <Qt3DRenderer/qviewport.h> -#include <Qt3DRenderer/qcameraselector.h> -#include <Qt3DRenderer/qclearbuffer.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qviewport.h> +#include <Qt3DRender/qcameraselector.h> +#include <Qt3DRender/qclearbuffer.h> +#include <Qt3DRender/qannotation.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h index 44249c767..10aacde9c 100644 --- a/src/render/defaults/qforwardrenderer.h +++ b/src/render/defaults/qforwardrenderer.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_H #define QT3DRENDER_RENDER_QFORWARDRENDERER_H -#include <Qt3DRenderer/qtechniquefilter.h> +#include <Qt3DRender/qtechniquefilter.h> #include <QRectF> #include <QColor> @@ -47,7 +47,7 @@ namespace Qt3DRender { class QForwardRendererPrivate; -class QT3DRENDERERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter +class QT3DRENDERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter { Q_OBJECT Q_PROPERTY(QRectF viewportRect READ viewportRect WRITE setViewportRect NOTIFY viewportRectChanged) diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/render/defaults/qforwardrenderer_p.h index 53517917d..fcbb5be39 100644 --- a/src/render/defaults/qforwardrenderer_p.h +++ b/src/render/defaults/qforwardrenderer_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qtechniquefilter_p.h> +#include <Qt3DRender/private/qtechniquefilter_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp index c969df70b..c59c197a2 100644 --- a/src/render/defaults/qgoochmaterial.cpp +++ b/src/render/defaults/qgoochmaterial.cpp @@ -37,11 +37,11 @@ #include "qgoochmaterial.h" #include "qgoochmaterial_p.h" -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qtechnique.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qtechnique.h> #include <QtCore/qurl.h> diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h index 6135b9eb3..188ca0805 100644 --- a/src/render/defaults/qgoochmaterial.h +++ b/src/render/defaults/qgoochmaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_H #define QT3DRENDER_RENDER_QGOOCHMATERIAL_H -#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qgoochmaterial_p.h b/src/render/defaults/qgoochmaterial_p.h index 8538ad47b..bdd38f87a 100644 --- a/src/render/defaults/qgoochmaterial_p.h +++ b/src/render/defaults/qgoochmaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qmaterial_p.h> +#include <Qt3DRender/private/qmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp index a75b8f7f5..3971193a3 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp @@ -37,15 +37,15 @@ #include "qnormaldiffusemapalphamaterial.h" #include "qnormaldiffusemapalphamaterial_p.h" -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/qalphacoverage.h> -#include <Qt3DRenderer/qdepthtest.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/qalphacoverage.h> +#include <Qt3DRender/qdepthtest.h> #include <QUrl> #include <QVector3D> diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h index 38188e04c..57b53e2a4 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.h +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H #define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H -#include <Qt3DRenderer/qnormaldiffusemapmaterial.h> +#include <Qt3DRender/qnormaldiffusemapmaterial.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QNormalDiffuseMapAlphaMaterialPrivate; -class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDiffuseMapMaterial +class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDiffuseMapMaterial { Q_OBJECT public: diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h index 66f3bd1f8..59135908c 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h +++ b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qnormaldiffusemapmaterial_p.h> +#include <Qt3DRender/private/qnormaldiffusemapmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp index 64bc8f768..a37c9cb9e 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp @@ -37,13 +37,13 @@ #include "qnormaldiffusemapmaterial.h" #include "qnormaldiffusemapmaterial_p.h" -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> #include <QUrl> #include <QVector3D> diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h index 158cfca45..f6faad788 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/render/defaults/qnormaldiffusemapmaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H #define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H -#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QAbstractTextureProvider; class QNormalDiffuseMapMaterialPrivate; -class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial +class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h index 96b952ce3..7bf820541 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qmaterial_p.h> +#include <Qt3DRender/private/qmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index d779768d3..17e7c4e6d 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -36,14 +36,14 @@ #include "qnormaldiffusespecularmapmaterial.h" #include "qnormaldiffusespecularmapmaterial_p.h" -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> #include <QUrl> #include <QVector3D> #include <QVector4D> diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h index 668fed0f3..6f437288d 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H #define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H -#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QNormalDiffuseSpecularMapMaterialPrivate; -class QT3DRENDERERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMaterial +class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h index e0703c92c..fcb85fe91 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qmaterial_p.h> +#include <Qt3DRender/private/qmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp index 37fddd691..c80013e5e 100644 --- a/src/render/defaults/qpervertexcolormaterial.cpp +++ b/src/render/defaults/qpervertexcolormaterial.cpp @@ -36,13 +36,13 @@ #include "qpervertexcolormaterial.h" #include "qpervertexcolormaterial_p.h" -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> #include <QUrl> #include <QVector3D> #include <QVector4D> diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h index 7ce8ece79..300eab170 100644 --- a/src/render/defaults/qpervertexcolormaterial.h +++ b/src/render/defaults/qpervertexcolormaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H #define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H -#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QPerVertexColorMaterialPrivate; -class QT3DRENDERERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial +class QT3DRENDERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial { Q_OBJECT diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/render/defaults/qpervertexcolormaterial_p.h index 676ec0a9a..5b6079b0f 100644 --- a/src/render/defaults/qpervertexcolormaterial_p.h +++ b/src/render/defaults/qpervertexcolormaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qmaterial_p.h> +#include <Qt3DRender/private/qmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp index 8e9186418..aaa8e338a 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/render/defaults/qphongmaterial.cpp @@ -36,13 +36,13 @@ #include "qphongmaterial.h" #include "qphongmaterial_p.h" -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> #include <QUrl> #include <QVector3D> #include <QVector4D> diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h index f9576058c..ba4a42afb 100644 --- a/src/render/defaults/qphongmaterial.h +++ b/src/render/defaults/qphongmaterial.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_H #define QT3DRENDER_RENDER_QPHONGMATERIAL_H -#include <Qt3DRenderer/qmaterial.h> +#include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QPhongMaterialPrivate; -class QT3DRENDERERSHARED_EXPORT QPhongMaterial : public QMaterial +class QT3DRENDERSHARED_EXPORT QPhongMaterial : public QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h index c6441a641..527310097 100644 --- a/src/render/defaults/qphongmaterial_p.h +++ b/src/render/defaults/qphongmaterial_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qmaterial_p.h> +#include <Qt3DRender/private/qmaterial_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp index 1e9b9641e..8fd526c46 100644 --- a/src/render/defaults/qskyboxentity.cpp +++ b/src/render/defaults/qskyboxentity.cpp @@ -38,17 +38,17 @@ #include "qskyboxentity_p.h" #include <Qt3DCore/qtransform.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qcullface.h> -#include <Qt3DRenderer/qdepthtest.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qcuboidmesh.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/qshaderprogram.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qcullface.h> +#include <Qt3DRender/qdepthtest.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qcuboidmesh.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/qshaderprogram.h> #include <Qt3DCore/qtranslatetransform.h> QT_BEGIN_NAMESPACE diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h index a3708a9f5..d0406466a 100644 --- a/src/render/defaults/qskyboxentity.h +++ b/src/render/defaults/qskyboxentity.h @@ -38,7 +38,7 @@ #define QT3DRENDER_RENDER_QSKYBOXENTITY_H #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QSkyboxEntityPrivate; -class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity +class QT3DRENDERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity { Q_OBJECT public: diff --git a/src/render/doc/src/qt3drenderer-framegraph.qdoc b/src/render/doc/src/qt3drender-framegraph.qdoc index 2fddec27f..52a4e2227 100644 --- a/src/render/doc/src/qt3drenderer-framegraph.qdoc +++ b/src/render/doc/src/qt3drender-framegraph.qdoc @@ -35,13 +35,13 @@ ****************************************************************************/ /*! - \page qt3drenderer-framegraph.html - \title Qt3D Renderer Framegraph + \page qt3drender-framegraph.html + \title Qt3D Render Framegraph \brief A framegraph is the data structure that controls how a scene is rendered. - The Qt3D Renderer aspect allows for the rendering algorithm to be entirely + The Qt3D Render aspect allows for the rendering algorithm to be entirely data-driven. The controlling data structure is known as the \e framegraph. Similar to how the Qt3D ECS (entity component system) allows you to define a so-called Scenegraph by building a scene from a tree of Entities and diff --git a/src/render/doc/src/qt3drenderer-module.qdoc b/src/render/doc/src/qt3drender-module.qdoc index 437920301..6e0e8806d 100644 --- a/src/render/doc/src/qt3drenderer-module.qdoc +++ b/src/render/doc/src/qt3drender-module.qdoc @@ -35,46 +35,46 @@ ****************************************************************************/ /*! - \module Qt3DRenderer - \title Qt3D Renderer C++ Classes - \brief The Qt3D Renderer module contains functionality to support 2D and 3D rendering using Qt3D. + \module Qt3DRender + \title Qt3D Render C++ Classes + \brief The Qt3D Render module contains functionality to support 2D and 3D rendering using Qt3D. \ingroup modules \ingroup qt3d-modules - \qtvariable 3drenderer + \qtvariable 3drender - The Qt3D Renderer module provides an aspect, components, and other supporting types necessary + The Qt3D Render module provides an aspect, components, and other supporting types necessary to implement 2D and 3D rendering as part of the Qt3D framework. To use classes from this module, add this directive into the C++ files: \code - #include <Qt3DRenderer> + #include <Qt3DRender> \endcode To link against the corresponding C++ library, add the following to your qmake project file: \badcode - QT += 3drenderer + QT += 3drender \endcode - Classes, types, and functions are declared under the \l [Qt3DCore]{Qt3D} namespace. + Classes, types, and functions are declared under the \l [Qt3DRender]{Qt3DRender} namespace. \section1 Overview - The Qt3D Renderer aspect offers support for data-driven configuration as described - in \l {Qt3D Renderer Framegraph}. + The Qt3D Render aspect offers support for data-driven configuration as described + in \l {Qt3D Render Framegraph}. \section1 Reference \list - \li \l {Qt3D Renderer C++ Classes} + \li \l {Qt3D Render C++ Classes} \li \l {Qt3D Examples} \endlist */ /*! - \qmlmodule Qt3D.Renderer 2.0 - \title Qt3D Renderer QML Types + \qmlmodule Qt3D.Render 2.0 + \title Qt3D Render QML Types \ingroup qmlmodules \ingroup qt3d-qmlmodules @@ -83,6 +83,6 @@ To import and use the module's QML types, use the following statement: \badcode - import Qt3D.Renderer 2.0 + import Qt3D.Render 2.0 \endcode */ diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp index 96377e9e7..71084a7a5 100644 --- a/src/render/framegraph/cameraselectornode.cpp +++ b/src/render/framegraph/cameraselectornode.cpp @@ -35,13 +35,13 @@ ****************************************************************************/ #include "cameraselectornode_p.h" -#include <Qt3DRenderer/private/qcameraselector_p.h> -#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRender/private/qcameraselector_p.h> +#include <Qt3DRender/private/renderer_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h index e7075334a..32f243135 100644 --- a/src/render/framegraph/cameraselectornode_p.h +++ b/src/render/framegraph/cameraselectornode_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/clearbuffer_p.h b/src/render/framegraph/clearbuffer_p.h index 67c4542a2..f14b476c6 100644 --- a/src/render/framegraph/clearbuffer_p.h +++ b/src/render/framegraph/clearbuffer_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/qclearbuffer.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/qclearbuffer.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp index 84b1b2238..10629f1d8 100644 --- a/src/render/framegraph/framegraphnode.cpp +++ b/src/render/framegraph/framegraphnode.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include "framegraphnode_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/qframegraph.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/qframegraph.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index e11222e21..e68d0b9bc 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -51,8 +51,8 @@ #include <Qt3DCore/qhandle.h> #include <Qt3DCore/qnode.h> #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/qframegraphnode.h> -#include <Qt3DRenderer/private/managers_p.h> +#include <Qt3DRender/qframegraphnode.h> +#include <Qt3DRender/private/managers_p.h> #include <qglobal.h> #include <QVector> diff --git a/src/render/framegraph/framegraphsubtreeselector_p.h b/src/render/framegraph/framegraphsubtreeselector_p.h index 72e4ac4a4..b06238348 100644 --- a/src/render/framegraph/framegraphsubtreeselector_p.h +++ b/src/render/framegraph/framegraphsubtreeselector_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/qframegraphselector.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/qframegraphselector.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp index 29de86e98..60307469a 100644 --- a/src/render/framegraph/framegraphvisitor.cpp +++ b/src/render/framegraph/framegraphvisitor.cpp @@ -37,7 +37,7 @@ #include "framegraphvisitor_p.h" #include "framegraphnode_p.h" -#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRender/private/renderer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h index 7d5ba58b0..cff04b13a 100644 --- a/src/render/framegraph/layerfilternode_p.h +++ b/src/render/framegraph/layerfilternode_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> #include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp index 55b0359c1..0d5b6578a 100644 --- a/src/render/framegraph/nodraw.cpp +++ b/src/render/framegraph/nodraw.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "nodraw_p.h" -#include <Qt3DRenderer/qnodraw.h> +#include <Qt3DRender/qnodraw.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h index 2289f79bd..49bd818b6 100644 --- a/src/render/framegraph/nodraw_p.h +++ b/src/render/framegraph/nodraw_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h index 4088f6e8b..3a663768f 100644 --- a/src/render/framegraph/qcameraselector.h +++ b/src/render/framegraph/qcameraselector.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QCAMERASELECTOR_H #define QT3DRENDER_QCAMERASELECTOR_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qframegraphnode.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QCameraSelectorPrivate; -class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) diff --git a/src/render/framegraph/qcameraselector_p.h b/src/render/framegraph/qcameraselector_p.h index aec10ae94..d4fb3f24d 100644 --- a/src/render/framegraph/qcameraselector_p.h +++ b/src/render/framegraph/qcameraselector_p.h @@ -49,7 +49,7 @@ // #include <private/qframegraphnode_p.h> -#include <Qt3DRenderer/qcameraselector.h> +#include <Qt3DRender/qcameraselector.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qclearbuffer.h b/src/render/framegraph/qclearbuffer.h index 62b645a06..d6adcf209 100644 --- a/src/render/framegraph/qclearbuffer.h +++ b/src/render/framegraph/qclearbuffer.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QCLEARBUFFER_H #define QT3DRENDER_QCLEARBUFFER_H -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QClearBufferPrivate; -class QT3DRENDERERSHARED_EXPORT QClearBuffer : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QClearBuffer : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged) diff --git a/src/render/framegraph/qclearbuffer_p.h b/src/render/framegraph/qclearbuffer_p.h index 23ee280ac..544b17e37 100644 --- a/src/render/framegraph/qclearbuffer_p.h +++ b/src/render/framegraph/qclearbuffer_p.h @@ -49,7 +49,7 @@ // #include <private/qframegraphnode_p.h> -#include <Qt3DRenderer/qclearbuffer.h> +#include <Qt3DRender/qclearbuffer.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qframegraph.cpp b/src/render/framegraph/qframegraph.cpp index a6193a4c9..8c8c34f59 100644 --- a/src/render/framegraph/qframegraph.cpp +++ b/src/render/framegraph/qframegraph.cpp @@ -37,8 +37,8 @@ #include "qframegraph.h" #include "qframegraph_p.h" #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qframegraphnode.h> -#include <Qt3DRenderer/private/qframegraphnode_p.h> +#include <Qt3DRender/qframegraphnode.h> +#include <Qt3DRender/private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qframegraph.h b/src/render/framegraph/qframegraph.h index 0b720ea72..35cf09b09 100644 --- a/src/render/framegraph/qframegraph.h +++ b/src/render/framegraph/qframegraph.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QFRAMEGRAPH_H #define QT3DRENDER_QFRAMEGRAPH_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qcomponent.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QFrameGraphPrivate; class QFrameGraphNode; -class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent { Q_OBJECT // Note : The full namespace has to be used to define the property diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index 826edd36f..cbde0be3e 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QFRAMEGRAPHNODE_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QObject> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QFrameGraphNodePrivate; -class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h index 1bcab0c29..32ba8ae38 100644 --- a/src/render/framegraph/qframegraphnode_p.h +++ b/src/render/framegraph/qframegraphnode_p.h @@ -50,7 +50,7 @@ #include <QtCore/QtGlobal> #include <private/qnode_p.h> -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qframegraphselector.h b/src/render/framegraph/qframegraphselector.h index 64f8bf9fb..e88fcbba8 100644 --- a/src/render/framegraph/qframegraphselector.h +++ b/src/render/framegraph/qframegraphselector.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_H #define QT3DRENDER_QFRAMEGRAPHSELECTOR_H -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QFrameGraphSelectorPrivate; -class QT3DRENDERERSHARED_EXPORT QFrameGraphSelectorFunctor +class QT3DRENDERSHARED_EXPORT QFrameGraphSelectorFunctor { public: virtual QVector<int> operator()() = 0; @@ -55,7 +55,7 @@ public: typedef QSharedPointer<QFrameGraphSelectorFunctor> QFrameGraphSelectorFunctorPtr; -class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qframegraphselector_p.h b/src/render/framegraph/qframegraphselector_p.h index 3f90efadd..afe91601a 100644 --- a/src/render/framegraph/qframegraphselector_p.h +++ b/src/render/framegraph/qframegraphselector_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qframegraphnode_p.h> +#include <Qt3DRender/private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 5d20ca30e..5ba129ba7 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QLAYERFILTER_H #define QT3DRENDER_QLAYERFILTER_H -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> #include <QStringList> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QLayerFilterPrivate; -class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged) diff --git a/src/render/framegraph/qlayerfilter_p.h b/src/render/framegraph/qlayerfilter_p.h index c2108145f..6df0b8b18 100644 --- a/src/render/framegraph/qlayerfilter_p.h +++ b/src/render/framegraph/qlayerfilter_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE @@ -57,7 +57,7 @@ namespace Qt3DRender { class QLayerFilter; -class QT3DRENDERERSHARED_EXPORT QLayerFilterPrivate : public QFrameGraphNodePrivate +class QT3DRENDERSHARED_EXPORT QLayerFilterPrivate : public QFrameGraphNodePrivate { public: QLayerFilterPrivate(); diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h index 3daee3212..312e0c808 100644 --- a/src/render/framegraph/qnodraw.h +++ b/src/render/framegraph/qnodraw.h @@ -37,13 +37,13 @@ #ifndef QT3DRENDER_QNODRAW_H #define QT3DRENDER_QNODRAW_H -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 0eb9fc45e..f95bd032b 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -38,8 +38,8 @@ #include "qrenderpassfilter_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qannotation.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qparameter.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index 15ff9738b..941a22a8f 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QRENDERPASSFILTER_H #define QT3DRENDER_QRENDERPASSFILTER_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qframegraphnode.h> #include <QString> @@ -50,7 +50,7 @@ class QRenderPassFilterPrivate; class QAnnotation; class QParameter; -class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode { Q_OBJECT diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index c3fca07a7..1cd17d911 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -36,9 +36,9 @@ #include "qrendertargetselector.h" #include "qrendertargetselector_p.h" -#include <Qt3DRenderer/qrendertarget.h> +#include <Qt3DRender/qrendertarget.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/qrenderpass_p.h> +#include <Qt3DRender/private/qrenderpass_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index a83029f3b..dc50adb97 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -37,10 +37,10 @@ #ifndef QT3DRENDER_QRENDERTARGETSELECTOR_H #define QT3DRENDER_QRENDERTARGETSELECTOR_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qframegraphnode.h> -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DRender/qframegraphnode.h> +#include <Qt3DRender/qrenderattachment.h> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ namespace Qt3DRender { class QRenderTargetSelectorPrivate; class QRenderTarget; -class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h index f056a3b94..72f6cd76c 100644 --- a/src/render/framegraph/qsortcriterion.h +++ b/src/render/framegraph/qsortcriterion.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QSORTCRITERION_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QSortCriterionPrivate; -class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) diff --git a/src/render/framegraph/qsortcriterion_p.h b/src/render/framegraph/qsortcriterion_p.h index f9f39f747..f78bd1fd5 100644 --- a/src/render/framegraph/qsortcriterion_p.h +++ b/src/render/framegraph/qsortcriterion_p.h @@ -49,7 +49,7 @@ // #include <private/qnode_p.h> -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qsortmethod.cpp b/src/render/framegraph/qsortmethod.cpp index 2eece78f1..d2a4aa6ab 100644 --- a/src/render/framegraph/qsortmethod.cpp +++ b/src/render/framegraph/qsortmethod.cpp @@ -38,7 +38,7 @@ #include "qsortmethod_p.h" #include "qsortcriterion_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qsortmethod.h b/src/render/framegraph/qsortmethod.h index 337eaebf6..e8866a726 100644 --- a/src/render/framegraph/qsortmethod.h +++ b/src/render/framegraph/qsortmethod.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSORTMETHOD_H #define QT3DRENDER_QSORTMETHOD_H -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QSortCriterion; class QSortMethodPrivate; -class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QSortMethod : public QFrameGraphNode { Q_OBJECT diff --git a/src/render/framegraph/qstateset.cpp b/src/render/framegraph/qstateset.cpp index f6dbfa35d..8ba2d9bc5 100644 --- a/src/render/framegraph/qstateset.cpp +++ b/src/render/framegraph/qstateset.cpp @@ -38,7 +38,7 @@ #include "qstateset_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qstateset.h b/src/render/framegraph/qstateset.h index 7e4ff1257..db9972a45 100644 --- a/src/render/framegraph/qstateset.h +++ b/src/render/framegraph/qstateset.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSTATESET_H #define QT3DRENDER_QSTATESET_H -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QStateSetPrivate; class QRenderState; -class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QStateSet : public QFrameGraphNode { Q_OBJECT diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 37fad6f70..4e754fee9 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -37,8 +37,8 @@ #include "qtechniquefilter.h" #include "qtechniquefilter_p.h" -#include <Qt3DRenderer/qannotation.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qparameter.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index b0798a04a..7637941dc 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QTECHNIQUEFILTER_H #define QT3DRENDER_QTECHNIQUEFILTER_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qframegraphnode.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ class QTechniqueFilterPrivate; class QAnnotation; class QParameter; -class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index baa6aeb1a..63750a98f 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QVIEWPORT_H #define QT3DRENDER_QVIEWPORT_H -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> #include <QRectF> #include <QColor> @@ -47,7 +47,7 @@ namespace Qt3DRender { class QViewportPrivate; -class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode +class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(QRectF rect READ rect WRITE setRect NOTIFY rectChanged) diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index a2088d0aa..bd1a48286 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -38,7 +38,7 @@ #include "qannotation.h" #include "qrenderpassfilter.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRender/qparameter.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h index 498afd70d..e1625c3ba 100644 --- a/src/render/framegraph/renderpassfilternode_p.h +++ b/src/render/framegraph/renderpassfilternode_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/parameterpack_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/private/parameterpack_p.h> #include <QList> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index 50171e700..4e6aa2b8a 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -35,14 +35,14 @@ ****************************************************************************/ #include "rendertargetselectornode_p.h" -#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRender/private/renderer_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> -#include <Qt3DRenderer/qrendertargetselector.h> -#include <Qt3DRenderer/qrendertarget.h> +#include <Qt3DRender/qrendertargetselector.h> +#include <Qt3DRender/qrendertarget.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/qrenderattachment.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h index f6e1605a2..1c5abc10c 100644 --- a/src/render/framegraph/rendertargetselectornode_p.h +++ b/src/render/framegraph/rendertargetselectornode_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/sortcriterion_p.h b/src/render/framegraph/sortcriterion_p.h index d0e20b603..b230cb1bb 100644 --- a/src/render/framegraph/sortcriterion_p.h +++ b/src/render/framegraph/sortcriterion_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/sortmethod.cpp b/src/render/framegraph/sortmethod.cpp index 32cba9307..9a6a91f97 100644 --- a/src/render/framegraph/sortmethod.cpp +++ b/src/render/framegraph/sortmethod.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "sortmethod_p.h" -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/sortmethod_p.h b/src/render/framegraph/sortmethod_p.h index 2222a76ea..206aa220e 100644 --- a/src/render/framegraph/sortmethod_p.h +++ b/src/render/framegraph/sortmethod_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/qsortmethod.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/qsortmethod.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index d7832c256..30d6ffbcf 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -37,9 +37,9 @@ #include "statesetnode_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qstateset.h> -#include <Qt3DRenderer/private/genericstate_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> +#include <Qt3DRender/qstateset.h> +#include <Qt3DRender/private/genericstate_p.h> +#include <Qt3DRender/private/renderstateset_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h index 7a9563cc0..e6cc72de2 100644 --- a/src/render/framegraph/statesetnode_p.h +++ b/src/render/framegraph/statesetnode_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 7e8ac5723..fae93ae2a 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -37,9 +37,9 @@ #include "techniquefilternode_p.h" #include "qannotation.h" #include "qtechniquefilter.h" -#include <Qt3DRenderer/private/managers_p.h> +#include <Qt3DRender/private/managers_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRender/qparameter.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h index 59688a557..17e0d7066 100644 --- a/src/render/framegraph/techniquefilternode_p.h +++ b/src/render/framegraph/techniquefilternode_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/parameterpack_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/private/parameterpack_p.h> #include <QList> #include <QString> diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index a016d9686..5834a5950 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "viewportnode_p.h" -#include <Qt3DRenderer/qviewport.h> +#include <Qt3DRender/qviewport.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h index 50ac79efa..439f1b70b 100644 --- a/src/render/framegraph/viewportnode_p.h +++ b/src/render/framegraph/viewportnode_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/framegraphnode_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> #include <QColor> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp index 8de31a818..d11b178fe 100644 --- a/src/render/frontend/qitemmodelbuffer.cpp +++ b/src/render/frontend/qitemmodelbuffer.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qitemmodelbuffer.h" -#include <Qt3DRenderer/private/graphicscontext_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> #include <QDebug> #include <QColor> diff --git a/src/render/frontend/qitemmodelbuffer.h b/src/render/frontend/qitemmodelbuffer.h index 1a4193868..5c10234ce 100644 --- a/src/render/frontend/qitemmodelbuffer.h +++ b/src/render/frontend/qitemmodelbuffer.h @@ -38,10 +38,10 @@ #define QT3DRENDER_QITEMMODELBUFFER_H #include <QObject> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qattribute.h> #include <QAbstractItemModel> #include <QMap> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QItemModelBuffer : public QObject +class QT3DRENDERSHARED_EXPORT QItemModelBuffer : public QObject { Q_OBJECT public: diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index e877aa108..fc3eda1b1 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QLAYER_H #include <Qt3DCore/qcomponent.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QStringList> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QLayerPrivate; -class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged) diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h index 1efed58ba..494448495 100644 --- a/src/render/frontend/qlayer_p.h +++ b/src/render/frontend/qlayer_p.h @@ -49,14 +49,14 @@ // #include <private/qcomponent_p.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate +class QT3DRENDERSHARED_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate { public: QLayerPrivate(); diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index d67090ebb..689ff15c4 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -37,68 +37,68 @@ #include "qrenderaspect.h" #include "qrenderaspect_p.h" -#include <Qt3DRenderer/private/texturedatamanager_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/scenemanager_p.h> -#include <Qt3DRenderer/private/geometryrenderermanager_p.h> - -#include <Qt3DRenderer/qabstractsceneloader.h> -#include <Qt3DRenderer/qcameraselector.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qlayer.h> -#include <Qt3DRenderer/qlayerfilter.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qparametermapping.h> -#include <Qt3DRenderer/qrenderpassfilter.h> -#include <Qt3DRenderer/qrendertargetselector.h> -#include <Qt3DRenderer/qtechniquefilter.h> -#include <Qt3DRenderer/qviewport.h> -#include <Qt3DRenderer/qrendertarget.h> -#include <Qt3DRenderer/qclearbuffer.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qshaderdata.h> -#include <Qt3DRenderer/qstateset.h> -#include <Qt3DRenderer/qnodraw.h> +#include <Qt3DRender/private/texturedatamanager_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/scenemanager_p.h> +#include <Qt3DRender/private/geometryrenderermanager_p.h> + +#include <Qt3DRender/qabstractsceneloader.h> +#include <Qt3DRender/qcameraselector.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qlayer.h> +#include <Qt3DRender/qlayerfilter.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qparametermapping.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qrendertargetselector.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qviewport.h> +#include <Qt3DRender/qrendertarget.h> +#include <Qt3DRender/qclearbuffer.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/qstateset.h> +#include <Qt3DRender/qnodraw.h> #include <Qt3DCore/qcameralens.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qgeometryrenderer.h> - -#include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/layerfilternode_p.h> -#include <Qt3DRenderer/private/annotation_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/shaderdata_p.h> -#include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/rendertargetselectornode_p.h> -#include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/viewportnode_p.h> -#include <Qt3DRenderer/private/rendertarget_p.h> -#include <Qt3DRenderer/private/scenemanager_p.h> -#include <Qt3DRenderer/private/clearbuffer_p.h> -#include <Qt3DRenderer/private/sortmethod_p.h> -#include <Qt3DRenderer/private/sortcriterion_p.h> -#include <Qt3DRenderer/private/framegraphsubtreeselector_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/nodefunctor_p.h> -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/loadtexturedatajob_p.h> -#include <Qt3DRenderer/private/updateboundingvolumejob_p.h> -#include <Qt3DRenderer/private/updateworldtransformjob_p.h> -#include <Qt3DRenderer/private/framecleanupjob_p.h> -#include <Qt3DRenderer/private/textureimage_p.h> -#include <Qt3DRenderer/private/statesetnode_p.h> -#include <Qt3DRenderer/private/nodraw_p.h> -#include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h> -#include <Qt3DRenderer/private/attribute_p.h> -#include <Qt3DRenderer/private/buffer_p.h> -#include <Qt3DRenderer/private/geometry_p.h> -#include <Qt3DRenderer/private/geometryrenderer_p.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> + +#include <Qt3DRender/private/cameraselectornode_p.h> +#include <Qt3DRender/private/layerfilternode_p.h> +#include <Qt3DRender/private/annotation_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/shaderdata_p.h> +#include <Qt3DRender/private/renderpassfilternode_p.h> +#include <Qt3DRender/private/rendertargetselectornode_p.h> +#include <Qt3DRender/private/techniquefilternode_p.h> +#include <Qt3DRender/private/viewportnode_p.h> +#include <Qt3DRender/private/rendertarget_p.h> +#include <Qt3DRender/private/scenemanager_p.h> +#include <Qt3DRender/private/clearbuffer_p.h> +#include <Qt3DRender/private/sortmethod_p.h> +#include <Qt3DRender/private/sortcriterion_p.h> +#include <Qt3DRender/private/framegraphsubtreeselector_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/nodefunctor_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/private/loadtexturedatajob_p.h> +#include <Qt3DRender/private/updateboundingvolumejob_p.h> +#include <Qt3DRender/private/updateworldtransformjob_p.h> +#include <Qt3DRender/private/framecleanupjob_p.h> +#include <Qt3DRender/private/textureimage_p.h> +#include <Qt3DRender/private/statesetnode_p.h> +#include <Qt3DRender/private/nodraw_p.h> +#include <Qt3DRender/private/vsyncframeadvanceservice_p.h> +#include <Qt3DRender/private/attribute_p.h> +#include <Qt3DRender/private/buffer_p.h> +#include <Qt3DRender/private/geometry_p.h> +#include <Qt3DRender/private/geometryrenderer_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qnodevisitor.h> diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h index 43242fb13..41a1bd9c8 100644 --- a/src/render/frontend/qrenderaspect.h +++ b/src/render/frontend/qrenderaspect.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QRENDERASPECT_H #define QT3DRENDER_QRENDERASPECT_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qabstractaspect.h> QT_BEGIN_NAMESPACE @@ -52,7 +52,7 @@ class Renderer; class QRenderAspectPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect +class QT3DRENDERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h index c4a54e017..903a6205f 100644 --- a/src/render/frontend/qrenderaspect_p.h +++ b/src/render/frontend/qrenderaspect_p.h @@ -49,13 +49,13 @@ // #include <Qt3DCore/private/qabstractaspect_p.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/private/updateboundingvolumejob_p.h> -#include <Qt3DRenderer/private/updateworldtransformjob_p.h> -#include <Qt3DRenderer/private/calcboundingvolumejob_p.h> -#include <Qt3DRenderer/private/framepreparationjob_p.h> -#include <Qt3DRenderer/private/framecleanupjob_p.h> -#include <Qt3DRenderer/private/platformsurfacefilter_p.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/private/updateboundingvolumejob_p.h> +#include <Qt3DRender/private/updateworldtransformjob_p.h> +#include <Qt3DRender/private/calcboundingvolumejob_p.h> +#include <Qt3DRender/private/framepreparationjob_p.h> +#include <Qt3DRender/private/framecleanupjob_p.h> +#include <Qt3DRender/private/platformsurfacefilter_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h index b19979c5c..89126830a 100644 --- a/src/render/frontend/qrenderattachment.h +++ b/src/render/frontend/qrenderattachment.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QRENDERATTACHMENT_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QAbstractTextureProvider; class QRenderAttachmentPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged) diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h index 6624b4694..1a9b7c91d 100644 --- a/src/render/frontend/qrenderattachment_p.h +++ b/src/render/frontend/qrenderattachment_p.h @@ -49,7 +49,7 @@ // #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DRenderer/qrenderattachment.h> +#include <Qt3DRender/qrenderattachment.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index 9c0fd9858..930e57764 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QRENDERTARGET_H #include <Qt3DCore/qcomponent.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QRenderTargetPrivate; class QRenderAttachment; -class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent { Q_OBJECT public: diff --git a/src/render/frontend/qwindow.cpp b/src/render/frontend/qwindow.cpp index da7ee8f8c..d5033c312 100644 --- a/src/render/frontend/qwindow.cpp +++ b/src/render/frontend/qwindow.cpp @@ -40,9 +40,9 @@ #include <Qt3DCore/qaspectengine.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcamera.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qforwardrenderer.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qforwardrenderer.h> #include <QOpenGLContext> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qwindow.h b/src/render/frontend/qwindow.h index 5ca4686f2..73fceb9de 100644 --- a/src/render/frontend/qwindow.h +++ b/src/render/frontend/qwindow.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QWINDOW_H #include <QtGui/qwindow.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ namespace Qt3DRender { class QWindowPrivate; class QFrameGraph; -class QT3DRENDERERSHARED_EXPORT QWindow : public ::QWindow +class QT3DRENDERSHARED_EXPORT QWindow : public ::QWindow { public: explicit QWindow(::QWindow *parent = Q_NULLPTR); diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h index faa07c433..99aa252f7 100644 --- a/src/render/frontend/sphere.h +++ b/src/render/frontend/sphere.h @@ -37,7 +37,7 @@ #ifndef SPHERE_H #define SPHERE_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qboundingsphere.h> @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3DCore::QBoundingSphere +class QT3DRENDERSHARED_EXPORT Sphere : public Qt3DCore::QBoundingSphere { public: inline Sphere(const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId()) diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index 292021e0f..bb568678f 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -36,7 +36,7 @@ #include "attribute_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qbuffer.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h index 83a5dfacf..8791d98a2 100644 --- a/src/render/geometry/attribute_p.h +++ b/src/render/geometry/attribute_p.h @@ -49,7 +49,7 @@ // #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/qattribute.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index 0fdd258a1..1aee9ca59 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -37,7 +37,7 @@ #include "buffer_p.h" #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DRenderer/private/buffermanager_p.h> +#include <Qt3DRender/private/buffermanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h index 7da08a2a2..2aad578ea 100644 --- a/src/render/geometry/buffer_p.h +++ b/src/render/geometry/buffer_p.h @@ -49,8 +49,8 @@ // #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h index 50bfc2a94..52b8c0ffd 100644 --- a/src/render/geometry/buffermanager_p.h +++ b/src/render/geometry/buffermanager_p.h @@ -49,7 +49,7 @@ // #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRenderer/private/buffer_p.h> +#include <Qt3DRender/private/buffer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index 0be114fa7..6b63c6294 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -37,7 +37,7 @@ #include "geometry_p.h" #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qabstractattribute.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index a7fb93818..13780781d 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -36,7 +36,7 @@ #include "geometryrenderer_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/geometryrenderermanager_p.h> +#include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h index 2f974bf27..81a37295c 100644 --- a/src/render/geometry/geometryrenderer_p.h +++ b/src/render/geometry/geometryrenderer_p.h @@ -49,8 +49,8 @@ // #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qgeometryfunctor.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qgeometryfunctor.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h index 69066b7a0..1c3afe68c 100644 --- a/src/render/geometry/geometryrenderermanager_p.h +++ b/src/render/geometry/geometryrenderermanager_p.h @@ -49,7 +49,7 @@ // #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRenderer/private/geometryrenderer_p.h> +#include <Qt3DRender/private/geometryrenderer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index 8c3bb2aad..615945188 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -40,8 +40,8 @@ #include <QVector3D> #include <QVector2D> #include <QVector> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h index 46429273a..7634ddae5 100644 --- a/src/render/geometry/qattribute.h +++ b/src/render/geometry/qattribute.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QATTRIBUTE_H #include <Qt3DCore/qabstractattribute.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { class QAttributePrivate; class QBuffer; -class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3DCore::QAbstractAttribute +class QT3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QAbstractAttribute { Q_OBJECT diff --git a/src/render/geometry/qattribute_p.h b/src/render/geometry/qattribute_p.h index 7968266e1..3d481e467 100644 --- a/src/render/geometry/qattribute_p.h +++ b/src/render/geometry/qattribute_p.h @@ -49,7 +49,7 @@ // #include <private/qabstractattribute_p.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -57,7 +57,7 @@ namespace Qt3DRender { class QAttribute; -class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3DCore::QAbstractAttributePrivate +class QT3DRENDERSHARED_EXPORT QAttributePrivate : public Qt3DCore::QAbstractAttributePrivate { public: QAttributePrivate(); diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index df789486b..ad4bc6be6 100644 --- a/src/render/geometry/qbuffer.cpp +++ b/src/render/geometry/qbuffer.cpp @@ -36,7 +36,7 @@ #include "qbuffer.h" #include "qbuffer_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index da1e4293f..031d1a8b2 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QBUFFER_H #include <Qt3DCore/qabstractbuffer.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QSharedPointer> #include <QOpenGLBuffer> @@ -54,7 +54,7 @@ class QBufferPrivate; class QBufferFunctor; typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr; -class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3DCore::QAbstractBuffer +class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QAbstractBuffer { Q_OBJECT Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged) diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h index e84ac2273..6f96774e9 100644 --- a/src/render/geometry/qbuffer_p.h +++ b/src/render/geometry/qbuffer_p.h @@ -49,16 +49,16 @@ // #include <private/qabstractbuffer_p.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> +#include <Qt3DRender/qt3drender_global.h> #include <QOpenGLBuffer> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QAbstractBufferPrivate +class QT3DRENDERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QAbstractBufferPrivate { public: QBufferPrivate(); diff --git a/src/render/geometry/qbufferfunctor.h b/src/render/geometry/qbufferfunctor.h index 36c4b3a12..b3e1074cc 100644 --- a/src/render/geometry/qbufferfunctor.h +++ b/src/render/geometry/qbufferfunctor.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QBUFFERFUNCTOR #define QT3DRENDER_QBUFFERFUNCTOR -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qabstractfunctor.h> #include <QSharedPointer> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor { public: virtual ~QBufferFunctor() {} diff --git a/src/render/geometry/qcuboidgeometry.cpp b/src/render/geometry/qcuboidgeometry.cpp index 205cb74e4..9b6b7f703 100644 --- a/src/render/geometry/qcuboidgeometry.cpp +++ b/src/render/geometry/qcuboidgeometry.cpp @@ -36,10 +36,10 @@ #include "qcuboidgeometry.h" #include "qcuboidgeometry_p.h" -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <limits> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qcuboidgeometry.h b/src/render/geometry/qcuboidgeometry.h index a760499d4..e2e5aa3cb 100644 --- a/src/render/geometry/qcuboidgeometry.h +++ b/src/render/geometry/qcuboidgeometry.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QCUBOIDGEOMETRY_H #define QT3DRENDER_QCUBOIDGEOMETRY_H -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometry.h> #include <QSize> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QCuboidGeometryPrivate; -class QT3DRENDERERSHARED_EXPORT QCuboidGeometry : public QGeometry +class QT3DRENDERSHARED_EXPORT QCuboidGeometry : public QGeometry { Q_OBJECT Q_PROPERTY(float xExtent READ xExtent WRITE setXExtent NOTIFY xExtentChanged) diff --git a/src/render/geometry/qcuboidgeometry_p.h b/src/render/geometry/qcuboidgeometry_p.h index b4e331983..34b4ef29d 100644 --- a/src/render/geometry/qcuboidgeometry_p.h +++ b/src/render/geometry/qcuboidgeometry_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qgeometry_p.h> +#include <Qt3DRender/private/qgeometry_p.h> #include <QSize> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h index 1bb9c6157..74c9871b5 100644 --- a/src/render/geometry/qcuboidmesh.h +++ b/src/render/geometry/qcuboidmesh.h @@ -37,15 +37,15 @@ #ifndef QT3DRENDER_CUBOIDMESH_H #define QT3DRENDER_CUBOIDMESH_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometryrenderer.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometryrenderer.h> #include <QSize> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer +class QT3DRENDERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer { Q_OBJECT diff --git a/src/render/geometry/qcylindergeometry.cpp b/src/render/geometry/qcylindergeometry.cpp index a1fff8a5f..9aed11f1d 100644 --- a/src/render/geometry/qcylindergeometry.cpp +++ b/src/render/geometry/qcylindergeometry.cpp @@ -40,9 +40,9 @@ #include "qcylindergeometry.h" #include "qcylindergeometry_p.h" -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> +#include <Qt3DRender/qattribute.h> #include <qmath.h> #include <QVector3D> diff --git a/src/render/geometry/qcylindergeometry.h b/src/render/geometry/qcylindergeometry.h index 3f381c609..930eade88 100644 --- a/src/render/geometry/qcylindergeometry.h +++ b/src/render/geometry/qcylindergeometry.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QCYLINDERGEOMETRY_H #define QT3DRENDER_QCYLINDERGEOMETRY_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QCylinderGeometryPrivate; -class QT3DRENDERERSHARED_EXPORT QCylinderGeometry : public QGeometry +class QT3DRENDERSHARED_EXPORT QCylinderGeometry : public QGeometry { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) diff --git a/src/render/geometry/qcylindergeometry_p.h b/src/render/geometry/qcylindergeometry_p.h index 6ef399767..b6aad91c7 100644 --- a/src/render/geometry/qcylindergeometry_p.h +++ b/src/render/geometry/qcylindergeometry_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qgeometry_p.h> +#include <Qt3DRender/private/qgeometry_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qcylindermesh.cpp b/src/render/geometry/qcylindermesh.cpp index 8d9783493..4c714c06a 100644 --- a/src/render/geometry/qcylindermesh.cpp +++ b/src/render/geometry/qcylindermesh.cpp @@ -41,9 +41,9 @@ #include "qcylindermesh.h" #include "qcylindergeometry.h" -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> +#include <Qt3DRender/qattribute.h> #include <qmath.h> #include <QVector3D> diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h index 3c4294d07..30e888f14 100644 --- a/src/render/geometry/qcylindermesh.h +++ b/src/render/geometry/qcylindermesh.h @@ -37,15 +37,15 @@ #ifndef QT3DRENDER_QCYLINDERMESH_H #define QT3DRENDER_QCYLINDERMESH_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometryrenderer.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometryrenderer.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer +class QT3DRENDERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index 37e2dede0..c7dde6074 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QGEOMETRY_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -52,7 +52,7 @@ class QGeometryPrivate; typedef QVector<Qt3DCore::QAbstractAttribute *> QAttributeList; -class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged) diff --git a/src/render/geometry/qgeometryfunctor.h b/src/render/geometry/qgeometryfunctor.h index e7075d614..71b1ab672 100644 --- a/src/render/geometry/qgeometryfunctor.h +++ b/src/render/geometry/qgeometryfunctor.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QGEOMETRYFUNCTOR #define QT3DRENDER_QGEOMETRYFUNCTOR -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qabstractfunctor.h> #include <QSharedPointer> @@ -47,7 +47,7 @@ namespace Qt3DRender { class QGeometry; -class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor { public: virtual ~QGeometryFunctor() {} diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index bb4d8a85b..4898b15bc 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -38,8 +38,8 @@ #define QT3DRENDER_QGEOMETRYRENDERER_H #include <Qt3DCore/qcomponent.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -50,7 +50,7 @@ class QGeometryFunctor; typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr; -class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged) diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h index b0b4f62ef..d6e34e4da 100644 --- a/src/render/geometry/qgeometryrenderer_p.h +++ b/src/render/geometry/qgeometryrenderer_p.h @@ -49,8 +49,8 @@ // #include <Qt3DCore/private/qcomponent_p.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qgeometryfunctor.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qgeometryfunctor.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 953dbe8c0..9c5de99bc 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -40,9 +40,9 @@ #include <QDebug> #include <QFile> #include <QFileInfo> -#include <Qt3DRenderer/private/objloader_p.h> +#include <Qt3DRender/private/objloader_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/private/qurlhelper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index ae4877b11..3125f26d0 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QMESH_H #define QT3DRENDER_QMESH_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometryrenderer.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometryrenderer.h> #include <QUrl> QT_BEGIN_NAMESPACE @@ -51,7 +51,7 @@ class QMeshPrivate; * @brief Simple static mesh * */ -class QT3DRENDERERSHARED_EXPORT QMesh : public QGeometryRenderer +class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h index 11140e9f9..4c493442a 100644 --- a/src/render/geometry/qmesh_p.h +++ b/src/render/geometry/qmesh_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/private/qgeometryrenderer_p.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/private/qgeometryrenderer_p.h> #include <QUrl> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ namespace Qt3DRender { class QMesh; -class QT3DRENDERERSHARED_EXPORT QMeshPrivate : public QGeometryRendererPrivate +class QT3DRENDERSHARED_EXPORT QMeshPrivate : public QGeometryRendererPrivate { public: QMeshPrivate(); diff --git a/src/render/geometry/qplanegeometry.cpp b/src/render/geometry/qplanegeometry.cpp index 952e28f5b..a8f9b8065 100644 --- a/src/render/geometry/qplanegeometry.cpp +++ b/src/render/geometry/qplanegeometry.cpp @@ -36,9 +36,9 @@ #include "qplanegeometry.h" #include "qplanegeometry_p.h" -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> #include <limits> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qplanegeometry.h b/src/render/geometry/qplanegeometry.h index 7012fbfb1..a51e589c6 100644 --- a/src/render/geometry/qplanegeometry.h +++ b/src/render/geometry/qplanegeometry.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QPLANEGEOMETRY_H #define QT3DRENDER_QPLANEGEOMETRY_H -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometry.h> #include <QSize> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QPlaneGeometryPrivate; -class QT3DRENDERERSHARED_EXPORT QPlaneGeometry : public QGeometry +class QT3DRENDERSHARED_EXPORT QPlaneGeometry : public QGeometry { Q_OBJECT Q_PROPERTY(float width READ width WRITE setWidth NOTIFY widthChanged) diff --git a/src/render/geometry/qplanegeometry_p.h b/src/render/geometry/qplanegeometry_p.h index 9705c044d..3b8d84fba 100644 --- a/src/render/geometry/qplanegeometry_p.h +++ b/src/render/geometry/qplanegeometry_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qgeometry_p.h> +#include <Qt3DRender/private/qgeometry_p.h> #include <QSize> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h index f9867b4de..0a730ca6a 100644 --- a/src/render/geometry/qplanemesh.h +++ b/src/render/geometry/qplanemesh.h @@ -37,15 +37,15 @@ #ifndef QT3DRENDER_QPLANEMESH_H #define QT3DRENDER_QPLANEMESH_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometryrenderer.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometryrenderer.h> #include <QSize> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer +class QT3DRENDERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer { Q_OBJECT Q_PROPERTY(float width READ width WRITE setWidth NOTIFY widthChanged) diff --git a/src/render/geometry/qspheregeometry.cpp b/src/render/geometry/qspheregeometry.cpp index 4cc655d98..6fab1c95a 100644 --- a/src/render/geometry/qspheregeometry.cpp +++ b/src/render/geometry/qspheregeometry.cpp @@ -36,9 +36,9 @@ #include "qspheregeometry.h" #include "qspheregeometry_p.h" -#include <Qt3DRenderer/qbufferfunctor.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/qbufferfunctor.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qattribute.h> #ifndef _USE_MATH_DEFINES # define _USE_MATH_DEFINES // For MSVC diff --git a/src/render/geometry/qspheregeometry.h b/src/render/geometry/qspheregeometry.h index c836d9e07..71d32a8da 100644 --- a/src/render/geometry/qspheregeometry.h +++ b/src/render/geometry/qspheregeometry.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSPHEREGEOMETRY_H #define QT3DRENDER_QSPHEREGEOMETRY_H -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QSphereGeometryPrivate; -class QT3DRENDERERSHARED_EXPORT QSphereGeometry : public QGeometry +class QT3DRENDERSHARED_EXPORT QSphereGeometry : public QGeometry { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) diff --git a/src/render/geometry/qspheregeometry_p.h b/src/render/geometry/qspheregeometry_p.h index 7b5c632f3..d46ef9ecd 100644 --- a/src/render/geometry/qspheregeometry_p.h +++ b/src/render/geometry/qspheregeometry_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qgeometry_p.h> +#include <Qt3DRender/private/qgeometry_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h index 57f810092..9ac2ac281 100644 --- a/src/render/geometry/qspheremesh.h +++ b/src/render/geometry/qspheremesh.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QSPHEREMESH_H #define QT3DRENDER_QSPHEREMESH_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometryrenderer.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometryrenderer.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QSphereMeshPrivate; -class QT3DRENDERERSHARED_EXPORT QSphereMesh : public QGeometryRenderer +class QT3DRENDERSHARED_EXPORT QSphereMesh : public QGeometryRenderer { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) diff --git a/src/render/geometry/qtorusgeometry.cpp b/src/render/geometry/qtorusgeometry.cpp index d4236e9c9..e18651793 100644 --- a/src/render/geometry/qtorusgeometry.cpp +++ b/src/render/geometry/qtorusgeometry.cpp @@ -36,9 +36,9 @@ #include "qtorusgeometry.h" #include "qtorusgeometry_p.h" -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> +#include <Qt3DRender/qattribute.h> #include <qmath.h> #include <QVector3D> diff --git a/src/render/geometry/qtorusgeometry.h b/src/render/geometry/qtorusgeometry.h index 69b30f856..f2c6ad3c5 100644 --- a/src/render/geometry/qtorusgeometry.h +++ b/src/render/geometry/qtorusgeometry.h @@ -37,8 +37,8 @@ #ifndef QT3D_QTORUSGEOMETRY_H #define QT3D_QTORUSGEOMETRY_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QTorusGeometryPrivate; -class QT3DRENDERERSHARED_EXPORT QTorusGeometry : public QGeometry +class QT3DRENDERSHARED_EXPORT QTorusGeometry : public QGeometry { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) diff --git a/src/render/geometry/qtorusgeometry_p.h b/src/render/geometry/qtorusgeometry_p.h index 60886363a..ba19d1b9f 100644 --- a/src/render/geometry/qtorusgeometry_p.h +++ b/src/render/geometry/qtorusgeometry_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/qgeometry_p.h> +#include <Qt3DRender/private/qgeometry_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h index 1f8778bbd..6b470b1b1 100644 --- a/src/render/geometry/qtorusmesh.h +++ b/src/render/geometry/qtorusmesh.h @@ -37,14 +37,14 @@ #ifndef QT3DRENDER_QTORUSMESH_H #define QT3DRENDER_QTORUSMESH_H -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qgeometryrenderer.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qgeometryrenderer.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QTorusMesh : public QGeometryRenderer +class QT3DRENDERSHARED_EXPORT QTorusMesh : public QGeometryRenderer { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp index c6441cadb..626e34e3b 100644 --- a/src/render/graphicshelpers/graphicscontext.cpp +++ b/src/render/graphicshelpers/graphicscontext.cpp @@ -37,21 +37,21 @@ #include "graphicscontext_p.h" -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/private/material_p.h> -#include <Qt3DRenderer/private/texture_p.h> -#include <Qt3DRenderer/private/buffer_p.h> -#include <Qt3DRenderer/private/attribute_p.h> -#include <Qt3DRenderer/private/rendercommand_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> -#include <Qt3DRenderer/private/rendertarget_p.h> -#include <Qt3DRenderer/private/graphicshelperinterface_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/attachmentpack_p.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/private/material_p.h> +#include <Qt3DRender/private/texture_p.h> +#include <Qt3DRender/private/buffer_p.h> +#include <Qt3DRender/private/attribute_p.h> +#include <Qt3DRender/private/rendercommand_p.h> +#include <Qt3DRender/private/renderstateset_p.h> +#include <Qt3DRender/private/rendertarget_p.h> +#include <Qt3DRender/private/graphicshelperinterface_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/attachmentpack_p.h> #include <QOpenGLShaderProgram> #if !defined(QT_OPENGL_ES_2) @@ -59,12 +59,12 @@ #include <QOpenGLFunctions_3_2_Core> #include <QOpenGLFunctions_3_3_Core> #include <QOpenGLFunctions_4_3_Core> -#include <Qt3DRenderer/private/graphicshelpergl2_p.h> -#include <Qt3DRenderer/private/graphicshelpergl3_p.h> -#include <Qt3DRenderer/private/graphicshelpergl3_3_p.h> -#include <Qt3DRenderer/private/graphicshelpergl4_p.h> +#include <Qt3DRender/private/graphicshelpergl2_p.h> +#include <Qt3DRender/private/graphicshelpergl3_p.h> +#include <Qt3DRender/private/graphicshelpergl3_3_p.h> +#include <Qt3DRender/private/graphicshelpergl4_p.h> #endif -#include <Qt3DRenderer/private/graphicshelperes2_p.h> +#include <Qt3DRender/private/graphicshelperes2_p.h> #include <QSurface> #include <QWindow> diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h index 065032172..ab7d061b1 100644 --- a/src/render/graphicshelpers/graphicscontext_p.h +++ b/src/render/graphicshelpers/graphicscontext_p.h @@ -57,10 +57,10 @@ #include <QColor> #include <QMatrix4x4> #include <QBitArray> -#include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/qclearbuffer.h> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/private/quniformvalue_p.h> +#include <Qt3DRender/qclearbuffer.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/qattribute.h> QT_BEGIN_NAMESPACE diff --git a/src/render/graphicshelpers/graphicshelperes2.cpp b/src/render/graphicshelpers/graphicshelperes2.cpp index 4e6d36c10..1daac7f9f 100644 --- a/src/render/graphicshelpers/graphicshelperes2.cpp +++ b/src/render/graphicshelpers/graphicshelperes2.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "graphicshelperes2_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <private/attachmentpack_p.h> #include <private/qgraphicsutils_p.h> diff --git a/src/render/graphicshelpers/graphicshelperes2_p.h b/src/render/graphicshelpers/graphicshelperes2_p.h index b1290bbd6..6d0fc1993 100644 --- a/src/render/graphicshelpers/graphicshelperes2_p.h +++ b/src/render/graphicshelpers/graphicshelperes2_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/graphicshelperinterface_p.h> +#include <Qt3DRender/private/graphicshelperinterface_p.h> #include <QOpenGLContext> #include <QOpenGLFunctions> diff --git a/src/render/graphicshelpers/graphicshelpergl2_p.h b/src/render/graphicshelpers/graphicshelpergl2_p.h index e127aad0a..5f86c0d67 100644 --- a/src/render/graphicshelpers/graphicshelpergl2_p.h +++ b/src/render/graphicshelpers/graphicshelpergl2_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/graphicshelperinterface_p.h> +#include <Qt3DRender/private/graphicshelperinterface_p.h> #ifndef QT_OPENGL_ES_2 diff --git a/src/render/graphicshelpers/graphicshelpergl3.cpp b/src/render/graphicshelpers/graphicshelpergl3.cpp index 75fd99416..f4a296c30 100644 --- a/src/render/graphicshelpers/graphicshelpergl3.cpp +++ b/src/render/graphicshelpers/graphicshelpergl3.cpp @@ -40,7 +40,7 @@ #include <QOpenGLFunctions_3_2_Core> #include <QOpenGLFunctions_3_3_Core> #include <QtOpenGLExtensions/qopenglextensions.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <private/attachmentpack_p.h> #include <private/qgraphicsutils_p.h> diff --git a/src/render/graphicshelpers/graphicshelpergl3_3.cpp b/src/render/graphicshelpers/graphicshelpergl3_3.cpp index fcb7bf883..9000889b9 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_3.cpp +++ b/src/render/graphicshelpers/graphicshelpergl3_3.cpp @@ -39,7 +39,7 @@ #ifndef QT_OPENGL_ES_2 #include <QOpenGLFunctions_3_3_Core> #include <QtOpenGLExtensions/qopenglextensions.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <private/attachmentpack_p.h> #include <private/qgraphicsutils_p.h> diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h index db02b3760..8dc0749a9 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h +++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/graphicshelperinterface_p.h> +#include <Qt3DRender/private/graphicshelperinterface_p.h> #include <QtCore/qscopedpointer.h> #ifndef QT_OPENGL_ES_2 diff --git a/src/render/graphicshelpers/graphicshelpergl3_p.h b/src/render/graphicshelpers/graphicshelpergl3_p.h index 765410524..92e921cfc 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_p.h +++ b/src/render/graphicshelpers/graphicshelpergl3_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/graphicshelperinterface_p.h> +#include <Qt3DRender/private/graphicshelperinterface_p.h> #include <QtCore/qscopedpointer.h> #ifndef QT_OPENGL_ES_2 diff --git a/src/render/graphicshelpers/graphicshelpergl4.cpp b/src/render/graphicshelpers/graphicshelpergl4.cpp index c92bb028c..fa95bfc8f 100644 --- a/src/render/graphicshelpers/graphicshelpergl4.cpp +++ b/src/render/graphicshelpers/graphicshelpergl4.cpp @@ -39,7 +39,7 @@ #ifndef QT_OPENGL_ES_2 #include <QOpenGLFunctions_4_3_Core> #include <QtOpenGLExtensions/qopenglextensions.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <private/attachmentpack_p.h> #include <private/qgraphicsutils_p.h> diff --git a/src/render/graphicshelpers/graphicshelpergl4_p.h b/src/render/graphicshelpers/graphicshelpergl4_p.h index d24528eeb..13c806629 100644 --- a/src/render/graphicshelpers/graphicshelpergl4_p.h +++ b/src/render/graphicshelpers/graphicshelpergl4_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/private/graphicshelperinterface_p.h> +#include <Qt3DRender/private/graphicshelperinterface_p.h> #include <QtCore/qscopedpointer.h> #ifndef QT_OPENGL_ES_2 diff --git a/src/render/graphicshelpers/graphicshelperinterface_p.h b/src/render/graphicshelpers/graphicshelperinterface_p.h index 32e8a75a1..4a538274e 100644 --- a/src/render/graphicshelpers/graphicshelperinterface_p.h +++ b/src/render/graphicshelpers/graphicshelperinterface_p.h @@ -51,7 +51,7 @@ #include <QOpenGLFunctions> #include <QOpenGLTexture> #include <QVector> -#include <Qt3DRenderer/private/shadervariables_p.h> +#include <Qt3DRender/private/shadervariables_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/abstractsceneparser.cpp b/src/render/io/abstractsceneparser.cpp index b7756f6cd..1237dcffa 100644 --- a/src/render/io/abstractsceneparser.cpp +++ b/src/render/io/abstractsceneparser.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "abstractsceneparser_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/render/io/abstractsceneparser_p.h b/src/render/io/abstractsceneparser_p.h index a4b5ab92d..eebb2e7f3 100644 --- a/src/render/io/abstractsceneparser_p.h +++ b/src/render/io/abstractsceneparser_p.h @@ -52,7 +52,7 @@ #include <QStringList> #include <QLoggingCategory> #include <QUrl> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -64,7 +64,7 @@ namespace Qt3DRender { Q_DECLARE_LOGGING_CATEGORY(SceneParsers) -class QT3DRENDERERSHARED_EXPORT AbstractSceneParser : public QObject +class QT3DRENDERSHARED_EXPORT AbstractSceneParser : public QObject { Q_OBJECT Q_PROPERTY(ParserStatus parserStatus READ parserStatus NOTIFY parserStatusChanged) diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp index 09ab6985c..76bd9cfa5 100644 --- a/src/render/io/objloader.cpp +++ b/src/render/io/objloader.cpp @@ -41,16 +41,16 @@ #include "qattribute.h" #include <Qt3DCore/qaxisalignedboundingbox.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QFile> #include <QOpenGLBuffer> #include <QOpenGLShaderProgram> #include <QTextStream> #include <QVector> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qabstractsceneloader.cpp b/src/render/io/qabstractsceneloader.cpp index 110da9fa9..e8b0119d7 100644 --- a/src/render/io/qabstractsceneloader.cpp +++ b/src/render/io/qabstractsceneloader.cpp @@ -36,8 +36,8 @@ #include "qabstractsceneloader.h" #include "qabstractsceneloader_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qabstractsceneloader.h b/src/render/io/qabstractsceneloader.h index 66b41d265..e4f19eb12 100644 --- a/src/render/io/qabstractsceneloader.h +++ b/src/render/io/qabstractsceneloader.h @@ -39,7 +39,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qscenechange.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QUrl> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ namespace Qt3DRender { class QAbstractSceneLoader; class QAbstractSceneLoaderPrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QAbstractSceneLoader : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/io/qabstractsceneloader_p.h b/src/render/io/qabstractsceneloader_p.h index e62a588fb..c5ff77cd1 100644 --- a/src/render/io/qabstractsceneloader_p.h +++ b/src/render/io/qabstractsceneloader_p.h @@ -49,8 +49,8 @@ // #include <private/qcomponent_p.h> -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qabstractsceneloader.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qabstractsceneloader.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ namespace Qt3DRender { class AbstractSceneParser; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3DCore::QComponentPrivate +class QT3DRENDERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3DCore::QComponentPrivate { public: QAbstractSceneLoaderPrivate(); diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index 70eb15533..d25a9bf55 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 5ca560fdd..d90747b10 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -37,13 +37,13 @@ #ifndef QT3DRENDER_QSCENELOADER_H #define QT3DRENDER_QSCENELOADER_H -#include <Qt3DRenderer/qabstractsceneloader.h> +#include <Qt3DRender/qabstractsceneloader.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader +class QT3DRENDERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader { Q_OBJECT public: diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp index 8874db279..0d4c97649 100644 --- a/src/render/io/scene.cpp +++ b/src/render/io/scene.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DRenderer/qabstractsceneloader.h> -#include <Qt3DRenderer/private/scenemanager_p.h> +#include <Qt3DRender/qabstractsceneloader.h> +#include <Qt3DRender/private/scenemanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index 7baccd006..b6489da1d 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -49,9 +49,9 @@ // #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRenderer/private/scene_p.h> +#include <Qt3DRender/private/scene_p.h> #include <Qt3DCore/qnodeid.h> -#include <Qt3DRenderer/private/loadscenejob_p.h> +#include <Qt3DRender/private/loadscenejob_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp index 798de964d..424e078ac 100644 --- a/src/render/jobs/calcboundingvolumejob.cpp +++ b/src/render/jobs/calcboundingvolumejob.cpp @@ -37,14 +37,14 @@ #include "calcboundingvolumejob_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/geometryrenderer_p.h> -#include <Qt3DRenderer/private/buffermanager_p.h> -#include <Qt3DRenderer/private/buffer_p.h> -#include <Qt3DRenderer/sphere.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/geometryrenderer_p.h> +#include <Qt3DRender/private/buffermanager_p.h> +#include <Qt3DRender/private/buffer_p.h> +#include <Qt3DRender/sphere.h> #include <Qt3DCore/qaxisalignedboundingbox.h> #include <QtCore/qmath.h> diff --git a/src/render/jobs/framecleanupjob_p.h b/src/render/jobs/framecleanupjob_p.h index 9dddc925e..247ee30cf 100644 --- a/src/render/jobs/framecleanupjob_p.h +++ b/src/render/jobs/framecleanupjob_p.h @@ -49,7 +49,7 @@ // #include <Qt3DCore/qaspectjob.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/framepreparationjob.cpp b/src/render/jobs/framepreparationjob.cpp index 8578cdb7f..1375370a4 100644 --- a/src/render/jobs/framepreparationjob.cpp +++ b/src/render/jobs/framepreparationjob.cpp @@ -35,10 +35,10 @@ ****************************************************************************/ #include "framepreparationjob_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/shaderdata_p.h> -#include <Qt3DRenderer/sphere.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/shaderdata_p.h> +#include <Qt3DRender/sphere.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/loadbufferjob.cpp b/src/render/jobs/loadbufferjob.cpp index 4feb07358..64b0dad3d 100644 --- a/src/render/jobs/loadbufferjob.cpp +++ b/src/render/jobs/loadbufferjob.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include "loadbufferjob_p.h" -#include <Qt3DRenderer/private/buffer_p.h> -#include <Qt3DRenderer/private/buffermanager_p.h> -#include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRender/private/buffer_p.h> +#include <Qt3DRender/private/buffermanager_p.h> +#include <Qt3DRender/private/renderer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h index d6b0d2ca6..ce7e31eba 100644 --- a/src/render/jobs/loadbufferjob_p.h +++ b/src/render/jobs/loadbufferjob_p.h @@ -50,7 +50,7 @@ #include <QSharedPointer> #include <Qt3DCore/qaspectjob.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/private/handle_types_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/loadgeometryjob.cpp b/src/render/jobs/loadgeometryjob.cpp index 695e32dc1..11dc2b3f3 100644 --- a/src/render/jobs/loadgeometryjob.cpp +++ b/src/render/jobs/loadgeometryjob.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include "loadgeometryjob_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/geometryrenderermanager_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/geometryrenderermanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h index 9ed4a8269..1ae5f4f8d 100644 --- a/src/render/jobs/loadgeometryjob_p.h +++ b/src/render/jobs/loadgeometryjob_p.h @@ -50,7 +50,7 @@ #include <QSharedPointer> #include <Qt3DCore/qaspectjob.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/private/handle_types_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp index a7dbc3dae..5051fbedc 100644 --- a/src/render/jobs/loadscenejob.cpp +++ b/src/render/jobs/loadscenejob.cpp @@ -38,7 +38,7 @@ #include <private/renderer_p.h> #include <private/scenemanager_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp index 35ddf6cc5..b2dd8eb21 100644 --- a/src/render/jobs/loadtexturedatajob.cpp +++ b/src/render/jobs/loadtexturedatajob.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include "loadtexturedatajob_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/texturedatamanager_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/texturedatamanager_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h index 09d5e3b5d..9826181b1 100644 --- a/src/render/jobs/loadtexturedatajob_p.h +++ b/src/render/jobs/loadtexturedatajob_p.h @@ -50,7 +50,7 @@ #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qaspectjob.h> -#include <Qt3DRenderer/qtextureimage.h> +#include <Qt3DRender/qtextureimage.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/renderviewjob.cpp b/src/render/jobs/renderviewjob.cpp index 750a2e8b7..aa76356b5 100644 --- a/src/render/jobs/renderviewjob.cpp +++ b/src/render/jobs/renderviewjob.cpp @@ -36,10 +36,10 @@ #include "renderviewjob_p.h" -#include <Qt3DRenderer/private/renderview_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/renderviewjobutils_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderview_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/renderviewjobutils_p.h> +#include <Qt3DRender/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp index 9d4d52797..7f1336581 100644 --- a/src/render/jobs/renderviewjobutils.cpp +++ b/src/render/jobs/renderviewjobutils.cpp @@ -37,26 +37,26 @@ #include "renderviewjobutils_p.h" #include "renderlogging_p.h" -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/sphere.h> -#include <Qt3DRenderer/qshaderdata.h> - -#include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/clearbuffer_p.h> -#include <Qt3DRenderer/private/layerfilternode_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/effect_p.h> -#include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> -#include <Qt3DRenderer/private/rendertargetselectornode_p.h> -#include <Qt3DRenderer/private/renderview_p.h> -#include <Qt3DRenderer/private/sortmethod_p.h> -#include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/viewportnode_p.h> -#include <Qt3DRenderer/private/shadervariables_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/shaderdata_p.h> -#include <Qt3DRenderer/private/statesetnode_p.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/sphere.h> +#include <Qt3DRender/qshaderdata.h> + +#include <Qt3DRender/private/cameraselectornode_p.h> +#include <Qt3DRender/private/clearbuffer_p.h> +#include <Qt3DRender/private/layerfilternode_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/effect_p.h> +#include <Qt3DRender/private/renderpassfilternode_p.h> +#include <Qt3DRender/private/renderstateset_p.h> +#include <Qt3DRender/private/rendertargetselectornode_p.h> +#include <Qt3DRender/private/renderview_p.h> +#include <Qt3DRender/private/sortmethod_p.h> +#include <Qt3DRender/private/techniquefilternode_p.h> +#include <Qt3DRender/private/viewportnode_p.h> +#include <Qt3DRender/private/shadervariables_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/shaderdata_p.h> +#include <Qt3DRender/private/statesetnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h index 76b37a1bf..9064ab02c 100644 --- a/src/render/jobs/renderviewjobutils_p.h +++ b/src/render/jobs/renderviewjobutils_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnodeid.h> #include <QtCore/qhash.h> #include <QtCore/qvariant.h> diff --git a/src/render/jobs/updateboundingvolumejob.cpp b/src/render/jobs/updateboundingvolumejob.cpp index 7ec3c110c..8dee7c9a3 100644 --- a/src/render/jobs/updateboundingvolumejob.cpp +++ b/src/render/jobs/updateboundingvolumejob.cpp @@ -36,9 +36,9 @@ #include "updateboundingvolumejob_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <sphere.h> #include <QElapsedTimer> diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp index ba338f676..46f478a31 100644 --- a/src/render/jobs/updateworldtransformjob.cpp +++ b/src/render/jobs/updateworldtransformjob.cpp @@ -36,11 +36,11 @@ #include "updateworldtransformjob_p.h" -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/entity_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/entity_p.h> #include <sphere.h> -#include <Qt3DRenderer/private/transform_p.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/transform_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 15eac8b04..4379f6aa6 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QABSTRACTLIGHT_H #define QT3DRENDER_QABSTRACTLIGHT_H -#include <Qt3DRenderer/qshaderdata.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/qt3drender_global.h> #include <QVector3D> #include <QColor> @@ -49,7 +49,7 @@ namespace Qt3DRender { class QAbstractLightPrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractLight : public QShaderData +class QT3DRENDERSHARED_EXPORT QAbstractLight : public QShaderData { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) diff --git a/src/render/lights/qabstractlight_p.h b/src/render/lights/qabstractlight_p.h index b222fdd39..47eb88eaf 100644 --- a/src/render/lights/qabstractlight_p.h +++ b/src/render/lights/qabstractlight_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <private/qshaderdata_p.h> QT_BEGIN_NAMESPACE @@ -57,7 +57,7 @@ namespace Qt3DRender { class QAbstractLight; -class QT3DRENDERERSHARED_EXPORT QAbstractLightPrivate : public QShaderDataPrivate +class QT3DRENDERSHARED_EXPORT QAbstractLightPrivate : public QShaderDataPrivate { public: QAbstractLightPrivate(); diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h index c0fe1dfe7..6acc28721 100644 --- a/src/render/lights/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QDIRECTIONALLIGHT_H #define QT3DRENDER_QDIRECTIONALLIGHT_H -#include <Qt3DRenderer/qabstractlight.h> +#include <Qt3DRender/qabstractlight.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QDirectionalLightPrivate; -class QT3DRENDERERSHARED_EXPORT QDirectionalLight : public QAbstractLight +class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QAbstractLight { Q_OBJECT Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged) diff --git a/src/render/lights/qdirectionallight_p.h b/src/render/lights/qdirectionallight_p.h index d5bb9f383..78bd65fa2 100644 --- a/src/render/lights/qdirectionallight_p.h +++ b/src/render/lights/qdirectionallight_p.h @@ -56,7 +56,7 @@ namespace Qt3DRender { class QDirectionalLight; -class QT3DRENDERERSHARED_EXPORT QDirectionalLightPrivate : QAbstractLightPrivate +class QT3DRENDERSHARED_EXPORT QDirectionalLightPrivate : QAbstractLightPrivate { public: QDirectionalLightPrivate(); diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h index 881c85f3e..2f3711459 100644 --- a/src/render/lights/qpointlight.h +++ b/src/render/lights/qpointlight.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QPOINTLIGHT_H #define QT3DRENDER_QPOINTLIGHT_H -#include <Qt3DRenderer/qabstractlight.h> +#include <Qt3DRender/qabstractlight.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QPointLightPrivate; -class QT3DRENDERERSHARED_EXPORT QPointLight : public QAbstractLight +class QT3DRENDERSHARED_EXPORT QPointLight : public QAbstractLight { Q_OBJECT diff --git a/src/render/lights/qpointlight_p.h b/src/render/lights/qpointlight_p.h index f3399a4a6..3b2a3a2d4 100644 --- a/src/render/lights/qpointlight_p.h +++ b/src/render/lights/qpointlight_p.h @@ -56,7 +56,7 @@ namespace Qt3DRender { class QPointLight; -class QT3DRENDERERSHARED_EXPORT QPointLightPrivate : public QAbstractLightPrivate +class QT3DRENDERSHARED_EXPORT QPointLightPrivate : public QAbstractLightPrivate { public: QPointLightPrivate(); diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h index d262b3d97..6f8d2bbd6 100644 --- a/src/render/lights/qspotlight.h +++ b/src/render/lights/qspotlight.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSPOTLIGHT_H #define QT3DRENDER_QSPOTLIGHT_H -#include <Qt3DRenderer/qabstractlight.h> +#include <Qt3DRender/qabstractlight.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QSpotLightPrivate; -class QT3DRENDERERSHARED_EXPORT QSpotLight : public QAbstractLight +class QT3DRENDERSHARED_EXPORT QSpotLight : public QAbstractLight { Q_OBJECT Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged) diff --git a/src/render/lights/qspotlight_p.h b/src/render/lights/qspotlight_p.h index dc951e55f..d806a0539 100644 --- a/src/render/lights/qspotlight_p.h +++ b/src/render/lights/qspotlight_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QSpotLightPrivate : public QAbstractLightPrivate +class QT3DRENDERSHARED_EXPORT QSpotLightPrivate : public QAbstractLightPrivate { public: QSpotLightPrivate(); diff --git a/src/render/materialsystem/annotation_p.h b/src/render/materialsystem/annotation_p.h index 564fe1671..4cb549d0c 100644 --- a/src/render/materialsystem/annotation_p.h +++ b/src/render/materialsystem/annotation_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qannotation.h> #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index bf0e64a58..bc88f3c16 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -34,10 +34,10 @@ ** ****************************************************************************/ -#include <Qt3DRenderer/private/effect_p.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qparameter.h> +#include <Qt3DRender/private/effect_p.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qparameter.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h index 0d307d0c5..17214497f 100644 --- a/src/render/materialsystem/effect_p.h +++ b/src/render/materialsystem/effect_p.h @@ -48,8 +48,8 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/private/parameterpack_p.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/private/parameterpack_p.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> #include <QList> diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h index f45912ab6..c9f54512c 100644 --- a/src/render/materialsystem/material_p.h +++ b/src/render/materialsystem/material_p.h @@ -50,8 +50,8 @@ #include <QVariant> -#include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/parameterpack_p.h> +#include <Qt3DRender/private/quniformvalue_p.h> +#include <Qt3DRender/private/parameterpack_p.h> #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index 34eb395f7..fea400e0b 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -36,11 +36,11 @@ #include "parameter_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qshaderdata.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qshaderdata.h> -#include <Qt3DRenderer/private/managers_p.h> +#include <Qt3DRender/private/managers_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/parametermapping_p.h b/src/render/materialsystem/parametermapping_p.h index 7c5df3c31..4043c8dd1 100644 --- a/src/render/materialsystem/parametermapping_p.h +++ b/src/render/materialsystem/parametermapping_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DRenderer/qparametermapping.h> +#include <Qt3DRender/qparametermapping.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qannotation.h b/src/render/materialsystem/qannotation.h index e36bfe46e..28b2e87d8 100644 --- a/src/render/materialsystem/qannotation.h +++ b/src/render/materialsystem/qannotation.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QANNOTATION_H #define QT3DRENDER_QANNOTATION_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> #include <QVariant> @@ -47,7 +47,7 @@ namespace Qt3DRender { class QAnnotationPrivate; -class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QAnnotation : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) diff --git a/src/render/materialsystem/qannotation_p.h b/src/render/materialsystem/qannotation_p.h index f37004b0c..c91a4df87 100644 --- a/src/render/materialsystem/qannotation_p.h +++ b/src/render/materialsystem/qannotation_p.h @@ -49,7 +49,7 @@ // #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qannotation.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index be1d4a21b..0f806f02b 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QEFFECT_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ class QParameter; class QTechnique; class QEffectPrivate; -class QT3DRENDERERSHARED_EXPORT QEffect +class QT3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode { Q_OBJECT diff --git a/src/render/materialsystem/qeffect_p.h b/src/render/materialsystem/qeffect_p.h index 844016022..6cc5eb25d 100644 --- a/src/render/materialsystem/qeffect_p.h +++ b/src/render/materialsystem/qeffect_p.h @@ -49,7 +49,7 @@ // #include <private/qnode_p.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -59,7 +59,7 @@ class QEffect; class QParameter; class QTechnique; -class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate { public : QEffectPrivate(); diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index 3610c4e3b..e0ab55019 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -38,7 +38,7 @@ #include "qmaterial_p.h" #include "qtexture.h" #include "qeffect.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include "qparameter.h" #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index cfc3c0d99..daf580c11 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -40,7 +40,7 @@ #include <QVariant> #include <Qt3DCore/qcomponent.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -52,7 +52,7 @@ class QMaterialPrivate; class QEffect; typedef QMap<QString, QAbstractTextureProvider*> TextureDict; -class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h index c84aeb6c1..9f305b074 100644 --- a/src/render/materialsystem/qmaterial_p.h +++ b/src/render/materialsystem/qmaterial_p.h @@ -49,7 +49,7 @@ // #include <private/qcomponent_p.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ namespace Qt3DRender { class QParameter; class QEffect; -class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate +class QT3DRENDERSHARED_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate { public: QMaterialPrivate(); diff --git a/src/render/materialsystem/qopenglfilter.h b/src/render/materialsystem/qopenglfilter.h index 9c4b729bd..a7d46b285 100644 --- a/src/render/materialsystem/qopenglfilter.h +++ b/src/render/materialsystem/qopenglfilter.h @@ -39,7 +39,7 @@ #include <QObject> #include <QStringList> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QSurfaceFormat> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { class QOpenGLFilterPrivate; -class QT3DRENDERERSHARED_EXPORT QOpenGLFilter : public QObject +class QT3DRENDERSHARED_EXPORT QOpenGLFilter : public QObject { Q_OBJECT Q_PROPERTY(Qt3DRender::QOpenGLFilter::Api api READ api WRITE setApi NOTIFY apiChanged) diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index fd14603a8..2535d5608 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -35,10 +35,10 @@ ****************************************************************************/ #include "qparameter.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <private/qparameter_p.h> -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/qtexture.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index b0a9c9b2e..5278829c6 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -39,7 +39,7 @@ #include <QVariant> #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { class QParameterPrivate; class QAbstractTextureProvider; -class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) diff --git a/src/render/materialsystem/qparameter_p.h b/src/render/materialsystem/qparameter_p.h index 01bdf63c2..96db66b7a 100644 --- a/src/render/materialsystem/qparameter_p.h +++ b/src/render/materialsystem/qparameter_p.h @@ -49,7 +49,7 @@ // #include <private/qnode_p.h> -#include <private/qt3drenderer_global_p.h> +#include <private/qt3drender_global_p.h> QT_BEGIN_NAMESPACE @@ -57,7 +57,7 @@ namespace Qt3DRender { class QParameter; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate { public: QParameterPrivate(); diff --git a/src/render/materialsystem/qparametermapping.h b/src/render/materialsystem/qparametermapping.h index e104f4001..9b6bbfd57 100644 --- a/src/render/materialsystem/qparametermapping.h +++ b/src/render/materialsystem/qparametermapping.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QPARAMETERMAPPING_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QParameterMappingPrivate; -class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged) diff --git a/src/render/materialsystem/qparametermapping_p.h b/src/render/materialsystem/qparametermapping_p.h index 940f3983e..a53627703 100644 --- a/src/render/materialsystem/qparametermapping_p.h +++ b/src/render/materialsystem/qparametermapping_p.h @@ -49,7 +49,7 @@ // #include <private/qnode_p.h> -#include <Qt3DRenderer/QParameterMapping> +#include <Qt3DRender/QParameterMapping> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index b7018e7a1..569ae8377 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -38,11 +38,11 @@ #ifndef QT3DRENDER_QRENDERPASS_H #define QT3DRENDER_QRENDERPASS_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> -#include <Qt3DRenderer/qshaderprogram.h> -#include <Qt3DRenderer/qrenderstate.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qshaderprogram.h> +#include <Qt3DRender/qrenderstate.h> +#include <Qt3DRender/qannotation.h> #include <QHash> #include <QList> @@ -58,7 +58,7 @@ typedef QList<QParameter*> ParameterList; class QRenderPassPrivate; -class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) diff --git a/src/render/materialsystem/qrenderpass_p.h b/src/render/materialsystem/qrenderpass_p.h index b587b7708..86c9da84d 100644 --- a/src/render/materialsystem/qrenderpass_p.h +++ b/src/render/materialsystem/qrenderpass_p.h @@ -50,8 +50,8 @@ // #include <private/qnode_p.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -68,7 +68,7 @@ namespace Render class RenderStateSet; } -class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_EXPORT QRenderPassPrivate : public Qt3DCore::QNodePrivate { public: QRenderPassPrivate(); diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 35f195f88..5d18eda70 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QSHADERDATA_H #include <Qt3DCore/qcomponent.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QShaderDataPrivate; -class QT3DRENDERERSHARED_EXPORT PropertyReaderInterface +class QT3DRENDERSHARED_EXPORT PropertyReaderInterface { public: virtual ~PropertyReaderInterface() {} @@ -55,7 +55,7 @@ public: typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr; -class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent { Q_OBJECT public: diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h index 8a0c78e05..add621b5e 100644 --- a/src/render/materialsystem/qshaderdata_p.h +++ b/src/render/materialsystem/qshaderdata_p.h @@ -49,8 +49,8 @@ // #include <private/qcomponent_p.h> -#include <Qt3DRenderer/qshaderdata.h> -#include <Qt3DRenderer/private/qt3drenderer_global_p.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/private/qt3drender_global_p.h> QT_BEGIN_NAMESPACE @@ -83,7 +83,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface } }; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate { public: QShaderDataPrivate(); diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index c229ad704..7b286802c 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QSHADERPROGRAM_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QShaderProgramPrivate; -class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged) diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index 4a8863d73..7e28f313b 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -37,10 +37,10 @@ #ifndef QT3DRENDER_QTECHNIQUE_H #define QT3DRENDER_QTECHNIQUE_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qannotation.h> #include <QList> #include <QSharedPointer> @@ -52,7 +52,7 @@ class QParameter; class QTechniquePrivate; class QOpenGLFilter; -class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter) diff --git a/src/render/materialsystem/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h index 669a75a56..da92fe5c4 100644 --- a/src/render/materialsystem/qtechnique_p.h +++ b/src/render/materialsystem/qtechnique_p.h @@ -49,8 +49,8 @@ // #include <private/qnode_p.h> -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -61,7 +61,7 @@ class QAnnotation; class QParameter; class QRenderPass; -class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_EXPORT QTechniquePrivate : public Qt3DCore::QNodePrivate { public: QTechniquePrivate(); diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index cdbf92126..e499a85ba 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -36,14 +36,14 @@ ****************************************************************************/ #include "renderpass_p.h" -#include <Qt3DRenderer/private/annotation_p.h> -#include <Qt3DRenderer/qparametermapping.h> -#include <Qt3DRenderer/qrenderstate.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qparameter.h> - -#include <Qt3DRenderer/private/renderstates_p.h> -#include <Qt3DRenderer/private/renderstateset_p.h> +#include <Qt3DRender/private/annotation_p.h> +#include <Qt3DRender/qparametermapping.h> +#include <Qt3DRender/qrenderstate.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qparameter.h> + +#include <Qt3DRender/private/renderstates_p.h> +#include <Qt3DRender/private/renderstateset_p.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h index 2d5a2a6d8..ad1c329f4 100644 --- a/src/render/materialsystem/renderpass_p.h +++ b/src/render/materialsystem/renderpass_p.h @@ -49,9 +49,9 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/private/parametermapping_p.h> -#include <Qt3DRenderer/private/parameterpack_p.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/private/parametermapping_p.h> +#include <Qt3DRender/private/parameterpack_p.h> #include <Qt3DCore/private/qabstractaspect_p.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index f52d01543..f2e7bce78 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -42,8 +42,8 @@ #include <QOpenGLShaderProgram> #include <QMutexLocker> #include <qshaderprogram.h> -#include <Qt3DRenderer/private/graphicscontext_p.h> -#include <Qt3DRenderer/private/attachmentpack_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/attachmentpack_p.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h index 3dd9570ac..cc38f8c4a 100644 --- a/src/render/materialsystem/shader_p.h +++ b/src/render/materialsystem/shader_p.h @@ -49,8 +49,8 @@ // #include <QVector> -#include <Qt3DRenderer/private/quniformvalue_p.h> -#include <Qt3DRenderer/private/shadervariables_p.h> +#include <Qt3DRender/private/quniformvalue_p.h> +#include <Qt3DRender/private/shadervariables_p.h> #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h index c87196776..b45395f07 100644 --- a/src/render/materialsystem/shaderdata_p.h +++ b/src/render/materialsystem/shaderdata_p.h @@ -50,7 +50,7 @@ #include <Qt3DCore/qbackendnode.h> #include <private/shadervariables_p.h> -#include <Qt3DRenderer/qshaderdata.h> +#include <Qt3DRender/qshaderdata.h> #include <QMutex> #include <QMatrix4x4> diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index ac2e4554c..866161bf8 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -36,13 +36,13 @@ #include "technique_p.h" -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qopenglfilter.h> -#include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/annotation_p.h> -#include <Qt3DRenderer/private/shader_p.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qopenglfilter.h> +#include <Qt3DRender/private/renderer_p.h> +#include <Qt3DRender/private/annotation_p.h> +#include <Qt3DRender/private/shader_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h index 77c96d4f0..896642d58 100644 --- a/src/render/materialsystem/technique_p.h +++ b/src/render/materialsystem/technique_p.h @@ -51,8 +51,8 @@ #include <QVector> #include <QStringList> -#include <Qt3DRenderer/private/parameterpack_p.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/private/parameterpack_p.h> +#include <Qt3DRender/qannotation.h> #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE diff --git a/src/render/qt3drenderer_global.h b/src/render/qt3drender_global.h index 0e71054e6..6f3f2453d 100644 --- a/src/render/qt3drenderer_global.h +++ b/src/render/qt3drender_global.h @@ -34,23 +34,23 @@ ** ****************************************************************************/ -#ifndef QT3DRENDERER_GLOBAL_H -#define QT3DRENDERER_GLOBAL_H +#ifndef QT3DRENDER_GLOBAL_H +#define QT3DRENDER_GLOBAL_H #include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) -# if defined(QT3DRENDERER_LIBRARY) -# define QT3DRENDERERSHARED_EXPORT Q_DECL_EXPORT +# if defined(QT3DRENDER_LIBRARY) +# define QT3DRENDERSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DRENDERERSHARED_EXPORT Q_DECL_IMPORT +# define QT3DRENDERSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DRENDERERSHARED_EXPORT +# define QT3DRENDERSHARED_EXPORT #endif QT_END_NAMESPACE -#endif // QT3DRENDERER_GLOBAL_H +#endif // QT3DRENDER_GLOBAL_H diff --git a/src/render/qt3drenderer_global_p.h b/src/render/qt3drender_global_p.h index 1676417a0..99db6303f 100644 --- a/src/render/qt3drenderer_global_p.h +++ b/src/render/qt3drender_global_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDERER_GLOBAL_P_H -#define QT3DRENDERER_GLOBAL_P_H +#ifndef QT3DRENDER_GLOBAL_P_H +#define QT3DRENDER_GLOBAL_P_H // // W A R N I N G @@ -48,8 +48,8 @@ // We mean it. // -#include "qt3drenderer_global.h" +#include "qt3drender_global.h" -#define QT3DRENDERERSHARED_PRIVATE_EXPORT QT3DRENDERERSHARED_EXPORT +#define QT3DRENDERSHARED_PRIVATE_EXPORT QT3DRENDERSHARED_EXPORT -#endif // QT3DRENDERER_GLOBAL_P_H +#endif // QT3DRENDER_GLOBAL_P_H diff --git a/src/render/render.pro b/src/render/render.pro index 1bfc7bf98..768fed5bd 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -1,10 +1,10 @@ -TARGET = Qt3DRenderer +TARGET = Qt3DRender QT += core-private gui-private 3dcore 3dcore-private openglextensions concurrent -DEFINES += QT3DRENDERER_LIBRARY +DEFINES += QT3DRENDER_LIBRARY -MODULE = 3drenderer +MODULE = 3drender MODULE_PLUGIN_TYPES = \ sceneparsers @@ -39,9 +39,9 @@ gcov { } HEADERS += \ - qt3drenderer_global.h \ - qt3drenderer_global_p.h \ - renderlogging_p.h + renderlogging_p.h \ + qt3drender_global.h \ + qt3drender_global_p.h !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index 5ba0a5506..7e0487688 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QALPHACOVERAGE_H #define QT3DRENDER_QALPHACOVERAGE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QAlphaCoveragePrivate; -class QT3DRENDERERSHARED_EXPORT QAlphaCoverage : public QRenderState +class QT3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index 44d107529..b5def41ac 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QALPHATEST_H #define QT3DRENDER_QALPHATEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QAlphaTestPrivate; -class QT3DRENDERERSHARED_EXPORT QAlphaTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QAlphaTest : public QRenderState { Q_OBJECT Q_PROPERTY(AlphaFunc func READ func WRITE setFunc NOTIFY funcChanged) diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index e6ca15fb7..a314a67b9 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QBLENDEQUATION_H #define QT3DRENDER_QBLENDEQUATION_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QBlendEquationPrivate; -class QT3DRENDERERSHARED_EXPORT QBlendEquation : public QRenderState +class QT3DRENDERSHARED_EXPORT QBlendEquation : public QRenderState { Q_OBJECT Q_PROPERTY(BlendMode mode READ mode WRITE setMode NOTIFY modeChanged) diff --git a/src/render/renderstates/qblendstate.h b/src/render/renderstates/qblendstate.h index 2ae8b06bc..f67b30275 100644 --- a/src/render/renderstates/qblendstate.h +++ b/src/render/renderstates/qblendstate.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QBLENDSTATE_H #define QT3DRENDER_QBLENDSTATE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QBlendStatePrivate; -class QT3DRENDERERSHARED_EXPORT QBlendState : public QRenderState +class QT3DRENDERSHARED_EXPORT QBlendState : public QRenderState { Q_OBJECT Q_PROPERTY(Blending srcRGB READ srcRGB WRITE setSrcRGB NOTIFY srcRGBChanged) @@ -110,7 +110,7 @@ private: QT3D_CLONEABLE(QBlendState) }; -class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState +class QT3DRENDERSHARED_EXPORT QBlendStateSeparate : public QBlendState { Q_OBJECT public: diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp index eb327c0e4..9063ef9ad 100644 --- a/src/render/renderstates/qclipplane.cpp +++ b/src/render/renderstates/qclipplane.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qclipplane.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index 40ebfd9a5..b04661d85 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QCLIPPLANE_H #define QT3DRENDER_QCLIPPLANE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QClipPlanePrivate; -class QT3DRENDERERSHARED_EXPORT QClipPlane : public QRenderState +class QT3DRENDERSHARED_EXPORT QClipPlane : public QRenderState { Q_OBJECT Q_PROPERTY(int plane READ plane WRITE setPlane NOTIFY planeChanged) diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp index e52a5d067..6f4761894 100644 --- a/src/render/renderstates/qcolormask.cpp +++ b/src/render/renderstates/qcolormask.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qcolormask.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h index fcbfac88b..2e5aefe9c 100644 --- a/src/render/renderstates/qcolormask.h +++ b/src/render/renderstates/qcolormask.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QCOLORMASK_H #define QT3DRENDER_QCOLORMASK_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QColorMaskPrivate; -class QT3DRENDERERSHARED_EXPORT QColorMask : public QRenderState +class QT3DRENDERSHARED_EXPORT QColorMask : public QRenderState { Q_OBJECT Q_PROPERTY(bool red READ isRed WRITE setRed NOTIFY redChanged) diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index d6329d205..9cbfe53fa 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -39,7 +39,7 @@ #ifndef QT3DRENDER_QCULLFACE_H #define QT3DRENDER_QCULLFACE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QCullFacePrivate; -class QT3DRENDERERSHARED_EXPORT QCullFace : public QRenderState +class QT3DRENDERSHARED_EXPORT QCullFace : public QRenderState { Q_OBJECT Q_PROPERTY(CullingMode mode READ mode WRITE setMode NOTIFY modeChanged) diff --git a/src/render/renderstates/qdepthmask.h b/src/render/renderstates/qdepthmask.h index 8d0ea920a..acee32b9d 100644 --- a/src/render/renderstates/qdepthmask.h +++ b/src/render/renderstates/qdepthmask.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QDEPTHMASK_H #define QT3DRENDER_QDEPTHMASK_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QDepthMaskPrivate; -class QT3DRENDERERSHARED_EXPORT QDepthMask : public QRenderState +class QT3DRENDERSHARED_EXPORT QDepthMask : public QRenderState { Q_OBJECT Q_PROPERTY (bool mask READ mask WRITE setMask NOTIFY maskChanged) diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index bedec55e3..5e8da269b 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QDEPTHTEST_H #define QT3DRENDER_QDEPTHTEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QDepthTestPrivate; -class QT3DRENDERERSHARED_EXPORT QDepthTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QDepthTest : public QRenderState { Q_OBJECT Q_PROPERTY(DepthFunc func READ func WRITE setFunc NOTIFY funcChanged) diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index 6fcf83786..6026bfffb 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QDITHERING_H #define QT3DRENDER_QDITHERING_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QDitheringPrivate; -class QT3DRENDERERSHARED_EXPORT QDithering : public QRenderState +class QT3DRENDERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index 95fe3f0c5..fefc142b8 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QFRONTFACE_H #define QT3DRENDER_QFRONTFACE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QFrontFacePrivate; -class QT3DRENDERERSHARED_EXPORT QFrontFace : public QRenderState +class QT3DRENDERSHARED_EXPORT QFrontFace : public QRenderState { Q_OBJECT Q_PROPERTY(FaceDir direction READ direction WRITE setDirection NOTIFY directionChanged) diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h index dde7dca43..acc93dd54 100644 --- a/src/render/renderstates/qpolygonoffset.h +++ b/src/render/renderstates/qpolygonoffset.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QPOLYGONOFFSET_H #define QT3DRENDER_QPOLYGONOFFSET_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QPolygonOffsetPrivate; -class QT3DRENDERERSHARED_EXPORT QPolygonOffset : public QRenderState +class QT3DRENDERSHARED_EXPORT QPolygonOffset : public QRenderState { Q_OBJECT diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h index 790c89e83..dfe69c021 100644 --- a/src/render/renderstates/qrenderstate.h +++ b/src/render/renderstates/qrenderstate.h @@ -39,7 +39,7 @@ #define QT3DRENDER_QRENDERSTATE_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QRenderStatePrivate; -class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QRenderState : public Qt3DCore::QNode { Q_OBJECT diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h index 3f976611c..45418bb07 100644 --- a/src/render/renderstates/qrenderstate_p.h +++ b/src/render/renderstates/qrenderstate_p.h @@ -50,14 +50,14 @@ // #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DRenderer/qrenderstate.h> -#include <Qt3DRenderer/private/qt3drenderer_global_p.h> +#include <Qt3DRender/qrenderstate.h> +#include <Qt3DRender/private/qt3drender_global_p.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_PRIVATE_EXPORT QRenderStatePrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderStatePrivate : public Qt3DCore::QNodePrivate { public: QRenderStatePrivate(QRenderState::Type type); diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index 2e09fff64..41e843ea3 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QSCISSORTEST_H #define QT3DRENDER_QSCISSORTEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QScissorTestPrivate; -class QT3DRENDERERSHARED_EXPORT QScissorTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QScissorTest : public QRenderState { Q_OBJECT Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftChanged) diff --git a/src/render/renderstates/qstencilmask.cpp b/src/render/renderstates/qstencilmask.cpp index 44098296a..32d47a54b 100644 --- a/src/render/renderstates/qstencilmask.cpp +++ b/src/render/renderstates/qstencilmask.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qstencilmask.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index b4414e148..5be51f5c1 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSTENCILMASK_H #define QT3DRENDER_QSTENCILMASK_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QStencilMaskPrivate; -class QT3DRENDERERSHARED_EXPORT QStencilMask : public QRenderState +class QT3DRENDERSHARED_EXPORT QStencilMask : public QRenderState { Q_OBJECT Q_PROPERTY(uint frontMask READ frontMask WRITE setFrontMask NOTIFY frontMaskChanged) diff --git a/src/render/renderstates/qstencilop.cpp b/src/render/renderstates/qstencilop.cpp index 67a571202..7dbbdc1ea 100644 --- a/src/render/renderstates/qstencilop.cpp +++ b/src/render/renderstates/qstencilop.cpp @@ -36,7 +36,7 @@ #include "qstencilop.h" #include "qstencilopseparate.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstencilop.h b/src/render/renderstates/qstencilop.h index 881ea1354..88ea2aac8 100644 --- a/src/render/renderstates/qstencilop.h +++ b/src/render/renderstates/qstencilop.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSTENCILOP_H #define QT3DRENDER_QSTENCILOP_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QStencilOpPrivate; class QStencilOpSeparate; -class QT3DRENDERERSHARED_EXPORT QStencilOp : public QRenderState +class QT3DRENDERSHARED_EXPORT QStencilOp : public QRenderState { Q_OBJECT Q_PROPERTY(Qt3DRender::QStencilOpSeparate *front READ front CONSTANT) diff --git a/src/render/renderstates/qstencilopseparate.h b/src/render/renderstates/qstencilopseparate.h index 44561131c..cc21ebaad 100644 --- a/src/render/renderstates/qstencilopseparate.h +++ b/src/render/renderstates/qstencilopseparate.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QSTENCILOPSEPARATE_H #include <QObject> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QStencilOpPrivate; class QStencilOpSeparatePrivate; -class QT3DRENDERERSHARED_EXPORT QStencilOpSeparate : public QObject +class QT3DRENDERSHARED_EXPORT QStencilOpSeparate : public QObject { Q_OBJECT Q_PROPERTY(StencilFaceMode faceMode READ faceMode NOTIFY faceModeChanged) diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index 2c538d186..c631e7fac 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QSTENCILTEST_H #define QT3DRENDER_QSTENCILTEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestSeparate; -class QT3DRENDERERSHARED_EXPORT QStencilTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState { Q_OBJECT Q_PROPERTY(Qt3DRender::QStencilTestSeparate *front READ front CONSTANT) diff --git a/src/render/renderstates/qstenciltestseparate.h b/src/render/renderstates/qstenciltestseparate.h index 5689a1cfb..79258689d 100644 --- a/src/render/renderstates/qstenciltestseparate.h +++ b/src/render/renderstates/qstenciltestseparate.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QSTENCILTESTSEPARATE_H #include <QObject> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestSeparatePrivate; -class QT3DRENDERERSHARED_EXPORT QStencilTestSeparate : public QObject +class QT3DRENDERSHARED_EXPORT QStencilTestSeparate : public QObject { Q_OBJECT Q_PROPERTY(StencilFaceMode faceMode READ faceMode NOTIFY faceModeChanged) diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp index a7e398035..ff6c24af6 100644 --- a/src/render/renderstates/renderstates.cpp +++ b/src/render/renderstates/renderstates.cpp @@ -37,7 +37,7 @@ #include "renderstates_p.h" -#include <Qt3DRenderer/private/graphicscontext_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> #include <QOpenGLFunctions_3_2_Core> diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h index fb32318cd..055f0cb11 100644 --- a/src/render/renderstates/renderstates_p.h +++ b/src/render/renderstates/renderstates_p.h @@ -49,7 +49,7 @@ // We mean it. // -#include <Qt3DRenderer/private/genericstate_p.h> +#include <Qt3DRender/private/genericstate_p.h> #include <QOpenGLContext> diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp index 3da5e37ef..faf40302d 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -42,27 +42,27 @@ #include <QDebug> #include <QOpenGLContext> -#include <Qt3DRenderer/private/graphicscontext_p.h> -#include <Qt3DRenderer/private/renderstates_p.h> - -#include <Qt3DRenderer/qalphacoverage.h> -#include <Qt3DRenderer/qalphatest.h> -#include <Qt3DRenderer/qblendequation.h> -#include <Qt3DRenderer/qblendstate.h> -#include <Qt3DRenderer/qcolormask.h> -#include <Qt3DRenderer/qcullface.h> -#include <Qt3DRenderer/qdepthmask.h> -#include <Qt3DRenderer/qdepthtest.h> -#include <Qt3DRenderer/qdithering.h> -#include <Qt3DRenderer/qfrontface.h> -#include <Qt3DRenderer/qpolygonoffset.h> -#include <Qt3DRenderer/qscissortest.h> -#include <Qt3DRenderer/qstenciltest.h> -#include <Qt3DRenderer/qstenciltestseparate.h> -#include <Qt3DRenderer/qclipplane.h> -#include <Qt3DRenderer/qstencilop.h> -#include <Qt3DRenderer/qstencilopseparate.h> -#include <Qt3DRenderer/qstencilmask.h> +#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/renderstates_p.h> + +#include <Qt3DRender/qalphacoverage.h> +#include <Qt3DRender/qalphatest.h> +#include <Qt3DRender/qblendequation.h> +#include <Qt3DRender/qblendstate.h> +#include <Qt3DRender/qcolormask.h> +#include <Qt3DRender/qcullface.h> +#include <Qt3DRender/qdepthmask.h> +#include <Qt3DRender/qdepthtest.h> +#include <Qt3DRender/qdithering.h> +#include <Qt3DRender/qfrontface.h> +#include <Qt3DRender/qpolygonoffset.h> +#include <Qt3DRender/qscissortest.h> +#include <Qt3DRender/qstenciltest.h> +#include <Qt3DRender/qstenciltestseparate.h> +#include <Qt3DRender/qclipplane.h> +#include <Qt3DRender/qstencilop.h> +#include <Qt3DRender/qstencilopseparate.h> +#include <Qt3DRender/qstencilmask.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderstates/renderstateset_p.h index 710c06ce3..33862db2b 100644 --- a/src/render/renderstates/renderstateset_p.h +++ b/src/render/renderstates/renderstateset_p.h @@ -49,7 +49,7 @@ // We mean it. // -#include <Qt3DRenderer/private/genericstate_p.h> +#include <Qt3DRender/private/genericstate_p.h> #include <QVector> QT_BEGIN_NAMESPACE diff --git a/src/render/services/qraycastingservice.cpp b/src/render/services/qraycastingservice.cpp index 68907b8b5..3045a065b 100644 --- a/src/render/services/qraycastingservice.cpp +++ b/src/render/services/qraycastingservice.cpp @@ -38,7 +38,7 @@ #include "qraycastingservice_p.h" #include <Qt3DCore/qray3d.h> -#include <Qt3DRenderer/sphere.h> +#include <Qt3DRender/sphere.h> #include <Qt3DCore/qboundingvolumeprovider.h> #include <QMap> diff --git a/src/render/services/qraycastingservice.h b/src/render/services/qraycastingservice.h index 387b77592..680d4c092 100644 --- a/src/render/services/qraycastingservice.h +++ b/src/render/services/qraycastingservice.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H #define QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qabstractcollisionqueryservice.h> @@ -51,7 +51,7 @@ namespace Qt3DRender { class QRayCastingServicePrivate; -class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3DCore::QAbstractCollisionQueryService +class QT3DRENDERSHARED_EXPORT QRayCastingService : public Qt3DCore::QAbstractCollisionQueryService { public: explicit QRayCastingService(Qt3DCore::QBoundingVolumeProvider *provider); diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp index 19d7e70d1..02aca518b 100644 --- a/src/render/services/vsyncframeadvanceservice.cpp +++ b/src/render/services/vsyncframeadvanceservice.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "vsyncframeadvanceservice_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/private/qabstractframeadvanceservice_p.h> #include <QSemaphore> #include <QElapsedTimer> diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index a7eed7d91..a34306314 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H #include <Qt3DCore/qabstractfunctor.h> -#include <Qt3DRenderer/qabstracttextureprovider.h> +#include <Qt3DRender/qabstracttextureprovider.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { // We might also get rid of the layer, face, mipmap level from // TexImageDataPtr and store that in the functor directly // or use the QTextureImage instead -class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor { public: virtual ~QTextureDataFunctor() {} @@ -60,7 +60,7 @@ typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr; class QAbstractTextureImagePrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(int mipmapLevel READ mipmapLevel WRITE setMipmapLevel NOTIFY mipmapLevelChanged) diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h index abd95e302..e3529c428 100644 --- a/src/render/texture/qabstracttextureimage_p.h +++ b/src/render/texture/qabstracttextureimage_p.h @@ -49,8 +49,8 @@ // #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DRenderer/private/qt3drenderer_global_p.h> -#include <Qt3DRenderer/qabstracttextureprovider.h> +#include <Qt3DRender/private/qt3drender_global_p.h> +#include <Qt3DRender/qabstracttextureprovider.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ namespace Qt3DRender { class QAbstractTextureImage; -class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate { public: QAbstractTextureImagePrivate() diff --git a/src/render/texture/qabstracttextureprovider.cpp b/src/render/texture/qabstracttextureprovider.cpp index bed56a14b..e85121f7f 100644 --- a/src/render/texture/qabstracttextureprovider.cpp +++ b/src/render/texture/qabstracttextureprovider.cpp @@ -37,7 +37,7 @@ #include "qabstracttextureprovider.h" #include "qabstracttextureprovider_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/qabstracttextureimage.h> +#include <Qt3DRender/qabstracttextureimage.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h index 96d4f403c..09644a0e5 100644 --- a/src/render/texture/qabstracttextureprovider.h +++ b/src/render/texture/qabstracttextureprovider.h @@ -37,8 +37,8 @@ #ifndef QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H #define QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H -#include <Qt3DRenderer/texturedata.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/texturedata.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ class QAbstractTextureProviderPrivate; class QTextureWrapMode; class QAbstractTextureImage; -class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Target target READ target CONSTANT) diff --git a/src/render/texture/qabstracttextureprovider_p.h b/src/render/texture/qabstracttextureprovider_p.h index c1df87de9..b27ef3660 100644 --- a/src/render/texture/qabstracttextureprovider_p.h +++ b/src/render/texture/qabstracttextureprovider_p.h @@ -48,10 +48,10 @@ // We mean it. // -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DRenderer/qabstracttextureprovider.h> -#include <Qt3DRenderer/qwrapmode.h> +#include <Qt3DRender/qabstracttextureprovider.h> +#include <Qt3DRender/qwrapmode.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtexture.h b/src/render/texture/qtexture.h index d794f5b08..84f84fc3d 100644 --- a/src/render/texture/qtexture.h +++ b/src/render/texture/qtexture.h @@ -38,10 +38,10 @@ #define QT3DRENDER_QTEXTURE_H #include <QOpenGLTexture> -#include <Qt3DRenderer/texturedata.h> -#include <Qt3DRenderer/qwrapmode.h> -#include <Qt3DRenderer/qtextureproviders.h> -#include <Qt3DRenderer/qtextureimage.h> +#include <Qt3DRender/texturedata.h> +#include <Qt3DRender/qwrapmode.h> +#include <Qt3DRender/qtextureproviders.h> +#include <Qt3DRender/qtextureimage.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index 51a612f37..357cc9ebf 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QTEXTUREIMAGE_H #include <QUrl> -#include <Qt3DRenderer/qabstracttextureimage.h> +#include <Qt3DRender/qabstracttextureimage.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QTextureImagePrivate; -class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage +class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/texture/qtextureproviders.h b/src/render/texture/qtextureproviders.h index 4cf2f7289..17e4a62d5 100644 --- a/src/render/texture/qtextureproviders.h +++ b/src/render/texture/qtextureproviders.h @@ -37,13 +37,13 @@ #ifndef QT3DRENDER_QTEXTUREPROVIDERS_H #define QT3DRENDER_QTEXTUREPROVIDERS_H -#include <Qt3DRenderer/qabstracttextureprovider.h> +#include <Qt3DRender/qabstracttextureprovider.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider { Q_OBJECT public: @@ -51,7 +51,7 @@ public: ~QTexture1D(); }; -class QT3DRENDERERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvider { Q_OBJECT public: @@ -59,7 +59,7 @@ public: ~QTexture1DArray(); }; -class QT3DRENDERERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider { Q_OBJECT public: @@ -67,7 +67,7 @@ public: ~QTexture2D(); }; -class QT3DRENDERERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvider { Q_OBJECT public: @@ -75,7 +75,7 @@ public: ~QTexture2DArray(); }; -class QT3DRENDERERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider { Q_OBJECT public: @@ -83,7 +83,7 @@ public: ~QTexture3D(); }; -class QT3DRENDERERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvider { Q_OBJECT public: @@ -91,7 +91,7 @@ public: ~QTextureCubeMap(); }; -class QT3DRENDERERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTextureProvider { Q_OBJECT public: @@ -99,7 +99,7 @@ public: ~QTextureCubeMapArray(); }; -class QT3DRENDERERSHARED_EXPORT QTexture2DMultisample : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTextureProvider { Q_OBJECT public: @@ -107,7 +107,7 @@ public: ~QTexture2DMultisample(); }; -class QT3DRENDERERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTextureProvider { Q_OBJECT public: @@ -115,7 +115,7 @@ public: ~QTexture2DMultisampleArray(); }; -class QT3DRENDERERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvider { Q_OBJECT public: @@ -123,7 +123,7 @@ public: ~QTextureRectangle(); }; -class QT3DRENDERERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider +class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider { Q_OBJECT public: diff --git a/src/render/texture/qwrapmode.h b/src/render/texture/qwrapmode.h index 6254fe5bf..4bd2cc1ff 100644 --- a/src/render/texture/qwrapmode.h +++ b/src/render/texture/qwrapmode.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QWRAPMODE_H #define QT3DRENDER_QWRAPMODE_H -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QObject> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QTextureWrapModePrivate; -class QT3DRENDERERSHARED_EXPORT QTextureWrapMode : public QObject +class QT3DRENDERSHARED_EXPORT QTextureWrapMode : public QObject { Q_OBJECT Q_PROPERTY(WrapMode x READ x WRITE setX NOTIFY xChanged) diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index edbf26b68..c665e3cf8 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -41,12 +41,12 @@ #include <QOpenGLFunctions> #include <QOpenGLTexture> #include <QOpenGLPixelTransferOptions> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/texturedata.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/texturedata.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/qaspectmanager_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/texturedatamanager_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/texturedatamanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index 313dc40b0..a784a4e91 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -50,10 +50,10 @@ #include <QOpenGLContext> #include <QMutex> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/texturedata.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/texturedata.h> #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/private/handle_types_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/texturedata.h b/src/render/texture/texturedata.h index 2f3fdb9a9..031bd441b 100644 --- a/src/render/texture/texturedata.h +++ b/src/render/texture/texturedata.h @@ -40,13 +40,13 @@ #include <QOpenGLTexture> #include <QImage> #include <QSharedPointer> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT TexImageData +class QT3DRENDERSHARED_EXPORT TexImageData { public: TexImageData(); diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h index fcdabebce..9748b3699 100644 --- a/src/render/texture/texturedatamanager_p.h +++ b/src/render/texture/texturedatamanager_p.h @@ -49,9 +49,9 @@ // #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/texturedata.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/texturedata.h> +#include <Qt3DRender/private/handle_types_p.h> #include <QPair> #include <Qt3DCore/qnodeid.h> diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 96c6cbd3e..3504833ae 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -36,8 +36,8 @@ #include "textureimage_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/texturedatamanager_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/private/texturedatamanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h index bde1e58ca..28aa275ec 100644 --- a/src/render/texture/textureimage_p.h +++ b/src/render/texture/textureimage_p.h @@ -50,9 +50,9 @@ #include <qglobal.h> #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/qabstracttextureprovider.h> -#include <Qt3DRenderer/qabstracttextureimage.h> -#include <Qt3DRenderer/private/handle_types_p.h> +#include <Qt3DRender/qabstracttextureprovider.h> +#include <Qt3DRender/qabstracttextureimage.h> +#include <Qt3DRender/private/handle_types_p.h> QT_BEGIN_NAMESPACE diff --git a/src/src.pro b/src/src.pro index 9c70fad79..849c25d82 100644 --- a/src/src.pro +++ b/src/src.pro @@ -24,7 +24,7 @@ src_quick3d_core.subdir = $$PWD/quick3d/quick3d src_quick3d_core.target = sub-quick3d-core src_quick3d_core.depends = src_core src_input -src_quick3d_render.subdir = $$PWD/quick3d/quick3drenderer +src_quick3d_render.subdir = $$PWD/quick3d/quick3drender src_quick3d_render.target = sub-quick3d-render src_quick3d_render.depends = src_render src_quick3d_core diff --git a/sync.profile b/sync.profile index 5e9420a87..958a4a3ca 100644 --- a/sync.profile +++ b/sync.profile @@ -1,8 +1,8 @@ %modules = ( # path to module name map "Qt3DCore" => "$basedir/src/core", - "Qt3DRenderer" => "$basedir/src/render", + "Qt3DRender" => "$basedir/src/render", "Qt3DQuick" => "$basedir/src/quick3d/quick3d", - "Qt3DQuickRenderer" => "$basedir/src/quick3d/quick3drenderer", + "Qt3DQuickRender" => "$basedir/src/quick3d/quick3drender", "Qt3DInput" => "$basedir/src/input", "Qt3DLogic" => "$basedir/src/logic", "Qt3DCollision" => "$basedir/src/collision", diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index b68e55708..69db916da 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,10 +9,10 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -set(QAspectEngine_NAMESPACE Qt3D) -set(QMesh_NAMESPACE Qt3D) +set(QAspectEngine_NAMESPACE Qt3DCore) +set(QMesh_NAMESPACE Qt3DRender) test_module_includes( 3DCore QAspectEngine - 3DRenderer QMesh + 3DRender QMesh ) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 9be7e3797..8eca7b7ff 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -2,6 +2,6 @@ # Cause make to do nothing. TEMPLATE = subdirs -CMAKE_QT_MODULES_UNDER_TEST = 3dcore 3drenderer +CMAKE_QT_MODULES_UNDER_TEST = 3dcore 3drender CONFIG += ctest_testcase diff --git a/tests/auto/render/attribute/attribute.pro b/tests/auto/render/attribute/attribute.pro index 1786b49b0..259053efa 100644 --- a/tests/auto/render/attribute/attribute.pro +++ b/tests/auto/render/attribute/attribute.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_attribute -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp index eeeca88f6..6d09414e9 100644 --- a/tests/auto/render/attribute/tst_attribute.cpp +++ b/tests/auto/render/attribute/tst_attribute.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/attribute_p.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/private/attribute_p.h> +#include <Qt3DRender/qbuffer.h> #include <Qt3DCore/qscenepropertychange.h> class tst_Attribute : public QObject diff --git a/tests/auto/render/buffer/buffer.pro b/tests/auto/render/buffer/buffer.pro index 5e6dcfcf2..73c13dd42 100644 --- a/tests/auto/render/buffer/buffer.pro +++ b/tests/auto/render/buffer/buffer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_buffer -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index e2bb93b29..a367d0929 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/buffer_p.h> +#include <Qt3DRender/private/buffer_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/qbackendnode_p.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/entity/entity.pro b/tests/auto/render/entity/entity.pro index c14c9edfa..be8998802 100644 --- a/tests/auto/render/entity/entity.pro +++ b/tests/auto/render/entity/entity.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_entity -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp index 1f3f1d390..ea3dcbbeb 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.cpp @@ -35,17 +35,17 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/entity_p.h> +#include <Qt3DRender/private/entity_p.h> #include <Qt3DCore/QCameraLens> #include <Qt3DCore/QScenePropertyChange> #include <Qt3DCore/QTransform> -#include <Qt3DRenderer/QMesh> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QLayer> -#include <Qt3DRenderer/QShaderData> -#include <Qt3DRenderer/QGeometryRenderer> +#include <Qt3DRender/QMesh> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QLayer> +#include <Qt3DRender/QShaderData> +#include <Qt3DRender/QGeometryRenderer> typedef Qt3DCore::QNodeId (*UuidMethod)(Qt3DRender::Render::Entity *); typedef QList<Qt3DCore::QNodeId> (*UuidListMethod)(Qt3DRender::Render::Entity *); diff --git a/tests/auto/render/framegraphnode/framegraphnode.pro b/tests/auto/render/framegraphnode/framegraphnode.pro index 478e74c02..577bc9775 100644 --- a/tests/auto/render/framegraphnode/framegraphnode.pro +++ b/tests/auto/render/framegraphnode/framegraphnode.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_framegraphnode -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp index cfc85fa5b..0e606dff9 100644 --- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp +++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/managers_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/private/managers_p.h> class MyFrameGraphNode : public Qt3DRender::Render::FrameGraphNode { diff --git a/tests/auto/render/geometry/geometry.pro b/tests/auto/render/geometry/geometry.pro index 9d4edb51e..fc916fc7a 100644 --- a/tests/auto/render/geometry/geometry.pro +++ b/tests/auto/render/geometry/geometry.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_geometry -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index 2fa9a4377..1ff1a2ba5 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/geometry_p.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/private/geometry_p.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> #include <Qt3DCore/qscenepropertychange.h> class tst_RenderGeometry : public QObject diff --git a/tests/auto/render/geometryrenderer/geometryrenderer.pro b/tests/auto/render/geometryrenderer/geometryrenderer.pro index 63ad16592..7499730f9 100644 --- a/tests/auto/render/geometryrenderer/geometryrenderer.pro +++ b/tests/auto/render/geometryrenderer/geometryrenderer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_geometryrenderer -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 7602452d5..c9bdebb34 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/geometryrenderer_p.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qgeometryfunctor.h> +#include <Qt3DRender/private/geometryrenderer_p.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qgeometryfunctor.h> #include <Qt3DCore/qscenepropertychange.h> class TestFunctor : public Qt3DRender::QGeometryFunctor diff --git a/tests/auto/render/material/material.pro b/tests/auto/render/material/material.pro index 051b8f3e0..b848ec0ec 100644 --- a/tests/auto/render/material/material.pro +++ b/tests/auto/render/material/material.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_material -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index 48733d03b..7f104347d 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -35,11 +35,11 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/material_p.h> +#include <Qt3DRender/private/material_p.h> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QParameter> -#include <Qt3DRenderer/QEffect> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QParameter> +#include <Qt3DRender/QEffect> #include <Qt3DCore/QScenePropertyChange> diff --git a/tests/auto/render/meshfunctors/meshfunctors.pro b/tests/auto/render/meshfunctors/meshfunctors.pro index 008969cd0..cdf7d5e9b 100644 --- a/tests/auto/render/meshfunctors/meshfunctors.pro +++ b/tests/auto/render/meshfunctors/meshfunctors.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderviews -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp index 36a0f7316..3b4f587a5 100644 --- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp +++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/qgeometryfunctor.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometryfunctor.h> +#include <Qt3DRender/qgeometry.h> class MeshFunctorA : public Qt3DRender::QGeometryFunctor { diff --git a/tests/auto/render/qattribute/qattribute.pro b/tests/auto/render/qattribute/qattribute.pro index 474531bf3..50acb9ded 100644 --- a/tests/auto/render/qattribute/qattribute.pro +++ b/tests/auto/render/qattribute/qattribute.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qattribute -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp index de73fa016..1880e5091 100644 --- a/tests/auto/render/qattribute/tst_qattribute.cpp +++ b/tests/auto/render/qattribute/tst_qattribute.cpp @@ -38,8 +38,8 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/QAttribute> -#include <Qt3DRenderer/QBuffer> +#include <Qt3DRender/QAttribute> +#include <Qt3DRender/QBuffer> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qbuffer/qbuffer.pro b/tests/auto/render/qbuffer/qbuffer.pro index 69f30d1f8..7b3e4315e 100644 --- a/tests/auto/render/qbuffer/qbuffer.pro +++ b/tests/auto/render/qbuffer/qbuffer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qbuffer -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp index 5711d9547..6d9649a42 100644 --- a/tests/auto/render/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp @@ -38,8 +38,8 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qcameraselector/qcameraselector.pro b/tests/auto/render/qcameraselector/qcameraselector.pro index 87cb30636..79f8f660e 100644 --- a/tests/auto/render/qcameraselector/qcameraselector.pro +++ b/tests/auto/render/qcameraselector/qcameraselector.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qcameraselector -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp index f336ab890..96faf4e18 100644 --- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp +++ b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qcameraselector.h> +#include <Qt3DRender/qcameraselector.h> #include <Qt3DCore/qentity.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qclearbuffer/qclearbuffer.pro b/tests/auto/render/qclearbuffer/qclearbuffer.pro index 0e33f3a32..e85e481f3 100644 --- a/tests/auto/render/qclearbuffer/qclearbuffer.pro +++ b/tests/auto/render/qclearbuffer/qclearbuffer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qclearbuffer -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp b/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp index 1e8876b9c..23fec8cff 100644 --- a/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp +++ b/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qclearbuffer.h> +#include <Qt3DRender/qclearbuffer.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qframegraph/qframegraph.pro b/tests/auto/render/qframegraph/qframegraph.pro index 3e89d8cd1..4f782fcd1 100644 --- a/tests/auto/render/qframegraph/qframegraph.pro +++ b/tests/auto/render/qframegraph/qframegraph.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qframegraph -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qframegraph/tst_qframegraph.cpp b/tests/auto/render/qframegraph/tst_qframegraph.cpp index ce6ed338c..f3dfe7ca9 100644 --- a/tests/auto/render/qframegraph/tst_qframegraph.cpp +++ b/tests/auto/render/qframegraph/tst_qframegraph.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qframegraphnode.h> -#include <Qt3DRenderer/qframegraph.h> +#include <Qt3DRender/qframegraphnode.h> +#include <Qt3DRender/qframegraph.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qframegraphnode/qframegraphnode.pro b/tests/auto/render/qframegraphnode/qframegraphnode.pro index 7f306d19c..0cfce4e68 100644 --- a/tests/auto/render/qframegraphnode/qframegraphnode.pro +++ b/tests/auto/render/qframegraphnode/qframegraphnode.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qframegraphnode -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp index f0705a479..93805eab4 100644 --- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp +++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qgeometry/qgeometry.pro b/tests/auto/render/qgeometry/qgeometry.pro index 9ab76b6cc..45b86a089 100644 --- a/tests/auto/render/qgeometry/qgeometry.pro +++ b/tests/auto/render/qgeometry/qgeometry.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qgeometry -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index 08a1429db..a9e09ae30 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -38,9 +38,9 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro b/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro index 668fa6550..8d0a700d7 100644 --- a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro +++ b/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qgeometryrenderer -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 0eb3e1248..093491a43 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -38,11 +38,11 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qgeometryfunctor.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qgeometryfunctor.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qgraphicsutils/qgraphicsutils.pro b/tests/auto/render/qgraphicsutils/qgraphicsutils.pro index 6ab00ad6a..031a26246 100644 --- a/tests/auto/render/qgraphicsutils/qgraphicsutils.pro +++ b/tests/auto/render/qgraphicsutils/qgraphicsutils.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qgraphicsutils -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qlayerfilter/qlayerfilter.pro b/tests/auto/render/qlayerfilter/qlayerfilter.pro index ac115a556..44dfdd08e 100644 --- a/tests/auto/render/qlayerfilter/qlayerfilter.pro +++ b/tests/auto/render/qlayerfilter/qlayerfilter.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qlayerfilter -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp index ed8e9ab30..97581c875 100644 --- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp +++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qlayerfilter.h> +#include <Qt3DRender/qlayerfilter.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qmaterial/qmaterial.pro b/tests/auto/render/qmaterial/qmaterial.pro index 75e5e93a9..a9a27b4bf 100644 --- a/tests/auto/render/qmaterial/qmaterial.pro +++ b/tests/auto/render/qmaterial/qmaterial.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qmaterial -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 3edeb33e1..fc3396d03 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -38,19 +38,19 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/QEffect> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QParameter> -#include <Qt3DRenderer/QTechnique> -#include <Qt3DRenderer/QRenderPass> -#include <Qt3DRenderer/QPhongMaterial> -#include <Qt3DRenderer/QParameterMapping> -#include <Qt3DRenderer/QDiffuseMapMaterial> -#include <Qt3DRenderer/QPerVertexColorMaterial> -#include <Qt3DRenderer/QNormalDiffuseMapMaterial> -#include <Qt3DRenderer/QDiffuseSpecularMapMaterial> -#include <Qt3DRenderer/QNormalDiffuseMapAlphaMaterial> -#include <Qt3DRenderer/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DRender/QEffect> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QParameter> +#include <Qt3DRender/QTechnique> +#include <Qt3DRender/QRenderPass> +#include <Qt3DRender/QPhongMaterial> +#include <Qt3DRender/QParameterMapping> +#include <Qt3DRender/QDiffuseMapMaterial> +#include <Qt3DRender/QPerVertexColorMaterial> +#include <Qt3DRender/QNormalDiffuseMapMaterial> +#include <Qt3DRender/QDiffuseSpecularMapMaterial> +#include <Qt3DRender/QNormalDiffuseMapAlphaMaterial> +#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro b/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro index f69ed7202..0769b3fe5 100644 --- a/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro +++ b/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qrenderpassfilter -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index a8e3f943f..43bdb2e0a 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp @@ -39,9 +39,9 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qrenderpassfilter.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qannotation.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qrendertargetselector/qrendertargetselector.pro b/tests/auto/render/qrendertargetselector/qrendertargetselector.pro index e5939d54f..8f4c110df 100644 --- a/tests/auto/render/qrendertargetselector/qrendertargetselector.pro +++ b/tests/auto/render/qrendertargetselector/qrendertargetselector.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qrendertargetselector -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp index aa4aac5f1..2b3088562 100644 --- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp +++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qrendertargetselector.h> -#include <Qt3DRenderer/qrendertarget.h> +#include <Qt3DRender/qrendertargetselector.h> +#include <Qt3DRender/qrendertarget.h> #include "testpostmanarbiter.h" // We need to call QNode::clone which is protected diff --git a/tests/auto/render/qsortcriterion/qsortcriterion.pro b/tests/auto/render/qsortcriterion/qsortcriterion.pro index 1a7b34239..f612fcd5a 100644 --- a/tests/auto/render/qsortcriterion/qsortcriterion.pro +++ b/tests/auto/render/qsortcriterion/qsortcriterion.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qsortcriterion -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp index fd53bed2e..fe835b97e 100644 --- a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp +++ b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qsortmethod/qsortmethod.pro b/tests/auto/render/qsortmethod/qsortmethod.pro index 64d7ea4b8..ca9537aa6 100644 --- a/tests/auto/render/qsortmethod/qsortmethod.pro +++ b/tests/auto/render/qsortmethod/qsortmethod.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qsortmethod -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qsortmethod/tst_qsortmethod.cpp b/tests/auto/render/qsortmethod/tst_qsortmethod.cpp index 718d0855e..035291375 100644 --- a/tests/auto/render/qsortmethod/tst_qsortmethod.cpp +++ b/tests/auto/render/qsortmethod/tst_qsortmethod.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qsortmethod.h> -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortmethod.h> +#include <Qt3DRender/qsortcriterion.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qstateset/qstateset.pro b/tests/auto/render/qstateset/qstateset.pro index ca622c9db..ab96eb8f7 100644 --- a/tests/auto/render/qstateset/qstateset.pro +++ b/tests/auto/render/qstateset/qstateset.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qstateset -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qstateset/tst_qstateset.cpp b/tests/auto/render/qstateset/tst_qstateset.cpp index f6e1655c8..f28b772d0 100644 --- a/tests/auto/render/qstateset/tst_qstateset.cpp +++ b/tests/auto/render/qstateset/tst_qstateset.cpp @@ -39,9 +39,9 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qstateset.h> -#include <Qt3DRenderer/private/qrenderstate_p.h> -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qstateset.h> +#include <Qt3DRender/private/qrenderstate_p.h> +#include <Qt3DRender/qrenderstate.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qtechniquefilter/qtechniquefilter.pro b/tests/auto/render/qtechniquefilter/qtechniquefilter.pro index d36d6069b..772176823 100644 --- a/tests/auto/render/qtechniquefilter/qtechniquefilter.pro +++ b/tests/auto/render/qtechniquefilter/qtechniquefilter.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qtechniquefilter -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 71a0ecac1..dfe101009 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -39,9 +39,9 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qtechniquefilter.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qannotation.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qviewport/qviewport.pro b/tests/auto/render/qviewport/qviewport.pro index 49b3ffb84..3f0a2f070 100644 --- a/tests/auto/render/qviewport/qviewport.pro +++ b/tests/auto/render/qviewport/qviewport.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qviewport -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp index 1d03ce67c..019e43a9b 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qviewport.h> +#include <Qt3DRender/qviewport.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/raycasting/raycasting.pro b/tests/auto/render/raycasting/raycasting.pro index e389ef3d7..9eb5db48f 100644 --- a/tests/auto/render/raycasting/raycasting.pro +++ b/tests/auto/render/raycasting/raycasting.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_raycasting -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp index 2aaa92984..fed440f62 100644 --- a/tests/auto/render/raycasting/tst_raycasting.cpp +++ b/tests/auto/render/raycasting/tst_raycasting.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/qraycastingservice.h> -#include <Qt3DRenderer/sphere.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/qraycastingservice.h> +#include <Qt3DRender/sphere.h> #include <Qt3DCore/qboundingvolumeprovider.h> #include <Qt3DCore/qray3d.h> diff --git a/tests/auto/render/renderpass/renderpass.pro b/tests/auto/render/renderpass/renderpass.pro index ab0fe4211..2b7806af1 100644 --- a/tests/auto/render/renderpass/renderpass.pro +++ b/tests/auto/render/renderpass/renderpass.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderpass -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index a5b66a534..56123ad25 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -35,36 +35,36 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/renderpass_p.h> +#include <Qt3DRender/private/renderpass_p.h> #include <Qt3DCore/QScenePropertyChange> -#include <Qt3DRenderer/QAnnotation> -#include <Qt3DRenderer/QParameterMapping> -#include <Qt3DRenderer/QRenderPass> -#include <Qt3DRenderer/QShaderProgram> -#include <Qt3DRenderer/QParameter> - -#include <Qt3DRenderer/QAlphaCoverage> -#include <Qt3DRenderer/QAlphaTest> -#include <Qt3DRenderer/QBlendEquation> -#include <Qt3DRenderer/QBlendState> -#include <Qt3DRenderer/QColorMask> -#include <Qt3DRenderer/QCullFace> -#include <Qt3DRenderer/QDepthMask> -#include <Qt3DRenderer/QDepthTest> -#include <Qt3DRenderer/QDithering> -#include <Qt3DRenderer/QFrontFace> -#include <Qt3DRenderer/QPolygonOffset> -#include <Qt3DRenderer/QScissorTest> -#include <Qt3DRenderer/QStencilTest> -#include <Qt3DRenderer/QStencilTestSeparate> -#include <Qt3DRenderer/QStencilMask> -#include <Qt3DRenderer/QStencilOp> -#include <Qt3DRenderer/QStencilOpSeparate> -#include <Qt3DRenderer/QClipPlane> - -#include <Qt3DRenderer/private/renderstates_p.h> +#include <Qt3DRender/QAnnotation> +#include <Qt3DRender/QParameterMapping> +#include <Qt3DRender/QRenderPass> +#include <Qt3DRender/QShaderProgram> +#include <Qt3DRender/QParameter> + +#include <Qt3DRender/QAlphaCoverage> +#include <Qt3DRender/QAlphaTest> +#include <Qt3DRender/QBlendEquation> +#include <Qt3DRender/QBlendState> +#include <Qt3DRender/QColorMask> +#include <Qt3DRender/QCullFace> +#include <Qt3DRender/QDepthMask> +#include <Qt3DRender/QDepthTest> +#include <Qt3DRender/QDithering> +#include <Qt3DRender/QFrontFace> +#include <Qt3DRender/QPolygonOffset> +#include <Qt3DRender/QScissorTest> +#include <Qt3DRender/QStencilTest> +#include <Qt3DRender/QStencilTestSeparate> +#include <Qt3DRender/QStencilMask> +#include <Qt3DRender/QStencilOp> +#include <Qt3DRender/QStencilOpSeparate> +#include <Qt3DRender/QClipPlane> + +#include <Qt3DRender/private/renderstates_p.h> using namespace Qt3DCore; using namespace Qt3DRender; diff --git a/tests/auto/render/renderqueue/renderqueue.pro b/tests/auto/render/renderqueue/renderqueue.pro index 85ed34db4..92e675285 100644 --- a/tests/auto/render/renderqueue/renderqueue.pro +++ b/tests/auto/render/renderqueue/renderqueue.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderqueue -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderqueue/tst_renderqueue.cpp b/tests/auto/render/renderqueue/tst_renderqueue.cpp index 2fb01554b..c571de2c0 100644 --- a/tests/auto/render/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/renderqueue/tst_renderqueue.cpp @@ -38,8 +38,8 @@ #include <QMutex> #include <QWaitCondition> #include <QThread> -#include <Qt3DRenderer/private/renderqueue_p.h> -#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRender/private/renderqueue_p.h> +#include <Qt3DRender/private/renderview_p.h> class tst_RenderQueue : public QObject { diff --git a/tests/auto/render/renderviews/renderviews.pro b/tests/auto/render/renderviews/renderviews.pro index 93bcf7e8c..8a46b90df 100644 --- a/tests/auto/render/renderviews/renderviews.pro +++ b/tests/auto/render/renderviews/renderviews.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderviews -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderviewutils/renderviewutils.pro b/tests/auto/render/renderviewutils/renderviewutils.pro index 1ce0affec..c45313023 100644 --- a/tests/auto/render/renderviewutils/renderviewutils.pro +++ b/tests/auto/render/renderviewutils/renderviewutils.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderviewutils -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp index ca02b3166..1cab4da2e 100644 --- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp @@ -36,10 +36,10 @@ #include <QtTest/QTest> -#include <Qt3DRenderer/private/renderviewjobutils_p.h> -#include <Qt3DRenderer/private/shaderdata_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/qshaderdata.h> +#include <Qt3DRender/private/renderviewjobutils_p.h> +#include <Qt3DRender/private/shaderdata_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/qshaderdata.h> class tst_RenderViewUtils : public QObject diff --git a/tests/auto/render/shader/shader.pro b/tests/auto/render/shader/shader.pro index ba942083a..8d0dd99a5 100644 --- a/tests/auto/render/shader/shader.pro +++ b/tests/auto/render/shader/shader.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_shader -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/shader/tst_shader.cpp b/tests/auto/render/shader/tst_shader.cpp index 6a8a61f58..ae850ddc3 100644 --- a/tests/auto/render/shader/tst_shader.cpp +++ b/tests/auto/render/shader/tst_shader.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/qshaderprogram.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/qshaderprogram.h> class tst_RenderShader : public QObject { diff --git a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp index 48bfef9f3..bfa394a25 100644 --- a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp +++ b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp @@ -36,7 +36,7 @@ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h> +#include <Qt3DRender/private/vsyncframeadvanceservice_p.h> class FakeRenderThread Q_DECL_FINAL : public QThread { diff --git a/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro b/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro index 25d8a70e5..4d6b336d1 100644 --- a/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro +++ b/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_vsyncframeadvanceservice -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase |