diff options
106 files changed, 413 insertions, 530 deletions
diff --git a/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro b/examples/qt3d/anaglyph-rendering/anaglyph-rendering.pro index d31b21924..c49f8374d 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 3dextras +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras 3dquickextras OTHER_FILES += *.qml diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp index 441a58ea5..dfda2f05d 100644 --- a/examples/qt3d/anaglyph-rendering/main.cpp +++ b/examples/qt3d/anaglyph-rendering/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <QQmlEngine> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); view.setSource(QUrl("qrc:/main.qml")); diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp index 11e58a5f8..9701cb66a 100644 --- a/examples/qt3d/assimp-cpp/main.cpp +++ b/examples/qt3d/assimp-cpp/main.cpp @@ -58,8 +58,8 @@ #include <Qt3DRender/QSceneLoader> #include <Qt3DRender/QRenderAspect> #include <Qt3DExtras/QForwardRenderer> -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> class SceneWalker : public QObject { @@ -117,7 +117,7 @@ void SceneWalker::walkEntity(Qt3DCore::QEntity *e, int depth) int main(int ac, char **av) { QApplication app(ac, av); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; view.defaultFramegraph()->setClearColor(Qt::black); // Root entity @@ -132,7 +132,7 @@ int main(int ac, char **av) camera->setFarPlane(10000.0f); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(sceneRoot); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(sceneRoot); camController->setCamera(camera); // Scene loader diff --git a/examples/qt3d/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro index 798a22b67..97f502bc7 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 3dextras +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras 3dquickextras OTHER_FILES += main.qml diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index e0e62acb8..78d2035d9 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <qt3dquickwindow.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DRender/QSceneLoader> #include <Qt3DCore/QEntity> @@ -105,7 +105,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; qmlRegisterType<SceneHelper>("Qt3D.Examples", 2, 0, "SceneHelper"); view.setSource(QUrl("qrc:/main.qml")); diff --git a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro index 4e8152895..15eef0271 100644 --- a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro +++ b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro @@ -6,7 +6,7 @@ android|ios|tvos|winrt { error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras QT += widgets SOURCES += main.cpp \ diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index e01c0feeb..301aabb66 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -80,13 +80,13 @@ #include <Qt3DRender/qrenderaspect.h> #include <Qt3DExtras/qforwardrenderer.h> -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> int main(int argc, char **argv) { QApplication app(argc, argv); - Qt3DWindow *view = new Qt3DWindow(); + Qt3DExtras::Qt3DWindow *view = new Qt3DExtras::Qt3DWindow(); view->defaultFramegraph()->setClearColor(QColor(QRgb(0x4d4d4f))); QWidget *container = QWidget::createWindowContainer(view); QSize screenSize = view->screen()->size(); @@ -117,7 +117,7 @@ int main(int argc, char **argv) cameraEntity->setViewCenter(QVector3D(0, 0, 0)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(rootEntity); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(rootEntity); camController->setCamera(cameraEntity); // Scenemodifier diff --git a/examples/qt3d/bigmodel-qml/bigmodel-qml.pro b/examples/qt3d/bigmodel-qml/bigmodel-qml.pro index 063a27b01..cb590374a 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 3dextras +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dextras 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp index 0542429cf..c004e2a45 100644 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ b/examples/qt3d/bigmodel-qml/main.cpp @@ -48,14 +48,14 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/bigscene-cpp/bigscene-cpp.pro b/examples/qt3d/bigscene-cpp/bigscene-cpp.pro index 5dcaf3d0f..a61fcd9a1 100644 --- a/examples/qt3d/bigscene-cpp/bigscene-cpp.pro +++ b/examples/qt3d/bigscene-cpp/bigscene-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras SOURCES += \ main.cpp \ diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp index 4c5d0a115..95b198f58 100644 --- a/examples/qt3d/bigscene-cpp/main.cpp +++ b/examples/qt3d/bigscene-cpp/main.cpp @@ -67,8 +67,8 @@ #include <Qt3DExtras/QPhongMaterial> #include <Qt3DExtras/QForwardRenderer> #include <qmath.h> -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> using namespace Qt3DCore; using namespace Qt3DRender; @@ -76,7 +76,7 @@ using namespace Qt3DRender; int main(int ac, char **av) { QGuiApplication app(ac, av); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; view.defaultFramegraph()->setClearColor(Qt::black); QEntity *root = new QEntity(); @@ -89,7 +89,7 @@ int main(int ac, char **av) cameraEntity->setViewCenter(QVector3D(0, 0, 0)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(root); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(root); camController->setCamera(cameraEntity); const float radius = 100.0f; diff --git a/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro index d2c5166ee..166b79e73 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 3dextras +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp index 0a8b739d9..70a8ec467 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.cpp +++ b/examples/qt3d/bigscene-instanced-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/clip-planes-qml/clip-planes-qml.pro b/examples/qt3d/clip-planes-qml/clip-planes-qml.pro index 81500e4ce..2c83b2e63 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 3dextras +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dquickextras SOURCES += main.cpp diff --git a/examples/qt3d/clip-planes-qml/main.cpp b/examples/qt3d/clip-planes-qml/main.cpp index 422257337..aa7e240fd 100644 --- a/examples/qt3d/clip-planes-qml/main.cpp +++ b/examples/qt3d/clip-planes-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/component-changes/component-changes.pro b/examples/qt3d/component-changes/component-changes.pro index ef2da4ed6..a1a935145 100644 --- a/examples/qt3d/component-changes/component-changes.pro +++ b/examples/qt3d/component-changes/component-changes.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/component-changes/main.cpp b/examples/qt3d/component-changes/main.cpp index 93ae52d4d..e4e46a0d5 100644 --- a/examples/qt3d/component-changes/main.cpp +++ b/examples/qt3d/component-changes/main.cpp @@ -58,8 +58,8 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> -#include "qt3dwindow.h" -#include "qorbitcontrol.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qorbitcontrol.h> #include <QTimer> @@ -106,7 +106,7 @@ private: int main(int argc, char **argv) { QGuiApplication app(argc, argv); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; // Root entity Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); @@ -117,7 +117,7 @@ int main(int argc, char **argv) camera->setViewCenter(QVector3D(0, 0, 0)); // For camera controls - Qt3DInput::QOrbitControl *cameraController = new Qt3DInput::QOrbitControl(rootEntity); + Qt3DExtras::QOrbitControl *cameraController = new Qt3DExtras::QOrbitControl(rootEntity); cameraController->setCamera(camera); // Cylinder mesh data diff --git a/examples/qt3d/compute-particles/compute-particles.pro b/examples/qt3d/compute-particles/compute-particles.pro index 96b1a6b5d..c25cc0c30 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 3dextras +QT += 3dcore 3drender 3dquick 3dinput quick qml HEADERS += \ diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index 68e657670..b53760022 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -72,14 +72,14 @@ #include <Qt3DRender/qviewport.h> #include <Qt3DRender/qrenderaspect.h> #include <Qt3DRender/qclearbuffers.h> -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> int main(int ac, char **av) { QGuiApplication app(ac, av); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; // Root entity Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); @@ -119,7 +119,7 @@ int main(int ac, char **av) cameraEntity->setUpVector(QVector3D(0, 1, 0)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(rootEntity); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(rootEntity); camController->setCamera(cameraEntity); // Set root object of the scene diff --git a/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro b/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro index e562663bd..abbb3b771 100644 --- a/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro +++ b/examples/qt3d/custom-mesh-cpp/custom-mesh-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras SOURCES += \ main.cpp diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index d4652839c..6809e62aa 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -69,13 +69,13 @@ #include <Qt3DRender/QBuffer> #include <QPropertyAnimation> -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; view.defaultFramegraph()->setClearColor(QColor::fromRgbF(0.0, 0.5, 1.0, 1.0)); // Root entity @@ -90,7 +90,7 @@ int main(int argc, char* argv[]) cameraEntity->setViewCenter(QVector3D(0, 0, 0)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(rootEntity); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(rootEntity); camController->setCamera(cameraEntity); // Material diff --git a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro b/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro index 111d0ef40..228cc8ed0 100644 --- a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro +++ b/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick quick +QT += 3dcore 3drender 3dinput 3dquick quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/custom-mesh-qml/main.cpp b/examples/qt3d/custom-mesh-qml/main.cpp index 196eefe05..41d2f08a5 100644 --- a/examples/qt3d/custom-mesh-qml/main.cpp +++ b/examples/qt3d/custom-mesh-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/cylinder-cpp/cylinder-cpp.pro b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro index ef2da4ed6..a1a935145 100644 --- a/examples/qt3d/cylinder-cpp/cylinder-cpp.pro +++ b/examples/qt3d/cylinder-cpp/cylinder-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras SOURCES += main.cpp diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index 725d373fe..2fbb31c6f 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -68,13 +68,13 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qaspectengine.h> -#include "qt3dwindow.h" -#include "qorbitcontrol.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qorbitcontrol.h> int main(int argc, char **argv) { QGuiApplication app(argc, argv); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; // Root entity Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); @@ -87,7 +87,7 @@ int main(int argc, char **argv) camera->setViewCenter(QVector3D(0, 0, 0)); // For camera controls - Qt3DInput::QOrbitControl *cameraController = new Qt3DInput::QOrbitControl(rootEntity); + Qt3DExtras::QOrbitControl *cameraController = new Qt3DExtras::QOrbitControl(rootEntity); cameraController->setCamera(camera); // Cylinder shape data diff --git a/examples/qt3d/cylinder-qml/cylinder-qml.pro b/examples/qt3d/cylinder-qml/cylinder-qml.pro index ed5b093b3..b73085a8e 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 3dextras +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp index 0a8b739d9..70a8ec467 100644 --- a/examples/qt3d/cylinder-qml/main.cpp +++ b/examples/qt3d/cylinder-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index 868158e49..be8a5f403 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -68,15 +68,15 @@ #include "finaleffect.h" #include "sceneeffect.h" #include "pointlightblock.h" -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> int main(int ac, char **av) { QGuiApplication app(ac, av); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; // Root entity Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); @@ -121,7 +121,7 @@ int main(int ac, char **av) camera->setViewCenter(QVector3D(0.0f, 0.0f, 10.0f)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(rootEntity); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(rootEntity); camController->setCamera(camera); // FrameGraph diff --git a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro index b16b57d7f..40b2f555c 100644 --- a/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro +++ b/examples/qt3d/deferred-renderer-qml/deferred-renderer-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras HEADERS += \ diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp index a7dcf9bb6..55bbe91ee 100644 --- a/examples/qt3d/deferred-renderer-qml/main.cpp +++ b/examples/qt3d/deferred-renderer-qml/main.cpp @@ -49,14 +49,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; - + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro index 527cc6183..264989f43 100644 --- a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro +++ b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras SOURCES += \ main.cpp \ diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 353f6a42d..ebc36ab5f 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -59,13 +59,13 @@ #include <Qt3DExtras/QForwardRenderer> #include "examplescene.h" -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; ExampleScene *sceneRoot = new ExampleScene(); @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) basicCamera->setPosition(QVector3D(0.0f, 3.5f, 25.0f)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(sceneRoot); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(sceneRoot); camController->setCamera(basicCamera); view.setRootEntity(sceneRoot); diff --git a/examples/qt3d/enabled-qml/enabled-qml.pro b/examples/qt3d/enabled-qml/enabled-qml.pro index a1f83a2f4..142af5e41 100644 --- a/examples/qt3d/enabled-qml/enabled-qml.pro +++ b/examples/qt3d/enabled-qml/enabled-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick qml +QT += 3dcore 3drender 3dquick qml 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/enabled-qml/main.cpp b/examples/qt3d/enabled-qml/main.cpp index 5bf849758..349d7ad31 100644 --- a/examples/qt3d/enabled-qml/main.cpp +++ b/examples/qt3d/enabled-qml/main.cpp @@ -49,12 +49,12 @@ ****************************************************************************/ #include <QGuiApplication> -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl(QStringLiteral("qrc:/main.qml"))); view.show(); diff --git a/examples/qt3d/examples-common/FirstPersonCameraController.qml b/examples/qt3d/examples-common/FirstPersonCameraController.qml deleted file mode 100644 index e6950140d..000000000 --- a/examples/qt3d/examples-common/FirstPersonCameraController.qml +++ /dev/null @@ -1,176 +0,0 @@ -/**************************************************************************** -** -** 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/examples/qt3d/examples-common/examples-common.pri b/examples/qt3d/examples-common/examples-common.pri deleted file mode 100644 index ddfea6765..000000000 --- a/examples/qt3d/examples-common/examples-common.pri +++ /dev/null @@ -1,20 +0,0 @@ -QT += 3dcore 3drender 3dinput 3dlogic qml 3dextras - -INCLUDEPATH += $$PWD - -win32 { - build_pass { - CONFIG(debug, debug|release) { - common_static_lib = $$OUT_PWD/../examples-common/debug/$${QMAKE_PREFIX_STATICLIB}examples-common.$${QMAKE_EXTENSION_STATICLIB} - } else { - common_static_lib = $$OUT_PWD/../examples-common/release/$${QMAKE_PREFIX_STATICLIB}examples-common.$${QMAKE_EXTENSION_STATICLIB} - } - } - LIBS += $$common_static_lib - PRE_TARGETDEPS += $$common_static_lib -} else { - LIBS += -L$$OUT_PWD/../examples-common -l$$qtLibraryTarget(examples-common) - PRE_TARGETDEPS += $$OUT_PWD/../examples-common/lib$$qtLibraryTarget(examples-common).a -} - -RESOURCES += $$OUT_PWD/../examples-common/examples-common.qrc diff --git a/examples/qt3d/examples-common/examples-common.pro b/examples/qt3d/examples-common/examples-common.pro deleted file mode 100644 index a11a77ee5..000000000 --- a/examples/qt3d/examples-common/examples-common.pro +++ /dev/null @@ -1,48 +0,0 @@ -TEMPLATE = lib -CONFIG += staticlib -TARGET = $$qtLibraryTarget(examples-common) -QT += core-private 3dcore 3dcore-private 3drender 3dinput 3dlogic qml quick 3dextras - -SOURCES += \ - qfirstpersoncameracontroller.cpp \ - qorbitcontrol.cpp \ - qt3dwindow.cpp \ - qt3dquickwindow.cpp - - -HEADERS += \ - qfirstpersoncameracontroller.h \ - qfirstpersoncameracontroller_p.h \ - qorbitcontrol_p.h \ - qorbitcontrol.h \ - qt3dwindow.h \ - qt3dquickwindow.h - -QML_FILES = \ - $$PWD/OrbitController.qml \ - $$PWD/FirstPersonCameraController.qml - -OTHER_FILES += \ - $$QML_FILES - -# Create a resource file for qml files that need to be registered by the plugin -GENERATED_RESOURCE_FILE = $$OUT_PWD/examples-common.qrc -INCLUDED_RESOURCE_FILES = $$QML_FILES -RESOURCE_CONTENT = \ - "<RCC>" \ - "<qresource prefix=\"/\">" - -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/examples/qt3d/examples.pri b/examples/qt3d/examples.pri index 1f58b0f02..31cafc396 100644 --- a/examples/qt3d/examples.pri +++ b/examples/qt3d/examples.pri @@ -1,10 +1,6 @@ TEMPLATE = app -include(./examples-common/examples-common.pri) - -#INCLUDEPATH += $$PWD/common -#SOURCES += $$PWD/common/window.cpp -#HEADERS += $$PWD/common/window.h +QT += 3dextras target.path = $$[QT_INSTALL_EXAMPLES]/qt3d/$$TARGET INSTALLS += target diff --git a/examples/qt3d/gltf/gltf.pro b/examples/qt3d/gltf/gltf.pro index 8a79ab06c..2ec5551a9 100644 --- a/examples/qt3d/gltf/gltf.pro +++ b/examples/qt3d/gltf/gltf.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras HEADERS += \ diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp index afde3a5f9..8fc9cd8e2 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/examples/qt3d/gltf/main.cpp @@ -48,14 +48,14 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> #include <QOpenGLContext> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/gooch-qml/gooch-qml.pro b/examples/qt3d/gooch-qml/gooch-qml.pro index c5ead19d8..1239a73c3 100644 --- a/examples/qt3d/gooch-qml/gooch-qml.pro +++ b/examples/qt3d/gooch-qml/gooch-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick 3dinput qml quick +QT += 3dcore 3drender 3dquick 3dinput qml quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/gooch-qml/main.cpp b/examples/qt3d/gooch-qml/main.cpp index 007b73590..95044bf67 100644 --- a/examples/qt3d/gooch-qml/main.cpp +++ b/examples/qt3d/gooch-qml/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <QQmlEngine> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; // Expose the window as a context property so we can set the aspect ratio view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); view.setSource(QUrl("qrc:/main.qml")); diff --git a/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro b/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro index d15f5ad56..e3f7e436f 100644 --- a/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro +++ b/examples/qt3d/instanced-arrays-qml/instanced-arrays-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drender 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dquickextras SOURCES += \ main.cpp \ diff --git a/examples/qt3d/instanced-arrays-qml/main.cpp b/examples/qt3d/instanced-arrays-qml/main.cpp index cc651590e..20b32563b 100644 --- a/examples/qt3d/instanced-arrays-qml/main.cpp +++ b/examples/qt3d/instanced-arrays-qml/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include "instancebuffer.h" -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QQmlEngine> #include <QQmlContext> @@ -58,7 +58,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; InstanceBuffer buffer; view.engine()->qmlEngine()->rootContext()->setContextProperty("_instanceBuffer", &buffer); diff --git a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro index 5ebea8962..406c6b8b8 100644 --- a/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro +++ b/examples/qt3d/keyboardinput-qml/keyboardinput-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick 3dinput quick qml +QT += 3dcore 3drender 3dquick 3dinput quick qml 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp index b91cd44d6..70a8ec467 100644 --- a/examples/qt3d/keyboardinput-qml/main.cpp +++ b/examples/qt3d/keyboardinput-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include <qt3dquickwindow.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/lights/lights.pro b/examples/qt3d/lights/lights.pro index 85fe72c15..be41ac01d 100644 --- a/examples/qt3d/lights/lights.pro +++ b/examples/qt3d/lights/lights.pro @@ -4,7 +4,7 @@ SOURCE += main.cpp -QT += qml quick 3dcore 3drender 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dquickextras OTHER_FILES += main.qml \ PlaneEntity.qml diff --git a/examples/qt3d/lights/main.cpp b/examples/qt3d/lights/main.cpp index a99db6f74..ddddf6e3d 100644 --- a/examples/qt3d/lights/main.cpp +++ b/examples/qt3d/lights/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/loader-qml/loader-qml.pro b/examples/qt3d/loader-qml/loader-qml.pro index ed74a300a..55572232d 100644 --- a/examples/qt3d/loader-qml/loader-qml.pro +++ b/examples/qt3d/loader-qml/loader-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp index 0a8b739d9..70a8ec467 100644 --- a/examples/qt3d/loader-qml/main.cpp +++ b/examples/qt3d/loader-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index 0514df414..5ca6998e0 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -66,14 +66,14 @@ #include "rotatingtrefoilknot.h" #include "barrel.h" #include "houseplant.h" -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; // Scene Root Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity(); @@ -86,7 +86,7 @@ int main(int argc, char* argv[]) basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f)); basicCamera->setPosition(QVector3D(0.0f, 3.5f, 25.0f)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(sceneRoot); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(sceneRoot); camController->setCamera(basicCamera); // Scene floor diff --git a/examples/qt3d/materials-cpp/materials-cpp.pro b/examples/qt3d/materials-cpp/materials-cpp.pro index 8cdffd313..326feca75 100644 --- a/examples/qt3d/materials-cpp/materials-cpp.pro +++ b/examples/qt3d/materials-cpp/materials-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras HEADERS += \ planeentity.h \ diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp index 2661de1ff..faed40390 100644 --- a/examples/qt3d/materials/main.cpp +++ b/examples/qt3d/materials/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <QQmlEngine> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; // Expose the window as a context property so we can set the aspect ratio view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/materials/materials.pro b/examples/qt3d/materials/materials.pro index a5c892fe8..c19361472 100644 --- a/examples/qt3d/materials/materials.pro +++ b/examples/qt3d/materials/materials.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras HEADERS += \ diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp index 428891833..e1a359d2a 100644 --- a/examples/qt3d/mouseinput-qml/main.cpp +++ b/examples/qt3d/mouseinput-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl(QStringLiteral("qrc:/main.qml"))); view.show(); diff --git a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro b/examples/qt3d/mouseinput-qml/mouseinput-qml.pro index 8d72e3a8b..a5bad5991 100644 --- a/examples/qt3d/mouseinput-qml/mouseinput-qml.pro +++ b/examples/qt3d/mouseinput-qml/mouseinput-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras SOURCES += main.cpp diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp index 74e8e7b0b..ce5b883bd 100644 --- a/examples/qt3d/multiviewport/main.cpp +++ b/examples/qt3d/multiviewport/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include <qt3dquickwindow.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int ac, char **av) { QGuiApplication app(ac, av); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/multiviewport/multiviewport.pro b/examples/qt3d/multiviewport/multiviewport.pro index 12b30ad50..c53be2113 100644 --- a/examples/qt3d/multiviewport/multiviewport.pro +++ b/examples/qt3d/multiviewport/multiviewport.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras HEADERS += \ diff --git a/examples/qt3d/picking-qml/main.cpp b/examples/qt3d/picking-qml/main.cpp index 05ca909d8..337a0766a 100644 --- a/examples/qt3d/picking-qml/main.cpp +++ b/examples/qt3d/picking-qml/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> #include <Qt3DQuick/QQmlAspectEngine> #include <QQmlContext> @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.engine()->qmlEngine()->rootContext()->setContextProperty("_view", &view); view.setSource(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/qt3d/picking-qml/picking-qml.pro b/examples/qt3d/picking-qml/picking-qml.pro index 6639f745f..93fd17583 100644 --- a/examples/qt3d/picking-qml/picking-qml.pro +++ b/examples/qt3d/picking-qml/picking-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3drender-private 3dinput 3dquick qml quick +QT += 3dcore 3drender 3drender-private 3dinput 3dquick qml quick 3dquickextras SOURCES += main.cpp diff --git a/examples/qt3d/plasma/main.cpp b/examples/qt3d/plasma/main.cpp index f2a470828..7b2c4041b 100644 --- a/examples/qt3d/plasma/main.cpp +++ b/examples/qt3d/plasma/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <QQmlEngine> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; // Expose the window as a context property so we can set the aspect ratio view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/plasma/plasma.pro b/examples/qt3d/plasma/plasma.pro index dbd221b40..0e2e9cdb3 100644 --- a/examples/qt3d/plasma/plasma.pro +++ b/examples/qt3d/plasma/plasma.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick qml quick +QT += 3dcore 3drender 3dquick qml quick 3dquickextras HEADERS += \ diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp index 0bf16c79e..7e130a718 100644 --- a/examples/qt3d/playground-qml/main.cpp +++ b/examples/qt3d/playground-qml/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <qt3dquickwindow.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> #include <QtQml> @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/playground-qml/playground-qml.pro b/examples/qt3d/playground-qml/playground-qml.pro index bbd16e027..a8a659a68 100644 --- a/examples/qt3d/playground-qml/playground-qml.pro +++ b/examples/qt3d/playground-qml/playground-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick qml quick 3dinput +QT += 3dcore 3drender 3dquick qml quick 3dinput 3dquickextras HEADERS += \ diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index af2fd703a..6fd9cf30b 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - examples-common \ playground-qml \ simple-qml \ simple-cpp \ @@ -59,9 +58,3 @@ qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml #SUBDIRS += qt3d qtHaveModule(widgets): SUBDIRS += assimp-cpp \ basicshapes-cpp - -for(subdir, SUBDIRS) { - !equals(subdir, examples-common) { - $${subdir}.depends += examples-common - } -} diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp index f08717185..a8b76c224 100644 --- a/examples/qt3d/shadow-map-qml/main.cpp +++ b/examples/qt3d/shadow-map-qml/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <qt3dquickwindow.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <QQmlContext> @@ -58,7 +58,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.resize(1600, 800); view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); view.setSource(QUrl("qrc:/main.qml")); diff --git a/examples/qt3d/shadow-map-qml/shadow-map-qml.pro b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro index b8f50aed0..0819dc196 100644 --- a/examples/qt3d/shadow-map-qml/shadow-map-qml.pro +++ b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index af7f429fe..af7f1f9d9 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -124,7 +124,7 @@ Qt3DCore::QEntity *createScene() int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DWindow view; + Qt3DExtras::Qt3DWindow view; Qt3DCore::QEntity *scene = createScene(); @@ -134,7 +134,7 @@ int main(int argc, char* argv[]) camera->setPosition(QVector3D(0, 0, 40.0f)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(scene); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(scene); camController->setLinearSpeed( 50.0f ); camController->setLookSpeed( 180.0f ); camController->setCamera(camera); diff --git a/examples/qt3d/simple-cpp/simple-cpp.pro b/examples/qt3d/simple-cpp/simple-cpp.pro index db0d0d972..cf01c1242 100644 --- a/examples/qt3d/simple-cpp/simple-cpp.pro +++ b/examples/qt3d/simple-cpp/simple-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras SOURCES += \ main.cpp \ diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp index 6c5d56582..32ae912df 100644 --- a/examples/qt3d/simple-qml/main.cpp +++ b/examples/qt3d/simple-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/simple-qml/simple-qml.pro b/examples/qt3d/simple-qml/simple-qml.pro index 8abb2b301..f9fc1156b 100644 --- a/examples/qt3d/simple-qml/simple-qml.pro +++ b/examples/qt3d/simple-qml/simple-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick 3dlogic qml quick +QT += 3dcore 3drender 3dinput 3dquick 3dlogic qml quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp index 196eefe05..41d2f08a5 100644 --- a/examples/qt3d/simple-shaders-qml/main.cpp +++ b/examples/qt3d/simple-shaders-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro b/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro index 6da510e50..e7c398b4b 100644 --- a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro +++ b/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp index 97df70a8d..066421e9d 100644 --- a/examples/qt3d/skybox/main.cpp +++ b/examples/qt3d/skybox/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); return app.exec(); diff --git a/examples/qt3d/skybox/skybox.pro b/examples/qt3d/skybox/skybox.pro index 919858d35..d836f2058 100644 --- a/examples/qt3d/skybox/skybox.pro +++ b/examples/qt3d/skybox/skybox.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras RESOURCES += \ skybox.qrc \ diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp index e74ec7dbd..a0eae5175 100644 --- a/examples/qt3d/tessellation-modes/main.cpp +++ b/examples/qt3d/tessellation-modes/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include "tessellatedquadmesh.h" -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <qqml.h> @@ -60,7 +60,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; // Register our custom types qmlRegisterType<TessellatedQuadMesh>("Qt3D.Examples", 1, 0, "TessellatedQuadMesh"); diff --git a/examples/qt3d/tessellation-modes/tessellation-modes.pro b/examples/qt3d/tessellation-modes/tessellation-modes.pro index e6c758577..c1691e607 100644 --- a/examples/qt3d/tessellation-modes/tessellation-modes.pro +++ b/examples/qt3d/tessellation-modes/tessellation-modes.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras HEADERS += \ tessellatedquadmesh.h diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp index bf120144b..32ae912df 100644 --- a/examples/qt3d/torus-qml/main.cpp +++ b/examples/qt3d/torus-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include <qt3dquickwindow.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/torus-qml/torus-qml.pro b/examples/qt3d/torus-qml/torus-qml.pro index dddcd9aad..2aba23531 100644 --- a/examples/qt3d/torus-qml/torus-qml.pro +++ b/examples/qt3d/torus-qml/torus-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/transforms-qml/main.cpp b/examples/qt3d/transforms-qml/main.cpp index ee0837a1b..3487e7bb2 100644 --- a/examples/qt3d/transforms-qml/main.cpp +++ b/examples/qt3d/transforms-qml/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QQmlEngine> #include <QQmlContext> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.engine()->qmlEngine()->rootContext()->setContextProperty("_view", &view); view.setSource(QUrl("qrc:/main.qml")); diff --git a/examples/qt3d/transforms-qml/transforms-qml.pro b/examples/qt3d/transforms-qml/transforms-qml.pro index 18dd6fa43..060ddbd2a 100644 --- a/examples/qt3d/transforms-qml/transforms-qml.pro +++ b/examples/qt3d/transforms-qml/transforms-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 3dquickextras SOURCES += \ main.cpp diff --git a/examples/qt3d/transparency-qml/main.cpp b/examples/qt3d/transparency-qml/main.cpp index 196eefe05..41d2f08a5 100644 --- a/examples/qt3d/transparency-qml/main.cpp +++ b/examples/qt3d/transparency-qml/main.cpp @@ -48,13 +48,13 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/examples/qt3d/transparency-qml/transparency-qml.pro b/examples/qt3d/transparency-qml/transparency-qml.pro index e39694137..273e31546 100644 --- a/examples/qt3d/transparency-qml/transparency-qml.pro +++ b/examples/qt3d/transparency-qml/transparency-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += qml quick 3dcore 3drender 3dinput 3dquick +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dquickextras SOURCES += main.cpp diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp index 4c2480741..56d78f17a 100644 --- a/examples/qt3d/wave/main.cpp +++ b/examples/qt3d/wave/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <QQmlEngine> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; // Expose the window as a context property so we can set the aspect ratio view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/wave/wave.pro b/examples/qt3d/wave/wave.pro index 2ec36d43a..45c8c64b6 100644 --- a/examples/qt3d/wave/wave.pro +++ b/examples/qt3d/wave/wave.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick 3dinput qml quick +QT += 3dcore 3drender 3dquick 3dinput qml quick 3dquickextras HEADERS += \ diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp index a2140fd1f..760786ee8 100644 --- a/examples/qt3d/wireframe/main.cpp +++ b/examples/qt3d/wireframe/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; // Expose the window as a context property so we can set the aspect ratio view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/wireframe/wireframe.pro b/examples/qt3d/wireframe/wireframe.pro index 6aeb7a5ae..a7c538bc8 100644 --- a/examples/qt3d/wireframe/wireframe.pro +++ b/examples/qt3d/wireframe/wireframe.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras HEADERS += \ diff --git a/src/extras/defaults/defaults.pri b/src/extras/defaults/defaults.pri index 1560f55ec..6ff23403b 100644 --- a/src/extras/defaults/defaults.pri +++ b/src/extras/defaults/defaults.pri @@ -22,7 +22,12 @@ HEADERS += \ $$PWD/qgoochmaterial.h \ $$PWD/qgoochmaterial_p.h \ $$PWD/qphongalphamaterial.h \ - $$PWD/qphongalphamaterial_p.h + $$PWD/qphongalphamaterial_p.h \ + $$PWD/qt3dwindow.h \ + $$PWD/qorbitcontrol.h \ + $$PWD/qorbitcontrol_p.h \ + $$PWD/qfirstpersoncameracontroller.h \ + $$PWD/qfirstpersoncameracontroller_p.h SOURCES += \ $$PWD/qphongmaterial.cpp \ @@ -35,5 +40,8 @@ SOURCES += \ $$PWD/qpervertexcolormaterial.cpp \ $$PWD/qskyboxentity.cpp \ $$PWD/qgoochmaterial.cpp \ - $$PWD/qphongalphamaterial.cpp + $$PWD/qphongalphamaterial.cpp \ + $$PWD/qt3dwindow.cpp \ + $$PWD/qorbitcontrol.cpp \ + $$PWD/qfirstpersoncameracontroller.cpp diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/src/extras/defaults/qfirstpersoncameracontroller.cpp index 3e0bd2c68..57cf3ba88 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp +++ b/src/extras/defaults/qfirstpersoncameracontroller.cpp @@ -63,32 +63,31 @@ QT_BEGIN_NAMESPACE -namespace Qt3DInput { - +namespace Qt3DExtras { QFirstPersonCameraControllerPrivate::QFirstPersonCameraControllerPrivate() : Qt3DCore::QEntityPrivate() , m_camera(Q_NULLPTR) - , m_leftMouseButtonAction(new QAction()) - , m_fineMotionAction(new QAction()) - , m_rxAxis(new QAxis()) - , m_ryAxis(new QAxis()) - , m_txAxis(new QAxis()) - , m_tyAxis(new QAxis()) - , m_tzAxis(new QAxis()) - , m_leftMouseButtonInput(new QActionInput()) - , m_fineMotionKeyInput(new QActionInput()) - , m_mouseRxInput(new QAxisInput()) - , m_mouseRyInput(new QAxisInput()) - , m_keyboardTxPosInput(new QAxisInput()) - , m_keyboardTyPosInput(new QAxisInput()) - , m_keyboardTzPosInput(new QAxisInput()) - , m_keyboardTxNegInput(new QAxisInput()) - , m_keyboardTyNegInput(new QAxisInput()) - , m_keyboardTzNegInput(new QAxisInput()) - , m_keyboardDevice(new QKeyboardDevice()) - , m_mouseDevice(new QMouseDevice()) - , m_logicalDevice(new QLogicalDevice()) + , m_leftMouseButtonAction(new Qt3DInput::QAction()) + , m_fineMotionAction(new Qt3DInput::QAction()) + , m_rxAxis(new Qt3DInput::QAxis()) + , m_ryAxis(new Qt3DInput::QAxis()) + , m_txAxis(new Qt3DInput::QAxis()) + , m_tyAxis(new Qt3DInput::QAxis()) + , m_tzAxis(new Qt3DInput::QAxis()) + , m_leftMouseButtonInput(new Qt3DInput::QActionInput()) + , m_fineMotionKeyInput(new Qt3DInput::QActionInput()) + , m_mouseRxInput(new Qt3DInput::QAxisInput()) + , m_mouseRyInput(new Qt3DInput::QAxisInput()) + , m_keyboardTxPosInput(new Qt3DInput::QAxisInput()) + , m_keyboardTyPosInput(new Qt3DInput::QAxisInput()) + , m_keyboardTzPosInput(new Qt3DInput::QAxisInput()) + , m_keyboardTxNegInput(new Qt3DInput::QAxisInput()) + , m_keyboardTyNegInput(new Qt3DInput::QAxisInput()) + , m_keyboardTzNegInput(new Qt3DInput::QAxisInput()) + , m_keyboardDevice(new Qt3DInput::QKeyboardDevice()) + , m_mouseDevice(new Qt3DInput::QMouseDevice()) + , m_logicalDevice(new Qt3DInput::QLogicalDevice()) , m_frameAction(new Qt3DLogic::QFrameAction()) , m_linearSpeed(10.0f) , m_lookSpeed(180.0f) @@ -100,7 +99,7 @@ void QFirstPersonCameraControllerPrivate::init() //// Actions // Left Mouse Button Action - m_leftMouseButtonInput->setButtons(QVariantList() << QMouseEvent::LeftButton); + m_leftMouseButtonInput->setButtons(QVariantList() << Qt::LeftButton); m_leftMouseButtonInput->setSourceDevice(m_mouseDevice); m_leftMouseButtonAction->addInput(m_leftMouseButtonInput); @@ -112,12 +111,12 @@ void QFirstPersonCameraControllerPrivate::init() //// Axes // Mouse X - m_mouseRxInput->setAxis(QMouseDevice::X); + m_mouseRxInput->setAxis(Qt3DInput::QMouseDevice::X); m_mouseRxInput->setSourceDevice(m_mouseDevice); m_rxAxis->addInput(m_mouseRxInput); // Mouse Y - m_mouseRyInput->setAxis(QMouseDevice::Y); + m_mouseRyInput->setAxis(Qt3DInput::QMouseDevice::Y); m_mouseRyInput->setSourceDevice(m_mouseDevice); m_ryAxis->addInput(m_mouseRyInput); @@ -246,7 +245,7 @@ void QFirstPersonCameraController::setLookSpeed(float lookSpeed) } } -} // Qt3DInput +} // Qt3DExtras QT_END_NAMESPACE diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.h b/src/extras/defaults/qfirstpersoncameracontroller.h index 5b9019586..358f69160 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.h +++ b/src/extras/defaults/qfirstpersoncameracontroller.h @@ -48,9 +48,10 @@ ** ****************************************************************************/ -#ifndef QT3DINPUT_QFIRSTPERSONCAMERACONTROLLER_H -#define QT3DINPUT_QFIRSTPERSONCAMERACONTROLLER_H +#ifndef QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_H +#define QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DCore/QEntity> QT_BEGIN_NAMESPACE @@ -59,11 +60,11 @@ namespace Qt3DRender { class QCamera; } -namespace Qt3DInput { +namespace Qt3DExtras { class QFirstPersonCameraControllerPrivate; -class QFirstPersonCameraController : public Qt3DCore::QEntity +class QT3DEXTRASSHARED_EXPORT QFirstPersonCameraController : public Qt3DCore::QEntity { Q_OBJECT Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) @@ -92,8 +93,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_onTriggered(float)) }; -} // Qt3DInput +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DINPUT_QFIRSTPERSONCAMERACONTROLLER_H +#endif // QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_H diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h b/src/extras/defaults/qfirstpersoncameracontroller_p.h index 4df7278d1..e93b0bc33 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h +++ b/src/extras/defaults/qfirstpersoncameracontroller_p.h @@ -48,8 +48,8 @@ ** ****************************************************************************/ -#ifndef QT3DINPUT_QFIRSTPERSONCAMERACONTROLLER_P_H -#define QT3DINPUT_QFIRSTPERSONCAMERACONTROLLER_P_H +#ifndef QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_P_H +#define QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_P_H #include <Qt3DCore/private/qentity_p.h> #include <QVector3D> @@ -76,6 +76,10 @@ class QAxis; class QAxisInput; class QAxisActionHandler; +} + +namespace Qt3DExtras { + class QFirstPersonCameraControllerPrivate : public Qt3DCore::QEntityPrivate { public: @@ -85,31 +89,31 @@ public: Qt3DRender::QCamera *m_camera; - QAction *m_leftMouseButtonAction; - QAction *m_fineMotionAction; + Qt3DInput::QAction *m_leftMouseButtonAction; + Qt3DInput::QAction *m_fineMotionAction; - QAxis *m_rxAxis; - QAxis *m_ryAxis; - QAxis *m_txAxis; - QAxis *m_tyAxis; - QAxis *m_tzAxis; + Qt3DInput::QAxis *m_rxAxis; + Qt3DInput::QAxis *m_ryAxis; + Qt3DInput::QAxis *m_txAxis; + Qt3DInput::QAxis *m_tyAxis; + Qt3DInput::QAxis *m_tzAxis; - QActionInput *m_leftMouseButtonInput; - QActionInput *m_fineMotionKeyInput; + Qt3DInput::QActionInput *m_leftMouseButtonInput; + Qt3DInput::QActionInput *m_fineMotionKeyInput; - QAxisInput *m_mouseRxInput; - QAxisInput *m_mouseRyInput; - QAxisInput *m_keyboardTxPosInput; - QAxisInput *m_keyboardTyPosInput; - QAxisInput *m_keyboardTzPosInput; - QAxisInput *m_keyboardTxNegInput; - QAxisInput *m_keyboardTyNegInput; - QAxisInput *m_keyboardTzNegInput; + Qt3DInput::QAxisInput *m_mouseRxInput; + Qt3DInput::QAxisInput *m_mouseRyInput; + Qt3DInput::QAxisInput *m_keyboardTxPosInput; + Qt3DInput::QAxisInput *m_keyboardTyPosInput; + Qt3DInput::QAxisInput *m_keyboardTzPosInput; + Qt3DInput::QAxisInput *m_keyboardTxNegInput; + Qt3DInput::QAxisInput *m_keyboardTyNegInput; + Qt3DInput::QAxisInput *m_keyboardTzNegInput; - QKeyboardDevice *m_keyboardDevice; - QMouseDevice *m_mouseDevice; + Qt3DInput::QKeyboardDevice *m_keyboardDevice; + Qt3DInput::QMouseDevice *m_mouseDevice; - QLogicalDevice *m_logicalDevice; + Qt3DInput::QLogicalDevice *m_logicalDevice; Qt3DLogic::QFrameAction *m_frameAction; diff --git a/examples/qt3d/examples-common/qorbitcontrol.cpp b/src/extras/defaults/qorbitcontrol.cpp index 4f35158f6..65810e1a0 100644 --- a/examples/qt3d/examples-common/qorbitcontrol.cpp +++ b/src/extras/defaults/qorbitcontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DInput { +namespace Qt3DExtras { /*! * \class QOrbitControl::QOrbitControl @@ -60,30 +60,30 @@ namespace Qt3DInput { QOrbitControlPrivate::QOrbitControlPrivate() : Qt3DCore::QEntityPrivate() , m_camera(Q_NULLPTR) - , m_leftMouseButtonAction(new QAction()) - , m_rightMouseButtonAction(new QAction()) - , m_altButtonAction(new QAction()) - , m_shiftButtonAction(new QAction()) - , m_rxAxis(new QAxis()) - , m_ryAxis(new QAxis()) - , m_txAxis(new QAxis()) - , m_tyAxis(new QAxis()) - , m_tzAxis(new QAxis()) - , m_leftMouseButtonInput(new QActionInput()) - , m_rightMouseButtonInput(new QActionInput()) - , m_altButtonInput(new QActionInput()) - , m_shiftButtonInput(new QActionInput()) - , m_mouseRxInput(new QAxisInput()) - , m_mouseRyInput(new QAxisInput()) - , m_keyboardTxPosInput(new QAxisInput()) - , m_keyboardTyPosInput(new QAxisInput()) - , m_keyboardTzPosInput(new QAxisInput()) - , m_keyboardTxNegInput(new QAxisInput()) - , m_keyboardTyNegInput(new QAxisInput()) - , m_keyboardTzNegInput(new QAxisInput()) - , m_keyboardDevice(new QKeyboardDevice()) - , m_mouseDevice(new QMouseDevice()) - , m_logicalDevice(new QLogicalDevice()) + , m_leftMouseButtonAction(new Qt3DInput::QAction()) + , m_rightMouseButtonAction(new Qt3DInput::QAction()) + , m_altButtonAction(new Qt3DInput::QAction()) + , m_shiftButtonAction(new Qt3DInput::QAction()) + , m_rxAxis(new Qt3DInput::QAxis()) + , m_ryAxis(new Qt3DInput::QAxis()) + , m_txAxis(new Qt3DInput::QAxis()) + , m_tyAxis(new Qt3DInput::QAxis()) + , m_tzAxis(new Qt3DInput::QAxis()) + , m_leftMouseButtonInput(new Qt3DInput::QActionInput()) + , m_rightMouseButtonInput(new Qt3DInput::QActionInput()) + , m_altButtonInput(new Qt3DInput::QActionInput()) + , m_shiftButtonInput(new Qt3DInput::QActionInput()) + , m_mouseRxInput(new Qt3DInput::QAxisInput()) + , m_mouseRyInput(new Qt3DInput::QAxisInput()) + , m_keyboardTxPosInput(new Qt3DInput::QAxisInput()) + , m_keyboardTyPosInput(new Qt3DInput::QAxisInput()) + , m_keyboardTzPosInput(new Qt3DInput::QAxisInput()) + , m_keyboardTxNegInput(new Qt3DInput::QAxisInput()) + , m_keyboardTyNegInput(new Qt3DInput::QAxisInput()) + , m_keyboardTzNegInput(new Qt3DInput::QAxisInput()) + , m_keyboardDevice(new Qt3DInput::QKeyboardDevice()) + , m_mouseDevice(new Qt3DInput::QMouseDevice()) + , m_logicalDevice(new Qt3DInput::QLogicalDevice()) , m_frameAction(new Qt3DLogic::QFrameAction()) , m_linearSpeed(10.0f) , m_lookSpeed(180.0f) @@ -96,12 +96,12 @@ void QOrbitControlPrivate::init() //// Actions // Left Mouse Button Action - m_leftMouseButtonInput->setButtons(QVariantList() << QMouseEvent::LeftButton); + m_leftMouseButtonInput->setButtons(QVariantList() << Qt::LeftButton); m_leftMouseButtonInput->setSourceDevice(m_mouseDevice); m_leftMouseButtonAction->addInput(m_leftMouseButtonInput); // Right Mouse Button Action - m_rightMouseButtonInput->setButtons(QVariantList() << QMouseEvent::RightButton); + m_rightMouseButtonInput->setButtons(QVariantList() << Qt::RightButton); m_rightMouseButtonInput->setSourceDevice(m_mouseDevice); m_rightMouseButtonAction->addInput(m_rightMouseButtonInput); @@ -118,12 +118,12 @@ void QOrbitControlPrivate::init() //// Axes // Mouse X - m_mouseRxInput->setAxis(QMouseDevice::X); + m_mouseRxInput->setAxis(Qt3DInput::QMouseDevice::X); m_mouseRxInput->setSourceDevice(m_mouseDevice); m_rxAxis->addInput(m_mouseRxInput); // Mouse Y - m_mouseRyInput->setAxis(QMouseDevice::Y); + m_mouseRyInput->setAxis(Qt3DInput::QMouseDevice::Y); m_mouseRyInput->setSourceDevice(m_mouseDevice); m_ryAxis->addInput(m_mouseRyInput); @@ -313,7 +313,7 @@ void QOrbitControl::setZoomInLimit(float zoomInLimit) } } -} // Qt3DInput +} // Qt3DExtras QT_END_NAMESPACE diff --git a/examples/qt3d/examples-common/qorbitcontrol.h b/src/extras/defaults/qorbitcontrol.h index dbfc6e08d..2fb0c0bb9 100644 --- a/examples/qt3d/examples-common/qorbitcontrol.h +++ b/src/extras/defaults/qorbitcontrol.h @@ -34,9 +34,10 @@ ** ****************************************************************************/ -#ifndef QT3DINPUT_QORBITCONTROL_H -#define QT3DINPUT_QORBITCONTROL_H +#ifndef QT3DEXTRAS_QORBITCONTROL_H +#define QT3DEXTRAS_QORBITCONTROL_H +#include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DCore/QEntity> QT_BEGIN_NAMESPACE @@ -45,11 +46,11 @@ namespace Qt3DRender { class QCamera; } -namespace Qt3DInput { +namespace Qt3DExtras { class QOrbitControlPrivate; -class QOrbitControl : public Qt3DCore::QEntity +class QT3DEXTRASSHARED_EXPORT QOrbitControl : public Qt3DCore::QEntity { Q_OBJECT Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) @@ -83,8 +84,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_onTriggered(float)) }; -} // Qt3DInput +} // Qt3DExtras QT_END_NAMESPACE -#endif // QT3DINPUT_QORBITCONTROL_H +#endif // QT3DEXTRAS_QORBITCONTROL_H diff --git a/examples/qt3d/examples-common/qorbitcontrol_p.h b/src/extras/defaults/qorbitcontrol_p.h index 34f853685..e37ca50f6 100644 --- a/examples/qt3d/examples-common/qorbitcontrol_p.h +++ b/src/extras/defaults/qorbitcontrol_p.h @@ -73,6 +73,10 @@ class QAxis; class QAxisInput; class QAxisActionHandler; +} + +namespace Qt3DExtras { + class QOrbitControlPrivate : public Qt3DCore::QEntityPrivate { public: @@ -82,35 +86,35 @@ public: Qt3DRender::QCamera *m_camera; - QAction *m_leftMouseButtonAction; - QAction *m_rightMouseButtonAction; - QAction *m_altButtonAction; - QAction *m_shiftButtonAction; + Qt3DInput::QAction *m_leftMouseButtonAction; + Qt3DInput::QAction *m_rightMouseButtonAction; + Qt3DInput::QAction *m_altButtonAction; + Qt3DInput::QAction *m_shiftButtonAction; - QAxis *m_rxAxis; - QAxis *m_ryAxis; - QAxis *m_txAxis; - QAxis *m_tyAxis; - QAxis *m_tzAxis; + Qt3DInput::QAxis *m_rxAxis; + Qt3DInput::QAxis *m_ryAxis; + Qt3DInput::QAxis *m_txAxis; + Qt3DInput::QAxis *m_tyAxis; + Qt3DInput::QAxis *m_tzAxis; - QActionInput *m_leftMouseButtonInput; - QActionInput *m_rightMouseButtonInput; - QActionInput *m_altButtonInput; - QActionInput *m_shiftButtonInput; + Qt3DInput::QActionInput *m_leftMouseButtonInput; + Qt3DInput::QActionInput *m_rightMouseButtonInput; + Qt3DInput::QActionInput *m_altButtonInput; + Qt3DInput::QActionInput *m_shiftButtonInput; - QAxisInput *m_mouseRxInput; - QAxisInput *m_mouseRyInput; - QAxisInput *m_keyboardTxPosInput; - QAxisInput *m_keyboardTyPosInput; - QAxisInput *m_keyboardTzPosInput; - QAxisInput *m_keyboardTxNegInput; - QAxisInput *m_keyboardTyNegInput; - QAxisInput *m_keyboardTzNegInput; + Qt3DInput::QAxisInput *m_mouseRxInput; + Qt3DInput::QAxisInput *m_mouseRyInput; + Qt3DInput::QAxisInput *m_keyboardTxPosInput; + Qt3DInput::QAxisInput *m_keyboardTyPosInput; + Qt3DInput::QAxisInput *m_keyboardTzPosInput; + Qt3DInput::QAxisInput *m_keyboardTxNegInput; + Qt3DInput::QAxisInput *m_keyboardTyNegInput; + Qt3DInput::QAxisInput *m_keyboardTzNegInput; - QKeyboardDevice *m_keyboardDevice; - QMouseDevice *m_mouseDevice; + Qt3DInput::QKeyboardDevice *m_keyboardDevice; + Qt3DInput::QMouseDevice *m_mouseDevice; - QLogicalDevice *m_logicalDevice; + Qt3DInput::QLogicalDevice *m_logicalDevice; Qt3DLogic::QFrameAction *m_frameAction; @@ -124,8 +128,8 @@ public: Q_DECLARE_PUBLIC(QOrbitControl) }; -} // namespace Qt3DInput +} // namespace Qt3DExtras QT_END_NAMESPACE -#endif // QTINPUT_QORBITCONTROL_P_H +#endif // QT3DEXTRAS_QORBITCONTROL_P_H diff --git a/examples/qt3d/examples-common/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp index 4c0bfc21a..eed9d8862 100644 --- a/examples/qt3d/examples-common/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -65,6 +65,8 @@ QT_BEGIN_NAMESPACE +namespace Qt3DExtras { + Qt3DWindow::Qt3DWindow(QScreen *screen) : QWindow(screen) , m_aspectEngine(new Qt3DCore::QAspectEngine) @@ -172,4 +174,6 @@ void Qt3DWindow::resizeEvent(QResizeEvent *) m_defaultCamera->setAspectRatio(float(width()) / float(height())); } +} // Qt3DExtras + QT_END_NAMESPACE diff --git a/examples/qt3d/examples-common/qt3dwindow.h b/src/extras/defaults/qt3dwindow.h index 5cb71d1d9..1d73966de 100644 --- a/examples/qt3d/examples-common/qt3dwindow.h +++ b/src/extras/defaults/qt3dwindow.h @@ -52,6 +52,7 @@ #define QT3DWINDOW_H #include <QWindow> +#include <Qt3DExtras/qt3dextras_global.h> QT_BEGIN_NAMESPACE @@ -81,7 +82,9 @@ namespace Qt3DLogic { class QLogicAspect; } -class Qt3DWindow : public QWindow +namespace Qt3DExtras { + +class QT3DEXTRASSHARED_EXPORT Qt3DWindow : public QWindow { Q_OBJECT public: @@ -132,6 +135,8 @@ private: bool m_initialized; }; +} // Qt3DExtras + QT_END_NAMESPACE #endif // QT3DWINDOW_H diff --git a/src/extras/extras.pro b/src/extras/extras.pro index 3b7758007..57ba35652 100644 --- a/src/extras/extras.pro +++ b/src/extras/extras.pro @@ -1,6 +1,6 @@ TARGET = Qt3DExtras MODULE = 3dextras -QT += core-private 3dcore 3dcore-private 3drender 3drender-private +QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dinput 3dlogic DEFINES += QT3DEXTRAS_LIBRARY diff --git a/src/quick3d/imports/extras/defaults/defaults.pri b/src/quick3d/imports/extras/defaults/defaults.pri index eee644925..249c9139b 100644 --- a/src/quick3d/imports/extras/defaults/defaults.pri +++ b/src/quick3d/imports/extras/defaults/defaults.pri @@ -4,7 +4,7 @@ # resource file. # # To have the plugin register them as types, add an entries to the -# qmldir array in qt3dquick3drenderplugin.cpp +# qmldir array in qt3dquick3dextrasplugin.cpp QML_FILES = \ $$PWD/qml/PhongMaterial.qml \ $$PWD/qml/DiffuseMapMaterial.qml \ @@ -17,4 +17,6 @@ QML_FILES = \ $$PWD/qml/SkyboxEntity.qml \ $$PWD/qml/GoochMaterial.qml \ $$PWD/qml/PhongAlphaMaterial.qml \ - $$PWD/qml/TextureMaterial.qml + $$PWD/qml/TextureMaterial.qml \ + $$PWD/qml/OrbitController.qml \ + $$PWD/qml/FirstPersonCameraController.qml diff --git a/examples/qt3d/examples-common/OrbitController.qml b/src/quick3d/imports/extras/defaults/qml/OrbitController.qml index bba114730..bba114730 100644 --- a/examples/qt3d/examples-common/OrbitController.qml +++ b/src/quick3d/imports/extras/defaults/qml/OrbitController.qml diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index cd7743915..95be07095 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -72,7 +72,10 @@ static const struct { // FrameGraphs { "ForwardRenderer", 2, 0 }, // Entities - { "SkyboxEntity", 2, 0 } + { "SkyboxEntity", 2, 0 }, + // Camera Controllers + { "OrbitController", 2, 0 }, + { "FirstPersonCameraController", 2, 0 }, }; void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) diff --git a/src/quick3d/quick3dextras/qt3dquickextras_global.h b/src/quick3d/quick3dextras/qt3dquickextras_global.h new file mode 100644 index 000000000..d9277baee --- /dev/null +++ b/src/quick3d/quick3dextras/qt3dquickextras_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 QT3DQUICKEXTRAS_GLOBAL_H +#define QT3DQUICKEXTRAS_GLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_NAMESPACE + +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT_BUILD_3DQUICKEXTRAS_LIB) +# define QT3DQUICKEXTRASSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DQUICKEXTRASSHARED_EXPORT Q_DECL_IMPORT +# endif +#else +# define QT3DQUICKEXTRASSHARED_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QT3DQUICKEXTRAS_GLOBAL_H diff --git a/examples/qt3d/examples-common/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index 1537b4e71..96c4bff6a 100644 --- a/examples/qt3d/examples-common/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <Qt3DRender/qcamera.h> #include <Qt3DRender/qrenderaspect.h> @@ -64,6 +64,10 @@ QT_BEGIN_NAMESPACE +namespace Qt3DExtras { + +namespace Quick { + Qt3DQuickWindow::Qt3DQuickWindow(QWindow *parent) : QQuickWindow(parent) , m_engine(Q_NULLPTR) @@ -243,4 +247,8 @@ void Qt3DQuickWindow::updateCameraAspectRatio() } } +} // Quick + +} // Qt3DExtras + QT_END_NAMESPACE diff --git a/examples/qt3d/examples-common/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h index 5a01be779..83d31dbc9 100644 --- a/examples/qt3d/examples-common/qt3dquickwindow.h +++ b/src/quick3d/quick3dextras/qt3dquickwindow.h @@ -48,9 +48,10 @@ ** ****************************************************************************/ -#ifndef QT3DQUICKWINDOW_H -#define QT3DQUICKWINDOW_H +#ifndef QT3DEXTRAS_QUICK_QT3DQUICKWINDOW_H +#define QT3DEXTRAS_QUICK_QT3DQUICKWINDOW_H +#include <Qt3DQuickExtras/qt3dquickextras_global.h> #include <QQuickWindow> #include <QtCore/qpointer.h> #include <QUrl> @@ -77,7 +78,11 @@ namespace Qt3DLogic { class QLogicAspect; } -class Qt3DQuickWindow : public QQuickWindow +namespace Qt3DExtras { + +namespace Quick { + +class QT3DQUICKEXTRASSHARED_EXPORT Qt3DQuickWindow : public QQuickWindow { Q_OBJECT Q_PROPERTY(CameraAspectRatioMode cameraAspectRatioMode READ cameraAspectRatioMode WRITE setCameraAspectRatioMode NOTIFY cameraAspectRatioModeChanged) @@ -126,6 +131,10 @@ private: CameraAspectRatioMode m_cameraAspectRatioMode; }; +} // Quick + +} // Qt3DExtras + QT_END_NAMESPACE -#endif // QT3DQUICKWINDOW_H +#endif // QT3DEXTRAS_QUICK_QT3DQUICKWINDOW_H diff --git a/src/quick3d/quick3dextras/quick3dextras.pro b/src/quick3d/quick3dextras/quick3dextras.pro new file mode 100644 index 000000000..aa3b485e7 --- /dev/null +++ b/src/quick3d/quick3dextras/quick3dextras.pro @@ -0,0 +1,26 @@ +TARGET = Qt3DQuickExtras +MODULE = 3dquickextras + +QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3drender 3dlogic +CONFIG -= precompile_header + +gcov { + CONFIG += static + QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage + QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage +} + +SOURCES += \ + qt3dquickwindow.cpp + + +HEADERS += \ + qt3dquickextras_global.h \ + qt3dquickwindow.h + +!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL + +# otherwise mingw headers do not declare common functions like ::strcasecmp +win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x + +load(qt_module) diff --git a/src/src.pro b/src/src.pro index fb999f6ca..9d51e6b14 100644 --- a/src/src.pro +++ b/src/src.pro @@ -17,7 +17,7 @@ src_input.depends = src_render src_extras.subdir = $$PWD/extras src_extras.target = src_extras -src_extras.depends = src_render src_input +src_extras.depends = src_render src_input src_logic # Quick3D libs src_quick3d_core.subdir = $$PWD/quick3d/quick3d @@ -32,6 +32,10 @@ src_quick3d_input.subdir = $$PWD/quick3d/quick3dinput src_quick3d_input.target = sub-quick3d-input src_quick3d_input.depends = src_input src_quick3d_core +src_quick3d_extras.subdir = $$PWD/quick3d/quick3dextras +src_quick3d_extras.target = sub-quick3d-extras +src_quick3d_extras.depends = src_render src_logic src_input src_quick3d_core + # Quick3D imports src_quick3d_core_imports.file = $$PWD/quick3d/imports/core/importscore.pro src_quick3d_core_imports.target = sub-quick3d-imports-core @@ -72,6 +76,7 @@ SUBDIRS += \ src_quick3d_core_imports \ src_quick3d_render \ src_quick3d_input \ + src_quick3d_extras \ src_quick3d_imports_render \ src_quick3d_imports_scene3d \ src_quick3d_imports_input \ diff --git a/sync.profile b/sync.profile index f0a2dd1f0..3c23a8b8d 100644 --- a/sync.profile +++ b/sync.profile @@ -7,6 +7,7 @@ "Qt3DQuickInput" => "$basedir/src/quick3d/quick3dinput", "Qt3DLogic" => "$basedir/src/logic", "Qt3DExtras" => "$basedir/src/extras", + "Qt3DQuickExtras" => "$basedir/src/quick3d/quick3dextras", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); |