diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-11 14:58:17 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:30 +0000 |
commit | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (patch) | |
tree | 77a1ed41c16262f5cc7aa9ddb2d66d3f9b61a719 | |
parent | 8677f62fa690efa29fbb6f870af1ea2b4e7111cf (diff) |
Move defaults and geometries out of Qt3DRender and into Qt3DExtras
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
246 files changed, 1608 insertions, 899 deletions
diff --git a/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro b/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro index 436b6dc35..d31b21924 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 3drender 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras OTHER_FILES += *.qml diff --git a/examples/qt3d/anaglyph-rendering/main.qml b/examples/qt3d/anaglyph-rendering/main.qml index 36a612310..3510850a2 100644 --- a/examples/qt3d/anaglyph-rendering/main.qml +++ b/examples/qt3d/anaglyph-rendering/main.qml @@ -51,6 +51,7 @@ import QtQuick 2.4 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/assimp-cpp/assimp-cpp.pro b/examples/qt3d/assimp-cpp/assimp-cpp.pro index 0cc6dd164..201cef7a2 100644 --- a/examples/qt3d/assimp-cpp/assimp-cpp.pro +++ b/examples/qt3d/assimp-cpp/assimp-cpp.pro @@ -6,6 +6,6 @@ android|ios|tvos|winrt { error( "Couldn't find the examples.pri file!" ) } -QT += widgets 3dcore 3drender 3dinput +QT += widgets 3dcore 3drender 3dinput 3dextras SOURCES += main.cpp diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp index f7dd6fccd..11e58a5f8 100644 --- a/examples/qt3d/assimp-cpp/main.cpp +++ b/examples/qt3d/assimp-cpp/main.cpp @@ -57,7 +57,7 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QSceneLoader> #include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/QForwardRenderer> +#include <Qt3DExtras/QForwardRenderer> #include "qt3dwindow.h" #include "qfirstpersoncameracontroller.h" diff --git a/examples/qt3d/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro index 02eac7dc9..798a22b67 100644 --- a/examples/qt3d/assimp/assimp.pro +++ b/examples/qt3d/assimp/assimp.pro @@ -4,7 +4,7 @@ SOURCE += main.cpp -QT += qml quick 3dcore 3drender 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras OTHER_FILES += main.qml diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index 40ea31e51..f3ea3c7a5 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -53,6 +53,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Examples 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index 591c0cfc3..e01c0feeb 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -65,7 +65,7 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRender/qtorusmesh.h> +#include <Qt3DExtras/qtorusmesh.h> #include <Qt3DRender/qmesh.h> #include <Qt3DRender/qtechnique.h> #include <Qt3DRender/qmaterial.h> @@ -78,7 +78,7 @@ #include <Qt3DCore/qaspectengine.h> #include <Qt3DRender/qrenderaspect.h> -#include <Qt3DRender/qforwardrenderer.h> +#include <Qt3DExtras/qforwardrenderer.h> #include "qt3dwindow.h" #include "qfirstpersoncameracontroller.h" diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp index b1420b7e6..798d3aeb6 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp @@ -58,7 +58,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) // Torus shape data //! [0] - m_torus = new Qt3DRender::QTorusMesh(); + m_torus = new Qt3DExtras::QTorusMesh(); m_torus->setRadius(1.0f); m_torus->setMinorRadius(0.4f); m_torus->setRings(100); @@ -74,7 +74,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) //! [1] //! [2] - Qt3DRender::QPhongMaterial *torusMaterial = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QPhongMaterial *torusMaterial = new Qt3DExtras::QPhongMaterial(); torusMaterial->setDiffuse(QColor(QRgb(0xbeb32b))); //! [2] @@ -87,7 +87,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) //! [3] // Cone shape data - Qt3DRender::QConeMesh *cone = new Qt3DRender::QConeMesh(); + Qt3DExtras::QConeMesh *cone = new Qt3DExtras::QConeMesh(); cone->setTopRadius(0.5); cone->setBottomRadius(1); cone->setLength(3); @@ -100,7 +100,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) coneTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1.0f, 0.0f, 0.0f), 45.0f)); coneTransform->setTranslation(QVector3D(0.0f, 4.0f, -1.5)); - Qt3DRender::QPhongMaterial *coneMaterial = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QPhongMaterial *coneMaterial = new Qt3DExtras::QPhongMaterial(); coneMaterial->setDiffuse(QColor(QRgb(0x928327))); // Cone @@ -110,7 +110,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) m_coneEntity->addComponent(coneTransform); // Cylinder shape data - Qt3DRender::QCylinderMesh *cylinder = new Qt3DRender::QCylinderMesh(); + Qt3DExtras::QCylinderMesh *cylinder = new Qt3DExtras::QCylinderMesh(); cylinder->setRadius(1); cylinder->setLength(3); cylinder->setRings(100); @@ -122,7 +122,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) cylinderTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1.0f, 0.0f, 0.0f), 45.0f)); cylinderTransform->setTranslation(QVector3D(-5.0f, 4.0f, -1.5)); - Qt3DRender::QPhongMaterial *cylinderMaterial = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QPhongMaterial *cylinderMaterial = new Qt3DExtras::QPhongMaterial(); cylinderMaterial->setDiffuse(QColor(QRgb(0x928327))); // Cylinder @@ -132,14 +132,14 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) m_cylinderEntity->addComponent(cylinderTransform); // Cuboid shape data - Qt3DRender::QCuboidMesh *cuboid = new Qt3DRender::QCuboidMesh(); + Qt3DExtras::QCuboidMesh *cuboid = new Qt3DExtras::QCuboidMesh(); // CuboidMesh Transform Qt3DCore::QTransform *cuboidTransform = new Qt3DCore::QTransform(); cuboidTransform->setScale(4.0f); cuboidTransform->setTranslation(QVector3D(5.0f, -4.0f, 0.0f)); - Qt3DRender::QPhongMaterial *cuboidMaterial = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QPhongMaterial *cuboidMaterial = new Qt3DExtras::QPhongMaterial(); cuboidMaterial->setDiffuse(QColor(QRgb(0x665423))); //Cuboid @@ -149,7 +149,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) m_cuboidEntity->addComponent(cuboidTransform); // Plane shape data - Qt3DRender::QPlaneMesh *planeMesh = new Qt3DRender::QPlaneMesh(); + Qt3DExtras::QPlaneMesh *planeMesh = new Qt3DExtras::QPlaneMesh(); planeMesh->setWidth(2); planeMesh->setHeight(2); @@ -159,7 +159,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) planeTransform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1.0f, 0.0f, 0.0f), 45.0f)); planeTransform->setTranslation(QVector3D(0.0f, -4.0f, 0.0f)); - Qt3DRender::QPhongMaterial *planeMaterial = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QPhongMaterial *planeMaterial = new Qt3DExtras::QPhongMaterial(); planeMaterial->setDiffuse(QColor(QRgb(0xa69929))); // Plane @@ -169,7 +169,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) m_planeEntity->addComponent(planeTransform); // Sphere shape data - Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh(); + Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh(); sphereMesh->setRings(20); sphereMesh->setSlices(20); sphereMesh->setRadius(2); @@ -180,7 +180,7 @@ SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) sphereTransform->setScale(1.3f); sphereTransform->setTranslation(QVector3D(-5.0f, -4.0f, 0.0f)); - Qt3DRender::QPhongMaterial *sphereMaterial = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QPhongMaterial *sphereMaterial = new Qt3DExtras::QPhongMaterial(); sphereMaterial->setDiffuse(QColor(QRgb(0xa69929))); // Sphere diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h index fed79a433..2d33ec95e 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.h +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h @@ -56,13 +56,13 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DRender/QTorusMesh> -#include <Qt3DRender/QConeMesh> -#include <Qt3DRender/QCylinderMesh> -#include <Qt3DRender/QCuboidMesh> -#include <Qt3DRender/QPlaneMesh> -#include <Qt3DRender/QSphereMesh> -#include <Qt3DRender/QPhongMaterial> +#include <Qt3DExtras/QTorusMesh> +#include <Qt3DExtras/QConeMesh> +#include <Qt3DExtras/QCylinderMesh> +#include <Qt3DExtras/QCuboidMesh> +#include <Qt3DExtras/QPlaneMesh> +#include <Qt3DExtras/QSphereMesh> +#include <Qt3DExtras/QPhongMaterial> class SceneModifier : public QObject { @@ -82,7 +82,7 @@ public slots: private: Qt3DCore::QEntity *m_rootEntity; - Qt3DRender::QTorusMesh *m_torus; + Qt3DExtras::QTorusMesh *m_torus; Qt3DCore::QEntity *m_coneEntity; Qt3DCore::QEntity *m_cylinderEntity; Qt3DCore::QEntity *m_torusEntity; diff --git a/examples/qt3d/bigmodel-qml/MyEntity.qml b/examples/qt3d/bigmodel-qml/MyEntity.qml index 04b77aedc..c2c7e5d7c 100644 --- a/examples/qt3d/bigmodel-qml/MyEntity.qml +++ b/examples/qt3d/bigmodel-qml/MyEntity.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/bigmodel-qml/bigmodel-qml.pro b/examples/qt3d/bigmodel-qml/bigmodel-qml.pro index d183530e5..063a27b01 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 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dextras SOURCES += \ main.cpp diff --git a/examples/qt3d/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml index e83cace9d..61d9d39a5 100644 --- a/examples/qt3d/bigmodel-qml/main.qml +++ b/examples/qt3d/bigmodel-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/bigscene-cpp/entity.cpp b/examples/qt3d/bigscene-cpp/entity.cpp index 878a3839f..9a4ecae3b 100644 --- a/examples/qt3d/bigscene-cpp/entity.cpp +++ b/examples/qt3d/bigscene-cpp/entity.cpp @@ -50,16 +50,16 @@ #include "entity.h" -#include <Qt3DRender/QCylinderMesh> -#include <Qt3DRender/QPhongMaterial> +#include <Qt3DExtras/QCylinderMesh> +#include <Qt3DExtras/QPhongMaterial> #include <Qt3DCore/QTransform> #include <QMatrix4x4> Entity::Entity(Qt3DCore::QNode *parent) : QEntity(parent) , m_transform(new Qt3DCore::QTransform()) - , m_mesh(new Qt3DRender::QCylinderMesh()) - , m_material(new Qt3DRender::QPhongMaterial()) + , m_mesh(new Qt3DExtras::QCylinderMesh()) + , m_material(new Qt3DExtras::QPhongMaterial()) { m_mesh->setRings(50.0f); m_mesh->setSlices(30.0f); diff --git a/examples/qt3d/bigscene-cpp/entity.h b/examples/qt3d/bigscene-cpp/entity.h index cf4f1497d..04dcbbcb3 100644 --- a/examples/qt3d/bigscene-cpp/entity.h +++ b/examples/qt3d/bigscene-cpp/entity.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QTransform; } -namespace Qt3DRender { +namespace Qt3DExtras { class QCylinderMesh; class QPhongMaterial; } @@ -101,8 +101,8 @@ private: private: Qt3DCore::QTransform *m_transform; - Qt3DRender::QCylinderMesh *m_mesh; - Qt3DRender::QPhongMaterial *m_material; + Qt3DExtras::QCylinderMesh *m_mesh; + Qt3DExtras::QPhongMaterial *m_material; float m_theta; float m_phi; QVector3D m_position; diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp index 15f113280..4c5d0a115 100644 --- a/examples/qt3d/bigscene-cpp/main.cpp +++ b/examples/qt3d/bigscene-cpp/main.cpp @@ -61,11 +61,11 @@ #include <Qt3DCore/qaspectengine.h> #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QParameter> -#include <Qt3DRender/QCylinderMesh> +#include <Qt3DExtras//QCylinderMesh> #include <Qt3DRender/QRenderAspect> #include <Qt3DRender/QCameraSelector> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QForwardRenderer> +#include <Qt3DExtras/QPhongMaterial> +#include <Qt3DExtras/QForwardRenderer> #include <qmath.h> #include "qt3dwindow.h" #include "qfirstpersoncameracontroller.h" diff --git a/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro index 78c0e6927..d2c5166ee 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 3drender 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras SOURCES += \ main.cpp diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml index 79fb09533..ea804963a 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.qml +++ b/examples/qt3d/bigscene-instanced-qml/main.qml @@ -52,6 +52,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import QtQuick 2.2 as QQ2 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml index fb03341cb..5af9be195 100644 --- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml +++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml @@ -54,6 +54,7 @@ import Qt3D.Render 2.0 Viewport { property alias camera: cameraSelector.camera property alias window: surfaceSelector.surface + property alias clearColor: clearBuffer.clearColor RenderSurfaceSelector { id: surfaceSelector @@ -76,6 +77,7 @@ Viewport { // Fills depth buffer for entities that are clipped layers: ["content", "visualization"] ClearBuffers { + id: clearBuffer buffers: ClearBuffers.ColorDepthBuffer RenderPassFilter { matchAny: FilterKey { name: "pass"; value: "material" } diff --git a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml index d3cac2c81..e70177c6d 100644 --- a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml +++ b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml index 28f526955..c1dd905f3 100644 --- a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml +++ b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml @@ -51,6 +51,7 @@ import QtQuick 2.4 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { 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 5ecc28ca7..81500e4ce 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 3drender 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras SOURCES += main.cpp diff --git a/examples/qt3d/component-changes/main.cpp b/examples/qt3d/component-changes/main.cpp index 7cac4e0be..93ae52d4d 100644 --- a/examples/qt3d/component-changes/main.cpp +++ b/examples/qt3d/component-changes/main.cpp @@ -51,9 +51,9 @@ #include <QGuiApplication> #include <Qt3DRender/qcamera.h> -#include <Qt3DRender/qcylindermesh.h> -#include <Qt3DRender/qspheremesh.h> -#include <Qt3DRender/qphongmaterial.h> +#include <Qt3DExtras/qcylindermesh.h> +#include <Qt3DExtras/qspheremesh.h> +#include <Qt3DExtras/qphongmaterial.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> @@ -121,14 +121,14 @@ int main(int argc, char **argv) cameraController->setCamera(camera); // Cylinder mesh data - Qt3DRender::QCylinderMesh *cylinderMesh = new Qt3DRender::QCylinderMesh(); + Qt3DExtras::QCylinderMesh *cylinderMesh = new Qt3DExtras::QCylinderMesh(); cylinderMesh->setRadius(1); cylinderMesh->setLength(3); cylinderMesh->setRings(5); cylinderMesh->setSlices(40); // Sphere mesh data - Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh(); + Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh(); sphereMesh->setRings(20); sphereMesh->setSlices(40); @@ -138,7 +138,7 @@ int main(int argc, char **argv) transform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f)); // Material - Qt3DRender::QPhongMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity); + Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity); material->setDiffuse(Qt::red); // Cylinder diff --git a/examples/qt3d/compute-particles/ParticlesScene.qml b/examples/qt3d/compute-particles/ParticlesScene.qml index e9a309022..cbb21f266 100644 --- a/examples/qt3d/compute-particles/ParticlesScene.qml +++ b/examples/qt3d/compute-particles/ParticlesScene.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { property alias particleStep: computeMaterial.particleStep diff --git a/examples/qt3d/compute-particles/compute-particles.pro b/examples/qt3d/compute-particles/compute-particles.pro index c25cc0c30..96b1a6b5d 100644 --- a/examples/qt3d/compute-particles/compute-particles.pro +++ b/examples/qt3d/compute-particles/compute-particles.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick 3dinput quick qml +QT += 3dcore 3drender 3dquick 3dinput quick qml 3dextras HEADERS += \ diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml index 0f2fe1fb3..a686e29bd 100644 --- a/examples/qt3d/controls/Logo.qml +++ b/examples/qt3d/controls/Logo.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import QtQuick 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/cpp_example/cpp_example.pro b/examples/qt3d/cpp_example/cpp_example.pro index f78ec0860..b6fffb8cc 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 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras SOURCES += main.cpp diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index e93c417ee..68e657670 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -58,7 +58,7 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRender/qtorusmesh.h> +#include <Qt3DExtras//qtorusmesh.h> #include <Qt3DRender/qmesh.h> #include <Qt3DRender/qtechnique.h> #include <Qt3DRender/qmaterial.h> @@ -88,7 +88,7 @@ int main(int ac, char **av) Qt3DCore::QEntity *torusEntity = new Qt3DCore::QEntity(rootEntity); // Torus shape data - Qt3DRender::QTorusMesh *torus = new Qt3DRender::QTorusMesh(); + Qt3DExtras::QTorusMesh *torus = new Qt3DExtras::QTorusMesh(); torus->setRadius(40); torus->setMinorRadius(15); diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index 68f2683bf..d4652839c 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -60,8 +60,8 @@ #include <Qt3DRender/QRenderStateSet> #include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/QForwardRenderer> -#include <Qt3DRender/QPerVertexColorMaterial> +#include <Qt3DExtras/QForwardRenderer> +#include <Qt3DExtras/QPerVertexColorMaterial> #include <Qt3DRender/QGeometryRenderer> #include <Qt3DRender/QGeometry> @@ -94,7 +94,7 @@ int main(int argc, char* argv[]) camController->setCamera(cameraEntity); // Material - Qt3DRender::QMaterial *material = new Qt3DRender::QPerVertexColorMaterial(rootEntity); + Qt3DRender::QMaterial *material = new Qt3DExtras::QPerVertexColorMaterial(rootEntity); // Torus Qt3DCore::QEntity *customMeshEntity = new Qt3DCore::QEntity(rootEntity); diff --git a/examples/qt3d/custom-mesh-qml/main.qml b/examples/qt3d/custom-mesh-qml/main.qml index 2d93d84f3..e5d26e23f 100644 --- a/examples/qt3d/custom-mesh-qml/main.qml +++ b/examples/qt3d/custom-mesh-qml/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index 22442d813..725d373fe 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -54,15 +54,15 @@ #include <Qt3DRender/qcamera.h> #include <Qt3DRender/qcameralens.h> -#include <Qt3DRender/qcylindermesh.h> +#include <Qt3DExtras/qcylindermesh.h> #include <Qt3DRender/qmesh.h> #include <Qt3DRender/qtechnique.h> -#include <Qt3DRender/qphongmaterial.h> +#include <Qt3DExtras/qphongmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qrenderaspect.h> -#include <Qt3DRender/qforwardrenderer.h> +#include <Qt3DExtras/qforwardrenderer.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> @@ -91,7 +91,7 @@ int main(int argc, char **argv) cameraController->setCamera(camera); // Cylinder shape data - Qt3DRender::QCylinderMesh *mesh = new Qt3DRender::QCylinderMesh(); + Qt3DExtras::QCylinderMesh *mesh = new Qt3DExtras::QCylinderMesh(); mesh->setRadius(1); mesh->setLength(3); mesh->setRings(100); @@ -103,7 +103,7 @@ int main(int argc, char **argv) transform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f)); // Material - Qt3DRender::QPhongMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity); + Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity); material->setDiffuse(Qt::red); // Cylinder diff --git a/examples/qt3d/cylinder-qml/cylinder-qml.pro b/examples/qt3d/cylinder-qml/cylinder-qml.pro index 5658d30ff..ed5b093b3 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 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dextras SOURCES += \ main.cpp diff --git a/examples/qt3d/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml index 3735c8569..9d2fed54b 100644 --- a/examples/qt3d/cylinder-qml/main.qml +++ b/examples/qt3d/cylinder-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 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 261d893ce..f9f239f24 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 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras HEADERS += \ gbuffer.h \ diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index f1221fd3b..868158e49 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -51,8 +51,8 @@ #include <Qt3DCore/QEntity> #include <Qt3DRender/QMaterial> -#include <Qt3DRender/QSphereMesh> -#include <Qt3DRender/QPlaneMesh> +#include <Qt3DExtras//QSphereMesh> +#include <Qt3DExtras//QPlaneMesh> #include <Qt3DRender/QLayer> #include <Qt3DRender/QParameter> #include <Qt3DRender/QCamera> @@ -87,7 +87,7 @@ int main(int ac, char **av) FinalEffect *finalEffect = new FinalEffect(); SceneEffect *sceneEffect = new SceneEffect(); - Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh(); + Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh(); sphereMesh->setRings(50); sphereMesh->setSlices(100); @@ -97,7 +97,7 @@ int main(int ac, char **av) Qt3DRender::QLayer *quadLayer = new Qt3DRender::QLayer(); quadLayer->setNames(QStringList("screenQuad")); - Qt3DRender::QPlaneMesh *planeMesh = new Qt3DRender::QPlaneMesh(); + Qt3DExtras::QPlaneMesh *planeMesh = new Qt3DExtras::QPlaneMesh(); planeMesh->setMeshResolution(QSize(2, 2)); planeMesh->setWidth(2.0f); planeMesh->setHeight(2.0f); diff --git a/examples/qt3d/deferred-renderer-qml/main.qml b/examples/qt3d/deferred-renderer-qml/main.qml index 09812674f..cca32ca3c 100644 --- a/examples/qt3d/deferred-renderer-qml/main.qml +++ b/examples/qt3d/deferred-renderer-qml/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.0 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id : root diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp index c0e8c7511..a39c9a9dc 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp +++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp @@ -55,8 +55,8 @@ BoxEntity::BoxEntity(QNode *parent) : Qt3DCore::QEntity(parent) , m_transform(new Qt3DCore::QTransform()) - , m_mesh(new Qt3DRender::QCuboidMesh()) - , m_material(new Qt3DRender::QPhongMaterial()) + , m_mesh(new Qt3DExtras::QCuboidMesh()) + , m_material(new Qt3DExtras::QPhongMaterial()) , m_angle(0.0f) , m_radius(1.0f) { diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h index 1aa24c436..f9fdb9580 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.h +++ b/examples/qt3d/dynamicscene-cpp/boxentity.h @@ -53,8 +53,8 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> -#include <Qt3DRender/QCuboidMesh> -#include <Qt3DRender/QPhongMaterial> +#include <Qt3DExtras/QCuboidMesh> +#include <Qt3DExtras/QPhongMaterial> class BoxEntity : public Qt3DCore::QEntity { @@ -85,8 +85,8 @@ private: void updateTransformation(); Qt3DCore::QTransform *m_transform; - Qt3DRender::QCuboidMesh *m_mesh; - Qt3DRender::QPhongMaterial *m_material; + Qt3DExtras::QCuboidMesh *m_mesh; + Qt3DExtras::QPhongMaterial *m_material; float m_angle; float m_radius; }; diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 3839b480a..353f6a42d 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -56,7 +56,7 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/QForwardRenderer> +#include <Qt3DExtras/QForwardRenderer> #include "examplescene.h" #include "qt3dwindow.h" diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml index 0a0894e82..182d35ca8 100644 --- a/examples/qt3d/enabled-qml/main.qml +++ b/examples/qt3d/enabled-qml/main.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 import QtQuick 2.0 as QQ2 Entity { diff --git a/examples/qt3d/examples-common/examples-common.pri b/examples/qt3d/examples-common/examples-common.pri index e50e39edd..ce77eadbe 100644 --- a/examples/qt3d/examples-common/examples-common.pri +++ b/examples/qt3d/examples-common/examples-common.pri @@ -1,4 +1,4 @@ -QT += 3dcore 3drender 3dinput 3dlogic qml +QT += 3dcore 3drender 3dinput 3dlogic qml 3dextras INCLUDEPATH += $$PWD diff --git a/examples/qt3d/examples-common/examples-common.pro b/examples/qt3d/examples-common/examples-common.pro index b5be67137..85123db4e 100644 --- a/examples/qt3d/examples-common/examples-common.pro +++ b/examples/qt3d/examples-common/examples-common.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += staticlib TARGET = examples-common -QT += core-private 3dcore 3dcore-private 3drender 3dinput 3dlogic qml quick +QT += core-private 3dcore 3dcore-private 3drender 3dinput 3dlogic qml quick 3dextras SOURCES += \ qfirstpersoncameracontroller.cpp \ @@ -9,6 +9,7 @@ SOURCES += \ qt3dwindow.cpp \ qt3dquickwindow.cpp + HEADERS += \ qfirstpersoncameracontroller.h \ qfirstpersoncameracontroller_p.h \ @@ -17,7 +18,6 @@ HEADERS += \ qt3dwindow.h \ qt3dquickwindow.h - QML_FILES = \ $$PWD/OrbitController.qml \ $$PWD/FirstPersonCameraController.qml diff --git a/examples/qt3d/examples-common/qt3dwindow.cpp b/examples/qt3d/examples-common/qt3dwindow.cpp index bbf3ee51f..4c0bfc21a 100644 --- a/examples/qt3d/examples-common/qt3dwindow.cpp +++ b/examples/qt3d/examples-common/qt3dwindow.cpp @@ -50,7 +50,7 @@ #include "qt3dwindow.h" -#include <Qt3DRender/qforwardrenderer.h> +#include <Qt3DExtras/qforwardrenderer.h> #include <Qt3DRender/qrendersettings.h> #include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/qinputaspect.h> @@ -72,7 +72,7 @@ Qt3DWindow::Qt3DWindow(QScreen *screen) , m_inputAspect(new Qt3DInput::QInputAspect) , m_logicAspect(new Qt3DLogic::QLogicAspect) , m_renderSettings(new Qt3DRender::QRenderSettings) - , m_forwardRenderer(new Qt3DRender::QForwardRenderer) + , m_forwardRenderer(new Qt3DExtras::QForwardRenderer) , m_defaultCamera(new Qt3DRender::QCamera) , m_inputSettings(new Qt3DInput::QInputSettings) , m_root(new Qt3DCore::QEntity) @@ -141,7 +141,7 @@ Qt3DRender::QFrameGraphNode *Qt3DWindow::activeFrameGraph() const return m_renderSettings->activeFrameGraph(); } -Qt3DRender::QForwardRenderer *Qt3DWindow::defaultFramegraph() const +Qt3DExtras::QForwardRenderer *Qt3DWindow::defaultFramegraph() const { return m_forwardRenderer; } diff --git a/examples/qt3d/examples-common/qt3dwindow.h b/examples/qt3d/examples-common/qt3dwindow.h index 90b660112..5cb71d1d9 100644 --- a/examples/qt3d/examples-common/qt3dwindow.h +++ b/examples/qt3d/examples-common/qt3dwindow.h @@ -64,11 +64,14 @@ class QEntity; namespace Qt3DRender { class QCamera; class QFrameGraphNode; -class QForwardRenderer; class QRenderAspect; class QRenderSettings; } +namespace Qt3DExtras { +class QForwardRenderer; +} + namespace Qt3DInput { class QInputAspect; class QInputSettings; @@ -92,7 +95,7 @@ public: void setActiveFrameGraph(Qt3DRender::QFrameGraphNode *activeFrameGraph); Qt3DRender::QFrameGraphNode *activeFrameGraph() const; - Qt3DRender::QForwardRenderer *defaultFramegraph() const; + Qt3DExtras::QForwardRenderer *defaultFramegraph() const; Qt3DRender::QCamera *camera() const; @@ -114,7 +117,7 @@ private: // Renderer configuration Qt3DRender::QRenderSettings *m_renderSettings; - Qt3DRender::QForwardRenderer *m_forwardRenderer; + Qt3DExtras::QForwardRenderer *m_forwardRenderer; Qt3DRender::QCamera *m_defaultCamera; // Input configuration diff --git a/examples/qt3d/gooch-qml/MyEntity.qml b/examples/qt3d/gooch-qml/MyEntity.qml index aba3f327e..0867c0f0e 100644 --- a/examples/qt3d/gooch-qml/MyEntity.qml +++ b/examples/qt3d/gooch-qml/MyEntity.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/gooch-qml/main.qml b/examples/qt3d/gooch-qml/main.qml index 9208512b6..571b894ee 100644 --- a/examples/qt3d/gooch-qml/main.qml +++ b/examples/qt3d/gooch-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp b/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp index 3151464e3..bfe7fa951 100644 --- a/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp +++ b/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp @@ -57,7 +57,7 @@ static const int colCount = 20; static const int maxInstanceCount = rowCount * colCount; InstanceBuffer::InstanceBuffer(Qt3DCore::QNode *parent) - : Qt3DRender::QBuffer(QBuffer::VertexBuffer, parent) + : Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, parent) , m_instanceCount(maxInstanceCount) { // Create some per instance data - position of each instance diff --git a/examples/qt3d/instanced-arrays-qml/main.qml b/examples/qt3d/instanced-arrays-qml/main.qml index c1478e965..91558fc42 100644 --- a/examples/qt3d/instanced-arrays-qml/main.qml +++ b/examples/qt3d/instanced-arrays-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 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 f0e26e776..2b7b449d7 100644 --- a/examples/qt3d/keyboardinput-qml/SphereEntity.qml +++ b/examples/qt3d/keyboardinput-qml/SphereEntity.qml @@ -52,6 +52,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 import QtQuick 2.3 as QQ2 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml index 396d75891..cc65c4a83 100644 --- a/examples/qt3d/keyboardinput-qml/main.qml +++ b/examples/qt3d/keyboardinput-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/lights/PlaneEntity.qml b/examples/qt3d/lights/PlaneEntity.qml index a00c0f1c0..268c59add 100644 --- a/examples/qt3d/lights/PlaneEntity.qml +++ b/examples/qt3d/lights/PlaneEntity.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/lights/main.qml b/examples/qt3d/lights/main.qml index 26f6716f8..b07733e5b 100644 --- a/examples/qt3d/lights/main.qml +++ b/examples/qt3d/lights/main.qml @@ -51,6 +51,7 @@ import QtQuick 2.0 as Quick import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { diff --git a/examples/qt3d/loader-qml/CuboidEntity.qml b/examples/qt3d/loader-qml/CuboidEntity.qml index 512c3369b..8555b6903 100644 --- a/examples/qt3d/loader-qml/CuboidEntity.qml +++ b/examples/qt3d/loader-qml/CuboidEntity.qml @@ -51,6 +51,7 @@ import QtQuick 2.4 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { components: [ mesh, phongMaterial, transform ] diff --git a/examples/qt3d/loader-qml/SphereEntity.qml b/examples/qt3d/loader-qml/SphereEntity.qml index fe0556e78..8e11de99e 100644 --- a/examples/qt3d/loader-qml/SphereEntity.qml +++ b/examples/qt3d/loader-qml/SphereEntity.qml @@ -51,6 +51,7 @@ import QtQuick 2.4 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { components: [ mesh, material, transform ] diff --git a/examples/qt3d/loader-qml/main.qml b/examples/qt3d/loader-qml/main.qml index 7ea7f43ca..42d9f4004 100644 --- a/examples/qt3d/loader-qml/main.qml +++ b/examples/qt3d/loader-qml/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp index 0a64a4f94..147f586aa 100644 --- a/examples/qt3d/materials-cpp/barrel.cpp +++ b/examples/qt3d/materials-cpp/barrel.cpp @@ -76,7 +76,7 @@ Barrel::Barrel(Qt3DCore::QNode *parent) , m_bumps(NoBumps) , m_diffuseColor(Red) , m_specularColor(None) - , m_material(new Qt3DRender::QNormalDiffuseSpecularMapMaterial()) + , m_material(new Qt3DExtras::QNormalDiffuseSpecularMapMaterial()) , m_diffuseTexture(m_material->diffuse()) , m_normalTexture(m_material->normal()) , m_specularTexture(m_material->specular()) diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h index 293501519..237ab446c 100644 --- a/examples/qt3d/materials-cpp/barrel.h +++ b/examples/qt3d/materials-cpp/barrel.h @@ -51,7 +51,7 @@ #ifndef BARREL_H #define BARREL_H -#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial> #include <Qt3DRender/qtexture.h> #include "renderableentity.h" @@ -96,7 +96,7 @@ private: Bumps m_bumps; DiffuseColor m_diffuseColor; SpecularColor m_specularColor; - Qt3DRender::QNormalDiffuseSpecularMapMaterial *m_material; + Qt3DExtras::QNormalDiffuseSpecularMapMaterial *m_material; Qt3DRender::QAbstractTexture *m_diffuseTexture; Qt3DRender::QAbstractTexture *m_normalTexture; Qt3DRender::QAbstractTexture *m_specularTexture; diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp index b9b42f5a2..638f8c4d1 100644 --- a/examples/qt3d/materials-cpp/houseplant.cpp +++ b/examples/qt3d/materials-cpp/houseplant.cpp @@ -72,9 +72,9 @@ HousePlant::HousePlant(Qt3DCore::QNode *parent) , m_pot(new RenderableEntity(this)) , m_plant(new RenderableEntity(m_pot)) , m_cover(new RenderableEntity(m_pot)) - , m_potMaterial(new Qt3DRender::QNormalDiffuseMapMaterial()) - , m_plantMaterial(new Qt3DRender::QNormalDiffuseMapAlphaMaterial()) - , m_coverMaterial(new Qt3DRender::QNormalDiffuseMapMaterial()) + , m_potMaterial(new Qt3DExtras::QNormalDiffuseMapMaterial()) + , m_plantMaterial(new Qt3DExtras::QNormalDiffuseMapAlphaMaterial()) + , m_coverMaterial(new Qt3DExtras::QNormalDiffuseMapMaterial()) , m_potImage(new Qt3DRender::QTextureImage()) , m_potNormalImage(new Qt3DRender::QTextureImage()) , m_plantImage(new Qt3DRender::QTextureImage()) diff --git a/examples/qt3d/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h index 232608843..d2081b3d1 100644 --- a/examples/qt3d/materials-cpp/houseplant.h +++ b/examples/qt3d/materials-cpp/houseplant.h @@ -53,8 +53,8 @@ #include "renderableentity.h" #include <QEntity> -#include <QNormalDiffuseMapAlphaMaterial> -#include <QNormalDiffuseMapMaterial> +#include <Qt3DExtras/QNormalDiffuseMapAlphaMaterial> +#include <Qt3DExtras/QNormalDiffuseMapMaterial> #include <QTextureImage> class HousePlant : public Qt3DCore::QEntity @@ -96,9 +96,9 @@ private: RenderableEntity *m_plant; RenderableEntity *m_cover; - Qt3DRender::QNormalDiffuseMapMaterial *m_potMaterial; - Qt3DRender::QNormalDiffuseMapAlphaMaterial *m_plantMaterial; - Qt3DRender::QNormalDiffuseMapMaterial *m_coverMaterial; + Qt3DExtras::QNormalDiffuseMapMaterial *m_potMaterial; + Qt3DExtras::QNormalDiffuseMapAlphaMaterial *m_plantMaterial; + Qt3DExtras::QNormalDiffuseMapMaterial *m_coverMaterial; Qt3DRender::QTextureImage *m_potImage; Qt3DRender::QTextureImage *m_potNormalImage; diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index 91c0ec8c2..0514df414 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -57,9 +57,9 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QDiffuseMapMaterial> -#include <Qt3DRender/QForwardRenderer> +#include <Qt3DExtras/QPhongMaterial> +#include <Qt3DExtras/QDiffuseMapMaterial> +#include <Qt3DExtras/QForwardRenderer> #include <Qt3DRender/QTextureImage> #include "planeentity.h" @@ -95,7 +95,7 @@ int main(int argc, char* argv[]) planeEntity->mesh()->setWidth(100.0f); planeEntity->mesh()->setMeshResolution(QSize(20, 20)); - Qt3DRender::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3DRender::QNormalDiffuseSpecularMapMaterial(); + Qt3DExtras::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3DExtras::QNormalDiffuseSpecularMapMaterial(); normalDiffuseSpecularMapMaterial->setTextureScale(10.0f); normalDiffuseSpecularMapMaterial->setShininess(80.0f); normalDiffuseSpecularMapMaterial->setAmbient(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f)); @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) RenderableEntity *chest = new RenderableEntity(sceneRoot); chest->transform()->setScale(0.03f); chest->mesh()->setSource(QUrl(QStringLiteral("qrc:/assets/chest/Chest.obj"))); - Qt3DRender::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3DRender::QDiffuseMapMaterial(); + Qt3DExtras::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3DExtras::QDiffuseMapMaterial(); diffuseMapMaterial->setSpecular(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f)); diffuseMapMaterial->setShininess(2.0f); @@ -133,7 +133,7 @@ int main(int argc, char* argv[]) RotatingTrefoilKnot *trefoil = new RotatingTrefoilKnot(sceneRoot); trefoil->setPosition(QVector3D(0.0f, 3.5f, 0.0f)); trefoil->setScale(0.5f); - Qt3DRender::QPhongMaterial *phongMaterial = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QPhongMaterial *phongMaterial = new Qt3DExtras::QPhongMaterial(); phongMaterial->setDiffuse(QColor(204, 205, 75)); // Safari Yellow #cccd4b phongMaterial->setSpecular(Qt::white); trefoil->addComponent(phongMaterial); diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp index e291e2d8f..b60e6c186 100644 --- a/examples/qt3d/materials-cpp/planeentity.cpp +++ b/examples/qt3d/materials-cpp/planeentity.cpp @@ -50,12 +50,12 @@ #include "planeentity.h" -#include <Qt3DRender/QPlaneMesh> +#include <Qt3DExtras/QPlaneMesh> #include <Qt3DCore/QTransform> PlaneEntity::PlaneEntity(Qt3DCore::QNode *parent) : Qt3DCore::QEntity(new Qt3DCore::QEntity(parent)) - , m_mesh(new Qt3DRender::QPlaneMesh()) + , m_mesh(new Qt3DExtras::QPlaneMesh()) , m_transform(new Qt3DCore::QTransform()) { addComponent(m_mesh); @@ -66,7 +66,7 @@ PlaneEntity::~PlaneEntity() { } -Qt3DRender::QPlaneMesh *PlaneEntity::mesh() const +Qt3DExtras::QPlaneMesh *PlaneEntity::mesh() const { return m_mesh; } diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h index 28c90a3a8..8491efb1a 100644 --- a/examples/qt3d/materials-cpp/planeentity.h +++ b/examples/qt3d/materials-cpp/planeentity.h @@ -53,7 +53,7 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> -#include <Qt3DRender/QPlaneMesh> +#include <Qt3DExtras/QPlaneMesh> class PlaneEntity : public Qt3DCore::QEntity { @@ -61,10 +61,10 @@ public: PlaneEntity(Qt3DCore::QNode *parent = 0); ~PlaneEntity(); - Qt3DRender::QPlaneMesh *mesh() const; + Qt3DExtras::QPlaneMesh *mesh() const; private: - Qt3DRender::QPlaneMesh *m_mesh; + Qt3DExtras::QPlaneMesh *m_mesh; Qt3DCore::QTransform *m_transform; }; diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml index 58987cd8d..40da0533a 100644 --- a/examples/qt3d/materials/Barrel.qml +++ b/examples/qt3d/materials/Barrel.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/materials/Chest.qml b/examples/qt3d/materials/Chest.qml index ab3eaa587..879ebb26f 100644 --- a/examples/qt3d/materials/Chest.qml +++ b/examples/qt3d/materials/Chest.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml index 667d721f9..a06f69e1e 100644 --- a/examples/qt3d/materials/HousePlant.qml +++ b/examples/qt3d/materials/HousePlant.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/materials/PlaneEntity.qml b/examples/qt3d/materials/PlaneEntity.qml index a00c0f1c0..268c59add 100644 --- a/examples/qt3d/materials/PlaneEntity.qml +++ b/examples/qt3d/materials/PlaneEntity.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml index bfcc7ead0..46a48c4e2 100644 --- a/examples/qt3d/materials/main.qml +++ b/examples/qt3d/materials/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.1 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/mouseinput-qml/main.qml b/examples/qt3d/mouseinput-qml/main.qml index c25166682..6f6386ce6 100644 --- a/examples/qt3d/mouseinput-qml/main.qml +++ b/examples/qt3d/mouseinput-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/multiviewport/main.qml b/examples/qt3d/multiviewport/main.qml index 4566600d1..df01bacec 100644 --- a/examples/qt3d/multiviewport/main.qml +++ b/examples/qt3d/multiviewport/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.0 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: rootNode diff --git a/examples/qt3d/picking-qml/main.qml b/examples/qt3d/picking-qml/main.qml index bc0bf82ba..fcc122e47 100644 --- a/examples/qt3d/picking-qml/main.qml +++ b/examples/qt3d/picking-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 import QtQuick 2.0 as QQ2 import QtQuick.Window 2.2 as W diff --git a/examples/qt3d/plasma/main.qml b/examples/qt3d/plasma/main.qml index 96927cd4c..0a01f699b 100644 --- a/examples/qt3d/plasma/main.qml +++ b/examples/qt3d/plasma/main.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { components: RenderSettings { diff --git a/examples/qt3d/scene3d-loader/AnimatedEntity.qml b/examples/qt3d/scene3d-loader/AnimatedEntity.qml index f95466cc5..0f6b7da1a 100644 --- a/examples/qt3d/scene3d-loader/AnimatedEntity.qml +++ b/examples/qt3d/scene3d-loader/AnimatedEntity.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 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 287e80169..efbb921c5 100644 --- a/examples/qt3d/scene3d-loader/Scene2.qml +++ b/examples/qt3d/scene3d-loader/Scene2.qml @@ -52,6 +52,7 @@ import QtQuick 2.0 import QtQuick.Scene3D 2.0 import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Scene3D { focus: true diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml index f95466cc5..0f6b7da1a 100644 --- a/examples/qt3d/scene3d/AnimatedEntity.qml +++ b/examples/qt3d/scene3d/AnimatedEntity.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/shadow-map-qml/GroundPlane.qml b/examples/qt3d/shadow-map-qml/GroundPlane.qml index 653e306a8..d78f5b07a 100644 --- a/examples/qt3d/shadow-map-qml/GroundPlane.qml +++ b/examples/qt3d/shadow-map-qml/GroundPlane.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 38d8842ed..af7f429fe 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -59,11 +59,11 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/QForwardRenderer> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QCylinderMesh> -#include <Qt3DRender/QSphereMesh> -#include <Qt3DRender/QTorusMesh> +#include <Qt3DExtras//QForwardRenderer> +#include <Qt3DExtras//QPhongMaterial> +#include <Qt3DExtras/QCylinderMesh> +#include <Qt3DExtras/QSphereMesh> +#include <Qt3DExtras/QTorusMesh> #include <QPropertyAnimation> @@ -77,11 +77,11 @@ Qt3DCore::QEntity *createScene() Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity; // Material - Qt3DRender::QMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity); + Qt3DRender::QMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity); // Torus Qt3DCore::QEntity *torusEntity = new Qt3DCore::QEntity(rootEntity); - Qt3DRender::QTorusMesh *torusMesh = new Qt3DRender::QTorusMesh; + Qt3DExtras::QTorusMesh *torusMesh = new Qt3DExtras::QTorusMesh; torusMesh->setRadius(5); torusMesh->setMinorRadius(1); torusMesh->setRings(100); @@ -97,7 +97,7 @@ Qt3DCore::QEntity *createScene() // Sphere Qt3DCore::QEntity *sphereEntity = new Qt3DCore::QEntity(rootEntity); - Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh; + Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh; sphereMesh->setRadius(3); Qt3DCore::QTransform *sphereTransform = new Qt3DCore::QTransform; diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml index 04bdee4b5..fb18043c3 100644 --- a/examples/qt3d/simple-qml/main.qml +++ b/examples/qt3d/simple-qml/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml index 17c673215..d1b5f4484 100644 --- a/examples/qt3d/simple-shaders-qml/main.qml +++ b/examples/qt3d/simple-shaders-qml/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml index 84994e396..84d999771 100644 --- a/examples/qt3d/skybox/Skybox.qml +++ b/examples/qt3d/skybox/Skybox.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { diff --git a/examples/qt3d/skybox/main.qml b/examples/qt3d/skybox/main.qml index 34206c770..13468906c 100644 --- a/examples/qt3d/skybox/main.qml +++ b/examples/qt3d/skybox/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/tessellation-modes/main.qml b/examples/qt3d/tessellation-modes/main.qml index c8d20cb88..d9c371aa0 100644 --- a/examples/qt3d/tessellation-modes/main.qml +++ b/examples/qt3d/tessellation-modes/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.1 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/torus-qml/main.qml b/examples/qt3d/torus-qml/main.qml index b52c03f7c..2c4f263fb 100644 --- a/examples/qt3d/torus-qml/main.qml +++ b/examples/qt3d/torus-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/transforms-qml/main.qml b/examples/qt3d/transforms-qml/main.qml index 2a8c97604..f49e161f2 100644 --- a/examples/qt3d/transforms-qml/main.qml +++ b/examples/qt3d/transforms-qml/main.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: sceneRoot diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml index 618ecc519..868f29ec1 100644 --- a/examples/qt3d/transparency-qml-scene3d/Scene.qml +++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 import QtQuick 2.2 as QQ2 Entity { diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml index 880e80875..2a45b22c8 100644 --- a/examples/qt3d/transparency-qml/main.qml +++ b/examples/qt3d/transparency-qml/main.qml @@ -51,6 +51,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 import QtQuick 2.4 as QQ2 Entity { diff --git a/examples/qt3d/wave/Wave.qml b/examples/qt3d/wave/Wave.qml index b527b8025..a4728e5a9 100644 --- a/examples/qt3d/wave/Wave.qml +++ b/examples/qt3d/wave/Wave.qml @@ -50,6 +50,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/examples/qt3d/wireframe/main.qml b/examples/qt3d/wireframe/main.qml index 7c281a360..e0b6b3304 100644 --- a/examples/qt3d/wireframe/main.qml +++ b/examples/qt3d/wireframe/main.qml @@ -52,6 +52,7 @@ import QtQuick 2.1 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 +import Qt3D.Extras 2.0 Entity { id: root diff --git a/src/render/defaults/defaults.pri b/src/extras/defaults/defaults.pri index 1560f55ec..1560f55ec 100644 --- a/src/render/defaults/defaults.pri +++ b/src/extras/defaults/defaults.pri diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/extras/defaults/qdiffusemapmaterial.cpp index 985b6c569..854d0a809 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/extras/defaults/qdiffusemapmaterial.cpp @@ -54,7 +54,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate() : QMaterialPrivate() @@ -309,6 +311,6 @@ void QDiffuseMapMaterial::setTextureScale(float textureScale) d->m_textureScaleParameter->setValue(textureScale); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/extras/defaults/qdiffusemapmaterial.h index cf30630ae..a0e6a88cf 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/extras/defaults/qdiffusemapmaterial.h @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H -#define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H +#ifndef QT3DEXTRAS_QDIFFUSEMAPMATERIAL_H +#define QT3DEXTRAS_QDIFFUSEMAPMATERIAL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> #include <QColor> @@ -47,10 +48,15 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QDiffuseMapMaterialPrivate; class QAbstractTexture; -class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial +} // namespace Qt3DRender + +namespace Qt3DExtras { + +class QDiffuseMapMaterialPrivate; + +class QT3DEXTRASSHARED_EXPORT QDiffuseMapMaterial : public Qt3DRender::QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) @@ -66,19 +72,19 @@ public: QColor ambient() const; QColor specular() const; float shininess() const; - QAbstractTexture *diffuse() const; + Qt3DRender::QAbstractTexture *diffuse() const; float textureScale() const; public Q_SLOTS: void setAmbient(const QColor &color); void setSpecular(const QColor &specular); void setShininess(float shininess); - void setDiffuse(QAbstractTexture *diffuse); + void setDiffuse(Qt3DRender::QAbstractTexture *diffuse); void setTextureScale(float textureScale); Q_SIGNALS: void ambientChanged(const QColor &ambient); - void diffuseChanged(QAbstractTexture *diffuse); + void diffuseChanged(Qt3DRender::QAbstractTexture *diffuse); void specularChanged(const QColor &specular); void shininessChanged(float shininess); void textureScaleChanged(float textureScale); @@ -87,8 +93,8 @@ private: Q_DECLARE_PRIVATE(QDiffuseMapMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H +#endif // QT3DEXTRASQDIFFUSEMAPMATERIAL_H diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/extras/defaults/qdiffusemapmaterial_p.h index 3a0d721a3..c0bcc01eb 100644 --- a/src/render/defaults/qdiffusemapmaterial_p.h +++ b/src/extras/defaults/qdiffusemapmaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_P_H -#define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_P_H +#ifndef QT3DEXTRAS_QDIFFUSEMAPMATERIAL_P_H +#define QT3DEXTRAS_QDIFFUSEMAPMATERIAL_P_H // // W A R N I N G @@ -65,9 +65,13 @@ class QParameter; class QShaderProgram; class QRenderPass; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QDiffuseMapMaterial; -class QDiffuseMapMaterialPrivate : public QMaterialPrivate +class QDiffuseMapMaterialPrivate : public Qt3DRender::QMaterialPrivate { QDiffuseMapMaterialPrivate(); @@ -79,29 +83,29 @@ class QDiffuseMapMaterialPrivate : public QMaterialPrivate void handleShininessChanged(const QVariant &var); void handleTextureScaleChanged(const QVariant &var); - QEffect *m_diffuseMapEffect; - QAbstractTexture *m_diffuseTexture; - QParameter *m_ambientParameter; - QParameter *m_diffuseParameter; - QParameter *m_specularParameter; - QParameter *m_shininessParameter; - QParameter *m_textureScaleParameter; - QTechnique *m_diffuseMapGL3Technique; - QTechnique *m_diffuseMapGL2Technique; - QTechnique *m_diffuseMapES2Technique; - QRenderPass *m_diffuseMapGL3RenderPass; - QRenderPass *m_diffuseMapGL2RenderPass; - QRenderPass *m_diffuseMapES2RenderPass; - QShaderProgram *m_diffuseMapGL3Shader; - QShaderProgram *m_diffuseMapGL2ES2Shader; - QFilterKey *m_filterKey; + Qt3DRender::QEffect *m_diffuseMapEffect; + Qt3DRender::QAbstractTexture *m_diffuseTexture; + Qt3DRender::QParameter *m_ambientParameter; + Qt3DRender::QParameter *m_diffuseParameter; + Qt3DRender::QParameter *m_specularParameter; + Qt3DRender::QParameter *m_shininessParameter; + Qt3DRender::QParameter *m_textureScaleParameter; + Qt3DRender::QTechnique *m_diffuseMapGL3Technique; + Qt3DRender::QTechnique *m_diffuseMapGL2Technique; + Qt3DRender::QTechnique *m_diffuseMapES2Technique; + Qt3DRender::QRenderPass *m_diffuseMapGL3RenderPass; + Qt3DRender::QRenderPass *m_diffuseMapGL2RenderPass; + Qt3DRender::QRenderPass *m_diffuseMapES2RenderPass; + Qt3DRender::QShaderProgram *m_diffuseMapGL3Shader; + Qt3DRender::QShaderProgram *m_diffuseMapGL2ES2Shader; + Qt3DRender::QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QDiffuseMapMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QDIFFUSEAPMATERIAL_P_H +#endif // QT3DEXTRAS_QDIFFUSEAPMATERIAL_P_H diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/extras/defaults/qdiffusespecularmapmaterial.cpp index 26b98bd2c..a4ccb6121 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/extras/defaults/qdiffusespecularmapmaterial.cpp @@ -54,7 +54,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate() : QMaterialPrivate() @@ -323,6 +325,6 @@ void QDiffuseSpecularMapMaterial::setTextureScale(float textureScale) d->m_textureScaleParameter->setValue(textureScale); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/extras/defaults/qdiffusespecularmapmaterial.h index ebeda9860..43e84bf90 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.h +++ b/src/extras/defaults/qdiffusespecularmapmaterial.h @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H -#define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H +#ifndef QT3DEXTRAS_QDIFFUSESPECULARMAPMATERIAL_H +#define QT3DEXTRAS_QDIFFUSESPECULARMAPMATERIAL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> #include <QColor> @@ -48,9 +49,13 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QAbstractTexture; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QDiffuseSpecularMapMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial +class QT3DEXTRASSHARED_EXPORT QDiffuseSpecularMapMaterial : public Qt3DRender::QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) @@ -64,22 +69,22 @@ public: ~QDiffuseSpecularMapMaterial(); QColor ambient() const; - QAbstractTexture *diffuse() const; - QAbstractTexture *specular() const; + Qt3DRender::QAbstractTexture *diffuse() const; + Qt3DRender::QAbstractTexture *specular() const; float shininess() const; float textureScale() const; public Q_SLOTS: void setAmbient(const QColor &ambient); - void setDiffuse(QAbstractTexture *diffuse); - void setSpecular(QAbstractTexture *specular); + void setDiffuse(Qt3DRender::QAbstractTexture *diffuse); + void setSpecular(Qt3DRender::QAbstractTexture *specular); void setShininess(float shininess); void setTextureScale(float textureScale); Q_SIGNALS: void ambientChanged(const QColor &ambient); - void diffuseChanged(QAbstractTexture *diffuse); - void specularChanged(QAbstractTexture *specular); + void diffuseChanged(Qt3DRender::QAbstractTexture *diffuse); + void specularChanged(Qt3DRender::QAbstractTexture *specular); void shininessChanged(float shininess); void textureScaleChanged(float textureScale); @@ -87,8 +92,8 @@ private: Q_DECLARE_PRIVATE(QDiffuseSpecularMapMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H +#endif // QT3DEXTRAS_QDIFFUSESPECULARMAPMATERIAL_H diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/extras/defaults/qdiffusespecularmapmaterial_p.h index 58e4e63ba..b358e088a 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial_p.h +++ b/src/extras/defaults/qdiffusespecularmapmaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H -#define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H +#ifndef QT3DEXTRAS_QDIFFUSESPECULARMAPMATERIAL_P_H +#define QT3DEXTRAS_QDIFFUSESPECULARMAPMATERIAL_P_H // // W A R N I N G @@ -65,9 +65,13 @@ class QParameter; class QShaderProgram; class QRenderPass; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QDiffuseSpecularMapMaterial; -class QDiffuseSpecularMapMaterialPrivate : public QMaterialPrivate +class QDiffuseSpecularMapMaterialPrivate : public Qt3DRender::QMaterialPrivate { public: QDiffuseSpecularMapMaterialPrivate(); @@ -80,30 +84,31 @@ public: void handleShininessChanged(const QVariant &var); void handleTextureScaleChanged(const QVariant &var); - QEffect *m_diffuseSpecularMapEffect; - QAbstractTexture *m_diffuseTexture; - QAbstractTexture *m_specularTexture; - QParameter *m_ambientParameter; - QParameter *m_diffuseParameter; - QParameter *m_specularParameter; - QParameter *m_shininessParameter; - QParameter *m_textureScaleParameter; - QTechnique *m_diffuseSpecularMapGL3Technique; - QTechnique *m_diffuseSpecularMapGL2Technique; - QTechnique *m_diffuseSpecularMapES2Technique; - QRenderPass *m_diffuseSpecularMapGL3RenderPass; - QRenderPass *m_diffuseSpecularMapGL2RenderPass; - QRenderPass *m_diffuseSpecularMapES2RenderPass; - QShaderProgram *m_diffuseSpecularMapGL3Shader; - QShaderProgram *m_diffuseSpecularMapGL2ES2Shader; - QFilterKey *m_filterKey; + Qt3DRender::QEffect *m_diffuseSpecularMapEffect; + Qt3DRender::QAbstractTexture *m_diffuseTexture; + Qt3DRender::QAbstractTexture *m_specularTexture; + Qt3DRender::QParameter *m_ambientParameter; + Qt3DRender::QParameter *m_diffuseParameter; + Qt3DRender::QParameter *m_specularParameter; + Qt3DRender::QParameter *m_shininessParameter; + Qt3DRender::QParameter *m_textureScaleParameter; + Qt3DRender::QTechnique *m_diffuseSpecularMapGL3Technique; + Qt3DRender::QTechnique *m_diffuseSpecularMapGL2Technique; + Qt3DRender::QTechnique *m_diffuseSpecularMapES2Technique; + Qt3DRender::QRenderPass *m_diffuseSpecularMapGL3RenderPass; + Qt3DRender::QRenderPass *m_diffuseSpecularMapGL2RenderPass; + Qt3DRender::QRenderPass *m_diffuseSpecularMapES2RenderPass; + Qt3DRender::QShaderProgram *m_diffuseSpecularMapGL3Shader; + Qt3DRender::QShaderProgram *m_diffuseSpecularMapGL2ES2Shader; + Qt3DRender::QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QDiffuseSpecularMapMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras + QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H +#endif // QT3DEXTRAS_QDIFFUSESPECULARMAPMATERIAL_P_H diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp index cd8f2a507..8e6dc9425 100644 --- a/src/render/defaults/qforwardrenderer.cpp +++ b/src/extras/defaults/qforwardrenderer.cpp @@ -49,7 +49,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QForwardRendererPrivate::QForwardRendererPrivate() : QTechniqueFilterPrivate() @@ -190,6 +192,6 @@ QObject *QForwardRenderer::surface() const return d->m_surfaceSelector->surface(); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qforwardrenderer.h b/src/extras/defaults/qforwardrenderer.h index e256affd6..34ea9055b 100644 --- a/src/render/defaults/qforwardrenderer.h +++ b/src/extras/defaults/qforwardrenderer.h @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_H -#define QT3DRENDER_RENDER_QFORWARDRENDERER_H +#ifndef QT3DEXTRAS_QFORWARDRENDERER_H +#define QT3DEXTRAS_QFORWARDRENDERER_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qtechniquefilter.h> #include <QRectF> #include <QColor> @@ -48,11 +49,11 @@ QT_BEGIN_NAMESPACE class QSurface; -namespace Qt3DRender { +namespace Qt3DExtras { class QForwardRendererPrivate; -class QT3DRENDERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter +class QT3DEXTRASSHARED_EXPORT QForwardRenderer : public Qt3DRender::QTechniqueFilter { Q_OBJECT Q_PROPERTY(QObject *surface READ surface WRITE setSurface NOTIFY surfaceChanged) @@ -84,8 +85,8 @@ private: Q_DECLARE_PRIVATE(QForwardRenderer) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDERER_QFORWARDRENDERER_H +#endif // QT3DEXTRAS_QFORWARDRENDERER_H diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/extras/defaults/qforwardrenderer_p.h index 5e5e6f696..56d66a542 100644 --- a/src/render/defaults/qforwardrenderer_p.h +++ b/src/extras/defaults/qforwardrenderer_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_P_H -#define QT3DRENDER_RENDER_QFORWARDRENDERER_P_H +#ifndef QT3DEXTRAS_QFORWARDRENDERER_P_H +#define QT3DEXTRAS_QFORWARDRENDERER_P_H // // W A R N I N G @@ -64,25 +64,29 @@ class QCameraSelector; class QFrustumCulling; class QRenderSurfaceSelector; -class QForwardRendererPrivate: public QTechniqueFilterPrivate +} // namespace Qt3DRender + +namespace Qt3DExtras { + +class QForwardRendererPrivate: public Qt3DRender::QTechniqueFilterPrivate { public: QForwardRendererPrivate(); - QRenderSurfaceSelector *m_surfaceSelector; - QViewport *m_viewport; - QCameraSelector *m_cameraSelector; - QClearBuffers *m_clearBuffer; - QFrustumCulling *m_frustumCulling; + Qt3DRender::QRenderSurfaceSelector *m_surfaceSelector; + Qt3DRender::QViewport *m_viewport; + Qt3DRender::QCameraSelector *m_cameraSelector; + Qt3DRender::QClearBuffers *m_clearBuffer; + Qt3DRender::QFrustumCulling *m_frustumCulling; void init(); Q_DECLARE_PUBLIC(QForwardRenderer) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QFORWARDRENDERER_P_H +#endif // QT3DEXTRAS_QFORWARDRENDERER_P_H diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/extras/defaults/qgoochmaterial.cpp index 7b4865734..7b4865734 100644 --- a/src/render/defaults/qgoochmaterial.cpp +++ b/src/extras/defaults/qgoochmaterial.cpp diff --git a/src/render/defaults/qgoochmaterial.h b/src/extras/defaults/qgoochmaterial.h index 3a6bfdd51..cf2c1c5fc 100644 --- a/src/render/defaults/qgoochmaterial.h +++ b/src/extras/defaults/qgoochmaterial.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_H -#define QT3DRENDER_RENDER_QGOOCHMATERIAL_H +#ifndef QT3DEXTRAS_QGOOCHMATERIAL_H +#define QT3DEXTRAS_QGOOCHMATERIAL_H #include <Qt3DRender/qmaterial.h> #include <QColor> @@ -49,7 +49,7 @@ namespace Qt3DRender { class QGoochMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QGoochMaterial : public QMaterial +class QGoochMaterial : public QMaterial { Q_OBJECT Q_PROPERTY(QColor diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) @@ -99,4 +99,4 @@ private: QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QGOOCHMATERIAL_H +#endif // QT3DEXTRAS_QGOOCHMATERIAL_H diff --git a/src/render/defaults/qgoochmaterial_p.h b/src/extras/defaults/qgoochmaterial_p.h index 3dfca1d50..0a6f67aea 100644 --- a/src/render/defaults/qgoochmaterial_p.h +++ b/src/extras/defaults/qgoochmaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H -#define QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H +#ifndef QT3DEXTRAS_QGOOCHMATERIAL_P_H +#define QT3DEXTRAS_QGOOCHMATERIAL_P_H // // W A R N I N G @@ -103,5 +103,5 @@ public: QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H +#endif // QT3DEXTRAS_QGOOCHMATERIAL_P_H diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp index 8a741e702..df61eafdf 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp @@ -56,7 +56,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QNormalDiffuseMapAlphaMaterialPrivate::QNormalDiffuseMapAlphaMaterialPrivate() diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/extras/defaults/qnormaldiffusemapalphamaterial.h index 3decf2ebb..ad4dd6c53 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.h +++ b/src/extras/defaults/qnormaldiffusemapalphamaterial.h @@ -37,18 +37,19 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H -#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H +#ifndef QT3DEXTRAS_QNORMALDIFFUSEMAPALPHAMATERIAL_H +#define QT3DEXTRAS_QNORMALDIFFUSEMAPALPHAMATERIAL_H -#include <Qt3DRender/qnormaldiffusemapmaterial.h> +#include <Qt3DExtras/qt3dextras_global.h> +#include <Qt3DExtras/qnormaldiffusemapmaterial.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { class QNormalDiffuseMapAlphaMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDiffuseMapMaterial +class QT3DEXTRASSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDiffuseMapMaterial { Q_OBJECT public: @@ -59,8 +60,8 @@ private: Q_DECLARE_PRIVATE(QNormalDiffuseMapAlphaMaterial) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H +#endif // QT3DEXTRAS_QNORMALDIFFUSEMAPALPHAMATERIAL_H diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h b/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h index d94fdaedd..91b0961f1 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h +++ b/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H -#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H +#ifndef QT3DEXTRAS_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H +#define QT3DEXTRAS_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H // // W A R N I N G @@ -51,17 +51,21 @@ // We mean it. // -#include <Qt3DRender/private/qnormaldiffusemapmaterial_p.h> +#include <qnormaldiffusemapmaterial_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { -class QNormalDiffuseMapAlphaMaterial; +namespace Qt3DRender { class QAlphaCoverage; class QDepthTest; +} // namespace Qt3DRender + +namespace Qt3DExtras { + +class QNormalDiffuseMapAlphaMaterial; class QNormalDiffuseMapAlphaMaterialPrivate: public QNormalDiffuseMapMaterialPrivate { public: @@ -69,15 +73,15 @@ public: void init() Q_DECL_OVERRIDE; - QAlphaCoverage *m_alphaCoverage; - QDepthTest *m_depthTest; + Qt3DRender::QAlphaCoverage *m_alphaCoverage; + Qt3DRender::QDepthTest *m_depthTest; Q_DECLARE_PUBLIC(QNormalDiffuseMapAlphaMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QNORMALDIFFUSEMAPALPHAMATERIAL_P_H +#endif // QT3DEXTRAS_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp index d1eef5929..01d67a477 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp @@ -54,7 +54,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate() : QMaterialPrivate() diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/extras/defaults/qnormaldiffusemapmaterial.h index 4f843bd05..7152d64d5 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/extras/defaults/qnormaldiffusemapmaterial.h @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H -#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H +#ifndef QT3DEXTRAS_QNORMALDIFFUSEMAPMATERIAL_H +#define QT3DEXTRAS_QNORMALDIFFUSEMAPMATERIAL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> #include <QColor> @@ -48,9 +49,14 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QAbstractTexture; + +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QNormalDiffuseMapMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial +class QT3DEXTRASSHARED_EXPORT QNormalDiffuseMapMaterial : public Qt3DRender::QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) @@ -66,23 +72,23 @@ public: QColor ambient() const; QColor specular() const; - QAbstractTexture *diffuse() const; - QAbstractTexture *normal() const; + Qt3DRender::QAbstractTexture *diffuse() const; + Qt3DRender::QAbstractTexture *normal() const; float shininess() const; float textureScale() const; public Q_SLOTS: void setAmbient(const QColor &ambient); void setSpecular(const QColor &specular); - void setDiffuse(QAbstractTexture *diffuse); - void setNormal(QAbstractTexture *normal); + void setDiffuse(Qt3DRender::QAbstractTexture *diffuse); + void setNormal(Qt3DRender::QAbstractTexture *normal); void setShininess(float shininess); void setTextureScale(float textureScale); Q_SIGNALS: void ambientChanged(const QColor &ambient); - void diffuseChanged(QAbstractTexture *diffuse); - void normalChanged(QAbstractTexture *normal); + void diffuseChanged(Qt3DRender::QAbstractTexture *diffuse); + void normalChanged(Qt3DRender::QAbstractTexture *normal); void specularChanged(const QColor &specular); void shininessChanged(float shininess); void textureScaleChanged(float textureScale); @@ -94,8 +100,8 @@ private: Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QNORMALDIFFUSEMAPMATERIAL_H +#endif // QT3DEXTRAS_QNORMALDIFFUSEMAPMATERIAL_H diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/extras/defaults/qnormaldiffusemapmaterial_p.h index a446faa13..8dff59218 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial_p.h +++ b/src/extras/defaults/qnormaldiffusemapmaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H -#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H +#ifndef QT3DEXTRAS_QNORMALDIFFUSEMAPMATERIAL_P_H +#define QT3DEXTRAS_QNORMALDIFFUSEMAPMATERIAL_P_H // // W A R N I N G @@ -65,9 +65,13 @@ class QParameter; class QShaderProgram; class QRenderPass; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QNormalDiffuseMapMaterial; -class QNormalDiffuseMapMaterialPrivate: public QMaterialPrivate +class QNormalDiffuseMapMaterialPrivate: public Qt3DRender::QMaterialPrivate { public: QNormalDiffuseMapMaterialPrivate(); @@ -81,31 +85,31 @@ public: void handleShininessChanged(const QVariant &var); void handleTextureScaleChanged(const QVariant &var); - QEffect *m_normalDiffuseEffect; - QAbstractTexture *m_diffuseTexture; - QAbstractTexture *m_normalTexture; - QParameter *m_ambientParameter; - QParameter *m_diffuseParameter; - QParameter *m_normalParameter; - QParameter *m_specularParameter; - QParameter *m_shininessParameter; - QParameter *m_textureScaleParameter; - QTechnique *m_normalDiffuseGL3Technique; - QTechnique *m_normalDiffuseGL2Technique; - QTechnique *m_normalDiffuseES2Technique; - QRenderPass *m_normalDiffuseGL3RenderPass; - QRenderPass *m_normalDiffuseGL2RenderPass; - QRenderPass *m_normalDiffuseES2RenderPass; - QShaderProgram *m_normalDiffuseGL3Shader; - QShaderProgram *m_normalDiffuseGL2ES2Shader; - QFilterKey *m_filterKey; + Qt3DRender::QEffect *m_normalDiffuseEffect; + Qt3DRender::QAbstractTexture *m_diffuseTexture; + Qt3DRender::QAbstractTexture *m_normalTexture; + Qt3DRender::QParameter *m_ambientParameter; + Qt3DRender::QParameter *m_diffuseParameter; + Qt3DRender::QParameter *m_normalParameter; + Qt3DRender::QParameter *m_specularParameter; + Qt3DRender::QParameter *m_shininessParameter; + Qt3DRender::QParameter *m_textureScaleParameter; + Qt3DRender::QTechnique *m_normalDiffuseGL3Technique; + Qt3DRender::QTechnique *m_normalDiffuseGL2Technique; + Qt3DRender::QTechnique *m_normalDiffuseES2Technique; + Qt3DRender::QRenderPass *m_normalDiffuseGL3RenderPass; + Qt3DRender::QRenderPass *m_normalDiffuseGL2RenderPass; + Qt3DRender::QRenderPass *m_normalDiffuseES2RenderPass; + Qt3DRender::QShaderProgram *m_normalDiffuseGL3Shader; + Qt3DRender::QShaderProgram *m_normalDiffuseGL2ES2Shader; + Qt3DRender::QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QNormalDiffuseMapMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H +#endif // QT3DEXTRAS_QNORMALDIFFUSEMAPMATERIAL_P_H diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp index 7457ee38b..6d54b9535 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -54,7 +54,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate() : QMaterialPrivate() @@ -372,6 +374,6 @@ void QNormalDiffuseSpecularMapMaterial::setTextureScale(float textureScale) d->m_textureScaleParameter->setValue(textureScale); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/extras/defaults/qnormaldiffusespecularmapmaterial.h index 581ca6fb2..a2f32d2ae 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.h @@ -37,19 +37,20 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H -#define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H +#ifndef QT3DEXTRAS_QNORMALDIFFUSESPECULARMAPMATERIAL_H +#define QT3DEXTRAS_QNORMALDIFFUSESPECULARMAPMATERIAL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { class QNormalDiffuseSpecularMapMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMaterial +class QT3DEXTRASSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public Qt3DRender::QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) @@ -64,25 +65,25 @@ public: ~QNormalDiffuseSpecularMapMaterial(); QColor ambient() const; - QAbstractTexture *diffuse() const; - QAbstractTexture *normal() const; - QAbstractTexture *specular() const; + Qt3DRender::QAbstractTexture *diffuse() const; + Qt3DRender::QAbstractTexture *normal() const; + Qt3DRender::QAbstractTexture *specular() const; float shininess() const; float textureScale() const; public Q_SLOTS: void setAmbient(const QColor &ambient); - void setDiffuse(QAbstractTexture *diffuse); - void setNormal(QAbstractTexture *normal); - void setSpecular(QAbstractTexture *specular); + void setDiffuse(Qt3DRender::QAbstractTexture *diffuse); + void setNormal(Qt3DRender::QAbstractTexture *normal); + void setSpecular(Qt3DRender::QAbstractTexture *specular); void setShininess(float shininess); void setTextureScale(float textureScale); Q_SIGNALS: void ambientChanged(const QColor &ambient); - void diffuseChanged(QAbstractTexture *diffuse); - void normalChanged(QAbstractTexture *normal); - void specularChanged(QAbstractTexture *specular); + void diffuseChanged(Qt3DRender::QAbstractTexture *diffuse); + void normalChanged(Qt3DRender::QAbstractTexture *normal); + void specularChanged(Qt3DRender::QAbstractTexture *specular); void shininessChanged(float shininess); void textureScaleChanged(float textureScale); @@ -93,8 +94,8 @@ private: Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H +#endif // QT3DEXTRAS_QNORMALDIFFUSESPECULARMAPMATERIAL_H diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/extras/defaults/qnormaldiffusespecularmapmaterial_p.h index cdd12abff..3316044ff 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h +++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H -#define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H +#ifndef QT3DEXTRAS_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H +#define QT3DEXTRAS_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H // // W A R N I N G @@ -65,9 +65,13 @@ class QParameter; class QShaderProgram; class QRenderPass; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QNormalDiffuseSpecularMapMaterial; -class QNormalDiffuseSpecularMapMaterialPrivate : public QMaterialPrivate +class QNormalDiffuseSpecularMapMaterialPrivate : public Qt3DRender::QMaterialPrivate { public: QNormalDiffuseSpecularMapMaterialPrivate(); @@ -81,32 +85,32 @@ public: void handleShininessChanged(const QVariant &var); void handleTextureScaleChanged(const QVariant &var); - QEffect *m_normalDiffuseSpecularEffect; - QAbstractTexture *m_diffuseTexture; - QAbstractTexture *m_normalTexture; - QAbstractTexture *m_specularTexture; - QParameter *m_ambientParameter; - QParameter *m_diffuseParameter; - QParameter *m_normalParameter; - QParameter *m_specularParameter; - QParameter *m_shininessParameter; - QParameter *m_textureScaleParameter; - QTechnique *m_normalDiffuseSpecularGL3Technique; - QTechnique *m_normalDiffuseSpecularGL2Technique; - QTechnique *m_normalDiffuseSpecularES2Technique; - QRenderPass *m_normalDiffuseSpecularGL3RenderPass; - QRenderPass *m_normalDiffuseSpecularGL2RenderPass; - QRenderPass *m_normalDiffuseSpecularES2RenderPass; - QShaderProgram *m_normalDiffuseSpecularGL3Shader; - QShaderProgram *m_normalDiffuseSpecularGL2ES2Shader; - QFilterKey *m_filterKey; + Qt3DRender::QEffect *m_normalDiffuseSpecularEffect; + Qt3DRender::QAbstractTexture *m_diffuseTexture; + Qt3DRender::QAbstractTexture *m_normalTexture; + Qt3DRender::QAbstractTexture *m_specularTexture; + Qt3DRender::QParameter *m_ambientParameter; + Qt3DRender::QParameter *m_diffuseParameter; + Qt3DRender::QParameter *m_normalParameter; + Qt3DRender::QParameter *m_specularParameter; + Qt3DRender::QParameter *m_shininessParameter; + Qt3DRender::QParameter *m_textureScaleParameter; + Qt3DRender::QTechnique *m_normalDiffuseSpecularGL3Technique; + Qt3DRender::QTechnique *m_normalDiffuseSpecularGL2Technique; + Qt3DRender::QTechnique *m_normalDiffuseSpecularES2Technique; + Qt3DRender::QRenderPass *m_normalDiffuseSpecularGL3RenderPass; + Qt3DRender::QRenderPass *m_normalDiffuseSpecularGL2RenderPass; + Qt3DRender::QRenderPass *m_normalDiffuseSpecularES2RenderPass; + Qt3DRender::QShaderProgram *m_normalDiffuseSpecularGL3Shader; + Qt3DRender::QShaderProgram *m_normalDiffuseSpecularGL2ES2Shader; + Qt3DRender::QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QNormalDiffuseSpecularMapMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H +#endif // QT3DEXTRAS_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/extras/defaults/qpervertexcolormaterial.cpp index 6b8db44d9..2a301cd3f 100644 --- a/src/render/defaults/qpervertexcolormaterial.cpp +++ b/src/extras/defaults/qpervertexcolormaterial.cpp @@ -53,7 +53,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate() : QMaterialPrivate() @@ -156,6 +158,6 @@ void QPerVertexColorMaterialPrivate::init() q->setEffect(m_vertexEffect); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/extras/defaults/qpervertexcolormaterial.h index 43e2a095b..86d169715 100644 --- a/src/render/defaults/qpervertexcolormaterial.h +++ b/src/extras/defaults/qpervertexcolormaterial.h @@ -37,19 +37,20 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H -#define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H +#ifndef QT3DEXTRAS_QPERVERTEXCOLORMATERIAL_H +#define QT3DEXTRAS_QPERVERTEXCOLORMATERIAL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { class QPerVertexColorMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial +class QT3DEXTRASSHARED_EXPORT QPerVertexColorMaterial : public Qt3DRender::QMaterial { Q_OBJECT @@ -61,8 +62,8 @@ private: Q_DECLARE_PRIVATE(QPerVertexColorMaterial) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H +#endif // QT3DEXTRAS_QPERVERTEXCOLORMATERIAL_H diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/extras/defaults/qpervertexcolormaterial_p.h index a5f5458e0..678353525 100644 --- a/src/render/defaults/qpervertexcolormaterial_p.h +++ b/src/extras/defaults/qpervertexcolormaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H -#define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H +#ifndef QT3DEXTRAS_QPERVERTEXCOLORMATERIAL_P_H +#define QT3DEXTRAS_QPERVERTEXCOLORMATERIAL_P_H // // W A R N I N G @@ -64,32 +64,36 @@ class QParameter; class QShaderProgram; class QRenderPass; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QPerVertexColorMaterial; -class QPerVertexColorMaterialPrivate : public QMaterialPrivate +class QPerVertexColorMaterialPrivate : public Qt3DRender::QMaterialPrivate { public: QPerVertexColorMaterialPrivate(); void init(); - QEffect *m_vertexEffect; - QTechnique *m_vertexGL3Technique; - QTechnique *m_vertexGL2Technique; - QTechnique *m_vertexES2Technique; - QRenderPass *m_vertexGL3RenderPass; - QRenderPass *m_vertexGL2RenderPass; - QRenderPass *m_vertexES2RenderPass; - QShaderProgram *m_vertexGL3Shader; - QShaderProgram *m_vertexGL2ES2Shader; - QFilterKey *m_filterKey; + Qt3DRender::QEffect *m_vertexEffect; + Qt3DRender::QTechnique *m_vertexGL3Technique; + Qt3DRender::QTechnique *m_vertexGL2Technique; + Qt3DRender::QTechnique *m_vertexES2Technique; + Qt3DRender::QRenderPass *m_vertexGL3RenderPass; + Qt3DRender::QRenderPass *m_vertexGL2RenderPass; + Qt3DRender::QRenderPass *m_vertexES2RenderPass; + Qt3DRender::QShaderProgram *m_vertexGL3Shader; + Qt3DRender::QShaderProgram *m_vertexGL2ES2Shader; + Qt3DRender::QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QPerVertexColorMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H +#endif // QT3DEXTRAS_QPERVERTEXCOLORMATERIAL_P_H diff --git a/src/render/defaults/qphongalphamaterial.cpp b/src/extras/defaults/qphongalphamaterial.cpp index 858b58314..9d80751c5 100644 --- a/src/render/defaults/qphongalphamaterial.cpp +++ b/src/extras/defaults/qphongalphamaterial.cpp @@ -56,7 +56,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QPhongAlphaMaterialPrivate::QPhongAlphaMaterialPrivate() : QMaterialPrivate() @@ -320,6 +322,6 @@ void QPhongAlphaMaterial::setAlpha(float alpha) d->m_alphaParameter->setValue(alpha); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qphongalphamaterial.h b/src/extras/defaults/qphongalphamaterial.h index 9a258b09f..d4d46f756 100644 --- a/src/render/defaults/qphongalphamaterial.h +++ b/src/extras/defaults/qphongalphamaterial.h @@ -37,19 +37,20 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QPHONGALPHAMATERIAL_H -#define QT3DRENDER_RENDER_QPHONGALPHAMATERIAL_H +#ifndef QT3DEXTRAS_QPHONGALPHAMATERIAL_H +#define QT3DEXTRAS_QPHONGALPHAMATERIAL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { class QPhongAlphaMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QPhongAlphaMaterial : public QMaterial +class QT3DEXTRASSHARED_EXPORT QPhongAlphaMaterial : public Qt3DRender::QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) @@ -86,8 +87,8 @@ private: Q_DECLARE_PRIVATE(QPhongAlphaMaterial) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QPHONGALPHAMATERIAL_H +#endif // QT3DEXTRAS_QPHONGALPHAMATERIAL_H diff --git a/src/render/defaults/qphongalphamaterial_p.h b/src/extras/defaults/qphongalphamaterial_p.h index 2adf59736..623eca0ea 100644 --- a/src/render/defaults/qphongalphamaterial_p.h +++ b/src/extras/defaults/qphongalphamaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QPHONGALPHAMATERIAL_P_H -#define QT3DRENDER_RENDER_QPHONGALPHAMATERIAL_P_H +#ifndef QT3DEXTRAS_QPHONGALPHAMATERIAL_P_H +#define QT3DEXTRAS_QPHONGALPHAMATERIAL_P_H // // W A R N I N G @@ -67,9 +67,13 @@ class QNoDepthMask; class QBlendEquationArguments; class QBlendEquation; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QPhongAlphaMaterial; -class QPhongAlphaMaterialPrivate : public QMaterialPrivate +class QPhongAlphaMaterialPrivate : public Qt3DRender::QMaterialPrivate { public: QPhongAlphaMaterialPrivate(); @@ -82,31 +86,31 @@ public: void handleShininessChanged(const QVariant &var); void handleAlphaChanged(const QVariant &var); - QEffect *m_phongEffect; - QParameter *m_ambientParameter; - QParameter *m_diffuseParameter; - QParameter *m_specularParameter; - QParameter *m_shininessParameter; - QParameter *m_alphaParameter; - QTechnique *m_phongAlphaGL3Technique; - QTechnique *m_phongAlphaGL2Technique; - QTechnique *m_phongAlphaES2Technique; - QRenderPass *m_phongAlphaGL3RenderPass; - QRenderPass *m_phongAlphaGL2RenderPass; - QRenderPass *m_phongAlphaES2RenderPass; - QShaderProgram *m_phongAlphaGL3Shader; - QShaderProgram *m_phongAlphaGL2ES2Shader; - QNoDepthMask *m_noDepthMask; - QBlendEquationArguments *m_blendState; - QBlendEquation *m_blendEquation; - QFilterKey *m_filterKey; + Qt3DRender::QEffect *m_phongEffect; + Qt3DRender::QParameter *m_ambientParameter; + Qt3DRender::QParameter *m_diffuseParameter; + Qt3DRender::QParameter *m_specularParameter; + Qt3DRender::QParameter *m_shininessParameter; + Qt3DRender::QParameter *m_alphaParameter; + Qt3DRender::QTechnique *m_phongAlphaGL3Technique; + Qt3DRender::QTechnique *m_phongAlphaGL2Technique; + Qt3DRender::QTechnique *m_phongAlphaES2Technique; + Qt3DRender::QRenderPass *m_phongAlphaGL3RenderPass; + Qt3DRender::QRenderPass *m_phongAlphaGL2RenderPass; + Qt3DRender::QRenderPass *m_phongAlphaES2RenderPass; + Qt3DRender::QShaderProgram *m_phongAlphaGL3Shader; + Qt3DRender::QShaderProgram *m_phongAlphaGL2ES2Shader; + Qt3DRender::QNoDepthMask *m_noDepthMask; + Qt3DRender::QBlendEquationArguments *m_blendState; + Qt3DRender::QBlendEquation *m_blendEquation; + Qt3DRender::QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QPhongAlphaMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QPHONGALPHAMATERIAL_P_H +#endif // QT3DEXTRAS_QPHONGALPHAMATERIAL_P_H diff --git a/src/render/defaults/qphongmaterial.cpp b/src/extras/defaults/qphongmaterial.cpp index 28dcd390a..f9c51bae8 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/extras/defaults/qphongmaterial.cpp @@ -53,7 +53,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { QPhongMaterialPrivate::QPhongMaterialPrivate() : QMaterialPrivate() @@ -268,6 +270,6 @@ void QPhongMaterial::setShininess(float shininess) d->m_shininessParameter->setValue(shininess); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qphongmaterial.h b/src/extras/defaults/qphongmaterial.h index ff518e2a7..112482dee 100644 --- a/src/render/defaults/qphongmaterial.h +++ b/src/extras/defaults/qphongmaterial.h @@ -37,19 +37,20 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_H -#define QT3DRENDER_RENDER_QPHONGMATERIAL_H +#ifndef QT3DEXTRAS_QPHONGMATERIAL_H +#define QT3DEXTRAS_QPHONGMATERIAL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { class QPhongMaterialPrivate; -class QT3DRENDERSHARED_EXPORT QPhongMaterial : public QMaterial +class QT3DEXTRASSHARED_EXPORT QPhongMaterial : public Qt3DRender::QMaterial { Q_OBJECT Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) @@ -82,8 +83,8 @@ private: Q_DECLARE_PRIVATE(QPhongMaterial) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QPHONGMATERIAL_H +#endif // QT3DEXTRAS_QPHONGMATERIAL_H diff --git a/src/render/defaults/qphongmaterial_p.h b/src/extras/defaults/qphongmaterial_p.h index 74fc05ea6..bc6d0ce44 100644 --- a/src/render/defaults/qphongmaterial_p.h +++ b/src/extras/defaults/qphongmaterial_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_P_H -#define QT3DRENDER_RENDER_QPHONGMATERIAL_P_H +#ifndef QT3DEXTRAS_QPHONGMATERIAL_P_H +#define QT3DEXTRAS_QPHONGMATERIAL_P_H // // W A R N I N G @@ -64,9 +64,13 @@ class QParameter; class QShaderProgram; class QRenderPass; +} // namespace Qt3DRender + +namespace Qt3DExtras { + class QPhongMaterial; -class QPhongMaterialPrivate : public QMaterialPrivate +class QPhongMaterialPrivate : public Qt3DRender::QMaterialPrivate { public: QPhongMaterialPrivate(); @@ -78,27 +82,27 @@ public: void handleSpecularChanged(const QVariant &var); void handleShininessChanged(const QVariant &var); - QEffect *m_phongEffect; - QParameter *m_ambientParameter; - QParameter *m_diffuseParameter; - QParameter *m_specularParameter; - QParameter *m_shininessParameter; - QTechnique *m_phongGL3Technique; - QTechnique *m_phongGL2Technique; - QTechnique *m_phongES2Technique; - QRenderPass *m_phongGL3RenderPass; - QRenderPass *m_phongGL2RenderPass; - QRenderPass *m_phongES2RenderPass; - QShaderProgram *m_phongGL3Shader; - QShaderProgram *m_phongGL2ES2Shader; - QFilterKey *m_filterKey; + Qt3DRender::QEffect *m_phongEffect; + Qt3DRender::QParameter *m_ambientParameter; + Qt3DRender::QParameter *m_diffuseParameter; + Qt3DRender::QParameter *m_specularParameter; + Qt3DRender::QParameter *m_shininessParameter; + Qt3DRender::QTechnique *m_phongGL3Technique; + Qt3DRender::QTechnique *m_phongGL2Technique; + Qt3DRender::QTechnique *m_phongES2Technique; + Qt3DRender::QRenderPass *m_phongGL3RenderPass; + Qt3DRender::QRenderPass *m_phongGL2RenderPass; + Qt3DRender::QRenderPass *m_phongES2RenderPass; + Qt3DRender::QShaderProgram *m_phongGL3Shader; + Qt3DRender::QShaderProgram *m_phongGL2ES2Shader; + Qt3DRender::QFilterKey *m_filterKey; Q_DECLARE_PUBLIC(QPhongMaterial) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QPHONGMATERIAL_P_H +#endif // QT3DEXTRAS_QPHONGMATERIAL_P_H diff --git a/src/render/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp index 6e333ab64..973532fff 100644 --- a/src/render/defaults/qskyboxentity.cpp +++ b/src/extras/defaults/qskyboxentity.cpp @@ -49,7 +49,7 @@ #include <Qt3DRender/qdepthtest.h> #include <Qt3DRender/qparameter.h> #include <Qt3DRender/qtechnique.h> -#include <Qt3DRender/qcuboidmesh.h> +#include <Qt3DExtras/qcuboidmesh.h> #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qgraphicsapifilter.h> #include <Qt3DRender/qshaderprogram.h> @@ -57,8 +57,9 @@ QT_BEGIN_NAMESPACE using namespace Qt3DCore; +using namespace Qt3DRender; -namespace Qt3DRender { +namespace Qt3DExtras { QSkyboxEntityPrivate::QSkyboxEntityPrivate() : QEntityPrivate() @@ -287,6 +288,6 @@ QVector3D QSkyboxEntity::cameraPosition() const return d->m_position; } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/defaults/qskyboxentity.h b/src/extras/defaults/qskyboxentity.h index e52e4bcd5..7112bff4c 100644 --- a/src/render/defaults/qskyboxentity.h +++ b/src/extras/defaults/qskyboxentity.h @@ -37,19 +37,19 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QSKYBOXENTITY_H -#define QT3DRENDER_RENDER_QSKYBOXENTITY_H +#ifndef QT3DEXTRAS_QSKYBOXENTITY_H +#define QT3DEXTRAS_QSKYBOXENTITY_H #include <Qt3DCore/qentity.h> -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { class QSkyboxEntityPrivate; -class QT3DRENDERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity +class QT3DEXTRASSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity { Q_OBJECT public: @@ -74,8 +74,8 @@ private: Q_DECLARE_PRIVATE(QSkyboxEntity) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QSKYBOXENTITY_H +#endif // QT3DEXTRAS_QSKYBOXENTITY_H diff --git a/src/render/defaults/qskyboxentity_p.h b/src/extras/defaults/qskyboxentity_p.h index f020ac824..565caa66d 100644 --- a/src/render/defaults/qskyboxentity_p.h +++ b/src/extras/defaults/qskyboxentity_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_QSKYBOXENTITY_P_H -#define QT3DRENDER_RENDER_QSKYBOXENTITY_P_H +#ifndef QT3DEXTRAS_QSKYBOXENTITY_P_H +#define QT3DEXTRAS_QSKYBOXENTITY_P_H // // W A R N I N G @@ -67,13 +67,18 @@ class QTextureCubeMap; class QShaderProgram; class QSkyboxEntity; class QTextureImage; -class QCuboidMesh; class QRenderPass; class QTechnique; class QParameter; class QMaterial; class QEffect; +} // namespace Qt3DRender + +namespace Qt3DExtras { + +class QCuboidMesh; + class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate { QSkyboxEntityPrivate(); @@ -83,35 +88,35 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate Q_DECLARE_PUBLIC(QSkyboxEntity) - QEffect *m_effect; - QMaterial *m_material; - QTextureCubeMap *m_skyboxTexture; - QShaderProgram *m_gl3Shader; - QShaderProgram *m_gl2es2Shader; - QTechnique *m_gl2Technique; - QTechnique *m_es2Technique; - QTechnique *m_gl3Technique; - QFilterKey *m_filterKey; - QRenderPass *m_gl2RenderPass; - QRenderPass *m_es2RenderPass; - QRenderPass *m_gl3RenderPass; + Qt3DRender::QEffect *m_effect; + Qt3DRender::QMaterial *m_material; + Qt3DRender::QTextureCubeMap *m_skyboxTexture; + Qt3DRender::QShaderProgram *m_gl3Shader; + Qt3DRender::QShaderProgram *m_gl2es2Shader; + Qt3DRender::QTechnique *m_gl2Technique; + Qt3DRender::QTechnique *m_es2Technique; + Qt3DRender::QTechnique *m_gl3Technique; + Qt3DRender::QFilterKey *m_filterKey; + Qt3DRender::QRenderPass *m_gl2RenderPass; + Qt3DRender::QRenderPass *m_es2RenderPass; + Qt3DRender::QRenderPass *m_gl3RenderPass; QCuboidMesh *m_mesh; Qt3DCore::QTransform *m_transform; - QParameter *m_textureParameter; - QTextureImage *m_posXImage; - QTextureImage *m_posYImage; - QTextureImage *m_posZImage; - QTextureImage *m_negXImage; - QTextureImage *m_negYImage; - QTextureImage *m_negZImage; + Qt3DRender::QParameter *m_textureParameter; + Qt3DRender::QTextureImage *m_posXImage; + Qt3DRender:: QTextureImage *m_posYImage; + Qt3DRender::QTextureImage *m_posZImage; + Qt3DRender::QTextureImage *m_negXImage; + Qt3DRender::QTextureImage *m_negYImage; + Qt3DRender::QTextureImage *m_negZImage; QString m_extension; QString m_baseName; QVector3D m_position; }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_QSKYBOXENTITY_P_H +#endif // QT3DEXTRAS_QSKYBOXENTITY_P_H diff --git a/src/extras/extras.pro b/src/extras/extras.pro new file mode 100644 index 000000000..3b7758007 --- /dev/null +++ b/src/extras/extras.pro @@ -0,0 +1,16 @@ +TARGET = Qt3DExtras +MODULE = 3dextras +QT += core-private 3dcore 3dcore-private 3drender 3drender-private + +DEFINES += QT3DEXTRAS_LIBRARY + +load(qt_module) + +include (geometries/geometries.pri) +include (defaults/defaults.pri) + +HEADERS += \ + qt3dextras_global.h + +RESOURCES += $$PWD/extras.qrc + diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc new file mode 100644 index 000000000..e7b1c1d9a --- /dev/null +++ b/src/extras/extras.qrc @@ -0,0 +1,43 @@ +<RCC> + <qresource prefix="/"> + <file>shaders/gl3/light.inc.frag</file> + <file>shaders/es2/light.inc.frag</file> + <file>shaders/es2/light.inc.frag100</file> + <file>shaders/gl3/phong.vert</file> + <file>shaders/gl3/phong.frag</file> + <file>shaders/es2/phong.vert</file> + <file>shaders/es2/phong.frag</file> + <file>shaders/gl3/normaldiffusespecularmap.frag</file> + <file>shaders/gl3/diffusemap.vert</file> + <file>shaders/gl3/diffusemap.frag</file> + <file>shaders/es2/normaldiffusespecularmap.frag</file> + <file>shaders/es2/diffusemap.vert</file> + <file>shaders/es2/diffusemap.frag</file> + <file>shaders/es2/normaldiffusemap.vert</file> + <file>shaders/es2/normaldiffusemap.frag</file> + <file>shaders/es2/normaldiffusemapalpha.frag</file> + <file>shaders/gl3/normaldiffusemap.frag</file> + <file>shaders/gl3/normaldiffusemap.vert</file> + <file>shaders/gl3/normaldiffusemapalpha.frag</file> + <file>shaders/es2/diffusespecularmap.frag</file> + <file>shaders/gl3/diffusespecularmap.frag</file> + <file>shaders/gl3/pervertexcolor.frag</file> + <file>shaders/gl3/pervertexcolor.vert</file> + <file>shaders/es2/pervertexcolor.frag</file> + <file>shaders/es2/pervertexcolor.vert</file> + <file>shaders/es2/skybox.frag</file> + <file>shaders/es2/skybox.vert</file> + <file>shaders/gl3/skybox.frag</file> + <file>shaders/gl3/skybox.vert</file> + <file>shaders/gl3/gooch.vert</file> + <file>shaders/gl3/gooch.frag</file> + <file>shaders/es2/gooch.frag</file> + <file>shaders/es2/gooch.vert</file> + <file>shaders/gl3/phongalpha.frag</file> + <file>shaders/es2/phongalpha.frag</file> + <file>shaders/gl3/unlittexture.vert</file> + <file>shaders/gl3/unlittexture.frag</file> + <file>shaders/es2/unlittexture.frag</file> + <file>shaders/es2/unlittexture.vert</file> + </qresource> +</RCC> diff --git a/src/extras/geometries/geometries.pri b/src/extras/geometries/geometries.pri new file mode 100644 index 000000000..7a2932cb7 --- /dev/null +++ b/src/extras/geometries/geometries.pri @@ -0,0 +1,35 @@ +HEADERS += \ + $$PWD/qconegeometry.h \ + $$PWD/qconegeometry_p.h \ + $$PWD/qconemesh.h \ + $$PWD/qcuboidmesh.h \ + $$PWD/qcylindergeometry.h \ + $$PWD/qcylindergeometry_p.h \ + $$PWD/qcylindermesh.h \ + $$PWD/qplanemesh.h \ + $$PWD/qspheremesh.h \ + $$PWD/qtorusmesh.h \ + $$PWD/qtorusgeometry.h \ + $$PWD/qtorusgeometry_p.h \ + $$PWD/qspheregeometry.h \ + $$PWD/qspheregeometry_p.h \ + $$PWD/qcuboidgeometry.h \ + $$PWD/qcuboidgeometry_p.h \ + $$PWD/qplanegeometry.h \ + $$PWD/qplanegeometry_p.h + +SOURCES += \ + $$PWD/qconegeometry.cpp \ + $$PWD/qconemesh.cpp \ + $$PWD/qcuboidmesh.cpp \ + $$PWD/qcylindergeometry.cpp \ + $$PWD/qcylindermesh.cpp \ + $$PWD/qplanemesh.cpp \ + $$PWD/qspheremesh.cpp \ + $$PWD/qtorusmesh.cpp \ + $$PWD/qtorusgeometry.cpp \ + $$PWD/qspheregeometry.cpp \ + $$PWD/qcuboidgeometry.cpp \ + $$PWD/qplanegeometry.cpp + +INCLUDEPATH += $$PWD diff --git a/src/render/geometry/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp index 816c24983..4d1c4ce17 100644 --- a/src/render/geometry/qconegeometry.cpp +++ b/src/extras/geometries/qconegeometry.cpp @@ -51,7 +51,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { namespace { @@ -344,8 +346,8 @@ void QConeGeometryPrivate::init() m_normalAttribute = new QAttribute(q); m_texCoordAttribute = new QAttribute(q); m_indexAttribute = new QAttribute(q); - m_vertexBuffer = new QBuffer(QBuffer::VertexBuffer, q); - m_indexBuffer = new QBuffer(QBuffer::IndexBuffer, q); + m_vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, q); + m_indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, q); // vec3 pos, vec2 tex, vec3 normal const quint32 elementSize = 3 + 2 + 3; @@ -582,6 +584,6 @@ QAttribute *QConeGeometry::indexAttribute() const return d->m_indexAttribute; } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qconegeometry.h b/src/extras/geometries/qconegeometry.h index 767cbc270..4f1dc944a 100644 --- a/src/render/geometry/qconegeometry.h +++ b/src/extras/geometries/qconegeometry.h @@ -37,20 +37,23 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCONEGEOMETRY_H -#define QT3DRENDER_QCONEGEOMETRY_H +#ifndef QT3DEXTRAS_QCONEGEOMETRY_H +#define QT3DEXTRAS_QCONEGEOMETRY_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { +class QAttribute; +} // Render + +namespace Qt3DExtras { class QConeGeometryPrivate; -class QAttribute; -class QT3DRENDERSHARED_EXPORT QConeGeometry : public QGeometry +class QT3DEXTRASSHARED_EXPORT QConeGeometry : public Qt3DRender::QGeometry { Q_OBJECT Q_PROPERTY( bool hasTopEndcap READ hasTopEndcap WRITE setHasTopEndcap NOTIFY hasTopEndcapChanged ) @@ -80,10 +83,10 @@ public: int slices() const; float length() const; - QAttribute *positionAttribute() const; - QAttribute *normalAttribute() const; - QAttribute *texCoordAttribute() const; - QAttribute *indexAttribute() const; + Qt3DRender::QAttribute *positionAttribute() const; + Qt3DRender::QAttribute *normalAttribute() const; + Qt3DRender::QAttribute *texCoordAttribute() const; + Qt3DRender::QAttribute *indexAttribute() const; public Q_SLOTS: void setHasTopEndcap( bool hasTopEndcap ); @@ -110,8 +113,8 @@ private: Q_DECLARE_PRIVATE(QConeGeometry) }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QCONEGEOMETRY_H +#endif // QT3DEXTRAS_QCONEGEOMETRY_H diff --git a/src/render/geometry/qconegeometry_p.h b/src/extras/geometries/qconegeometry_p.h index a135a6095..3987b4315 100644 --- a/src/render/geometry/qconegeometry_p.h +++ b/src/extras/geometries/qconegeometry_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCONEGEOMETRY_P_H -#define QT3DRENDER_QCONEGEOMETRY_P_H +#ifndef QT3DEXTRAS_QCONEGEOMETRY_P_H +#define QT3DEXTRAS_QCONEGEOMETRY_P_H // // W A R N I N G @@ -60,7 +60,11 @@ namespace Qt3DRender { class QAttribute; class QBuffer; -class QConeGeometryPrivate : public QGeometryPrivate +} // namespace Qt3DRender + +namespace Qt3DExtras { + +class QConeGeometryPrivate : public Qt3DRender::QGeometryPrivate { public: QConeGeometryPrivate(); @@ -76,18 +80,18 @@ public: float m_topRadius; float m_bottomRadius; float m_length; - QAttribute *m_positionAttribute; - QAttribute *m_normalAttribute; - QAttribute *m_texCoordAttribute; - QAttribute *m_indexAttribute; - QBuffer *m_positionBuffer; - QBuffer *m_vertexBuffer; - QBuffer *m_indexBuffer; + Qt3DRender::QAttribute *m_positionAttribute; + Qt3DRender::QAttribute *m_normalAttribute; + Qt3DRender::QAttribute *m_texCoordAttribute; + Qt3DRender::QAttribute *m_indexAttribute; + Qt3DRender::QBuffer *m_positionBuffer; + Qt3DRender::QBuffer *m_vertexBuffer; + Qt3DRender::QBuffer *m_indexBuffer; }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QCONEGEOMETRY_P_H +#endif // QT3DEXTRAS_QCONEGEOMETRY_P_H diff --git a/src/render/geometry/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp index b2620c5c4..621e06046 100644 --- a/src/render/geometry/qconemesh.cpp +++ b/src/extras/geometries/qconemesh.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { QConeMesh::QConeMesh(QNode *parent) : QGeometryRenderer(parent) @@ -143,6 +143,6 @@ float QConeMesh::length() const return static_cast<QConeGeometry *>(geometry())->length(); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qconemesh.h b/src/extras/geometries/qconemesh.h index 1b0b7ca99..c32070e5c 100644 --- a/src/render/geometry/qconemesh.h +++ b/src/extras/geometries/qconemesh.h @@ -37,18 +37,17 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCONEMESH_H -#define QT3DRENDER_QCONEMESH_H +#ifndef QT3DEXTRAS_QCONEMESH_H +#define QT3DEXTRAS_QCONEMESH_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometryrenderer.h> QT_BEGIN_NAMESPACE +namespace Qt3DExtras { -namespace Qt3DRender { - -class QT3DRENDERSHARED_EXPORT QConeMesh : public QGeometryRenderer +class QT3DEXTRASSHARED_EXPORT QConeMesh : public Qt3DRender::QGeometryRenderer { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) @@ -98,12 +97,12 @@ private: void setFirstInstance(int firstInstance); void setRestartIndexValue(int index); void setPrimitiveRestartEnabled(bool enabled); - void setGeometry(QGeometry *geometry); + void setGeometry(Qt3DRender::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QCONEMESH_H +#endif // QT3DEXTRAS_QCONEMESH_H diff --git a/src/render/geometry/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp index 9173ae0eb..b62ae0022 100644 --- a/src/render/geometry/qcuboidgeometry.cpp +++ b/src/extras/geometries/qcuboidgeometry.cpp @@ -47,7 +47,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { namespace { @@ -420,13 +422,13 @@ QCuboidGeometryPrivate::QCuboidGeometryPrivate() void QCuboidGeometryPrivate::init() { Q_Q(QCuboidGeometry); - m_positionAttribute = new QAttribute(q); - m_normalAttribute = new QAttribute(q); - m_texCoordAttribute = new QAttribute(q); - m_tangentAttribute = new QAttribute(q); - m_indexAttribute = new QAttribute(q); - m_vertexBuffer = new QBuffer(QBuffer::VertexBuffer, q); - m_indexBuffer = new QBuffer(QBuffer::IndexBuffer, q); + m_positionAttribute = new Qt3DRender::QAttribute(q); + m_normalAttribute = new Qt3DRender::QAttribute(q); + m_texCoordAttribute = new Qt3DRender::QAttribute(q); + m_tangentAttribute = new Qt3DRender::QAttribute(q); + m_indexAttribute = new Qt3DRender::QAttribute(q); + m_vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, q); + m_indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, q); // vec3 pos vec2 tex vec3 normal vec4 tangent const quint32 stride = (3 + 2 + 3 + 4) * sizeof(float); @@ -820,6 +822,6 @@ QAttribute *QCuboidGeometry::indexAttribute() const return d->m_indexAttribute; } -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qcuboidgeometry.h b/src/extras/geometries/qcuboidgeometry.h index 1ef2b8c42..7fa5f58ff 100644 --- a/src/render/geometry/qcuboidgeometry.h +++ b/src/extras/geometries/qcuboidgeometry.h @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCUBOIDGEOMETRY_H -#define QT3DRENDER_QCUBOIDGEOMETRY_H +#ifndef QT3DEXTRAS_QCUBOIDGEOMETRY_H +#define QT3DEXTRAS_QCUBOIDGEOMETRY_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometry.h> #include <QSize> @@ -47,10 +48,15 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QCuboidGeometryPrivate; class QAttribute; -class QT3DRENDERSHARED_EXPORT QCuboidGeometry : public QGeometry +} // Qt3DRender + +namespace Qt3DExtras { + +class QCuboidGeometryPrivate; + +class QT3DEXTRASSHARED_EXPORT QCuboidGeometry : public Qt3DRender::QGeometry { Q_OBJECT Q_PROPERTY(float xExtent READ xExtent WRITE setXExtent NOTIFY xExtentChanged) @@ -79,11 +85,11 @@ public: QSize xyMeshResolution() const; QSize xzMeshResolution() const; - QAttribute *positionAttribute() const; - QAttribute *normalAttribute() const; - QAttribute *texCoordAttribute() const; - QAttribute *tangentAttribute() const; - QAttribute *indexAttribute() const; + Qt3DRender::QAttribute *positionAttribute() const; + Qt3DRender::QAttribute *normalAttribute() const; + Qt3DRender::QAttribute *texCoordAttribute() const; + Qt3DRender::QAttribute *tangentAttribute() const; + Qt3DRender::QAttribute *indexAttribute() const; public Q_SLOTS: void setXExtent(float xExtent); @@ -109,8 +115,8 @@ private: Q_DECLARE_PRIVATE(QCuboidGeometry) }; -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QCUBOIDGEOMETRY_H +#endif // QT3DEXTRAS_QCUBOIDGEOMETRY_H diff --git a/src/render/geometry/qcuboidgeometry_p.h b/src/extras/geometries/qcuboidgeometry_p.h index 438b87fe6..212be19b4 100644 --- a/src/render/geometry/qcuboidgeometry_p.h +++ b/src/extras/geometries/qcuboidgeometry_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCUBOIDGEOMETRY_P_H -#define QT3DRENDER_QCUBOIDGEOMETRY_P_H +#ifndef QT3DEXTRAS_QCUBOIDGEOMETRY_P_H +#define QT3DEXTRAS_QCUBOIDGEOMETRY_P_H // // W A R N I N G @@ -61,7 +61,11 @@ namespace Qt3DRender { class QAttribute; class QBuffer; -class QCuboidGeometryPrivate : public QGeometryPrivate +} // Qt3DRender + +namespace Qt3DExtras { + +class QCuboidGeometryPrivate : public Qt3DRender::QGeometryPrivate { public: QCuboidGeometryPrivate(); @@ -77,20 +81,20 @@ public: QSize m_xzFaceResolution; QSize m_xyFaceResolution; - QAttribute *m_positionAttribute; - QAttribute *m_normalAttribute; - QAttribute *m_texCoordAttribute; - QAttribute *m_tangentAttribute; - QAttribute *m_indexAttribute; - QBuffer *m_vertexBuffer; - QBuffer *m_indexBuffer; + Qt3DRender::QAttribute *m_positionAttribute; + Qt3DRender::QAttribute *m_normalAttribute; + Qt3DRender::QAttribute *m_texCoordAttribute; + Qt3DRender::QAttribute *m_tangentAttribute; + Qt3DRender::QAttribute *m_indexAttribute; + Qt3DRender::QBuffer *m_vertexBuffer; + Qt3DRender::QBuffer *m_indexBuffer; Q_DECLARE_PUBLIC(QCuboidGeometry) }; -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QCUBOIDGEOMETRY_P_H +#endif // QT3DEXTRAS_QCUBOIDGEOMETRY_P_H diff --git a/src/render/geometry/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp index bcde6efe9..99cfa4733 100644 --- a/src/render/geometry/qcuboidmesh.cpp +++ b/src/extras/geometries/qcuboidmesh.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { /*! * \qmltype QCuboidMesh @@ -210,6 +210,6 @@ QSize QCuboidMesh::xyMeshResolution() const return static_cast<QCuboidGeometry *>(geometry())->xyMeshResolution(); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qcuboidmesh.h b/src/extras/geometries/qcuboidmesh.h index 5db062cbd..72f6a007d 100644 --- a/src/render/geometry/qcuboidmesh.h +++ b/src/extras/geometries/qcuboidmesh.h @@ -37,18 +37,18 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_CUBOIDMESH_H -#define QT3DRENDER_CUBOIDMESH_H +#ifndef QT3DEXTRAS_CUBOIDMESH_H +#define QT3DEXTRAS_CUBOIDMESH_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometryrenderer.h> #include <QSize> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { -class QT3DRENDERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer +class QT3DEXTRASSHARED_EXPORT QCuboidMesh : public Qt3DRender::QGeometryRenderer { Q_OBJECT @@ -97,12 +97,12 @@ private: void setFirstInstance(int firstInstance); void setRestartIndexValue(int index); void setPrimitiveRestartEnabled(bool enabled); - void setGeometry(QGeometry *geometry); + void setGeometry(Qt3DRender::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_CUBOIDMESH_H +#endif // QT3DEXTRAS_CUBOIDMESH_H diff --git a/src/render/geometry/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp index 1ea16bf37..f514d0dc9 100644 --- a/src/render/geometry/qcylindergeometry.cpp +++ b/src/extras/geometries/qcylindergeometry.cpp @@ -51,7 +51,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { namespace { @@ -283,8 +285,8 @@ void QCylinderGeometryPrivate::init() m_normalAttribute = new QAttribute(q); m_texCoordAttribute = new QAttribute(q); m_indexAttribute = new QAttribute(q); - m_vertexBuffer = new QBuffer(QBuffer::VertexBuffer, q); - m_indexBuffer = new QBuffer(QBuffer::IndexBuffer, q); + m_vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, q); + m_indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, q); // vec3 pos, vec2 tex, vec3 normal const quint32 elementSize = 3 + 2 + 3; @@ -578,6 +580,6 @@ QAttribute *QCylinderGeometry::indexAttribute() const return d->m_indexAttribute; } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qcylindergeometry.h b/src/extras/geometries/qcylindergeometry.h index 37f46b76b..570b2b25d 100644 --- a/src/render/geometry/qcylindergeometry.h +++ b/src/extras/geometries/qcylindergeometry.h @@ -37,20 +37,24 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCYLINDERGEOMETRY_H -#define QT3DRENDER_QCYLINDERGEOMETRY_H +#ifndef QT3DEXTRAS_QCYLINDERGEOMETRY_H +#define QT3DEXTRAS_QCYLINDERGEOMETRY_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QCylinderGeometryPrivate; class QAttribute; -class QT3DRENDERSHARED_EXPORT QCylinderGeometry : public QGeometry +} // namespace Qt3DRender + +namespace Qt3DExtras { + +class QCylinderGeometryPrivate; +class QT3DEXTRASSHARED_EXPORT QCylinderGeometry : public Qt3DRender::QGeometry { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) @@ -74,10 +78,10 @@ public: float radius() const; float length() const; - QAttribute *positionAttribute() const; - QAttribute *normalAttribute() const; - QAttribute *texCoordAttribute() const; - QAttribute *indexAttribute() const; + Qt3DRender::QAttribute *positionAttribute() const; + Qt3DRender::QAttribute *normalAttribute() const; + Qt3DRender::QAttribute *texCoordAttribute() const; + Qt3DRender::QAttribute *indexAttribute() const; public Q_SLOTS: void setRings(int rings); @@ -98,8 +102,8 @@ private: Q_DECLARE_PRIVATE(QCylinderGeometry) }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QCYLINDERGEOMETRY_H +#endif // QT3DEXTRAS_QCYLINDERGEOMETRY_H diff --git a/src/render/geometry/qcylindergeometry_p.h b/src/extras/geometries/qcylindergeometry_p.h index fb4fd7229..50c37cb62 100644 --- a/src/render/geometry/qcylindergeometry_p.h +++ b/src/extras/geometries/qcylindergeometry_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCYLINDERGEOMETRY_P_H -#define QT3DRENDER_QCYLINDERGEOMETRY_P_H +#ifndef QT3DEXTRAS_QCYLINDERGEOMETRY_P_H +#define QT3DEXTRAS_QCYLINDERGEOMETRY_P_H // // W A R N I N G @@ -60,7 +60,11 @@ namespace Qt3DRender { class QAttribute; class QBuffer; -class QCylinderGeometryPrivate : public QGeometryPrivate +} // namespace Qt3DRender + +namespace Qt3DExtras { + +class QCylinderGeometryPrivate : public Qt3DRender::QGeometryPrivate { public: QCylinderGeometryPrivate(); @@ -73,17 +77,17 @@ public: int m_slices; float m_radius; float m_length; - QAttribute *m_positionAttribute; - QAttribute *m_normalAttribute; - QAttribute *m_texCoordAttribute; - QAttribute *m_indexAttribute; - QBuffer *m_vertexBuffer; - QBuffer *m_indexBuffer; + Qt3DRender::QAttribute *m_positionAttribute; + Qt3DRender::QAttribute *m_normalAttribute; + Qt3DRender::QAttribute *m_texCoordAttribute; + Qt3DRender::QAttribute *m_indexAttribute; + Qt3DRender::QBuffer *m_vertexBuffer; + Qt3DRender::QBuffer *m_indexBuffer; }; -} // namespace Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QCYLINDERGEOMETRY_P_H +#endif // QT3DEXTRAS_QCYLINDERGEOMETRY_P_H diff --git a/src/render/geometry/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp index 45f2c63f5..9cbf729a6 100644 --- a/src/render/geometry/qcylindermesh.cpp +++ b/src/extras/geometries/qcylindermesh.cpp @@ -52,7 +52,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { /*! * \qmltype CylinderMesh @@ -177,6 +179,6 @@ float QCylinderMesh::length() const return static_cast<QCylinderGeometry *>(geometry())->length(); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qcylindermesh.h b/src/extras/geometries/qcylindermesh.h index 6af1a62b1..256508576 100644 --- a/src/render/geometry/qcylindermesh.h +++ b/src/extras/geometries/qcylindermesh.h @@ -37,18 +37,18 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QCYLINDERMESH_H -#define QT3DRENDER_QCYLINDERMESH_H +#ifndef QT3DEXTRAS_QCYLINDERMESH_H +#define QT3DEXTRAS_QCYLINDERMESH_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometryrenderer.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { -class QT3DRENDERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer +class QT3DEXTRASSHARED_EXPORT QCylinderMesh : public Qt3DRender::QGeometryRenderer { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) @@ -86,7 +86,7 @@ private: void setFirstInstance(int firstInstance); void setRestartIndexValue(int index); void setPrimitiveRestartEnabled(bool enabled); - void setGeometry(QGeometry *geometry); + void setGeometry(Qt3DRender::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; @@ -94,4 +94,4 @@ private: QT_END_NAMESPACE -#endif // QT3DRENDER_QCYLINDERMESH_H +#endif // QT3DEXTRAS_QCYLINDERMESH_H diff --git a/src/render/geometry/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp index ff9a1d2c4..a0c0ffbc0 100644 --- a/src/render/geometry/qplanegeometry.cpp +++ b/src/extras/geometries/qplanegeometry.cpp @@ -46,7 +46,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { namespace { @@ -463,8 +465,8 @@ void QPlaneGeometryPrivate::init() m_texCoordAttribute = new QAttribute(q); m_tangentAttribute = new QAttribute(q); m_indexAttribute = new QAttribute(q); - m_vertexBuffer = new QBuffer(QBuffer::VertexBuffer, q); - m_indexBuffer = new QBuffer(QBuffer::IndexBuffer, q); + m_vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, q); + m_indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, q); const int nVerts = m_meshResolution.width() * m_meshResolution.height(); const int stride = (3 + 2 + 3 + 4) * sizeof(float); @@ -522,6 +524,6 @@ void QPlaneGeometryPrivate::init() q->addAttribute(m_indexAttribute); } -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qplanegeometry.h b/src/extras/geometries/qplanegeometry.h index ccf492c47..708ea931d 100644 --- a/src/render/geometry/qplanegeometry.h +++ b/src/extras/geometries/qplanegeometry.h @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QPLANEGEOMETRY_H -#define QT3DRENDER_QPLANEGEOMETRY_H +#ifndef QT3DEXTRAS_QPLANEGEOMETRY_H +#define QT3DEXTRAS_QPLANEGEOMETRY_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometry.h> #include <QSize> @@ -47,10 +48,15 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QPlaneGeometryPrivate; class QAttribute; -class QT3DRENDERSHARED_EXPORT QPlaneGeometry : public QGeometry +} // Qt3DRender + +namespace Qt3DExtras { + +class QPlaneGeometryPrivate; + +class QT3DEXTRASSHARED_EXPORT QPlaneGeometry : public Qt3DRender::QGeometry { Q_OBJECT Q_PROPERTY(float width READ width WRITE setWidth NOTIFY widthChanged) @@ -73,11 +79,11 @@ public: float width() const; float height() const; - QAttribute *positionAttribute() const; - QAttribute *normalAttribute() const; - QAttribute *texCoordAttribute() const; - QAttribute *tangentAttribute() const; - QAttribute *indexAttribute() const; + Qt3DRender::QAttribute *positionAttribute() const; + Qt3DRender::QAttribute *normalAttribute() const; + Qt3DRender::QAttribute *texCoordAttribute() const; + Qt3DRender::QAttribute *tangentAttribute() const; + Qt3DRender::QAttribute *indexAttribute() const; public Q_SLOTS: void setResolution(const QSize &resolution); @@ -96,8 +102,8 @@ private: Q_DECLARE_PRIVATE(QPlaneGeometry) }; -} // Qt3DRender +} // Qt3DExpoerimental QT_END_NAMESPACE -#endif // QT3DRENDER_QPLANEGEOMETRY_H +#endif // QT3DEXTRAS_QPLANEGEOMETRY_H diff --git a/src/render/geometry/qplanegeometry_p.h b/src/extras/geometries/qplanegeometry_p.h index f4ec65738..d0a4e88e4 100644 --- a/src/render/geometry/qplanegeometry_p.h +++ b/src/extras/geometries/qplanegeometry_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QPLANEGEOMETRY_P_H -#define QT3DRENDER_QPLANEGEOMETRY_P_H +#ifndef QT3DEXTRAS_QPLANEGEOMETRY_P_H +#define QT3DEXTRAS_QPLANEGEOMETRY_P_H // // W A R N I N G @@ -61,7 +61,11 @@ namespace Qt3DRender { class QAttribute; class QBuffer; -class QPlaneGeometryPrivate : public QGeometryPrivate +} // Qt3DRender + +namespace Qt3DExtras { + +class QPlaneGeometryPrivate : public Qt3DRender::QGeometryPrivate { public: QPlaneGeometryPrivate(); @@ -70,20 +74,20 @@ public: float m_width; float m_height; QSize m_meshResolution; - QAttribute *m_positionAttribute; - QAttribute *m_normalAttribute; - QAttribute *m_texCoordAttribute; - QAttribute *m_tangentAttribute; - QAttribute *m_indexAttribute; - QBuffer *m_vertexBuffer; - QBuffer *m_indexBuffer; + Qt3DRender::QAttribute *m_positionAttribute; + Qt3DRender::QAttribute *m_normalAttribute; + Qt3DRender::QAttribute *m_texCoordAttribute; + Qt3DRender::QAttribute *m_tangentAttribute; + Qt3DRender::QAttribute *m_indexAttribute; + Qt3DRender::QBuffer *m_vertexBuffer; + Qt3DRender::QBuffer *m_indexBuffer; Q_DECLARE_PUBLIC(QPlaneGeometry) }; -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QPLANEGEOMETRY_P_H +#endif // QT3DEXTRAS_QPLANEGEOMETRY_P_H diff --git a/src/render/geometry/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp index 5efa33116..4c6cc914d 100644 --- a/src/render/geometry/qplanemesh.cpp +++ b/src/extras/geometries/qplanemesh.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { /*! * \qmltype PlaneMesh @@ -144,6 +144,6 @@ QSize QPlaneMesh::meshResolution() const return static_cast<QPlaneGeometry *>(geometry())->resolution(); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qplanemesh.h b/src/extras/geometries/qplanemesh.h index db0f43109..45edbdf45 100644 --- a/src/render/geometry/qplanemesh.h +++ b/src/extras/geometries/qplanemesh.h @@ -37,18 +37,18 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QPLANEMESH_H -#define QT3DRENDER_QPLANEMESH_H +#ifndef QT3DEXTRAS_QPLANEMESH_H +#define QT3DEXTRAS_QPLANEMESH_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometryrenderer.h> #include <QSize> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { -class QT3DRENDERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer +class QT3DEXTRASSHARED_EXPORT QPlaneMesh : public Qt3DRender::QGeometryRenderer { Q_OBJECT Q_PROPERTY(float width READ width WRITE setWidth NOTIFY widthChanged) @@ -83,7 +83,7 @@ private: void setFirstInstance(int firstInstance); void setRestartIndexValue(int index); void setPrimitiveRestartEnabled(bool enabled); - void setGeometry(QGeometry *geometry); + void setGeometry(Qt3DRender::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; @@ -91,4 +91,4 @@ private: QT_END_NAMESPACE -#endif // QT3DRENDER_QPLANEMESH_H +#endif // QT3DEXTRAS_QPLANEMESH_H diff --git a/src/render/geometry/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp index f82bc5ec6..0e610346c 100644 --- a/src/render/geometry/qspheregeometry.cpp +++ b/src/extras/geometries/qspheregeometry.cpp @@ -51,7 +51,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { namespace { @@ -250,8 +252,8 @@ void QSphereGeometryPrivate::init() m_texCoordAttribute = new QAttribute(q); m_tangentAttribute = new QAttribute(q); m_indexAttribute = new QAttribute(q); - m_vertexBuffer = new QBuffer(QBuffer::VertexBuffer, q); - m_indexBuffer = new QBuffer(QBuffer::IndexBuffer, q); + m_vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, q); + m_indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, q); // vec3 pos, vec2 tex, vec3 normal, vec4 tangent const quint32 elementSize = 3 + 2 + 3 + 4; @@ -313,7 +315,7 @@ void QSphereGeometryPrivate::init() /*! * \qmltype SphereGeometry - * \instantiates Qt3DRender::QSphereGeometry + * \instantiates QSphereGeometry * \inqmlmodule Qt3D.Render */ @@ -372,10 +374,10 @@ void QSphereGeometryPrivate::init() */ /*! - * \class Qt3DRender::QSphereGeometry + * \class QSphereGeometry * \inmodule Qt3DRender * - * \inherits Qt3DRender::QGeometry + * \inherits QGeometry */ /*! @@ -576,7 +578,7 @@ QAttribute *QSphereGeometry::indexAttribute() const return d->m_indexAttribute; } -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qspheregeometry.h b/src/extras/geometries/qspheregeometry.h index 182aa96cc..acc908d35 100644 --- a/src/render/geometry/qspheregeometry.h +++ b/src/extras/geometries/qspheregeometry.h @@ -37,19 +37,25 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QSPHEREGEOMETRY_H -#define QT3DRENDER_QSPHEREGEOMETRY_H +#ifndef QT3DEXTRAS_QSPHEREGEOMETRY_H +#define QT3DEXTRAS_QSPHEREGEOMETRY_H #include <Qt3DRender/qgeometry.h> +#include <Qt3DExtras/qt3dextras_global.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QSphereGeometryPrivate; class QAttribute; -class QT3DRENDERSHARED_EXPORT QSphereGeometry : public QGeometry +} // Qt3DRender + +namespace Qt3DExtras { + +class QSphereGeometryPrivate; + +class QT3DEXTRASSHARED_EXPORT QSphereGeometry : public Qt3DRender::QGeometry { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) @@ -74,11 +80,11 @@ public: int slices() const; float radius() const; - QAttribute *positionAttribute() const; - QAttribute *normalAttribute() const; - QAttribute *texCoordAttribute() const; - QAttribute *tangentAttribute() const; - QAttribute *indexAttribute() const; + Qt3DRender::QAttribute *positionAttribute() const; + Qt3DRender::QAttribute *normalAttribute() const; + Qt3DRender::QAttribute *texCoordAttribute() const; + Qt3DRender::QAttribute *tangentAttribute() const; + Qt3DRender::QAttribute *indexAttribute() const; public Q_SLOTS: void setRings(int rings); @@ -99,8 +105,8 @@ private: Q_DECLARE_PRIVATE(QSphereGeometry) }; -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QSPHEREGEOMETRY_H +#endif // QT3DEXTRAS_QSPHEREGEOMETRY_H diff --git a/src/render/geometry/qspheregeometry_p.h b/src/extras/geometries/qspheregeometry_p.h index 718cf6c3b..dc96766e1 100644 --- a/src/render/geometry/qspheregeometry_p.h +++ b/src/extras/geometries/qspheregeometry_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QSPHEREGEOMETRY_P_H -#define QT3DRENDER_QSPHEREGEOMETRY_P_H +#ifndef QT3DEXTRAS_QSPHEREGEOMETRY_P_H +#define QT3DEXTRAS_QSPHEREGEOMETRY_P_H // // W A R N I N G @@ -60,7 +60,11 @@ namespace Qt3DRender { class QAttribute; class QBuffer; -class QSphereGeometryPrivate : public QGeometryPrivate +} // Qt3DRender + +namespace Qt3DExtras { + +class QSphereGeometryPrivate : public Qt3DRender::QGeometryPrivate { public: QSphereGeometryPrivate(); @@ -70,20 +74,20 @@ public: int m_rings; int m_slices; float m_radius; - QAttribute *m_positionAttribute; - QAttribute *m_normalAttribute; - QAttribute *m_texCoordAttribute; - QAttribute *m_tangentAttribute; - QAttribute *m_indexAttribute; - QBuffer *m_vertexBuffer; - QBuffer *m_indexBuffer; + Qt3DRender::QAttribute *m_positionAttribute; + Qt3DRender::QAttribute *m_normalAttribute; + Qt3DRender::QAttribute *m_texCoordAttribute; + Qt3DRender::QAttribute *m_tangentAttribute; + Qt3DRender::QAttribute *m_indexAttribute; + Qt3DRender::QBuffer *m_vertexBuffer; + Qt3DRender::QBuffer *m_indexBuffer; Q_DECLARE_PUBLIC(QSphereGeometry); }; -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QSPHEREGEOMETRY_P_H +#endif //QT3DEXTRAS_QSPHEREGEOMETRY_P_H diff --git a/src/render/geometry/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp index a31370eb4..d5c4a1317 100644 --- a/src/render/geometry/qspheremesh.cpp +++ b/src/extras/geometries/qspheremesh.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { /*! * \qmltype SphereMesh @@ -167,6 +167,6 @@ float QSphereMesh::radius() const return static_cast<QSphereGeometry *>(geometry())->radius(); } -} //Qt3D +} // Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qspheremesh.h b/src/extras/geometries/qspheremesh.h index ee76ae110..7fe346e41 100644 --- a/src/render/geometry/qspheremesh.h +++ b/src/extras/geometries/qspheremesh.h @@ -37,19 +37,19 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QSPHEREMESH_H -#define QT3DRENDER_QSPHEREMESH_H +#ifndef QT3DEXTRAS_QSPHEREMESH_H +#define QT3DEXTRAS_QSPHEREMESH_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometryrenderer.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { class QSphereMeshPrivate; -class QT3DRENDERSHARED_EXPORT QSphereMesh : public QGeometryRenderer +class QT3DEXTRASSHARED_EXPORT QSphereMesh : public Qt3DRender::QGeometryRenderer { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) @@ -87,12 +87,12 @@ private: void setFirstInstance(int firstInstance); void setRestartIndexValue(int index); void setPrimitiveRestartEnabled(bool enabled); - void setGeometry(QGeometry *geometry); + void setGeometry(Qt3DRender::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QSPHEREMESH_H +#endif // QT3DEXTRAS_QSPHEREMESH_H diff --git a/src/render/geometry/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp index 9c88b125f..fe9ac7821 100644 --- a/src/render/geometry/qtorusgeometry.cpp +++ b/src/extras/geometries/qtorusgeometry.cpp @@ -47,7 +47,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +using namespace Qt3DRender; + +namespace Qt3DExtras { namespace { @@ -211,8 +213,8 @@ void QTorusGeometryPrivate::init() m_normalAttribute = new QAttribute(q); m_texCoordAttribute = new QAttribute(q); m_indexAttribute = new QAttribute(q); - m_vertexBuffer = new QBuffer(QBuffer::VertexBuffer, q); - m_indexBuffer = new QBuffer(QBuffer::IndexBuffer, q); + m_vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, q); + m_indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, q); // vec3 pos, vec2 tex, vec3 normal const quint32 elementSize = 3 + 2 + 3; const quint32 stride = elementSize * sizeof(float); @@ -504,6 +506,6 @@ QAttribute *QTorusGeometry::indexAttribute() const return d->m_indexAttribute; } -} // Qt3DRender +} // Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qtorusgeometry.h b/src/extras/geometries/qtorusgeometry.h index 64c5f885d..99b76acd3 100644 --- a/src/render/geometry/qtorusgeometry.h +++ b/src/extras/geometries/qtorusgeometry.h @@ -37,20 +37,25 @@ ** ****************************************************************************/ -#ifndef QT3D_QTORUSGEOMETRY_H -#define QT3D_QTORUSGEOMETRY_H +#ifndef QT3DEXTRAS_QTORUSGEOMETRY_H +#define QT3DEXTRAS_QTORUSGEOMETRY_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QTorusGeometryPrivate; class QAttribute; -class QT3DRENDERSHARED_EXPORT QTorusGeometry : public QGeometry +} // Qt3DRender + +namespace Qt3DExtras { + +class QTorusGeometryPrivate; + +class QT3DEXTRASSHARED_EXPORT QTorusGeometry : public Qt3DRender::QGeometry { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) @@ -74,10 +79,10 @@ public: float radius() const; float minorRadius() const; - QAttribute *positionAttribute() const; - QAttribute *normalAttribute() const; - QAttribute *texCoordAttribute() const; - QAttribute *indexAttribute() const; + Qt3DRender::QAttribute *positionAttribute() const; + Qt3DRender::QAttribute *normalAttribute() const; + Qt3DRender::QAttribute *texCoordAttribute() const; + Qt3DRender::QAttribute *indexAttribute() const; public Q_SLOTS: void setRings(int rings); @@ -99,8 +104,8 @@ private: Q_DECLARE_PRIVATE(QTorusGeometry) }; -} // Qt3D +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3D_QTORUSGEOMETRY_H +#endif // QT3DEXTRAS_QTORUSGEOMETRY_H diff --git a/src/render/geometry/qtorusgeometry_p.h b/src/extras/geometries/qtorusgeometry_p.h index 0324af6d5..b4bcbde9f 100644 --- a/src/render/geometry/qtorusgeometry_p.h +++ b/src/extras/geometries/qtorusgeometry_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QTORUSGEOMETRY_P_H -#define QT3DRENDER_QTORUSGEOMETRY_P_H +#ifndef QT3DEXTRAS_QTORUSGEOMETRY_P_H +#define QT3DEXTRAS_QTORUSGEOMETRY_P_H // // W A R N I N G @@ -60,7 +60,11 @@ namespace Qt3DRender { class QAttribute; class QBuffer; -class QTorusGeometryPrivate : public QGeometryPrivate +} // Qt3DRender + +namespace Qt3DExtras { + +class QTorusGeometryPrivate : public Qt3DRender::QGeometryPrivate { public: QTorusGeometryPrivate(); @@ -70,19 +74,20 @@ public: int m_slices; float m_radius; float m_minorRadius; - QAttribute *m_positionAttribute; - QAttribute *m_normalAttribute; - QAttribute *m_texCoordAttribute; - QAttribute *m_indexAttribute; - QBuffer *m_vertexBuffer; - QBuffer *m_indexBuffer; + Qt3DRender::QAttribute *m_positionAttribute; + Qt3DRender::QAttribute *m_normalAttribute; + Qt3DRender::QAttribute *m_texCoordAttribute; + Qt3DRender::QAttribute *m_indexAttribute; + Qt3DRender::QBuffer *m_vertexBuffer; + Qt3DRender::QBuffer *m_indexBuffer; Q_DECLARE_PUBLIC(QTorusGeometry) }; -} // Qt3D +} // Qt3DExtras + QT_END_NAMESPACE -#endif // QT3DRENDER_QTORUSGEOMETRY_P_H +#endif // QT3DEXTRAS_QTORUSGEOMETRY_P_H diff --git a/src/render/geometry/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp index 4d9161f7e..0f2143835 100644 --- a/src/render/geometry/qtorusmesh.cpp +++ b/src/extras/geometries/qtorusmesh.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { /*! * \qmltype TorusMesh @@ -172,6 +172,6 @@ float QTorusMesh::minorRadius() const return static_cast<QTorusGeometry *>(geometry())->minorRadius(); } -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE diff --git a/src/render/geometry/qtorusmesh.h b/src/extras/geometries/qtorusmesh.h index 6783c6833..16d1be736 100644 --- a/src/render/geometry/qtorusmesh.h +++ b/src/extras/geometries/qtorusmesh.h @@ -37,17 +37,17 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_QTORUSMESH_H -#define QT3DRENDER_QTORUSMESH_H +#ifndef QT3DEXTRAS_QTORUSMESH_H +#define QT3DEXTRAS_QTORUSMESH_H -#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometryrenderer.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DExtras { -class QT3DRENDERSHARED_EXPORT QTorusMesh : public QGeometryRenderer +class QT3DEXTRASSHARED_EXPORT QTorusMesh : public Qt3DRender::QGeometryRenderer { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) @@ -85,12 +85,12 @@ private: void setFirstInstance(int firstInstance); void setRestartIndexValue(int index); void setPrimitiveRestartEnabled(bool enabled); - void setGeometry(QGeometry *geometry); + void setGeometry(Qt3DRender::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); }; -} // namespace Qt3DRender +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QT3DRENDER_QTORUSMESH_H +#endif // QT3DEXTRAS_QTORUSMESH_H diff --git a/src/extras/qt3dextras_global.h b/src/extras/qt3dextras_global.h new file mode 100644 index 000000000..bd4160ab8 --- /dev/null +++ b/src/extras/qt3dextras_global.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3DEXTRAS_GLOBAL_H +#define QT3DEXTRAS_GLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_NAMESPACE + +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DEXTRAS_LIBRARY) +# define QT3DEXTRASSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DEXTRASSHARED_EXPORT Q_DECL_IMPORT +# endif +#else +# define QT3DEXTRASSHARED_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QT3DEXTRAS_GLOBAL_H diff --git a/src/render/shaders/es2/diffusemap.frag b/src/extras/shaders/es2/diffusemap.frag index 7d06d8e2c..7d06d8e2c 100644 --- a/src/render/shaders/es2/diffusemap.frag +++ b/src/extras/shaders/es2/diffusemap.frag diff --git a/src/render/shaders/es2/diffusemap.vert b/src/extras/shaders/es2/diffusemap.vert index 13798279e..13798279e 100644 --- a/src/render/shaders/es2/diffusemap.vert +++ b/src/extras/shaders/es2/diffusemap.vert diff --git a/src/render/shaders/es2/diffusespecularmap.frag b/src/extras/shaders/es2/diffusespecularmap.frag index 4d776772c..4d776772c 100644 --- a/src/render/shaders/es2/diffusespecularmap.frag +++ b/src/extras/shaders/es2/diffusespecularmap.frag diff --git a/src/render/shaders/es2/gooch.frag b/src/extras/shaders/es2/gooch.frag index 622aaf0b4..622aaf0b4 100644 --- a/src/render/shaders/es2/gooch.frag +++ b/src/extras/shaders/es2/gooch.frag diff --git a/src/render/shaders/es2/gooch.vert b/src/extras/shaders/es2/gooch.vert index dd162a66b..dd162a66b 100644 --- a/src/render/shaders/es2/gooch.vert +++ b/src/extras/shaders/es2/gooch.vert diff --git a/src/render/shaders/es2/light.inc.frag b/src/extras/shaders/es2/light.inc.frag index cdec536cf..cdec536cf 100644 --- a/src/render/shaders/es2/light.inc.frag +++ b/src/extras/shaders/es2/light.inc.frag diff --git a/src/render/shaders/es2/light.inc.frag100 b/src/extras/shaders/es2/light.inc.frag100 index b4988ad82..b4988ad82 100644 --- a/src/render/shaders/es2/light.inc.frag100 +++ b/src/extras/shaders/es2/light.inc.frag100 diff --git a/src/render/shaders/es2/normaldiffusemap.frag b/src/extras/shaders/es2/normaldiffusemap.frag index c69aa8b81..c69aa8b81 100644 --- a/src/render/shaders/es2/normaldiffusemap.frag +++ b/src/extras/shaders/es2/normaldiffusemap.frag diff --git a/src/render/shaders/es2/normaldiffusemap.vert b/src/extras/shaders/es2/normaldiffusemap.vert index ecc689f69..ecc689f69 100644 --- a/src/render/shaders/es2/normaldiffusemap.vert +++ b/src/extras/shaders/es2/normaldiffusemap.vert diff --git a/src/render/shaders/es2/normaldiffusemapalpha.frag b/src/extras/shaders/es2/normaldiffusemapalpha.frag index 98acbf01d..98acbf01d 100644 --- a/src/render/shaders/es2/normaldiffusemapalpha.frag +++ b/src/extras/shaders/es2/normaldiffusemapalpha.frag diff --git a/src/render/shaders/es2/normaldiffusespecularmap.frag b/src/extras/shaders/es2/normaldiffusespecularmap.frag index b30c1bd5f..b30c1bd5f 100644 --- a/src/render/shaders/es2/normaldiffusespecularmap.frag +++ b/src/extras/shaders/es2/normaldiffusespecularmap.frag diff --git a/src/render/shaders/es2/pervertexcolor.frag b/src/extras/shaders/es2/pervertexcolor.frag index ab429d942..ab429d942 100644 --- a/src/render/shaders/es2/pervertexcolor.frag +++ b/src/extras/shaders/es2/pervertexcolor.frag diff --git a/src/render/shaders/es2/pervertexcolor.vert b/src/extras/shaders/es2/pervertexcolor.vert index 7fc3e649f..7fc3e649f 100644 --- a/src/render/shaders/es2/pervertexcolor.vert +++ b/src/extras/shaders/es2/pervertexcolor.vert diff --git a/src/extras/shaders/es2/phong.frag b/src/extras/shaders/es2/phong.frag new file mode 100644 index 000000000..c00f89db0 --- /dev/null +++ b/src/extras/shaders/es2/phong.frag @@ -0,0 +1,20 @@ +#define FP highp + +uniform FP vec3 ka; // Ambient reflectivity +uniform FP vec3 kd; // Diffuse reflectivity +uniform FP vec3 ks; // Specular reflectivity +uniform FP float shininess; // Specular shininess factor + +uniform FP vec3 eyePosition; + +varying FP vec3 worldPosition; +varying FP vec3 worldNormal; + +#pragma include light.inc.frag + +void main() +{ + FP vec3 diffuseColor, specularColor; + adsModel(worldPosition, worldNormal, eyePosition, shininess, diffuseColor, specularColor); + gl_FragColor = vec4( ka + kd * diffuseColor + ks * specularColor, 1.0 ); +} diff --git a/src/extras/shaders/es2/phong.vert b/src/extras/shaders/es2/phong.vert new file mode 100644 index 000000000..2b4c51b14 --- /dev/null +++ b/src/extras/shaders/es2/phong.vert @@ -0,0 +1,17 @@ +attribute vec3 vertexPosition; +attribute vec3 vertexNormal; + +varying vec3 worldPosition; +varying vec3 worldNormal; + +uniform mat4 modelMatrix; +uniform mat3 modelNormalMatrix; +uniform mat4 modelViewProjection; + +void main() +{ + worldNormal = normalize( modelNormalMatrix * vertexNormal ); + worldPosition = vec3( modelMatrix * vec4( vertexPosition, 1.0 ) ); + + gl_Position = modelViewProjection * vec4( vertexPosition, 1.0 ); +} diff --git a/src/render/shaders/es2/phongalpha.frag b/src/extras/shaders/es2/phongalpha.frag index c5ec43049..c5ec43049 100644 --- a/src/render/shaders/es2/phongalpha.frag +++ b/src/extras/shaders/es2/phongalpha.frag diff --git a/src/render/shaders/es2/skybox.frag b/src/extras/shaders/es2/skybox.frag index 3de08be44..3de08be44 100644 --- a/src/render/shaders/es2/skybox.frag +++ b/src/extras/shaders/es2/skybox.frag diff --git a/src/render/shaders/es2/skybox.vert b/src/extras/shaders/es2/skybox.vert index e2de1d88b..e2de1d88b 100644 --- a/src/render/shaders/es2/skybox.vert +++ b/src/extras/shaders/es2/skybox.vert diff --git a/src/render/shaders/es2/unlittexture.frag b/src/extras/shaders/es2/unlittexture.frag index 66752ed32..66752ed32 100644 --- a/src/render/shaders/es2/unlittexture.frag +++ b/src/extras/shaders/es2/unlittexture.frag diff --git a/src/render/shaders/es2/unlittexture.vert b/src/extras/shaders/es2/unlittexture.vert index 050b2b7e2..050b2b7e2 100644 --- a/src/render/shaders/es2/unlittexture.vert +++ b/src/extras/shaders/es2/unlittexture.vert diff --git a/src/render/shaders/gl3/diffusemap.frag b/src/extras/shaders/gl3/diffusemap.frag index 7810fdb68..7810fdb68 100644 --- a/src/render/shaders/gl3/diffusemap.frag +++ b/src/extras/shaders/gl3/diffusemap.frag diff --git a/src/render/shaders/gl3/diffusemap.vert b/src/extras/shaders/gl3/diffusemap.vert index 439be6e99..439be6e99 100644 --- a/src/render/shaders/gl3/diffusemap.vert +++ b/src/extras/shaders/gl3/diffusemap.vert diff --git a/src/render/shaders/gl3/diffusespecularmap.frag b/src/extras/shaders/gl3/diffusespecularmap.frag index fb809393a..fb809393a 100644 --- a/src/render/shaders/gl3/diffusespecularmap.frag +++ b/src/extras/shaders/gl3/diffusespecularmap.frag diff --git a/src/render/shaders/gl3/gooch.frag b/src/extras/shaders/gl3/gooch.frag index 1beab1c01..1beab1c01 100644 --- a/src/render/shaders/gl3/gooch.frag +++ b/src/extras/shaders/gl3/gooch.frag diff --git a/src/render/shaders/gl3/gooch.vert b/src/extras/shaders/gl3/gooch.vert index 5230fb70e..5230fb70e 100644 --- a/src/render/shaders/gl3/gooch.vert +++ b/src/extras/shaders/gl3/gooch.vert diff --git a/src/render/shaders/gl3/light.inc.frag b/src/extras/shaders/gl3/light.inc.frag index 8cee315c1..8cee315c1 100644 --- a/src/render/shaders/gl3/light.inc.frag +++ b/src/extras/shaders/gl3/light.inc.frag diff --git a/src/render/shaders/gl3/normaldiffusemap.frag b/src/extras/shaders/gl3/normaldiffusemap.frag index a99a7ed73..a99a7ed73 100644 --- a/src/render/shaders/gl3/normaldiffusemap.frag +++ b/src/extras/shaders/gl3/normaldiffusemap.frag diff --git a/src/render/shaders/gl3/normaldiffusemap.vert b/src/extras/shaders/gl3/normaldiffusemap.vert index 306a562fb..306a562fb 100644 --- a/src/render/shaders/gl3/normaldiffusemap.vert +++ b/src/extras/shaders/gl3/normaldiffusemap.vert diff --git a/src/render/shaders/gl3/normaldiffusemapalpha.frag b/src/extras/shaders/gl3/normaldiffusemapalpha.frag index ce5cf0e90..ce5cf0e90 100644 --- a/src/render/shaders/gl3/normaldiffusemapalpha.frag +++ b/src/extras/shaders/gl3/normaldiffusemapalpha.frag diff --git a/src/render/shaders/gl3/normaldiffusespecularmap.frag b/src/extras/shaders/gl3/normaldiffusespecularmap.frag index b62932ffd..b62932ffd 100644 --- a/src/render/shaders/gl3/normaldiffusespecularmap.frag +++ b/src/extras/shaders/gl3/normaldiffusespecularmap.frag diff --git a/src/render/shaders/gl3/pervertexcolor.frag b/src/extras/shaders/gl3/pervertexcolor.frag index b5ed5a33d..b5ed5a33d 100644 --- a/src/render/shaders/gl3/pervertexcolor.frag +++ b/src/extras/shaders/gl3/pervertexcolor.frag diff --git a/src/render/shaders/gl3/pervertexcolor.vert b/src/extras/shaders/gl3/pervertexcolor.vert index 87713a520..87713a520 100644 --- a/src/render/shaders/gl3/pervertexcolor.vert +++ b/src/extras/shaders/gl3/pervertexcolor.vert diff --git a/src/extras/shaders/gl3/phong.frag b/src/extras/shaders/gl3/phong.frag new file mode 100644 index 000000000..a4d7e0969 --- /dev/null +++ b/src/extras/shaders/gl3/phong.frag @@ -0,0 +1,22 @@ +#version 150 core + +uniform vec3 ka; // Ambient reflectivity +uniform vec3 kd; // Diffuse reflectivity +uniform vec3 ks; // Specular reflectivity +uniform float shininess; // Specular shininess factor + +uniform vec3 eyePosition; + +in vec3 worldPosition; +in vec3 worldNormal; + +out vec4 fragColor; + +#pragma include light.inc.frag + +void main() +{ + vec3 diffuseColor, specularColor; + adsModel(worldPosition, worldNormal, eyePosition, shininess, diffuseColor, specularColor); + fragColor = vec4( ka + kd * diffuseColor + ks * specularColor, 1.0 ); +} diff --git a/src/extras/shaders/gl3/phong.vert b/src/extras/shaders/gl3/phong.vert new file mode 100644 index 000000000..cdb3c70e9 --- /dev/null +++ b/src/extras/shaders/gl3/phong.vert @@ -0,0 +1,19 @@ +#version 150 core + +in vec3 vertexPosition; +in vec3 vertexNormal; + +out vec3 worldPosition; +out vec3 worldNormal; + +uniform mat4 modelMatrix; +uniform mat3 modelNormalMatrix; +uniform mat4 modelViewProjection; + +void main() +{ + worldNormal = normalize( modelNormalMatrix * vertexNormal ); + worldPosition = vec3( modelMatrix * vec4( vertexPosition, 1.0 ) ); + + gl_Position = modelViewProjection * vec4( vertexPosition, 1.0 ); +} diff --git a/src/render/shaders/gl3/phongalpha.frag b/src/extras/shaders/gl3/phongalpha.frag index cb019e9aa..cb019e9aa 100644 --- a/src/render/shaders/gl3/phongalpha.frag +++ b/src/extras/shaders/gl3/phongalpha.frag diff --git a/src/render/shaders/gl3/skybox.frag b/src/extras/shaders/gl3/skybox.frag index 99c8f111b..99c8f111b 100644 --- a/src/render/shaders/gl3/skybox.frag +++ b/src/extras/shaders/gl3/skybox.frag diff --git a/src/render/shaders/gl3/skybox.vert b/src/extras/shaders/gl3/skybox.vert index 17bb2b00b..17bb2b00b 100644 --- a/src/render/shaders/gl3/skybox.vert +++ b/src/extras/shaders/gl3/skybox.vert diff --git a/src/render/shaders/gl3/unlittexture.frag b/src/extras/shaders/gl3/unlittexture.frag index 8abbeee8f..8abbeee8f 100644 --- a/src/render/shaders/gl3/unlittexture.frag +++ b/src/extras/shaders/gl3/unlittexture.frag diff --git a/src/render/shaders/gl3/unlittexture.vert b/src/extras/shaders/gl3/unlittexture.vert index 4aaa10a8f..4aaa10a8f 100644 --- a/src/render/shaders/gl3/unlittexture.vert +++ b/src/extras/shaders/gl3/unlittexture.vert diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro index 71fffe2e7..6126c1580 100644 --- a/src/plugins/sceneparsers/assimp/assimp.pro +++ b/src/plugins/sceneparsers/assimp/assimp.pro @@ -1,6 +1,6 @@ TARGET = assimpsceneparser -QT += core-private 3dcore 3dcore-private 3drender 3drender-private +QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras include(../../../3rdparty/assimp/assimp_dependency.pri) diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 33e1f9c1f..f21221883 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -49,9 +49,9 @@ #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qtexture.h> -#include <Qt3DRender/qdiffusemapmaterial.h> -#include <Qt3DRender/qdiffusespecularmapmaterial.h> -#include <Qt3DRender/qphongmaterial.h> +#include <Qt3DExtras/qdiffusemapmaterial.h> +#include <Qt3DExtras/qdiffusespecularmapmaterial.h> +#include <Qt3DExtras/qphongmaterial.h> #include <QFileInfo> #include <QColor> #include <qmath.h> @@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE using namespace Qt3DCore; +using namespace Qt3DExtras; namespace Qt3DRender { @@ -529,8 +530,8 @@ void AssimpParser::loadMesh(uint meshIndex) QGeometryRenderer *geometryRenderer = new QGeometryRenderer(); QGeometry *meshGeometry = new QGeometry(geometryRenderer); - QBuffer *vertexBuffer = new QBuffer(QBuffer::VertexBuffer, meshGeometry); - QBuffer *indexBuffer = new QBuffer(QBuffer::IndexBuffer, meshGeometry); + Qt3DRender::QBuffer *vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, meshGeometry); + Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, meshGeometry); geometryRenderer->setGeometry(meshGeometry); diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro index 675d127da..bc65c3426 100644 --- a/src/plugins/sceneparsers/gltf/gltf.pro +++ b/src/plugins/sceneparsers/gltf/gltf.pro @@ -1,6 +1,6 @@ TARGET = gltfsceneparser -QT += core-private 3dcore 3dcore-private 3drender 3drender-private +QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras HEADERS += \ gltfparser.h diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp index ca61debfc..b1a5ffb00 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser.cpp +++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp @@ -74,15 +74,16 @@ #include <Qt3DRender/QTechnique> #include <Qt3DRender/QTexture> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QDiffuseMapMaterial> -#include <Qt3DRender/QDiffuseSpecularMapMaterial> -#include <Qt3DRender/QNormalDiffuseMapMaterial> -#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QPhongMaterial> +#include <Qt3DExtras/QDiffuseMapMaterial> +#include <Qt3DExtras/QDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QNormalDiffuseMapMaterial> +#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial> QT_BEGIN_NAMESPACE using namespace Qt3DCore; +using namespace Qt3DExtras; namespace Qt3DRender { @@ -872,11 +873,11 @@ void GLTFParser::processJSONBufferView(const QString &id, const QJsonObject& jso } int target = json.value(KEY_TARGET).toInt(); - QBuffer::BufferType ty(QBuffer::VertexBuffer); + Qt3DRender::QBuffer::BufferType ty(Qt3DRender::QBuffer::VertexBuffer); switch (target) { - case GL_ARRAY_BUFFER: ty = QBuffer::VertexBuffer; break; - case GL_ELEMENT_ARRAY_BUFFER: ty = QBuffer::IndexBuffer; break; + case GL_ARRAY_BUFFER: ty = Qt3DRender::QBuffer::VertexBuffer; break; + case GL_ELEMENT_ARRAY_BUFFER: ty = Qt3DRender::QBuffer::IndexBuffer; break; default: qCWarning(GLTFParserLog) << Q_FUNC_INFO << "buffer" << id << "unsupported target:" << target; return; @@ -896,7 +897,7 @@ void GLTFParser::processJSONBufferView(const QString &id, const QJsonObject& jso << "for view" << id; } - QBuffer *b(new QBuffer(ty)); + Qt3DRender::QBuffer *b(new Qt3DRender::QBuffer(ty)); b->setData(bytes); m_buffers[id] = b; } @@ -1091,7 +1092,7 @@ void GLTFParser::processJSONMesh(const QString &id, const QJsonObject &json) attributeName = attrName; //Get buffer handle for accessor - QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR); + Qt3DRender::QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR); if (buffer == Q_NULLPTR) { qCWarning(GLTFParserLog) << "unknown buffer-view:" << m_accessorDict[k].bufferViewName << "processing accessor:" << id; continue; @@ -1114,7 +1115,7 @@ void GLTFParser::processJSONMesh(const QString &id, const QJsonObject &json) qCWarning(GLTFParserLog) << "unknown index accessor:" << k << "on mesh" << id; } else { //Get buffer handle for accessor - QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR); + Qt3DRender::QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR); if (buffer == Q_NULLPTR) { qCWarning(GLTFParserLog) << "unknown buffer-view:" << m_accessorDict[k].bufferViewName << "processing accessor:" << id; continue; diff --git a/src/plugins/sceneparsers/gltf/gltfparser.h b/src/plugins/sceneparsers/gltf/gltfparser.h index e21bed8de..b878cc3d8 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser.h +++ b/src/plugins/sceneparsers/gltf/gltfparser.h @@ -193,7 +193,7 @@ private: QMap<QString, QMaterial*> m_materialCache; QMap<QString, BufferData> m_bufferDatas; - QMap<QString, QBuffer*> m_buffers; + QMap<QString, Qt3DRender::QBuffer*> m_buffers; QMap<QString, QString> m_shaderPaths; QMap<QString, QShaderProgram*> m_programs; diff --git a/src/quick3d/imports/render/defaults/defaults.pri b/src/quick3d/imports/extras/defaults/defaults.pri index 5487dac49..eee644925 100644 --- a/src/quick3d/imports/render/defaults/defaults.pri +++ b/src/quick3d/imports/extras/defaults/defaults.pri @@ -1,3 +1,4 @@ + # When adding new QML files that should be built into the plugin, # add them to this variable and they will be listed into a generated # resource file. diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/extras/defaults/qml/DiffuseMapMaterial.qml index 6e5a843b0..6e5a843b0 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/DiffuseMapMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/extras/defaults/qml/DiffuseSpecularMapMaterial.qml index e5ec0562a..e5ec0562a 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/DiffuseSpecularMapMaterial.qml diff --git a/src/quick3d/imports/extras/defaults/qml/FirstPersonCameraController.qml b/src/quick3d/imports/extras/defaults/qml/FirstPersonCameraController.qml new file mode 100644 index 000000000..e6950140d --- /dev/null +++ b/src/quick3d/imports/extras/defaults/qml/FirstPersonCameraController.qml @@ -0,0 +1,176 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Paul Lemire <paul.lemire350@gmail.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 +import Qt3D.Input 2.0 +import Qt3D.Logic 2.0 +import QtQml 2.2 + +Entity { + id: root + property Camera camera + property real linearSpeed: 10.0 + property real lookSpeed: 180.0 + + QtObject { + id: d + readonly property vector3d firstPersonUp: Qt.vector3d(0, 1, 0) + readonly property bool leftMouseButtonPressed: leftMouseButtonAction.active + readonly property real vx: txAxis.value * linearSpeed; + readonly property real vy: tyAxis.value * linearSpeed; + readonly property real vz: tzAxis.value * linearSpeed; + readonly property real dx: rxAxis.value * lookSpeed + readonly property real dy: ryAxis.value * lookSpeed + readonly property bool fineMotion: fineMotionAction.active + } + + KeyboardDevice { + id: keyboardSourceDevice + } + + MouseDevice { + id: mouseSourceDevice + sensitivity: d.fineMotion ? 0.01 : 0.1 + } + + components: [ + + LogicalDevice { + actions: [ + Action { + id: leftMouseButtonAction + ActionInput { + sourceDevice: mouseSourceDevice + buttons: [MouseEvent.LeftButton] + } + }, + Action { + id: fineMotionAction + ActionInput { + sourceDevice: keyboardSourceDevice + buttons: [Qt.Key_Shift] + } + } + ] // actions + + axes: [ + // Rotation + Axis { + id: rxAxis + AxisInput { + sourceDevice: mouseSourceDevice + axis: MouseDevice.X + } + }, + Axis { + id: ryAxis + AxisInput { + sourceDevice: mouseSourceDevice + axis: MouseDevice.Y + } + }, + // Translation + Axis { + id: txAxis + AxisInput { + sourceDevice: keyboardSourceDevice + buttons: [Qt.Key_Left] + scale: -1.0 + } + AxisInput { + sourceDevice: keyboardSourceDevice + buttons: [Qt.Key_Right] + scale: 1.0 + } + }, + Axis { + id: tzAxis + AxisInput { + sourceDevice: keyboardSourceDevice + buttons: [Qt.Key_Up] + scale: 1.0 + } + AxisInput { + sourceDevice: keyboardSourceDevice + buttons: [Qt.Key_Down] + scale: -1.0 + } + }, + Axis { + id: tyAxis + AxisInput { + sourceDevice: keyboardSourceDevice + buttons: [Qt.Key_PageUp] + scale: 1.0 + } + AxisInput { + sourceDevice: keyboardSourceDevice + buttons: [Qt.Key_PageDown] + scale: -1.0 + } + } + ] // axes + }, + + FrameAction { + onTriggered: { + // The time difference since the last frame is passed in as the + // argument dt. It is a floating point value in units of seconds. + root.camera.translate(Qt.vector3d(d.vx, d.vy, d.vz).times(dt)) + + if (d.leftMouseButtonPressed) { + root.camera.pan(d.dx * dt, d.firstPersonUp) + root.camera.tilt(d.dy * dt) + } + } + } + ] // components +} diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/extras/defaults/qml/ForwardRenderer.qml index be30e7fb9..0cd5bcaa6 100644 --- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml +++ b/src/quick3d/imports/extras/defaults/qml/ForwardRenderer.qml @@ -43,7 +43,7 @@ import Qt3D.Render 2.0 TechniqueFilter { // Expose camera to allow user to choose which camera to use for rendering property alias camera: cameraSelector.camera - property alias clearColor: clearBuffers.clearColor + property alias clearColor: clearBuffer.clearColor property alias viewportRect: viewport.normalizedRect property alias window: surfaceSelector.surface @@ -63,9 +63,9 @@ TechniqueFilter { id : cameraSelector FrustumCulling { ClearBuffers { - id: clearBuffers - buffers : ClearBuffers.ColorDepthBuffer + id: clearBuffer clearColor: "white" + buffers : ClearBuffers.ColorDepthBuffer } } } diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/extras/defaults/qml/GoochMaterial.qml index 51c656ae0..51c656ae0 100644 --- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/GoochMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaMaterial.qml index 6dfbf98c1..6dfbf98c1 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapAlphaMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapMaterial.qml index eeb1d33d4..eeb1d33d4 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseMapMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseSpecularMapMaterial.qml index d2c0efda0..d2c0efda0 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/NormalDiffuseSpecularMapMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/extras/defaults/qml/PerVertexColorMaterial.qml index 9e286f459..9e286f459 100644 --- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/PerVertexColorMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml index 295d8abd1..295d8abd1 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/extras/defaults/qml/PhongMaterial.qml index e60bcefc8..e60bcefc8 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/PhongMaterial.qml diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/extras/defaults/qml/SkyboxEntity.qml index f3cb1f3bf..9fcf8559f 100644 --- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml +++ b/src/quick3d/imports/extras/defaults/qml/SkyboxEntity.qml @@ -39,6 +39,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Extras 2.0 Entity { diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/extras/defaults/qml/TextureMaterial.qml index 28d3a1713..d5f99445b 100644 --- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml +++ b/src/quick3d/imports/extras/defaults/qml/TextureMaterial.qml @@ -82,7 +82,7 @@ Material { techniques: [ // OpenGL 3.1 Technique { - filterKeys: [ forward ] + annotations: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL profile: GraphicsApiFilter.CoreProfile @@ -96,7 +96,7 @@ Material { // GL 2 Technique Technique { - filterKeys: [ forward ] + annotations: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGL majorVersion: 2 @@ -109,7 +109,7 @@ Material { // ES 2 Technique Technique { - filterKeys: [ forward ] + annotations: [ forward ] graphicsApiFilter { api: GraphicsApiFilter.OpenGLES profile: GraphicsApiFilter.NoProfile diff --git a/src/quick3d/imports/extras/importsextras.pro b/src/quick3d/imports/extras/importsextras.pro new file mode 100644 index 000000000..bc87843bf --- /dev/null +++ b/src/quick3d/imports/extras/importsextras.pro @@ -0,0 +1,41 @@ +CXX_MODULE = qml +TARGET = quick3dextrasplugin +TARGETPATH = Qt3D/Extras + +QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras + +HEADERS += \ + qt3dquick3dextrasplugin.h + +SOURCES += \ + qt3dquick3dextrasplugin.cpp + +load(qml_plugin) + +include(./defaults/defaults.pri) + +OTHER_FILES += \ + qmldir \ + $$QML_FILES + +# Create a resource file for qml files that need to be registered by the plugin +GENERATED_RESOURCE_FILE = $$OUT_PWD/defaults.qrc +INCLUDED_RESOURCE_FILES = $$QML_FILES +RESOURCE_CONTENT = \ + "<RCC>" \ + "<qresource prefix=\"/qt-project.org/imports/Qt3D/Extras/\">" + +for(resourcefile, INCLUDED_RESOURCE_FILES) { + resourcefileabsolutepath = $$absolute_path($$resourcefile) + relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) + relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) + RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" +} + +RESOURCE_CONTENT += \ + "</qresource>" \ + "</RCC>" + +write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") + +RESOURCES += $$GENERATED_RESOURCE_FILE diff --git a/src/quick3d/imports/extras/qmldir b/src/quick3d/imports/extras/qmldir new file mode 100644 index 000000000..4f7215ae0 --- /dev/null +++ b/src/quick3d/imports/extras/qmldir @@ -0,0 +1,3 @@ +module Qt3D.Extras +plugin quick3dextrasplugin +classname Qt3DQuick3DExtrasPlugin diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp new file mode 100644 index 000000000..cd7743915 --- /dev/null +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -0,0 +1,106 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qt3dquick3dextrasplugin.h" +#include <Qt3DExtras/qcuboidmesh.h> +#include <Qt3DExtras/qconemesh.h> +#include <Qt3DExtras/qcylindermesh.h> +#include <Qt3DExtras/qplanemesh.h> +#include <Qt3DExtras/qspheremesh.h> +#include <Qt3DExtras/qtorusmesh.h> +#include <Qt3DExtras/qtorusgeometry.h> +#include <Qt3DExtras/qspheregeometry.h> +#include <Qt3DExtras/qcuboidgeometry.h> +#include <Qt3DExtras/qplanegeometry.h> +#include <Qt3DExtras/qconegeometry.h> +#include <Qt3DExtras/qcylindergeometry.h> +#include <QtQml/qqml.h> + +QT_BEGIN_NAMESPACE + +static const struct { + const char *type; + int major, minor; +} qmldir [] = { + // Materials + { "PhongMaterial", 2, 0 }, + { "PhongAlphaMaterial", 2, 0 }, + { "DiffuseMapMaterial", 2, 0 }, + { "DiffuseSpecularMapMaterial", 2, 0 }, + { "NormalDiffuseMapAlphaMaterial", 2, 0 }, + { "NormalDiffuseMapMaterial", 2, 0 }, + { "NormalDiffuseSpecularMapMaterial", 2, 0 }, + { "PerVertexColorMaterial", 2, 0 }, + { "GoochMaterial", 2, 0 }, + { "TextureMaterial", 2, 0 }, + // FrameGraphs + { "ForwardRenderer", 2, 0 }, + // Entities + { "SkyboxEntity", 2, 0 } +}; + +void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) +{ + // Meshes + qmlRegisterType<Qt3DExtras::QConeMesh>(uri, 2, 0, "ConeMesh"); + qmlRegisterType<Qt3DExtras::QConeGeometry>(uri, 2, 0, "ConeGeometry"); + qmlRegisterType<Qt3DExtras::QCuboidMesh>(uri, 2, 0, "CuboidMesh"); + qmlRegisterType<Qt3DExtras::QCuboidGeometry>(uri, 2, 0, "CuboidGeometry"); + qmlRegisterType<Qt3DExtras::QCylinderMesh>(uri, 2, 0, "CylinderMesh"); + qmlRegisterType<Qt3DExtras::QCylinderGeometry>(uri, 2, 0, "CylinderGeometry"); + qmlRegisterType<Qt3DExtras::QPlaneMesh>(uri, 2, 0, "PlaneMesh"); + qmlRegisterType<Qt3DExtras::QPlaneGeometry>(uri, 2, 0, "PlaneGeometry"); + qmlRegisterType<Qt3DExtras::QTorusMesh>(uri, 2, 0, "TorusMesh"); + qmlRegisterType<Qt3DExtras::QTorusGeometry>(uri, 2, 0, "TorusGeometry"); + qmlRegisterType<Qt3DExtras::QSphereMesh>(uri, 2, 0, "SphereMesh"); + qmlRegisterType<Qt3DExtras::QSphereGeometry>(uri, 2, 0, "SphereGeometry"); + + + // Register types provided as QML files compiled into the plugin + for (int i = 0; i < int(sizeof(qmldir) / sizeof(qmldir[0])); i++) { + QString path = QStringLiteral("qrc:/qt-project.org/imports/Qt3D/Extras/defaults/qml/"); + qmlRegisterType(QUrl(path + qmldir[i].type + QStringLiteral(".qml")), + uri, + qmldir[i].major, qmldir[i].minor, + qmldir[i].type); + } +} + + +QT_END_NAMESPACE diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h new file mode 100644 index 000000000..147d7eca6 --- /dev/null +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3DQUICK3DEXTRASPLUGIN_H +#define QT3DQUICK3DEXTRASPLUGIN_H + +#include <QtQml/QQmlExtensionPlugin> + +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt3D_Core); +#endif +} + +QT_BEGIN_NAMESPACE + +class Qt3DQuick3DExtrasPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") +public: + Qt3DQuick3DExtrasPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } + void registerTypes(const char *uri) Q_DECL_OVERRIDE; +}; + +QT_END_NAMESPACE + +#endif // QT3DQUICK3DEXTRASPLUGIN_H diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro index 571092e03..36d9080c1 100644 --- a/src/quick3d/imports/render/importsrender.pro +++ b/src/quick3d/imports/render/importsrender.pro @@ -10,35 +10,6 @@ HEADERS += \ SOURCES += \ qt3dquick3drenderplugin.cpp -include(./defaults/defaults.pri) - OTHER_FILES += qmldir -include(./defaults/defaults.pri) - -OTHER_FILES += \ - $$QML_FILES - -# Create a resource file for qml files that need to be registered by the plugin -GENERATED_RESOURCE_FILE = $$OUT_PWD/defaults.qrc -INCLUDED_RESOURCE_FILES = $$QML_FILES -RESOURCE_CONTENT = \ - "<RCC>" \ - "<qresource prefix=\"/qt-project.org/imports/Qt3D/Render/\">" - -for(resourcefile, INCLUDED_RESOURCE_FILES) { - resourcefileabsolutepath = $$absolute_path($$resourcefile) - relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) - relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) - RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>" -} - -RESOURCE_CONTENT += \ - "</qresource>" \ - "</RCC>" - -write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") - -RESOURCES += $$GENERATED_RESOURCE_FILE - load(qml_plugin) diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 62111535c..1e8ace1ec 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -54,12 +54,6 @@ #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qparameter.h> #include <Qt3DRender/qfilterkey.h> -#include <Qt3DRender/qcuboidmesh.h> -#include <Qt3DRender/qconemesh.h> -#include <Qt3DRender/qcylindermesh.h> -#include <Qt3DRender/qplanemesh.h> -#include <Qt3DRender/qspheremesh.h> -#include <Qt3DRender/qtorusmesh.h> #include <Qt3DRender/qlayer.h> #include <Qt3DRender/qlayerfilter.h> #include <Qt3DRender/qlight.h> @@ -97,13 +91,7 @@ #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qgeometry.h> -#include <Qt3DRender/qtorusgeometry.h> -#include <Qt3DRender/qspheregeometry.h> -#include <Qt3DRender/qcuboidgeometry.h> -#include <Qt3DRender/qplanegeometry.h> #include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DRender/qconegeometry.h> -#include <Qt3DRender/qcylindergeometry.h> #include <Qt3DRender/qobjectpicker.h> #include <Qt3DRender/qpickevent.h> #include <Qt3DRender/qfrustumculling.h> @@ -138,27 +126,6 @@ QT_BEGIN_NAMESPACE -static const struct { - const char *type; - int major, minor; -} qmldir [] = { - // Materials - { "PhongMaterial", 2, 0 }, - { "PhongAlphaMaterial", 2, 0 }, - { "DiffuseMapMaterial", 2, 0 }, - { "DiffuseSpecularMapMaterial", 2, 0 }, - { "NormalDiffuseMapAlphaMaterial", 2, 0 }, - { "NormalDiffuseMapMaterial", 2, 0 }, - { "NormalDiffuseSpecularMapMaterial", 2, 0 }, - { "PerVertexColorMaterial", 2, 0 }, - { "GoochMaterial", 2, 0 }, - { "TextureMaterial", 2, 0 }, - // FrameGraphs - { "ForwardRenderer", 2, 0 }, - // Entities - { "SkyboxEntity", 2, 0 } -}; - QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3DRender::Render::Quick::Quick3DShaderDataArray *array) { QVector<Qt3DRender::QShaderData *> arrayValues = array->values(); @@ -226,28 +193,16 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DRender::QGeometryRenderer>(uri, 2, 0, "GeometryRenderer"); // Debug components - qmlRegisterType<Qt3DRender::QBoundingVolumeDebug>(uri, 2, 0, "BoundingVolumeDebug"); +// qmlRegisterType<Qt3DRender::QBoundingVolumeDebug>(uri, 2, 0, "BoundingVolumeDebug"); + + // Mesh + qmlRegisterType<Qt3DRender::QMesh>(uri, 2, 0, "Mesh"); // Picking qmlRegisterType<Qt3DRender::QObjectPicker>(uri, 2, 0, "ObjectPicker"); qmlRegisterUncreatableType<Qt3DRender::QPickEvent>(uri, 2, 0, "PickEvent", QStringLiteral("Events cannot be created")); - // Meshes - qmlRegisterType<Qt3DRender::QMesh>(uri, 2, 0, "Mesh"); - qmlRegisterType<Qt3DRender::QConeMesh>(uri, 2, 0, "ConeMesh"); - qmlRegisterType<Qt3DRender::QConeGeometry>(uri, 2, 0, "ConeGeometry"); - qmlRegisterType<Qt3DRender::QCuboidMesh>(uri, 2, 0, "CuboidMesh"); - qmlRegisterType<Qt3DRender::QCuboidGeometry>(uri, 2, 0, "CuboidGeometry"); - qmlRegisterType<Qt3DRender::QCylinderMesh>(uri, 2, 0, "CylinderMesh"); - qmlRegisterType<Qt3DRender::QCylinderGeometry>(uri, 2, 0, "CylinderGeometry"); - qmlRegisterType<Qt3DRender::QPlaneMesh>(uri, 2, 0, "PlaneMesh"); - qmlRegisterType<Qt3DRender::QPlaneGeometry>(uri, 2, 0, "PlaneGeometry"); - qmlRegisterType<Qt3DRender::QTorusMesh>(uri, 2, 0, "TorusMesh"); - qmlRegisterType<Qt3DRender::QTorusGeometry>(uri, 2, 0, "TorusGeometry"); - qmlRegisterType<Qt3DRender::QSphereMesh>(uri, 2, 0, "SphereMesh"); - qmlRegisterType<Qt3DRender::QSphereGeometry>(uri, 2, 0, "SphereGeometry"); - - // Compute Job + // Compute Job qmlRegisterType<Qt3DRender::QComputeCommand>(uri, 2, 0, "ComputeCommand"); // Layers @@ -307,15 +262,6 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DRender::QSeamlessCubemap>(uri, 2, 0, "SeamlessCubemap"); qmlRegisterType<Qt3DRender::QStencilOperation>(uri, 2, 0, "StencilOperation"); qmlRegisterType<Qt3DRender::QStencilMask>(uri, 2, 0, "StencilMask"); - - // Register types provided as QML files compiled into the plugin - for (int i = 0; i < int(sizeof(qmldir) / sizeof(qmldir[0])); i++) { - QString path = QStringLiteral("qrc:/qt-project.org/imports/Qt3D/Render/defaults/qml/"); - qmlRegisterType(QUrl(path + qmldir[i].type + QStringLiteral(".qml")), - uri, - qmldir[i].major, qmldir[i].minor, - qmldir[i].type); - } } QT_END_NAMESPACE diff --git a/src/render/backend/boundingvolumedebug.cpp b/src/render/backend/boundingvolumedebug.cpp index ae2f08198..96302c3cb 100644 --- a/src/render/backend/boundingvolumedebug.cpp +++ b/src/render/backend/boundingvolumedebug.cpp @@ -36,7 +36,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - +#if 0 #include "boundingvolumedebug_p.h" #include <Qt3DRender/private/qboundingvolumedebug_p.h> #include <Qt3DCore/qbackendnodepropertychange.h> @@ -116,3 +116,5 @@ void BoundingVolumeDebug::setCenter(const QVector3D ¢er) } // Qt3DRender QT_END_NAMESPACE + +#endif diff --git a/src/render/backend/boundingvolumedebug_p.h b/src/render/backend/boundingvolumedebug_p.h index 6a5706567..f7a1903e9 100644 --- a/src/render/backend/boundingvolumedebug_p.h +++ b/src/render/backend/boundingvolumedebug_p.h @@ -51,6 +51,8 @@ // We mean it. // +#if 0 + #include <Qt3DRender/private/backendnode_p.h> #include <QVector3D> @@ -89,4 +91,6 @@ private: QT_END_NAMESPACE +#endif + #endif // QT3DRENDER_RENDER_BOUNDINGVOLUMEDEBUG_H diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index b1a51f892..04cb606c5 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -315,8 +315,8 @@ void Entity::addComponent(Qt3DCore::QComponent *component) m_boundingDirty = true; } else if (qobject_cast<QObjectPicker *>(component) != Q_NULLPTR) { m_objectPickerComponent = component->id(); - } else if (qobject_cast<QBoundingVolumeDebug *>(component) != Q_NULLPTR) { - m_boundingVolumeDebugComponent = component->id(); +// } else if (qobject_cast<QBoundingVolumeDebug *>(component) != Q_NULLPTR) { +// m_boundingVolumeDebugComponent = component->id(); } else if (qobject_cast<QComputeCommand *>(component) != Q_NULLPTR) { m_computeComponent = component->id(); } @@ -346,8 +346,8 @@ void Entity::addComponent(Qt3DCore::QNodeIdTypePair idAndType) m_boundingDirty = true; } else if (type->inherits(&QObjectPicker::staticMetaObject)) { m_objectPickerComponent = id; - } else if (type->inherits(&QBoundingVolumeDebug::staticMetaObject)) { - m_boundingVolumeDebugComponent = id; +// } else if (type->inherits(&QBoundingVolumeDebug::staticMetaObject)) { +// m_boundingVolumeDebugComponent = id; } else if (type->inherits(&QComputeCommand::staticMetaObject)) { m_computeComponent = id; } @@ -370,8 +370,8 @@ void Entity::removeComponent(Qt3DCore::QNodeId nodeId) m_boundingDirty = true; } else if (m_objectPickerComponent == nodeId) { m_objectPickerComponent = QNodeId(); - } else if (m_boundingVolumeDebugComponent == nodeId) { - m_boundingVolumeDebugComponent = QNodeId(); +// } else if (m_boundingVolumeDebugComponent == nodeId) { +// m_boundingVolumeDebugComponent = QNodeId(); } else if (m_lightComponents.contains(nodeId)) { m_lightComponents.removeAll(nodeId); } else if (m_computeComponent == nodeId) { @@ -441,11 +441,11 @@ QList<HShaderData> Entity::componentsHandle<ShaderData>() const return shaderDataHandles; } -template<> -HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const -{ - return m_nodeManagers->boundingVolumeDebugManager()->lookupHandle(m_boundingVolumeDebugComponent); -} +//template<> +//HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const +//{ +// return m_nodeManagers->boundingVolumeDebugManager()->lookupHandle(m_boundingVolumeDebugComponent); +//} template<> QList<HLight> Entity::componentsHandle<Light>() const @@ -525,11 +525,11 @@ QList<Light *> Entity::renderComponents<Light>() const return lights; } -template<> -BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const -{ - return m_nodeManagers->boundingVolumeDebugManager()->lookupResource(m_boundingVolumeDebugComponent); -} +//template<> +//BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const +//{ +// return m_nodeManagers->boundingVolumeDebugManager()->lookupResource(m_boundingVolumeDebugComponent); +//} template<> ComputeCommand *Entity::renderComponent<ComputeCommand>() const diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index fa940d171..d5010e923 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -205,8 +205,8 @@ QList<HLayer> Entity::componentsHandle<Layer>() const; template<> QList<HShaderData> Entity::componentsHandle<ShaderData>() const; -template<> -Q_AUTOTEST_EXPORT HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const; +//template<> +//Q_AUTOTEST_EXPORT HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const; template<> QList<HLight> Entity::componentsHandle<Light>() const; @@ -236,8 +236,8 @@ QList<Layer *> Entity::renderComponents<Layer>() const; template<> QList<ShaderData *> Entity::renderComponents<ShaderData>() const; -template<> -Q_AUTOTEST_EXPORT BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const; +//template<> +//Q_AUTOTEST_EXPORT BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const; template<> QList<Light *> Entity::renderComponents<Light>() const; @@ -267,8 +267,8 @@ Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<GeometryRenderer>() co template<> Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<ObjectPicker>() const; -template<> -Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<BoundingVolumeDebug>() const; +//template<> +//Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<BoundingVolumeDebug>() const; template<> Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<ComputeCommand>() const; diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index e2294fb1b..77f0e6650 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -337,6 +337,7 @@ class ObjectPickerManager : public Qt3DCore::QResourceManager< { }; +#if 0 class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager< BoundingVolumeDebug, Qt3DCore::QNodeId, @@ -345,6 +346,7 @@ class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager< Qt3DCore::ObjectLevelLockingPolicy> { }; +#endif class LightManager : public Qt3DCore::QResourceManager< Light, diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp index d3eb0b6aa..9e7627c1f 100644 --- a/src/render/backend/nodemanagers.cpp +++ b/src/render/backend/nodemanagers.cpp @@ -82,7 +82,7 @@ NodeManagers::NodeManagers() , m_geometryManager(new GeometryManager()) , m_geometryRendererManager(new GeometryRendererManager) , m_objectPickerManager(new ObjectPickerManager()) - , m_boundingVolumeDebugManager(new BoundingVolumeDebugManager()) +// , m_boundingVolumeDebugManager(new BoundingVolumeDebugManager()) , m_lightManager(new LightManager()) , m_computeJobManager(new ComputeCommandManager()) , m_renderStateManager(new RenderStateManager()) @@ -257,11 +257,11 @@ ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOEXCEPT return m_objectPickerManager; } -template<> -BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT -{ - return m_boundingVolumeDebugManager; -} +//template<> +//BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT +//{ +// return m_boundingVolumeDebugManager; +//} template<> LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h index b5cb2a664..4ad7a8f0c 100644 --- a/src/render/backend/nodemanagers_p.h +++ b/src/render/backend/nodemanagers_p.h @@ -124,7 +124,7 @@ class Attribute; class Geometry; class GeometryRenderer; class ObjectPicker; -class BoundingVolumeDebug; +//class BoundingVolumeDebug; class Light; class ComputeCommand; class RenderStateNode; @@ -196,7 +196,7 @@ public: inline GeometryManager *geometryManager() const Q_DECL_NOEXCEPT { return m_geometryManager; } inline GeometryRendererManager *geometryRendererManager() const Q_DECL_NOEXCEPT { return m_geometryRendererManager; } inline ObjectPickerManager *objectPickerManager() const Q_DECL_NOEXCEPT { return m_objectPickerManager; } - inline BoundingVolumeDebugManager *boundingVolumeDebugManager() const Q_DECL_NOEXCEPT { return m_boundingVolumeDebugManager; } + // inline BoundingVolumeDebugManager *boundingVolumeDebugManager() const Q_DECL_NOEXCEPT { return m_boundingVolumeDebugManager; } inline LightManager *lightManager() const Q_DECL_NOEXCEPT { return m_lightManager; } inline ComputeCommandManager *computeJobManager() const Q_DECL_NOEXCEPT { return m_computeJobManager; } inline RenderStateManager *renderStateManager() const Q_DECL_NOEXCEPT { return m_renderStateManager; } @@ -230,7 +230,7 @@ private: GeometryManager *m_geometryManager; GeometryRendererManager *m_geometryRendererManager; ObjectPickerManager *m_objectPickerManager; - BoundingVolumeDebugManager *m_boundingVolumeDebugManager; + // BoundingVolumeDebugManager *m_boundingVolumeDebugManager; LightManager *m_lightManager; ComputeCommandManager *m_computeJobManager; RenderStateManager *m_renderStateManager; @@ -322,8 +322,8 @@ QT3DRENDERSHARED_PRIVATE_EXPORT GeometryRendererManager *NodeManagers::manager<G template<> QT3DRENDERSHARED_PRIVATE_EXPORT ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOEXCEPT; -template<> -QT3DRENDERSHARED_PRIVATE_EXPORT BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT; +//template<> +//QT3DRENDERSHARED_PRIVATE_EXPORT BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT; template<> LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT; diff --git a/src/render/framegraph/qtechniquefilter_p.h b/src/render/framegraph/qtechniquefilter_p.h index d90e305cf..d25f10a79 100644 --- a/src/render/framegraph/qtechniquefilter_p.h +++ b/src/render/framegraph/qtechniquefilter_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <Qt3DRender/private/qt3drender_global_p.h> #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE @@ -59,7 +60,7 @@ namespace Qt3DRender { class QTechniqueFilter; -class QTechniqueFilterPrivate : public QFrameGraphNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QTechniqueFilterPrivate : public QFrameGraphNodePrivate { public : QTechniqueFilterPrivate(); diff --git a/src/render/frontend/qboundingvolumedebug.cpp b/src/render/frontend/qboundingvolumedebug.cpp index 7c0494d92..cf178f51c 100644 --- a/src/render/frontend/qboundingvolumedebug.cpp +++ b/src/render/frontend/qboundingvolumedebug.cpp @@ -37,6 +37,8 @@ ** ****************************************************************************/ +#if 0 + #include "qboundingvolumedebug_p.h" #include <Qt3DCore/qentity.h> #include <Qt3DCore/private/qcomponent_p.h> @@ -45,7 +47,6 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DRender/qphongalphamaterial.h> #include <Qt3DRender/qlayer.h> - #include <QThread> QT_BEGIN_NAMESPACE @@ -184,3 +185,5 @@ void QBoundingVolumeDebugPrivate::updateSubtree() } // Qt3DRender QT_END_NAMESPACE + +#endif diff --git a/src/render/frontend/qboundingvolumedebug_p.h b/src/render/frontend/qboundingvolumedebug_p.h index e90909ad6..05977e9f6 100644 --- a/src/render/frontend/qboundingvolumedebug_p.h +++ b/src/render/frontend/qboundingvolumedebug_p.h @@ -37,6 +37,8 @@ ** ****************************************************************************/ +#if 0 + #ifndef QT3DRENDER_QBOUNDINGVOLUMEDEBUG_P_H #define QT3DRENDER_QBOUNDINGVOLUMEDEBUG_P_H @@ -92,3 +94,5 @@ private: QT_END_NAMESPACE #endif // QT3DRENDER_QBOUNDINGVOLUMEDEBUG_P_H + +#endif diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 7d7bf075a..9cc9ad74d 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -229,7 +229,7 @@ void QRenderAspectPrivate::registerBackendTypes() q->registerBackendType<QViewport>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::ViewportNode, QViewport>(m_renderer, m_nodeManagers->frameGraphManager()))); // Picking - q->registerBackendType<QBoundingVolumeDebug>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::BoundingVolumeDebug, Render::BoundingVolumeDebugManager>(m_renderer, m_nodeManagers->boundingVolumeDebugManager()))); + // q->registerBackendType<QBoundingVolumeDebug>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::BoundingVolumeDebug, Render::BoundingVolumeDebugManager>(m_renderer, m_nodeManagers->boundingVolumeDebugManager()))); q->registerBackendType<QObjectPicker>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::ObjectPicker, Render::ObjectPickerManager>(m_renderer, m_nodeManagers->objectPickerManager()))); } diff --git a/src/render/geometry/geometry.pri b/src/render/geometry/geometry.pri index 0e3e4276a..742cc1fef 100644 --- a/src/render/geometry/geometry.pri +++ b/src/render/geometry/geometry.pri @@ -9,13 +9,6 @@ HEADERS += \ $$PWD/geometryrenderermanager_p.h \ $$PWD/qbuffer.h \ $$PWD/qbuffer_p.h \ - $$PWD/qconegeometry.h \ - $$PWD/qconegeometry_p.h \ - $$PWD/qconemesh.h \ - $$PWD/qcuboidmesh.h \ - $$PWD/qcylindergeometry.h \ - $$PWD/qcylindergeometry_p.h \ - $$PWD/qcylindermesh.h \ $$PWD/qgeometry.h \ $$PWD/qgeometry_p.h \ $$PWD/qgeometryfactory.h \ @@ -23,17 +16,6 @@ HEADERS += \ $$PWD/qgeometryrenderer_p.h \ $$PWD/qmesh.h \ $$PWD/qmesh_p.h \ - $$PWD/qplanemesh.h \ - $$PWD/qspheremesh.h \ - $$PWD/qtorusmesh.h \ - $$PWD/qtorusgeometry.h \ - $$PWD/qtorusgeometry_p.h \ - $$PWD/qspheregeometry.h \ - $$PWD/qspheregeometry_p.h \ - $$PWD/qcuboidgeometry.h \ - $$PWD/qcuboidgeometry_p.h \ - $$PWD/qplanegeometry.h \ - $$PWD/qplanegeometry_p.h \ $$PWD/qattribute_p.h \ $$PWD/qattribute.h \ $$PWD/qbufferdatagenerator.h @@ -46,20 +28,8 @@ SOURCES += \ $$PWD/geometryrenderer.cpp \ $$PWD/geometryrenderermanager.cpp \ $$PWD/qbuffer.cpp \ - $$PWD/qconegeometry.cpp \ - $$PWD/qconemesh.cpp \ - $$PWD/qcuboidmesh.cpp \ - $$PWD/qcylindergeometry.cpp \ - $$PWD/qcylindermesh.cpp \ $$PWD/qgeometry.cpp \ $$PWD/qgeometryrenderer.cpp \ $$PWD/qmesh.cpp \ - $$PWD/qplanemesh.cpp \ - $$PWD/qspheremesh.cpp \ - $$PWD/qtorusmesh.cpp \ - $$PWD/qtorusgeometry.cpp \ - $$PWD/qspheregeometry.cpp \ - $$PWD/qcuboidgeometry.cpp \ - $$PWD/qplanegeometry.cpp \ $$PWD/qattribute.cpp diff --git a/src/render/jobs/framecleanupjob.cpp b/src/render/jobs/framecleanupjob.cpp index dba2f0066..46efd495d 100644 --- a/src/render/jobs/framecleanupjob.cpp +++ b/src/render/jobs/framecleanupjob.cpp @@ -83,6 +83,7 @@ void FrameCleanupJob::run() void FrameCleanupJob::updateBoundingVolumesDebug(Entity *node) { +#if 0 BoundingVolumeDebug *debugBV = node->renderComponent<BoundingVolumeDebug>(); if (debugBV) { Qt3DRender::Render::Sphere s; @@ -94,6 +95,7 @@ void FrameCleanupJob::updateBoundingVolumesDebug(Entity *node) debugBV->setRadius(s.radius()); debugBV->setCenter(s.center()); } +#endif Q_FOREACH (Entity *c, node->children()) updateBoundingVolumesDebug(c); diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h index cf5c99a2f..4368342ed 100644 --- a/src/render/materialsystem/qmaterial_p.h +++ b/src/render/materialsystem/qmaterial_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <Qt3DRender/private/qt3drender_global_p.h> #include <private/qcomponent_p.h> QT_BEGIN_NAMESPACE @@ -60,7 +61,7 @@ namespace Qt3DRender { class QParameter; class QEffect; -class QMaterialPrivate : public Qt3DCore::QComponentPrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate { public: QMaterialPrivate(); diff --git a/src/render/render.pro b/src/render/render.pro index 54d9c08dd..59d36f8c1 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -15,7 +15,6 @@ include (lights/lights.pri) include (materialsystem/materialsystem.pri) include (renderstates/renderstates.pri) include (io/io.pri) -include (defaults/defaults.pri) include (picking/picking.pri) include (raycasting/raycasting.pri) include (services/services.pri) @@ -23,11 +22,6 @@ include (texture/texture.pri) RESOURCES += $$PWD/render.qrc -OTHER_FILES += \ - $$PWD/shaders/* \ - $$PWD/shaders/gl3/* \ - $$PWD/shaders/es2/* - gcov { CONFIG += static QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage diff --git a/src/render/render.qrc b/src/render/render.qrc index e7b1c1d9a..8734971f7 100644 --- a/src/render/render.qrc +++ b/src/render/render.qrc @@ -1,43 +1,8 @@ <RCC> <qresource prefix="/"> - <file>shaders/gl3/light.inc.frag</file> - <file>shaders/es2/light.inc.frag</file> - <file>shaders/es2/light.inc.frag100</file> <file>shaders/gl3/phong.vert</file> <file>shaders/gl3/phong.frag</file> <file>shaders/es2/phong.vert</file> <file>shaders/es2/phong.frag</file> - <file>shaders/gl3/normaldiffusespecularmap.frag</file> - <file>shaders/gl3/diffusemap.vert</file> - <file>shaders/gl3/diffusemap.frag</file> - <file>shaders/es2/normaldiffusespecularmap.frag</file> - <file>shaders/es2/diffusemap.vert</file> - <file>shaders/es2/diffusemap.frag</file> - <file>shaders/es2/normaldiffusemap.vert</file> - <file>shaders/es2/normaldiffusemap.frag</file> - <file>shaders/es2/normaldiffusemapalpha.frag</file> - <file>shaders/gl3/normaldiffusemap.frag</file> - <file>shaders/gl3/normaldiffusemap.vert</file> - <file>shaders/gl3/normaldiffusemapalpha.frag</file> - <file>shaders/es2/diffusespecularmap.frag</file> - <file>shaders/gl3/diffusespecularmap.frag</file> - <file>shaders/gl3/pervertexcolor.frag</file> - <file>shaders/gl3/pervertexcolor.vert</file> - <file>shaders/es2/pervertexcolor.frag</file> - <file>shaders/es2/pervertexcolor.vert</file> - <file>shaders/es2/skybox.frag</file> - <file>shaders/es2/skybox.vert</file> - <file>shaders/gl3/skybox.frag</file> - <file>shaders/gl3/skybox.vert</file> - <file>shaders/gl3/gooch.vert</file> - <file>shaders/gl3/gooch.frag</file> - <file>shaders/es2/gooch.frag</file> - <file>shaders/es2/gooch.vert</file> - <file>shaders/gl3/phongalpha.frag</file> - <file>shaders/es2/phongalpha.frag</file> - <file>shaders/gl3/unlittexture.vert</file> - <file>shaders/gl3/unlittexture.frag</file> - <file>shaders/es2/unlittexture.frag</file> - <file>shaders/es2/unlittexture.vert</file> </qresource> </RCC> diff --git a/src/src.pro b/src/src.pro index 82d53cbf1..fb999f6ca 100644 --- a/src/src.pro +++ b/src/src.pro @@ -15,6 +15,10 @@ src_input.subdir = $$PWD/input src_input.target = sub-input src_input.depends = src_render +src_extras.subdir = $$PWD/extras +src_extras.target = src_extras +src_extras.depends = src_render src_input + # Quick3D libs src_quick3d_core.subdir = $$PWD/quick3d/quick3d src_quick3d_core.target = sub-quick3d-core @@ -49,16 +53,21 @@ src_quick3d_imports_logic.file = $$PWD/quick3d/imports/logic/importslogic.pro src_quick3d_imports_logic.target = sub-quick3d-imports-logic src_quick3d_imports_logic.depends = src_logic +src_quick3d_imports_extras.file = $$PWD/quick3d/imports/extras/importsextras.pro +src_quick3d_imports_extras.target = sub-quick3d-imports-extras +src_quick3d_imports_extras.depends = src_extras + # Qt3D Scene Parser plugins src_plugins_sceneparsers.file = $$PWD/plugins/sceneparsers/sceneparsers.pro src_plugins_sceneparsers.target = sub-plugins-sceneparsers -src_plugins_sceneparsers.depends = src_render +src_plugins_sceneparsers.depends = src_render src_extras SUBDIRS += \ src_core \ src_render \ src_logic \ src_input \ + src_extras \ src_quick3d_core \ src_quick3d_core_imports \ src_quick3d_render \ @@ -67,6 +76,7 @@ SUBDIRS += \ src_quick3d_imports_scene3d \ src_quick3d_imports_input \ src_quick3d_imports_logic \ + src_quick3d_imports_extras \ src_plugins_sceneparsers \ doc diff --git a/sync.profile b/sync.profile index f30e4f81a..f0a2dd1f0 100644 --- a/sync.profile +++ b/sync.profile @@ -6,6 +6,7 @@ "Qt3DInput" => "$basedir/src/input", "Qt3DQuickInput" => "$basedir/src/quick3d/quick3dinput", "Qt3DLogic" => "$basedir/src/logic", + "Qt3DExtras" => "$basedir/src/extras", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); diff --git a/tests/auto/render/picking/picking.pro b/tests/auto/render/picking/picking.pro index 4745033d3..3d7ad7875 100644 --- a/tests/auto/render/picking/picking.pro +++ b/tests/auto/render/picking/picking.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_picking -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras CONFIG += testcase diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp index cf8c16eba..d177aae6c 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.cpp @@ -34,16 +34,17 @@ #include <Qt3DRender/private/pickboundingvolumejob_p.h> #include <Qt3DRender/private/objectpicker_p.h> #include <Qt3DRender/qobjectpicker.h> -#include <Qt3DRender/qspheremesh.h> +#include <Qt3DExtras/qspheremesh.h> #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qbufferdatagenerator.h> -#include <Qt3DRender/qspheregeometry.h> +#include <Qt3DExtras/qspheregeometry.h> #include <Qt3DRender/qpickevent.h> #include <Qt3DCore/qbackendnodepropertychange.h> using namespace Qt3DCore; using namespace Qt3DRender; +using namespace Qt3DExtras; using namespace Qt3DRender::Render; class MyObjectPicker : public Qt3DRender::QObjectPicker diff --git a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp index f5c1fc1ae..615df7745 100644 --- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp +++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp @@ -35,6 +35,8 @@ #include "testpostmanarbiter.h" +#if 0 + class MyBoundingVolumeDebug : public Qt3DRender::QBoundingVolumeDebug { Q_OBJECT diff --git a/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro b/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro index fdd8bd6b2..aaf49b892 100644 --- a/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro +++ b/tests/auto/render/qdefaultmeshes/qdefaultmeshes.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qdefaultmeshes -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras CONFIG += testcase diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp index 6069dba9e..9e22bbbfb 100644 --- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp +++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp @@ -35,11 +35,11 @@ #include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qbufferdatagenerator.h> -#include <Qt3DRender/qspheremesh.h> -#include <Qt3DRender/qcylindermesh.h> -#include <Qt3DRender/qtorusmesh.h> -#include <Qt3DRender/qcuboidmesh.h> -#include <Qt3DRender/qplanemesh.h> +#include <Qt3DExtras/qspheremesh.h> +#include <Qt3DExtras/qcylindermesh.h> +#include <Qt3DExtras/qtorusmesh.h> +#include <Qt3DExtras/qcuboidmesh.h> +#include <Qt3DExtras/qplanemesh.h> // We need to call QNode::clone which is protected // So we sublcass QNode instead of QObject @@ -57,11 +57,11 @@ private Q_SLOTS: void checkCloning_data() { QTest::addColumn<Qt3DRender::QGeometryRenderer *>("geomRenderer"); - QTest::newRow("QSphereMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QSphereMesh); - QTest::newRow("QCylinderMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QCylinderMesh); - QTest::newRow("QTorusMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QTorusMesh); - QTest::newRow("QCuboidMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QCuboidMesh); - QTest::newRow("QPlaneMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DRender::QPlaneMesh); + QTest::newRow("QSphereMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QSphereMesh); + QTest::newRow("QCylinderMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QCylinderMesh); + QTest::newRow("QTorusMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QTorusMesh); + QTest::newRow("QCuboidMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QCuboidMesh); + QTest::newRow("QPlaneMesh") << static_cast<Qt3DRender::QGeometryRenderer *>(new Qt3DExtras::QPlaneMesh); } void checkCloning() diff --git a/tests/auto/render/qmaterial/qmaterial.pro b/tests/auto/render/qmaterial/qmaterial.pro index a9a27b4bf..5aa07f577 100644 --- a/tests/auto/render/qmaterial/qmaterial.pro +++ b/tests/auto/render/qmaterial/qmaterial.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qmaterial -QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib 3dextras CONFIG += testcase diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 104548b2f..acf03ea87 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -36,13 +36,13 @@ #include <Qt3DRender/QParameter> #include <Qt3DRender/QTechnique> #include <Qt3DRender/QRenderPass> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QDiffuseMapMaterial> -#include <Qt3DRender/QPerVertexColorMaterial> -#include <Qt3DRender/QNormalDiffuseMapMaterial> -#include <Qt3DRender/QDiffuseSpecularMapMaterial> -#include <Qt3DRender/QNormalDiffuseMapAlphaMaterial> -#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QPhongMaterial> +#include <Qt3DExtras/QDiffuseMapMaterial> +#include <Qt3DExtras/QPerVertexColorMaterial> +#include <Qt3DExtras/QNormalDiffuseMapMaterial> +#include <Qt3DExtras/QDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QNormalDiffuseMapAlphaMaterial> +#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial> #include "testpostmanarbiter.h" @@ -201,19 +201,19 @@ private Q_SLOTS: QTest::newRow("empty material") << material; material = new TestMaterial(); QTest::newRow("test material") << material; - material = new Qt3DRender::QPhongMaterial(); + material = new Qt3DExtras::QPhongMaterial(); QTest::newRow("QPhongMaterial") << material; - material = new Qt3DRender::QDiffuseMapMaterial(); + material = new Qt3DExtras::QDiffuseMapMaterial(); QTest::newRow("QDiffuseMapMaterial") << material; - material = new Qt3DRender::QDiffuseSpecularMapMaterial(); + material = new Qt3DExtras::QDiffuseSpecularMapMaterial(); QTest::newRow("QDiffuseMapSpecularMaterial") << material; - material = new Qt3DRender::QPerVertexColorMaterial(); + material = new Qt3DExtras::QPerVertexColorMaterial(); QTest::newRow("QPerVertexColorMaterial") << material; - material = new Qt3DRender::QNormalDiffuseMapMaterial(); + material = new Qt3DExtras::QNormalDiffuseMapMaterial(); QTest::newRow("QNormalDiffuseMapMaterial") << material; - material = new Qt3DRender::QNormalDiffuseMapAlphaMaterial(); + material = new Qt3DExtras::QNormalDiffuseMapAlphaMaterial(); QTest::newRow("QNormalDiffuseMapAlphaMaterial") << material; - material = new Qt3DRender::QNormalDiffuseSpecularMapMaterial(); + material = new Qt3DExtras::QNormalDiffuseSpecularMapMaterial(); QTest::newRow("QNormalDiffuseSpecularMapMaterial") << material; } diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro index 64bc1ddf0..403eb0f4d 100644 --- a/tests/auto/render/render.pro +++ b/tests/auto/render/render.pro @@ -39,8 +39,8 @@ contains(QT_CONFIG, private_tests) { qobjectpicker \ objectpicker \ picking \ - qboundingvolumedebug \ - boundingvolumedebug \ +# qboundingvolumedebug \ +# boundingvolumedebug \ qdefaultmeshes \ trianglesextractor \ triangleboundingvolume \ diff --git a/tests/benchmarks/render/jobs/jobs.pro b/tests/benchmarks/render/jobs/jobs.pro index 0eb6017e2..bfd0f1317 100644 --- a/tests/benchmarks/render/jobs/jobs.pro +++ b/tests/benchmarks/render/jobs/jobs.pro @@ -2,7 +2,7 @@ TARGET = tst_bench_jobs TEMPLATE = app -QT += testlib core core-private 3dcore 3dcore-private 3drender 3drender-private 3dquick qml +QT += testlib core core-private 3dcore 3dcore-private 3drender 3drender-private 3dquick qml 3dextras SOURCES += tst_bench_jobs.cpp diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp index 362a363a7..46427947c 100644 --- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp +++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp @@ -31,9 +31,9 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> #include <Qt3DRender/QMaterial> -#include <Qt3DRender/QForwardRenderer> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QCylinderMesh> +#include <Qt3DExtras/QForwardRenderer> +#include <Qt3DExtras/QPhongMaterial> +#include <Qt3DExtras/QCylinderMesh> #include <Qt3DRender/QRenderSettings> #include <Qt3DRender/private/managers_p.h> @@ -165,7 +165,7 @@ Qt3DCore::QEntity *buildBigScene() // FrameGraph Qt3DRender::QRenderSettings* renderSettings = new Qt3DRender::QRenderSettings(); - Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer(); + Qt3DExtras::QForwardRenderer *forwardRenderer = new Qt3DExtras::QForwardRenderer(); forwardRenderer->setCamera(cameraEntity); forwardRenderer->setClearColor(Qt::black); renderSettings->setActiveFrameGraph(forwardRenderer); @@ -178,8 +178,8 @@ Qt3DCore::QEntity *buildBigScene() for (int i = 0; i < max; i++) { Qt3DCore::QEntity *e = new Qt3DCore::QEntity(); Qt3DCore::QTransform *transform = new Qt3DCore::QTransform(); - Qt3DRender::QCylinderMesh *mesh = new Qt3DRender::QCylinderMesh(); - Qt3DRender::QPhongMaterial *material = new Qt3DRender::QPhongMaterial(); + Qt3DExtras::QCylinderMesh *mesh = new Qt3DExtras::QCylinderMesh(); + Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(); mesh->setRings(50.0f); mesh->setSlices(30.0f); mesh->setRadius(2.5f); |