diff options
Diffstat (limited to 'examples/qt3d')
197 files changed, 297 insertions, 297 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 += \ |