diff options
79 files changed, 447 insertions, 470 deletions
diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp index 6072269ae..14f76c605 100644 --- a/examples/qt3d/anaglyph-rendering/main.cpp +++ b/examples/qt3d/anaglyph-rendering/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp index 4b4048c6c..2b2670c02 100644 --- a/examples/qt3d/assimp-cpp/main.cpp +++ b/examples/qt3d/assimp-cpp/main.cpp @@ -107,7 +107,7 @@ int main(int ac, char **av) Window view; Qt3D::QAspectEngine engine; - Qt3D::QInputAspect *inputAspect = new Qt3D::QInputAspect(); + Qt3DInput::QInputAspect *inputAspect = new Qt3DInput::QInputAspect(); engine.registerAspect(new Qt3D::QRenderAspect()); engine.registerAspect(inputAspect); engine.initialize(); diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 8ada5287c..651766019 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -84,7 +84,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index 1e122c65e..f3e5a9129 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -91,7 +91,7 @@ int main(int argc, char **argv) Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp index 5d57b0694..d11e9e5c7 100644 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ b/examples/qt3d/bigmodel-qml/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp index 082c0779f..2b347d80b 100644 --- a/examples/qt3d/bigscene-cpp/main.cpp +++ b/examples/qt3d/bigscene-cpp/main.cpp @@ -66,7 +66,7 @@ int main(int ac, char **av) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp index 45385a76c..bfa959eab 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.cpp +++ b/examples/qt3d/bigscene-instanced-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/clip-planes-qml/main.cpp b/examples/qt3d/clip-planes-qml/main.cpp index 1f2035d3e..e8d6e6505 100644 --- a/examples/qt3d/clip-planes-qml/main.cpp +++ b/examples/qt3d/clip-planes-qml/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index 2bc079e25..1745aed42 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -74,7 +74,7 @@ int main(int ac, char **av) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index c17c71906..e26f9827b 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char* argv[]) Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index 01e6c7cf7..d8a55c670 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char **argv) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp index 53a1a94b9..2adbf32d8 100644 --- a/examples/qt3d/cylinder-qml/main.cpp +++ b/examples/qt3d/cylinder-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index dfa3d3f64..129d3174d 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -69,7 +69,7 @@ int main(int ac, char **av) QGuiApplication app(ac, av); Qt3D::QWindow view; - Qt3D::QInputAspect *input = new Qt3D::QInputAspect(); + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect(); view.registerAspect(input); // Root entity diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp index efbe03d70..16145787a 100644 --- a/examples/qt3d/deferred-renderer-qml/main.cpp +++ b/examples/qt3d/deferred-renderer-qml/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 4d43ba59b..27ca086bd 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp index 9cd7025fa..112661bef 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/examples/qt3d/gltf/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/gooch-qml/main.cpp b/examples/qt3d/gooch-qml/main.cpp index 29296db79..eaf35b0a3 100644 --- a/examples/qt3d/gooch-qml/main.cpp +++ b/examples/qt3d/gooch-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); // Expose the window as a context property so we can set the aspect ratio engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp index 0797d355f..52bf03e48 100644 --- a/examples/qt3d/keyboardinput-qml/main.cpp +++ b/examples/qt3d/keyboardinput-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp index 45385a76c..bfa959eab 100644 --- a/examples/qt3d/loader-qml/main.cpp +++ b/examples/qt3d/loader-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index 057f4f35e..0ea77c728 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::QAspectEngine engine; engine.registerAspect(new Qt3D::QRenderAspect()); - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); engine.initialize(); QVariantMap data; diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp index 160831d3e..a49c87a1c 100644 --- a/examples/qt3d/materials/main.cpp +++ b/examples/qt3d/materials/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp index 2751fe41a..c06af988d 100644 --- a/examples/qt3d/mouseinput-qml/main.cpp +++ b/examples/qt3d/mouseinput-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp index bb64bf2c7..3c9fe15fc 100644 --- a/examples/qt3d/multiviewport/main.cpp +++ b/examples/qt3d/multiviewport/main.cpp @@ -48,7 +48,7 @@ int main(int ac, char **av) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp index 9b2ff6e0b..00379f54a 100644 --- a/examples/qt3d/playground-qml/main.cpp +++ b/examples/qt3d/playground-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp index ac08f5381..f9b744e8c 100644 --- a/examples/qt3d/shadow-map-qml/main.cpp +++ b/examples/qt3d/shadow-map-qml/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char* argv[]) view.resize(1600, 800); engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 431b0ac8a..2755b37cc 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); Qt3D::QWindow view; - Qt3D::QInputAspect *input = new Qt3D::QInputAspect; + Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; view.registerAspect(input); // Root entity diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp index 45385a76c..bfa959eab 100644 --- a/examples/qt3d/simple-qml/main.cpp +++ b/examples/qt3d/simple-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp index 7f7afd225..0000a11c0 100644 --- a/examples/qt3d/simple-shaders-qml/main.cpp +++ b/examples/qt3d/simple-shaders-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp index c585bf5fb..d58eb8a9c 100644 --- a/examples/qt3d/skybox/main.cpp +++ b/examples/qt3d/skybox/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp index eee73d435..bc2b79cd9 100644 --- a/examples/qt3d/tessellation-modes/main.cpp +++ b/examples/qt3d/tessellation-modes/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp index d8fcbc269..f2e3f76ab 100644 --- a/examples/qt3d/torus-qml/main.cpp +++ b/examples/qt3d/torus-qml/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); diff --git a/examples/qt3d/transparency-qml/main.cpp b/examples/qt3d/transparency-qml/main.cpp index 50256fd2f..9034e7f4a 100644 --- a/examples/qt3d/transparency-qml/main.cpp +++ b/examples/qt3d/transparency-qml/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp index bd2e79f3e..802eef8ea 100644 --- a/examples/qt3d/wave/main.cpp +++ b/examples/qt3d/wave/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); // Expose the window as a context property so we can set the aspect ratio engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp index a92e10a23..21d971c79 100644 --- a/examples/qt3d/wireframe/main.cpp +++ b/examples/qt3d/wireframe/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); // Expose the window as a context property so we can set the aspect ratio engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/src/input/assignkeyboardfocusjob.cpp b/src/input/assignkeyboardfocusjob.cpp index 1cc9484ba..e816a4820 100644 --- a/src/input/assignkeyboardfocusjob.cpp +++ b/src/input/assignkeyboardfocusjob.cpp @@ -42,11 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { -AssignKeyboardFocusJob::AssignKeyboardFocusJob(const QNodeId &controller) +AssignKeyboardFocusJob::AssignKeyboardFocusJob(const Qt3D::QNodeId &controller) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_keyboardController(controller) @@ -72,8 +71,7 @@ void AssignKeyboardFocusJob::run() } } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/assignkeyboardfocusjob_p.h b/src/input/assignkeyboardfocusjob_p.h index 5e6993c84..fddbaa746 100644 --- a/src/input/assignkeyboardfocusjob_p.h +++ b/src/input/assignkeyboardfocusjob_p.h @@ -34,36 +34,34 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H -#define QT3D_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H +#ifndef QT3DINPUT_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H +#define QT3DINPUT_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; -class AssignKeyboardFocusJob : public QAspectJob +class AssignKeyboardFocusJob : public Qt3D::QAspectJob { public: - explicit AssignKeyboardFocusJob(const QNodeId &controller); + explicit AssignKeyboardFocusJob(const Qt3D::QNodeId &controller); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - const QNodeId m_keyboardController; + const Qt3D::QNodeId m_keyboardController; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H +#endif // QT3DINPUT_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H diff --git a/src/input/cameracontroller.cpp b/src/input/cameracontroller.cpp index 27f8988ae..6b616d3b1 100644 --- a/src/input/cameracontroller.cpp +++ b/src/input/cameracontroller.cpp @@ -48,7 +48,9 @@ QT_BEGIN_NAMESPACE using namespace Qt3D; -using namespace Qt3D::Input; + +namespace Qt3DInput { +namespace Input { CameraController::CameraController(QObject *parent) : QObject(parent), @@ -79,7 +81,7 @@ CameraController::CameraController(QObject *parent) : * an Entity, a CameraLens and a Transform instead of using the * ready made Camera element, it won't work. */ -void CameraController::setCamera( QCamera* cam ) +void CameraController::setCamera( Qt3D::QCamera* cam ) { m_camera = cam; m_cameraEntity = cam; @@ -90,7 +92,7 @@ void CameraController::setCamera( QCamera* cam ) m_updateTimer->stop(); } -QCamera *CameraController::camera() const +Qt3D::QCamera *CameraController::camera() const { return m_camera; } @@ -315,4 +317,7 @@ void CameraController::onUpdate() update(1.0 / 60.0); } +} // namespace Input +} // namespace Qt3DInput + QT_END_NAMESPACE diff --git a/src/input/cameracontroller_p.h b/src/input/cameracontroller_p.h index 481b6a044..215810ae7 100644 --- a/src/input/cameracontroller_p.h +++ b/src/input/cameracontroller_p.h @@ -49,10 +49,11 @@ class QKeyEvent; class QTimer; namespace Qt3D { - class QCamera; class QEntity; +} +namespace Qt3DInput { namespace Input { class CameraController : public QObject @@ -67,8 +68,8 @@ class CameraController : public QObject public: explicit CameraController(QObject *parent = 0); - void setCamera( QCamera* cam ); - QCamera *camera() const; + void setCamera( Qt3D::QCamera* cam ); + Qt3D::QCamera *camera() const; void setLinearSpeed( float speed ); float linearSpeed() const; @@ -106,8 +107,8 @@ private Q_SLOTS: void onUpdate(); private: - QCamera* m_camera; - QEntity* m_cameraEntity; + Qt3D::QCamera* m_camera; + Qt3D::QEntity* m_cameraEntity; float m_vx; float m_vy; @@ -132,9 +133,8 @@ private: QTimer *m_updateTimer; }; -} // of namespace Input - -} // of namespace Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/handle_types_p.h b/src/input/handle_types_p.h index ba158eb75..ad65f9377 100644 --- a/src/input/handle_types_p.h +++ b/src/input/handle_types_p.h @@ -34,15 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_HANDLE_TYPES_P_H -#define QT3D_INPUT_HANDLE_TYPES_P_H +#ifndef QT3DINPUT_INPUT_HANDLE_TYPES_P_H +#define QT3DINPUT_INPUT_HANDLE_TYPES_P_H #include <Qt3DCore/qhandle.h> QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class KeyboardController; @@ -50,15 +49,14 @@ class KeyboardInput; class MouseController; class MouseInput; -typedef QHandle<KeyboardController, 8> HKeyboardController; -typedef QHandle<KeyboardInput, 16> HKeyboardInput; -typedef QHandle<MouseController, 8> HMouseController; -typedef QHandle<MouseInput, 16> HMouseInput; - -} // Input +typedef Qt3D::QHandle<KeyboardController, 8> HKeyboardController; +typedef Qt3D::QHandle<KeyboardInput, 16> HKeyboardInput; +typedef Qt3D::QHandle<MouseController, 8> HMouseController; +typedef Qt3D::QHandle<MouseInput, 16> HMouseInput; -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_HANDLE_TYPES_P_H +#endif // QT3DINPUT_INPUT_HANDLE_TYPES_P_H diff --git a/src/input/inputhandler.cpp b/src/input/inputhandler.cpp index 2021694f1..ce2f09c00 100644 --- a/src/input/inputhandler.cpp +++ b/src/input/inputhandler.cpp @@ -44,8 +44,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DInput { namespace Input { InputHandler::InputHandler() @@ -146,7 +147,7 @@ void InputHandler::removeMouseController(HMouseController controller) // Return a vector of jobs to be performed for keyboard events // Handles all dependencies between jobs -QVector<QAspectJobPtr> InputHandler::keyboardJobs() +QVector<Qt3D::QAspectJobPtr> InputHandler::keyboardJobs() { // One job for Keyboard focus change event per Keyboard Controller QVector<QAspectJobPtr> jobs; @@ -176,7 +177,7 @@ QVector<QAspectJobPtr> InputHandler::keyboardJobs() return jobs; } -QVector<QAspectJobPtr> InputHandler::mouseJobs() +QVector<Qt3D::QAspectJobPtr> InputHandler::mouseJobs() { QVector<QAspectJobPtr> jobs; const QList<QMouseEvent> events = pendingMouseEvents(); @@ -197,8 +198,7 @@ QVector<QAspectJobPtr> InputHandler::mouseJobs() return jobs; } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/inputhandler_p.h b/src/input/inputhandler_p.h index 477c61e99..abf8b8414 100644 --- a/src/input/inputhandler_p.h +++ b/src/input/inputhandler_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_INPUTHANDLER_P_H -#define QT3D_INPUT_INPUTHANDLER_P_H +#ifndef QT3DINPUT_INPUT_INPUTHANDLER_P_H +#define QT3DINPUT_INPUT_INPUTHANDLER_P_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/private/handle_types_p.h> @@ -45,8 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class KeyboardInputManager; @@ -83,8 +82,8 @@ public: void appendMouseController(HMouseController controller); void removeMouseController(HMouseController controller); - QVector<QAspectJobPtr> keyboardJobs(); - QVector<QAspectJobPtr> mouseJobs(); + QVector<Qt3D::QAspectJobPtr> keyboardJobs(); + QVector<Qt3D::QAspectJobPtr> mouseJobs(); private: KeyboardControllerManager *m_keyboardControllerManager; @@ -101,10 +100,9 @@ private: mutable QMutex m_mutex; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_INPUTHANDLER_P_H +#endif // QT3DINPUT_INPUT_INPUTHANDLER_P_H diff --git a/src/input/inputmanagers_p.h b/src/input/inputmanagers_p.h index 928786c16..6e1341958 100644 --- a/src/input/inputmanagers_p.h +++ b/src/input/inputmanagers_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_INPUTMANAGERS_P_H -#define QT3D_INPUT_INPUTMANAGERS_P_H +#ifndef QT3DINPUT_INPUT_INPUTMANAGERS_P_H +#define QT3DINPUT_INPUT_INPUTMANAGERS_P_H #include <QtGlobal> #include <Qt3DInput/private/handle_types_p.h> @@ -47,13 +47,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { -class KeyboardInputManager : public QResourceManager< +class KeyboardInputManager : public Qt3D::QResourceManager< KeyboardInput, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy> { @@ -61,9 +60,9 @@ public: KeyboardInputManager() {} }; -class KeyboardControllerManager : public QResourceManager< +class KeyboardControllerManager : public Qt3D::QResourceManager< KeyboardController, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy> { @@ -71,9 +70,9 @@ public: KeyboardControllerManager() {} }; -class MouseControllerManager : public QResourceManager< +class MouseControllerManager : public Qt3D::QResourceManager< MouseController, - QNodeId, + Qt3D::QNodeId, 8, Qt3D::ArrayAllocatingPolicy> { @@ -81,9 +80,9 @@ public: MouseControllerManager() {} }; -class MouseInputManager : public QResourceManager< +class MouseInputManager : public Qt3D::QResourceManager< MouseInput, - QNodeId, + Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy> { @@ -91,10 +90,9 @@ public: MouseInputManager() {} }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_INPUTMANAGERS_P_H +#endif // QT3DINPUT_INPUT_INPUTMANAGERS_P_H diff --git a/src/input/keyboardcontroller.cpp b/src/input/keyboardcontroller.cpp index 0df458ed3..9e62633a5 100644 --- a/src/input/keyboardcontroller.cpp +++ b/src/input/keyboardcontroller.cpp @@ -41,8 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { // TO DO: Send change to frontend when activeInput changes @@ -53,11 +52,11 @@ KeyboardController::KeyboardController() { } -void KeyboardController::updateFromPeer(QNode *) +void KeyboardController::updateFromPeer(Qt3D::QNode *) { } -void KeyboardController::requestFocusForInput(const QNodeId &inputId) +void KeyboardController::requestFocusForInput(const Qt3D::QNodeId &inputId) { // Saves the last inputId, this will then be used in an Aspect Job to determine which // input will have the focus. This in turn will call KeyboardInput::setFocus which will @@ -70,7 +69,7 @@ void KeyboardController::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -void KeyboardController::addKeyboardInput(const QNodeId &input) +void KeyboardController::addKeyboardInput(const Qt3D::QNodeId &input) { if (!m_keyboardInputs.contains(input)) { m_keyboardInputs.append(input); @@ -78,18 +77,18 @@ void KeyboardController::addKeyboardInput(const QNodeId &input) } } -void KeyboardController::removeKeyboardInput(const QNodeId &input) +void KeyboardController::removeKeyboardInput(const Qt3D::QNodeId &input) { m_keyboardInputs.removeAll(input); m_keyboardInputHandles.removeAll(m_inputHandler->keyboardInputManager()->lookupHandle(input)); } -void KeyboardController::setCurrentFocusItem(const QNodeId &input) +void KeyboardController::setCurrentFocusItem(const Qt3D::QNodeId &input) { m_currentFocusItem = input; } -void KeyboardController::sceneChangeEvent(const QSceneChangePtr &) +void KeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &) { } @@ -98,7 +97,7 @@ KeyboardControllerFunctor::KeyboardControllerFunctor(InputHandler *handler) { } -QBackendNode *KeyboardControllerFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *KeyboardControllerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { KeyboardController *controller = m_handler->keyboardControllerManager()->getOrCreateResource(frontend->id()); controller->setFactory(factory); @@ -108,19 +107,18 @@ QBackendNode *KeyboardControllerFunctor::create(QNode *frontend, const QBackendN return controller; } -QBackendNode *KeyboardControllerFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *KeyboardControllerFunctor::get(const Qt3D::QNodeId &id) const { return m_handler->keyboardControllerManager()->lookupResource(id); } -void KeyboardControllerFunctor::destroy(const QNodeId &id) const +void KeyboardControllerFunctor::destroy(const Qt3D::QNodeId &id) const { m_handler->removeKeyboardController(m_handler->keyboardControllerManager()->lookupHandle(id)); m_handler->keyboardControllerManager()->releaseResource(id); } -} // Inputs - -} // Qt3D +} // namespace Inputs +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/keyboardcontroller_p.h b/src/input/keyboardcontroller_p.h index 277b4b0be..c9509ec98 100644 --- a/src/input/keyboardcontroller_p.h +++ b/src/input/keyboardcontroller_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_KEYBOARDCONTROLLER_P_H -#define QT3D_INPUT_KEYBOARDCONTROLLER_P_H +#ifndef QT3DINPUT_INPUT_KEYBOARDCONTROLLER_P_H +#define QT3DINPUT_INPUT_KEYBOARDCONTROLLER_P_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> @@ -43,58 +43,56 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; -class KeyboardController : public QBackendNode +class KeyboardController : public Qt3D::QBackendNode { public: KeyboardController(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void requestFocusForInput(const QNodeId &inputId); + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + void requestFocusForInput(const Qt3D::QNodeId &inputId); void setInputHandler(InputHandler *handler); - void addKeyboardInput(const QNodeId &input); - void removeKeyboardInput(const QNodeId &input); + void addKeyboardInput(const Qt3D::QNodeId &input); + void removeKeyboardInput(const Qt3D::QNodeId &input); - void setCurrentFocusItem(const QNodeId &input); + void setCurrentFocusItem(const Qt3D::QNodeId &input); - inline QNodeId currentFocusItem() const { return m_currentFocusItem; } - inline QNodeId lastKeyboardInputRequester() const { return m_lastRequester; } - inline QVector<QNodeId> keyboardInputs() const { return m_keyboardInputs; } + inline Qt3D::QNodeId currentFocusItem() const { return m_currentFocusItem; } + inline Qt3D::QNodeId lastKeyboardInputRequester() const { return m_lastRequester; } + inline QVector<Qt3D::QNodeId> keyboardInputs() const { return m_keyboardInputs; } inline QVector<HKeyboardInput> keyboardInputsHandles() const { return m_keyboardInputHandles; } protected: - void sceneChangeEvent(const QSceneChangePtr &) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - QVector<QNodeId> m_keyboardInputs; + QVector<Qt3D::QNodeId> m_keyboardInputs; QVector<HKeyboardInput> m_keyboardInputHandles; - QNodeId m_lastRequester; - QNodeId m_currentFocusItem; + Qt3D::QNodeId m_lastRequester; + Qt3D::QNodeId m_currentFocusItem; }; -class KeyboardControllerFunctor : public QBackendNodeFunctor +class KeyboardControllerFunctor : public Qt3D::QBackendNodeFunctor { public: explicit KeyboardControllerFunctor(InputHandler *handler); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_KEYBOARDCONTROLLER_P_H +#endif // QT3DINPUT_INPUT_KEYBOARDCONTROLLER_P_H diff --git a/src/input/keyboardeventfilter.cpp b/src/input/keyboardeventfilter.cpp index 312e98808..34c4dc580 100644 --- a/src/input/keyboardeventfilter.cpp +++ b/src/input/keyboardeventfilter.cpp @@ -41,8 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { // The KeyboardEventFilter must be in the same thread as the view it will be monitoring @@ -67,8 +66,7 @@ bool KeyboardEventFilter::eventFilter(QObject *obj, QEvent *e) return QObject::eventFilter(obj, e); } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/keyboardeventfilter_p.h b/src/input/keyboardeventfilter_p.h index 372625ad5..c157b1db3 100644 --- a/src/input/keyboardeventfilter_p.h +++ b/src/input/keyboardeventfilter_p.h @@ -34,15 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_KEYBOARDEVENTFILTER_P_H -#define QT3D_INPUT_KEYBOARDEVENTFILTER_P_H +#ifndef QT3DINPUT_INPUT_KEYBOARDEVENTFILTER_P_H +#define QT3DINPUT_INPUT_KEYBOARDEVENTFILTER_P_H #include <QObject> QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; @@ -62,10 +61,9 @@ private: InputHandler *m_inputHandler; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_KEYBOARDEVENTFILTER_P_H +#endif // QT3DINPUT_INPUT_KEYBOARDEVENTFILTER_P_H diff --git a/src/input/keyboardinput.cpp b/src/input/keyboardinput.cpp index 80e88b36d..f824220a8 100644 --- a/src/input/keyboardinput.cpp +++ b/src/input/keyboardinput.cpp @@ -45,8 +45,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DInput { namespace Input { KeyboardInput::KeyboardInput() @@ -56,7 +57,7 @@ KeyboardInput::KeyboardInput() { } -void KeyboardInput::updateFromPeer(QNode *peer) +void KeyboardInput::updateFromPeer(Qt3D::QNode *peer) { QKeyboardInput *input = static_cast<QKeyboardInput *>(peer); if (input->controller() != Q_NULLPTR) @@ -67,7 +68,7 @@ void KeyboardInput::updateFromPeer(QNode *peer) requestFocus(); } -QNodeId KeyboardInput::keyboardController() const +Qt3D::QNodeId KeyboardInput::keyboardController() const { return m_keyboardController; } @@ -167,8 +168,7 @@ void KeyboardInputFunctor::destroy(const QNodeId &id) const m_handler->keyboardInputManager()->releaseResource(id); } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/keyboardinput_p.h b/src/input/keyboardinput_p.h index c4db79b12..e42a17947 100644 --- a/src/input/keyboardinput_p.h +++ b/src/input/keyboardinput_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_KEYBOARDINPUT_P_H -#define QT3D_INPUT_KEYBOARDINPUT_P_H +#ifndef QT3DINPUT_INPUT_KEYBOARDINPUT_P_H +#define QT3DINPUT_INPUT_KEYBOARDINPUT_P_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class Q3DKeyEvent; @@ -51,12 +51,12 @@ namespace Input { class InputHandler; -class KeyboardInput : public QBackendNode +class KeyboardInput : public Qt3D::QBackendNode { public: KeyboardInput(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - QNodeId keyboardController() const; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + Qt3D::QNodeId keyboardController() const; void setInputHandler(InputHandler *handler); void setFocus(bool focus); void keyEvent(const Q3DKeyEventPtr &event); @@ -64,34 +64,33 @@ public: inline bool isEnabled() const { return m_enabled; } protected: - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; void requestFocus(); - void setController(const QNodeId &controller); + void setController(const Qt3D::QNodeId &controller); private: InputHandler *m_inputHandler; - QNodeId m_keyboardController; + Qt3D::QNodeId m_keyboardController; bool m_focus; bool m_enabled; }; -class KeyboardInputFunctor : public QBackendNodeFunctor +class KeyboardInputFunctor : public Qt3D::QBackendNodeFunctor { public: explicit KeyboardInputFunctor(InputHandler *handler); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_KEYBOARDINPUT_P_H +#endif // QT3DINPUT_INPUT_KEYBOARDINPUT_P_H diff --git a/src/input/keyeventdispatcherjob.cpp b/src/input/keyeventdispatcherjob.cpp index 49e835639..2eea7b2b7 100644 --- a/src/input/keyeventdispatcherjob.cpp +++ b/src/input/keyeventdispatcherjob.cpp @@ -41,11 +41,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { -KeyEventDispatcherJob::KeyEventDispatcherJob(const QNodeId &input, const QList<QKeyEvent> &events) +KeyEventDispatcherJob::KeyEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QKeyEvent> &events) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_keyboardInput(input) @@ -68,8 +67,7 @@ void KeyEventDispatcherJob::run() } } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/keyeventdispatcherjob_p.h b/src/input/keyeventdispatcherjob_p.h index 1572faa32..67ca370d0 100644 --- a/src/input/keyeventdispatcherjob_p.h +++ b/src/input/keyeventdispatcherjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_KEYEVENTDISPATCHERJOB_P_H -#define QT3D_INPUT_KEYEVENTDISPATCHERJOB_P_H +#ifndef QT3DINPUT_INPUT_KEYEVENTDISPATCHERJOB_P_H +#define QT3DINPUT_INPUT_KEYEVENTDISPATCHERJOB_P_H #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> @@ -43,29 +43,27 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; -class KeyEventDispatcherJob : public QAspectJob +class KeyEventDispatcherJob : public Qt3D::QAspectJob { public: - explicit KeyEventDispatcherJob(const QNodeId &input, const QList<QKeyEvent> &events); + explicit KeyEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QKeyEvent> &events); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - const QNodeId m_keyboardInput; + const Qt3D::QNodeId m_keyboardInput; const QList<QKeyEvent> m_events; }; -} // Input - -} // Key +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_KEYEVENTDISPATCHERJOB_P_H +#endif // QT3DINPUT_INPUT_KEYEVENTDISPATCHERJOB_P_H diff --git a/src/input/mousecontroller.cpp b/src/input/mousecontroller.cpp index d41ad1eb4..9b7e77c2e 100644 --- a/src/input/mousecontroller.cpp +++ b/src/input/mousecontroller.cpp @@ -45,8 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { MouseController::MouseController() @@ -58,7 +57,7 @@ MouseController::~MouseController() { } -void MouseController::updateFromPeer(QNode *peer) +void MouseController::updateFromPeer(Qt3D::QNode *peer) { Q_UNUSED(peer); } @@ -68,23 +67,23 @@ void MouseController::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -void MouseController::addMouseInput(const QNodeId &input) +void MouseController::addMouseInput(const Qt3D::QNodeId &input) { if (!m_mouseInputs.contains(input)) m_mouseInputs.append(input); } -void MouseController::removeMouseInput(const QNodeId &input) +void MouseController::removeMouseInput(const Qt3D::QNodeId &input) { m_mouseInputs.removeOne(input); } -QVector<QNodeId> MouseController::mouseInputs() const +QVector<Qt3D::QNodeId> MouseController::mouseInputs() const { return m_mouseInputs; } -void MouseController::sceneChangeEvent(const QSceneChangePtr &e) +void MouseController::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { Q_UNUSED(e); } @@ -94,7 +93,7 @@ MouseControllerFunctor::MouseControllerFunctor(InputHandler *handler) { } -QBackendNode *MouseControllerFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *MouseControllerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { MouseController *controller = m_handler->mouseControllerManager()->getOrCreateResource(frontend->id()); controller->setFactory(factory); @@ -104,19 +103,18 @@ QBackendNode *MouseControllerFunctor::create(QNode *frontend, const QBackendNode return controller; } -QBackendNode *MouseControllerFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *MouseControllerFunctor::get(const Qt3D::QNodeId &id) const { return m_handler->mouseControllerManager()->lookupResource(id); } -void MouseControllerFunctor::destroy(const QNodeId &id) const +void MouseControllerFunctor::destroy(const Qt3D::QNodeId &id) const { m_handler->removeMouseController(m_handler->mouseControllerManager()->lookupHandle(id)); m_handler->mouseControllerManager()->releaseResource(id); } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/mousecontroller_p.h b/src/input/mousecontroller_p.h index 1d8ecddeb..88acf0358 100644 --- a/src/input/mousecontroller_p.h +++ b/src/input/mousecontroller_p.h @@ -34,57 +34,55 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_MOUSECONTROLLER_H -#define QT3D_INPUT_MOUSECONTROLLER_H +#ifndef QT3DINPUT_INPUT_MOUSECONTROLLER_H +#define QT3DINPUT_INPUT_MOUSECONTROLLER_H #include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; -class MouseController : public QBackendNode +class MouseController : public Qt3D::QBackendNode { public: MouseController(); ~MouseController(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; void setInputHandler(InputHandler *handler); - void addMouseInput(const QNodeId &input); - void removeMouseInput(const QNodeId &input); + void addMouseInput(const Qt3D::QNodeId &input); + void removeMouseInput(const Qt3D::QNodeId &input); - QVector<QNodeId> mouseInputs() const; + QVector<Qt3D::QNodeId> mouseInputs() const; protected: - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - QVector<QNodeId> m_mouseInputs; + QVector<Qt3D::QNodeId> m_mouseInputs; InputHandler *m_inputHandler; }; -class MouseControllerFunctor : public QBackendNodeFunctor +class MouseControllerFunctor : public Qt3D::QBackendNodeFunctor { public: explicit MouseControllerFunctor(InputHandler *handler); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/mouseeventdispatcherjob.cpp b/src/input/mouseeventdispatcherjob.cpp index 6104f2093..0792fcb44 100644 --- a/src/input/mouseeventdispatcherjob.cpp +++ b/src/input/mouseeventdispatcherjob.cpp @@ -41,11 +41,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { -MouseEventDispatcherJob::MouseEventDispatcherJob(const QNodeId &input, const QList<QMouseEvent> &events) +MouseEventDispatcherJob::MouseEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QMouseEvent> &events) : QAspectJob() , m_inputHandler(Q_NULLPTR) , m_mouseInput(input) @@ -69,8 +68,7 @@ void MouseEventDispatcherJob::run() } } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/mouseeventdispatcherjob_p.h b/src/input/mouseeventdispatcherjob_p.h index bee74eafa..2cc0c44f9 100644 --- a/src/input/mouseeventdispatcherjob_p.h +++ b/src/input/mouseeventdispatcherjob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_MOUSEEVENTDISPATCHERJOB_P_H -#define QT3D_INPUT_MOUSEEVENTDISPATCHERJOB_P_H +#ifndef QT3DINPUT_INPUT_MOUSEEVENTDISPATCHERJOB_P_H +#define QT3DINPUT_INPUT_MOUSEEVENTDISPATCHERJOB_P_H #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> @@ -43,29 +43,27 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; -class MouseEventDispatcherJob : public QAspectJob +class MouseEventDispatcherJob : public Qt3D::QAspectJob { public: - explicit MouseEventDispatcherJob(const QNodeId &input, const QList<QMouseEvent> &events); + explicit MouseEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QMouseEvent> &events); void setInputHandler(InputHandler *handler); void run() Q_DECL_FINAL; private: InputHandler *m_inputHandler; - const QNodeId m_mouseInput; + const Qt3D::QNodeId m_mouseInput; const QList<QMouseEvent> m_events; }; -} // Input - -} // Mouse +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_MOUSEEVENTDISPATCHERJOB_P_H +#endif // QT3DINPUT_INPUT_MOUSEEVENTDISPATCHERJOB_P_H diff --git a/src/input/mouseeventfilter.cpp b/src/input/mouseeventfilter.cpp index ab0519623..076ecd8ce 100644 --- a/src/input/mouseeventfilter.cpp +++ b/src/input/mouseeventfilter.cpp @@ -41,8 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { // The MouseEventFilter must be in the same thread as the view it will be monitoring @@ -75,8 +74,7 @@ bool MouseEventFilter::eventFilter(QObject *obj, QEvent *e) return QObject::eventFilter(obj, e); } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/mouseeventfilter.h b/src/input/mouseeventfilter.h index 730245240..38c82ff96 100644 --- a/src/input/mouseeventfilter.h +++ b/src/input/mouseeventfilter.h @@ -34,15 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_MOUSEEVENTFILTER_P_H -#define QT3D_INPUT_MOUSEEVENTFILTER_P_H +#ifndef QT3DINPUT_INPUT_MOUSEEVENTFILTER_P_H +#define QT3DINPUT_INPUT_MOUSEEVENTFILTER_P_H #include <QObject> QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; @@ -62,10 +61,9 @@ private: InputHandler *m_inputHandler; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_MOUSEEVENTFILTER_P_H +#endif // QT3DINPUT_INPUT_MOUSEEVENTFILTER_P_H diff --git a/src/input/mouseinput.cpp b/src/input/mouseinput.cpp index e58c28192..f2239aada 100644 --- a/src/input/mouseinput.cpp +++ b/src/input/mouseinput.cpp @@ -46,8 +46,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DInput { namespace Input { MouseInput::MouseInput() @@ -61,7 +62,7 @@ MouseInput::~MouseInput() { } -void MouseInput::updateFromPeer(QNode *peer) +void MouseInput::updateFromPeer(Qt3D::QNode *peer) { QMouseInput *input = static_cast<QMouseInput *>(peer); if (input->controller() != Q_NULLPTR) @@ -69,7 +70,7 @@ void MouseInput::updateFromPeer(QNode *peer) m_enabled = input->isEnabled(); } -QNodeId MouseInput::mouseController() const +Qt3D::QNodeId MouseInput::mouseController() const { return m_mouseController; } @@ -97,7 +98,7 @@ void MouseInput::wheelEvent(const Q3DWheelEventPtr &event) notifyObservers(e); } -void MouseInput::sceneChangeEvent(const QSceneChangePtr &e) +void MouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -110,7 +111,7 @@ void MouseInput::sceneChangeEvent(const QSceneChangePtr &e) } } -void MouseInput::setController(const QNodeId &controller) +void MouseInput::setController(const Qt3D::QNodeId &controller) { if (!m_mouseController.isNull()) { MouseController *controller = m_inputHandler->mouseControllerManager()->lookupResource(m_mouseController); @@ -130,7 +131,7 @@ MouseInputFunctor::MouseInputFunctor(InputHandler *handler) { } -QBackendNode *MouseInputFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const +Qt3D::QBackendNode *MouseInputFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const { MouseInput *input = m_handler->mouseInputManager()->getOrCreateResource(frontend->id()); input->setFactory(factory); @@ -139,18 +140,17 @@ QBackendNode *MouseInputFunctor::create(QNode *frontend, const QBackendNodeFacto return input; } -QBackendNode *MouseInputFunctor::get(const QNodeId &id) const +Qt3D::QBackendNode *MouseInputFunctor::get(const Qt3D::QNodeId &id) const { return m_handler->mouseInputManager()->lookupResource(id); } -void MouseInputFunctor::destroy(const QNodeId &id) const +void MouseInputFunctor::destroy(const Qt3D::QNodeId &id) const { m_handler->mouseInputManager()->releaseResource(id); } -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/mouseinput_p.h b/src/input/mouseinput_p.h index f0804788e..094e3cf1b 100644 --- a/src/input/mouseinput_p.h +++ b/src/input/mouseinput_p.h @@ -34,28 +34,27 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_MOUSEINPUT_H -#define QT3D_INPUT_MOUSEINPUT_H +#ifndef QT3DINPUT_INPUT_MOUSEINPUT_H +#define QT3DINPUT_INPUT_MOUSEINPUT_H #include <Qt3DCore/qbackendnode.h> #include <Qt3DInput/q3dmouseevent.h> QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DInput { namespace Input { class InputHandler; -class MouseInput : public QBackendNode +class MouseInput : public Qt3D::QBackendNode { public: MouseInput(); ~MouseInput(); - void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - QNodeId mouseController() const; + void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; + Qt3D::QNodeId mouseController() const; void setInputHandler(InputHandler *handler); void mouseEvent(const Q3DMouseEventPtr &event); void wheelEvent(const Q3DWheelEventPtr &event); @@ -63,31 +62,30 @@ public: inline bool isEnabled() const { return m_enabled; } protected: - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; - void setController(const QNodeId &controller); + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void setController(const Qt3D::QNodeId &controller); private: bool m_enabled; - QNodeId m_mouseController; + Qt3D::QNodeId m_mouseController; InputHandler *m_inputHandler; }; -class MouseInputFunctor : public QBackendNodeFunctor +class MouseInputFunctor : public Qt3D::QBackendNodeFunctor { public: explicit MouseInputFunctor(InputHandler *handler); - QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const QNodeId &id) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; private: InputHandler *m_handler; }; -} // Input - -} // Qt3D +} // namespace Input +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/q3dkeyevent.cpp b/src/input/q3dkeyevent.cpp index bb1990955..3633618f6 100644 --- a/src/input/q3dkeyevent.cpp +++ b/src/input/q3dkeyevent.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { //Qt6: Move this into a QtQmlGui module and merge it with QQuickKeyEvent @@ -147,6 +147,6 @@ Q3DKeyEvent::Q3DKeyEvent(const QKeyEvent &ke) \sa QKeySequence::StandardKey */ -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/q3dkeyevent.h b/src/input/q3dkeyevent.h index 9f66d26c5..e48071858 100644 --- a/src/input/q3dkeyevent.h +++ b/src/input/q3dkeyevent.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_Q3DKEYEVENT_H -#define QT3D_Q3DKEYEVENT_H +#ifndef QT3DINPUT_Q3DKEYEVENT_H +#define QT3DINPUT_Q3DKEYEVENT_H #include <QObject> #include <QKeyEvent> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class Q3DKeyEventPrivate; class Q3DKeyEvent; @@ -80,8 +80,8 @@ private: QKeyEvent m_event; }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_Q3DKEYEVENT_H +#endif // QT3DINPUT_Q3DKEYEVENT_H diff --git a/src/input/q3dmouseevent.cpp b/src/input/q3dmouseevent.cpp index d173b9a01..5367428eb 100644 --- a/src/input/q3dmouseevent.cpp +++ b/src/input/q3dmouseevent.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { // Notes: // Maybe we should provide the world pos of the intersection @@ -258,6 +258,6 @@ Q3DWheelEvent::Modifiers Q3DWheelEvent::modifier() const } } -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/q3dmouseevent.h b/src/input/q3dmouseevent.h index 517d016b8..ef1a74bb0 100644 --- a/src/input/q3dmouseevent.h +++ b/src/input/q3dmouseevent.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_Q3DMOUSEEVENT_H -#define QT3D_Q3DMOUSEEVENT_H +#ifndef QT3DINPUT_Q3DMOUSEEVENT_H +#define QT3DINPUT_Q3DMOUSEEVENT_H #include <Qt3DInput/qt3dinput_global.h> #include <QObject> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QT3DINPUTSHARED_EXPORT Q3DMouseEvent : public QObject { @@ -52,9 +52,9 @@ class QT3DINPUTSHARED_EXPORT Q3DMouseEvent : public QObject Q_PROPERTY(int x READ x CONSTANT) Q_PROPERTY(int y READ y CONSTANT) Q_PROPERTY(bool wasHeld READ wasHeld CONSTANT) - Q_PROPERTY(Qt3D::Q3DMouseEvent::Buttons button READ button CONSTANT) + Q_PROPERTY(Qt3DInput::Q3DMouseEvent::Buttons button READ button CONSTANT) Q_PROPERTY(int buttons READ buttons CONSTANT) - Q_PROPERTY(Qt3D::Q3DMouseEvent::Modifiers modifier READ modifier CONSTANT) + Q_PROPERTY(Qt3DInput::Q3DMouseEvent::Modifiers modifier READ modifier CONSTANT) Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) public: @@ -104,7 +104,7 @@ class QT3DINPUTSHARED_EXPORT Q3DWheelEvent : public QObject Q_PROPERTY(int y READ y CONSTANT) Q_PROPERTY(QPoint angleDelta READ angleDelta CONSTANT) Q_PROPERTY(int buttons READ buttons CONSTANT) - Q_PROPERTY(Qt3D::Q3DWheelEvent::Modifiers modifier READ modifier CONSTANT) + Q_PROPERTY(Qt3DInput::Q3DWheelEvent::Modifiers modifier READ modifier CONSTANT) Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) public: @@ -146,11 +146,11 @@ private: typedef QSharedPointer<Q3DWheelEvent> Q3DWheelEventPtr; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Q3DMouseEvent*) -Q_DECLARE_METATYPE(Qt3D::Q3DWheelEvent*) +Q_DECLARE_METATYPE(Qt3DInput::Q3DMouseEvent*) +Q_DECLARE_METATYPE(Qt3DInput::Q3DWheelEvent*) -#endif // QT3D_Q3DMOUSEEVENT_H +#endif // QT3DINPUT_Q3DMOUSEEVENT_H diff --git a/src/input/qinputaspect.cpp b/src/input/qinputaspect.cpp index 41baa9846..676ca9a80 100644 --- a/src/input/qinputaspect.cpp +++ b/src/input/qinputaspect.cpp @@ -52,10 +52,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DInput { /*! - \class Qt3D::QInputAspectPrivate + \class Qt3DInput::QInputAspectPrivate \internal */ QInputAspectPrivate::QInputAspectPrivate() @@ -67,7 +69,7 @@ QInputAspectPrivate::QInputAspectPrivate() } /*! - \class Qt3D::QInputAspect + \class Qt3DInput::QInputAspect \inmodule Qt3DInput \since 5.5 */ @@ -81,13 +83,13 @@ QInputAspect::QInputAspect(QObject *parent) registerBackendType<QMouseInput>(QBackendNodeFunctorPtr(new Input::MouseInputFunctor(d_func()->m_inputHandler.data()))); } -QCamera *QInputAspect::camera() const +Qt3D::QCamera *QInputAspect::camera() const { Q_D(const QInputAspect); return d->m_cameraController->camera(); } -void QInputAspect::setCamera(QCamera *camera) +void QInputAspect::setCamera(Qt3D::QCamera *camera) { Q_D(QInputAspect); d->m_cameraController->setCamera(camera); @@ -105,7 +107,7 @@ QVector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time) return jobs; } -void QInputAspect::sceneNodeAdded(QSceneChangePtr &e) +void QInputAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -114,7 +116,7 @@ void QInputAspect::sceneNodeAdded(QSceneChangePtr &e) visitor.traverse(n, this, &QInputAspect::visitNode); } -void QInputAspect::sceneNodeRemoved(QSceneChangePtr &e) +void QInputAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>(); QNodePtr nodePtr = propertyChange->value().value<QNodePtr>(); @@ -122,7 +124,7 @@ void QInputAspect::sceneNodeRemoved(QSceneChangePtr &e) QAbstractAspect::clearBackendNode(n); } -void QInputAspect::setRootEntity(QEntity *rootObject) +void QInputAspect::setRootEntity(Qt3D::QEntity *rootObject) { QNodeVisitor visitor; visitor.traverse(rootObject, this, &QInputAspect::visitNode); @@ -156,13 +158,13 @@ void QInputAspect::onCleanup() d->m_inputHandler.reset(Q_NULLPTR); } -void QInputAspect::visitNode(QNode *node) +void QInputAspect::visitNode(Qt3D::QNode *node) { QAbstractAspect::createBackendNode(node); } -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -QT3D_REGISTER_NAMESPACED_ASPECT("input", QT_PREPEND_NAMESPACE(Qt3D), QInputAspect) +QT3D_REGISTER_NAMESPACED_ASPECT("input", QT_PREPEND_NAMESPACE(Qt3DInput), QInputAspect) diff --git a/src/input/qinputaspect.h b/src/input/qinputaspect.h index 6c126a036..e76712e83 100644 --- a/src/input/qinputaspect.h +++ b/src/input/qinputaspect.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QINPUTASPECT_H -#define QT3D_QINPUTASPECT_H +#ifndef QT3DINPUT_QINPUTASPECT_H +#define QT3DINPUT_QINPUTASPECT_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qabstractaspect.h> @@ -43,42 +43,45 @@ QT_BEGIN_NAMESPACE namespace Qt3D { - class QCamera; +} + +namespace Qt3DInput { + class QInputAspectPrivate; -class QT3DINPUTSHARED_EXPORT QInputAspect : public QAbstractAspect +class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3D::QAbstractAspect { Q_OBJECT Q_PROPERTY(Qt3D::QCamera* camera READ camera WRITE setCamera) public: explicit QInputAspect(QObject *parent = 0); - QCamera *camera() const; + Qt3D::QCamera *camera() const; public Q_SLOTS: - void setCamera(QCamera *camera); + void setCamera(Qt3D::QCamera *camera); public: - QVector<QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void sceneNodeAdded(QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; private: - void setRootEntity(QEntity *rootObject) Q_DECL_OVERRIDE; + void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE; void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; void onStartup() Q_DECL_OVERRIDE; void onShutdown() Q_DECL_OVERRIDE; void onCleanup() Q_DECL_OVERRIDE; - void visitNode(QNode *node); + void visitNode(Qt3D::QNode *node); Q_DECLARE_PRIVATE(QInputAspect) }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_QINPUTASPECT_H +#endif // QT3DINPUT_QINPUTASPECT_H diff --git a/src/input/qinputaspect_p.h b/src/input/qinputaspect_p.h index 3383e8cfd..d23e57c33 100644 --- a/src/input/qinputaspect_p.h +++ b/src/input/qinputaspect_p.h @@ -34,25 +34,23 @@ ** ****************************************************************************/ -#ifndef QT3D_QINPUTASPECT_P_H -#define QT3D_QINPUTASPECT_P_H +#ifndef QT3DINPUT_QINPUTASPECT_P_H +#define QT3DINPUT_QINPUTASPECT_P_H #include <private/qabstractaspect_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QInputAspect; namespace Input { - class CameraController; class InputHandler; - } -class QInputAspectPrivate : public QAbstractAspectPrivate +class QInputAspectPrivate : public Qt3D::QAbstractAspectPrivate { public: QInputAspectPrivate(); @@ -62,8 +60,8 @@ public: QScopedPointer<Input::CameraController> m_cameraController; }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_QINPUTASPECT_P_H +#endif // QT3DINPUT_QINPUTASPECT_P_H diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp index e6c8fcc34..23578ef03 100644 --- a/src/input/qkeyboardcontroller.cpp +++ b/src/input/qkeyboardcontroller.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DInput { /*! \class Qt3D::QKeyboardControllerPrivate @@ -93,7 +95,7 @@ QKeyboardController::QKeyboardController(QKeyboardControllerPrivate &dd, QNode * { } -void QKeyboardController::sceneChangeEvent(const QSceneChangePtr &change) +void QKeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) { Q_D(QKeyboardController); QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); @@ -112,6 +114,6 @@ void QKeyboardController::setActiveInput(QKeyboardInput *activeInput) } } -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/qkeyboardcontroller.h b/src/input/qkeyboardcontroller.h index d447ba3dc..b68faa830 100644 --- a/src/input/qkeyboardcontroller.h +++ b/src/input/qkeyboardcontroller.h @@ -34,23 +34,23 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_QKEYBOARDCONTROLLER_H -#define QT3D_INPUT_QKEYBOARDCONTROLLER_H +#ifndef QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H +#define QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QKeyboardControllerPrivate; class QKeyboardInput; -class QT3DINPUTSHARED_EXPORT QKeyboardController : public QNode +class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3D::QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged) + Q_PROPERTY(Qt3DInput::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged) public: explicit QKeyboardController(QNode *parent = 0); @@ -60,7 +60,7 @@ public: protected: QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = 0); - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; Q_SIGNALS: void activeInputChanged(); @@ -71,8 +71,8 @@ private: void setActiveInput(QKeyboardInput *activeInput); }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_QKEYBOARDCONTROLLER_H +#endif // QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H diff --git a/src/input/qkeyboardcontroller_p.h b/src/input/qkeyboardcontroller_p.h index a5888d648..4b8d9f6ae 100644 --- a/src/input/qkeyboardcontroller_p.h +++ b/src/input/qkeyboardcontroller_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_QKEYBOARDCONTROLLER_P_H -#define QT3D_INPUT_QKEYBOARDCONTROLLER_P_H +#ifndef QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_P_H +#define QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_P_H #include <private/qnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QKeyboardController; class QKeyboardInput; -class QKeyboardControllerPrivate : public QNodePrivate +class QKeyboardControllerPrivate : public Qt3D::QNodePrivate { public: QKeyboardControllerPrivate(); @@ -55,8 +55,8 @@ public: QKeyboardInput *m_activeInput; }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_QKEYBOARDCONTROLLER_P_H +#endif // QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_P_H diff --git a/src/input/qkeyboardinput.cpp b/src/input/qkeyboardinput.cpp index 1c502bb1a..5ecba9962 100644 --- a/src/input/qkeyboardinput.cpp +++ b/src/input/qkeyboardinput.cpp @@ -41,7 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DInput { /*! \class Qt3D::QKeyboardInputPrivate @@ -152,7 +154,7 @@ const QByteArray keyToSignal(int key) return keySignal; } -void QKeyboardInput::sceneChangeEvent(const QSceneChangePtr &change) +void QKeyboardInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) { QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); if (e->type() == NodeUpdated) { @@ -174,7 +176,7 @@ void QKeyboardInput::keyEvent(Q3DKeyEvent *event) QByteArray keySignal = keyToSignal(event->key()); if (!keySignal.isEmpty()) { - keySignal += "(Qt3D::Q3DKeyEvent*)"; + keySignal += "(Qt3DInput::Q3DKeyEvent*)"; // TO DO: Finding if the signal is connected to anything before doing the invocation // could be an improvement // That's what QQ2 does but since it accesses QML private classes to do so, that may not be @@ -406,6 +408,6 @@ void QKeyboardInput::setFocus(bool focus) qmlsignal Qt3D.Input::KeyboardInput::released(KeyEvent event) */ -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/qkeyboardinput.h b/src/input/qkeyboardinput.h index 683a4c38b..629aac2a9 100644 --- a/src/input/qkeyboardinput.h +++ b/src/input/qkeyboardinput.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_QKEYBOARDINPUT_H -#define QT3D_INPUT_QKEYBOARDINPUT_H +#ifndef QT3DINPUT_INPUT_QKEYBOARDINPUT_H +#define QT3DINPUT_INPUT_QKEYBOARDINPUT_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/q3dkeyevent.h> @@ -43,15 +43,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QKeyboardController; class QKeyboardInputPrivate; -class QT3DINPUTSHARED_EXPORT QKeyboardInput : public QComponent +class QT3DINPUTSHARED_EXPORT QKeyboardInput : public Qt3D::QComponent { Q_OBJECT - Q_PROPERTY(Qt3D::QKeyboardController *controller READ controller WRITE setController NOTIFY controllerChanged) + Q_PROPERTY(Qt3DInput::QKeyboardController *controller READ controller WRITE setController NOTIFY controllerChanged) Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged) public: explicit QKeyboardInput(QNode *parent = 0); @@ -66,54 +66,54 @@ Q_SIGNALS: void controllerChanged(); void focusChanged(); - void digit0Pressed(Qt3D::Q3DKeyEvent *event); - void digit1Pressed(Qt3D::Q3DKeyEvent *event); - void digit2Pressed(Qt3D::Q3DKeyEvent *event); - void digit3Pressed(Qt3D::Q3DKeyEvent *event); - void digit4Pressed(Qt3D::Q3DKeyEvent *event); - void digit5Pressed(Qt3D::Q3DKeyEvent *event); - void digit6Pressed(Qt3D::Q3DKeyEvent *event); - void digit7Pressed(Qt3D::Q3DKeyEvent *event); - void digit8Pressed(Qt3D::Q3DKeyEvent *event); - void digit9Pressed(Qt3D::Q3DKeyEvent *event); - - void leftPressed(Qt3D::Q3DKeyEvent *event); - void rightPressed(Qt3D::Q3DKeyEvent *event); - void upPressed(Qt3D::Q3DKeyEvent *event); - void downPressed(Qt3D::Q3DKeyEvent *event); - void tabPressed(Qt3D::Q3DKeyEvent *event); - void backtabPressed(Qt3D::Q3DKeyEvent *event); - - void asteriskPressed(Qt3D::Q3DKeyEvent *event); - void numberSignPressed(Qt3D::Q3DKeyEvent *event); - void escapePressed(Qt3D::Q3DKeyEvent *event); - void returnPressed(Qt3D::Q3DKeyEvent *event); - void enterPressed(Qt3D::Q3DKeyEvent *event); - void deletePressed(Qt3D::Q3DKeyEvent *event); - void spacePressed(Qt3D::Q3DKeyEvent *event); - void backPressed(Qt3D::Q3DKeyEvent *event); - void cancelPressed(Qt3D::Q3DKeyEvent *event); - void selectPressed(Qt3D::Q3DKeyEvent *event); - void yesPressed(Qt3D::Q3DKeyEvent *event); - void noPressed(Qt3D::Q3DKeyEvent *event); - void context1Pressed(Qt3D::Q3DKeyEvent *event); - void context2Pressed(Qt3D::Q3DKeyEvent *event); - void context3Pressed(Qt3D::Q3DKeyEvent *event); - void context4Pressed(Qt3D::Q3DKeyEvent *event); - void callPressed(Qt3D::Q3DKeyEvent *event); - void hangupPressed(Qt3D::Q3DKeyEvent *event); - void flipPressed(Qt3D::Q3DKeyEvent *event); - void menuPressed(Qt3D::Q3DKeyEvent *event); - void volumeUpPressed(Qt3D::Q3DKeyEvent *event); - void volumeDownPressed(Qt3D::Q3DKeyEvent *event); - - void pressed(Qt3D::Q3DKeyEvent *event); - void released(Qt3D::Q3DKeyEvent *event); + void digit0Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit1Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit2Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit3Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit4Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit5Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit6Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit7Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit8Pressed(Qt3DInput::Q3DKeyEvent *event); + void digit9Pressed(Qt3DInput::Q3DKeyEvent *event); + + void leftPressed(Qt3DInput::Q3DKeyEvent *event); + void rightPressed(Qt3DInput::Q3DKeyEvent *event); + void upPressed(Qt3DInput::Q3DKeyEvent *event); + void downPressed(Qt3DInput::Q3DKeyEvent *event); + void tabPressed(Qt3DInput::Q3DKeyEvent *event); + void backtabPressed(Qt3DInput::Q3DKeyEvent *event); + + void asteriskPressed(Qt3DInput::Q3DKeyEvent *event); + void numberSignPressed(Qt3DInput::Q3DKeyEvent *event); + void escapePressed(Qt3DInput::Q3DKeyEvent *event); + void returnPressed(Qt3DInput::Q3DKeyEvent *event); + void enterPressed(Qt3DInput::Q3DKeyEvent *event); + void deletePressed(Qt3DInput::Q3DKeyEvent *event); + void spacePressed(Qt3DInput::Q3DKeyEvent *event); + void backPressed(Qt3DInput::Q3DKeyEvent *event); + void cancelPressed(Qt3DInput::Q3DKeyEvent *event); + void selectPressed(Qt3DInput::Q3DKeyEvent *event); + void yesPressed(Qt3DInput::Q3DKeyEvent *event); + void noPressed(Qt3DInput::Q3DKeyEvent *event); + void context1Pressed(Qt3DInput::Q3DKeyEvent *event); + void context2Pressed(Qt3DInput::Q3DKeyEvent *event); + void context3Pressed(Qt3DInput::Q3DKeyEvent *event); + void context4Pressed(Qt3DInput::Q3DKeyEvent *event); + void callPressed(Qt3DInput::Q3DKeyEvent *event); + void hangupPressed(Qt3DInput::Q3DKeyEvent *event); + void flipPressed(Qt3DInput::Q3DKeyEvent *event); + void menuPressed(Qt3DInput::Q3DKeyEvent *event); + void volumeUpPressed(Qt3DInput::Q3DKeyEvent *event); + void volumeDownPressed(Qt3DInput::Q3DKeyEvent *event); + + void pressed(Qt3DInput::Q3DKeyEvent *event); + void released(Qt3DInput::Q3DKeyEvent *event); protected: QKeyboardInput(QKeyboardInputPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; void keyEvent(Q3DKeyEvent *event); private: @@ -121,8 +121,8 @@ private: QT3D_CLONEABLE(QKeyboardInput) }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_QKEYBOARDINPUT_H +#endif // QT3DINPUT_INPUT_QKEYBOARDINPUT_H diff --git a/src/input/qkeyboardinput_p.h b/src/input/qkeyboardinput_p.h index 3f5a7edee..7fed9e12b 100644 --- a/src/input/qkeyboardinput_p.h +++ b/src/input/qkeyboardinput_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_INPUT_QKEYBOARDINPUT_P_H -#define QT3D_INPUT_QKEYBOARDINPUT_P_H +#ifndef QT3DINPUT_INPUT_QKEYBOARDINPUT_P_H +#define QT3DINPUT_INPUT_QKEYBOARDINPUT_P_H #include <private/qcomponent_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QKeyboardInput; class QKeyboardController; -class QKeyboardInputPrivate : public QComponentPrivate +class QKeyboardInputPrivate : public Qt3D::QComponentPrivate { public: QKeyboardInputPrivate(); @@ -56,8 +56,8 @@ public: bool m_focus; }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_INPUT_QKEYBOARDINPUT_P_H +#endif // QT3DINPUT_INPUT_QKEYBOARDINPUT_P_H diff --git a/src/input/qmousecontroller.cpp b/src/input/qmousecontroller.cpp index 7c2fd38ce..90590e214 100644 --- a/src/input/qmousecontroller.cpp +++ b/src/input/qmousecontroller.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { QMouseControllerPrivate::QMouseControllerPrivate() : QNodePrivate() @@ -80,12 +80,12 @@ QMouseController::~QMouseController() QNode::cleanup(); } -void QMouseController::sceneChangeEvent(const QSceneChangePtr &change) +void QMouseController::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) { Q_UNUSED(change); // TODO: To be completed as the mouse input aspect takes shape } -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/qmousecontroller.h b/src/input/qmousecontroller.h index 4d0e3ef04..67af9a8e9 100644 --- a/src/input/qmousecontroller.h +++ b/src/input/qmousecontroller.h @@ -34,41 +34,41 @@ ** ****************************************************************************/ -#ifndef QT3D_QMOUSECONTROLLER_H -#define QT3D_QMOUSECONTROLLER_H +#ifndef QT3DINPUT_QMOUSECONTROLLER_H +#define QT3DINPUT_QMOUSECONTROLLER_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QMouseControllerPrivate; class QMouseInput; -class QT3DINPUTSHARED_EXPORT QMouseController : public QNode +class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3D::QNode { Q_OBJECT public: - explicit QMouseController(QNode *parent = 0); + explicit QMouseController(Qt3D::QNode *parent = 0); protected: - QMouseController(QMouseControllerPrivate &dd, QNode *parent = 0); + QMouseController(QMouseControllerPrivate &dd, Qt3D::QNode *parent = 0); ~QMouseController(); - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QMouseController) QT3D_CLONEABLE(QMouseController) }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QMouseController*) +Q_DECLARE_METATYPE(Qt3DInput::QMouseController*) -#endif // QT3D_QMOUSECONTROLLER_H +#endif // QT3DINPUT_QMOUSECONTROLLER_H diff --git a/src/input/qmousecontroller_p.h b/src/input/qmousecontroller_p.h index 7c00ef566..1b47f4a17 100644 --- a/src/input/qmousecontroller_p.h +++ b/src/input/qmousecontroller_p.h @@ -34,18 +34,18 @@ ** ****************************************************************************/ -#ifndef QT3D_QMOUSECONTROLLER_P_H -#define QT3D_QMOUSECONTROLLER_P_H +#ifndef QT3DINPUT_QMOUSECONTROLLER_P_H +#define QT3DINPUT_QMOUSECONTROLLER_P_H #include <private/qnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QMouseController; -class QMouseControllerPrivate : public QNodePrivate +class QMouseControllerPrivate : public Qt3D::QNodePrivate { public: QMouseControllerPrivate(); @@ -53,9 +53,9 @@ public: Q_DECLARE_PUBLIC(QMouseController) }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_QMOUSECONTROLLER_P_H +#endif // QT3DINPUT_QMOUSECONTROLLER_P_H diff --git a/src/input/qmouseinput.cpp b/src/input/qmouseinput.cpp index ab6e259a7..3f3f6dcca 100644 --- a/src/input/qmouseinput.cpp +++ b/src/input/qmouseinput.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DInput { QMouseInputPrivate::QMouseInputPrivate() : QComponentPrivate() @@ -139,7 +141,7 @@ void QMouseInput::copy(const QNode *ref) d->m_controller = static_cast<QMouseController *>(QNode::clone(refInput->controller())); } -void QMouseInput::sceneChangeEvent(const QSceneChangePtr &change) +void QMouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &change) { QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); if (e->type() == NodeUpdated) { @@ -188,6 +190,6 @@ void QMouseInput::setContainsMouse(bool contains) } } -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE diff --git a/src/input/qmouseinput.h b/src/input/qmouseinput.h index 83eab1525..949b824e8 100644 --- a/src/input/qmouseinput.h +++ b/src/input/qmouseinput.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QMOUSEINPUT_H -#define QT3D_QMOUSEINPUT_H +#ifndef QT3DINPUT_QMOUSEINPUT_H +#define QT3DINPUT_QMOUSEINPUT_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/q3dmouseevent.h> @@ -43,15 +43,15 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QMouseController; class QMouseInputPrivate; -class QT3DINPUTSHARED_EXPORT QMouseInput : public QComponent +class QT3DINPUTSHARED_EXPORT QMouseInput : public Qt3D::QComponent { Q_OBJECT - Q_PROPERTY(Qt3D::QMouseController *controller READ controller WRITE setController NOTIFY controllerChanged) + Q_PROPERTY(Qt3DInput::QMouseController *controller READ controller WRITE setController NOTIFY controllerChanged) Q_PROPERTY(bool containsMouse READ containsMouse NOTIFY containsMouseChanged) public: @@ -67,23 +67,23 @@ Q_SIGNALS: void controllerChanged(); void containsMouseChanged(); - void clicked(Qt3D::Q3DMouseEvent *mouse); - void doubleClicked(Qt3D::Q3DMouseEvent *mouse); + void clicked(Qt3DInput::Q3DMouseEvent *mouse); + void doubleClicked(Qt3DInput::Q3DMouseEvent *mouse); void entered(); void exited(); - void pressed(Qt3D::Q3DMouseEvent *mouse); - void released(Qt3D::Q3DMouseEvent *mouse); - void pressAndHold(Qt3D::Q3DMouseEvent *mouse); - void positionChanged(Qt3D::Q3DMouseEvent *mouse); + void pressed(Qt3DInput::Q3DMouseEvent *mouse); + void released(Qt3DInput::Q3DMouseEvent *mouse); + void pressAndHold(Qt3DInput::Q3DMouseEvent *mouse); + void positionChanged(Qt3DInput::Q3DMouseEvent *mouse); - void wheel(Qt3D::Q3DWheelEvent *wheel); + void wheel(Qt3DInput::Q3DWheelEvent *wheel); protected: - QMouseInput(QMouseInputPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE; + QMouseInput(QMouseInputPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE; void mouseEvent(Q3DMouseEvent *event); void setContainsMouse(bool contains); @@ -92,8 +92,8 @@ private: QT3D_CLONEABLE(QMouseInput) }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_QMOUSEINPUT_H +#endif // QT3DINPUT_QMOUSEINPUT_H diff --git a/src/input/qmouseinput_p.h b/src/input/qmouseinput_p.h index 981223b34..cd7028e76 100644 --- a/src/input/qmouseinput_p.h +++ b/src/input/qmouseinput_p.h @@ -34,19 +34,19 @@ ** ****************************************************************************/ -#ifndef QT3D_QMOUSEINPUT_P_H -#define QT3D_QMOUSEINPUT_P_H +#ifndef QT3DINPUT_QMOUSEINPUT_P_H +#define QT3DINPUT_QMOUSEINPUT_P_H #include <private/qcomponent_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DInput { class QMouseInput; class QMouseController; -class QMouseInputPrivate : public QComponentPrivate +class QMouseInputPrivate : public Qt3D::QComponentPrivate { public: QMouseInputPrivate(); @@ -57,9 +57,9 @@ public: Q_DECLARE_PUBLIC(QMouseInput) }; -} // Qt3D +} // namespace Qt3DInput QT_END_NAMESPACE -#endif // QT3D_QMOUSEINPUT_P_H +#endif // QT3DINPUT_QMOUSEINPUT_P_H diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index 537e27f7b..aa3b2710e 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) { - qmlRegisterUncreatableType<Qt3D::Q3DKeyEvent>(uri, 2, 0, "KeyEvent", QStringLiteral("Events cannot be created")); - qmlRegisterType<Qt3D::QKeyboardController>(uri, 2, 0, "KeyboardController"); - qmlRegisterType<Qt3D::QKeyboardInput>(uri, 2, 0, "KeyboardInput"); + qmlRegisterUncreatableType<Qt3DInput::Q3DKeyEvent>(uri, 2, 0, "KeyEvent", QStringLiteral("Events cannot be created")); + qmlRegisterType<Qt3DInput::QKeyboardController>(uri, 2, 0, "KeyboardController"); + qmlRegisterType<Qt3DInput::QKeyboardInput>(uri, 2, 0, "KeyboardInput"); - qmlRegisterUncreatableType<Qt3D::Q3DMouseEvent>(uri, 2, 0, "MouseEvent", QStringLiteral("Events cannot be created")); - qmlRegisterUncreatableType<Qt3D::Q3DWheelEvent>(uri, 2, 0, "WheelEvent", QStringLiteral("Events cannot be created")); - qmlRegisterType<Qt3D::QMouseInput>(uri, 2, 0, "MouseInput"); - qmlRegisterType<Qt3D::QMouseController>(uri, 2, 0, "MouseController"); + qmlRegisterUncreatableType<Qt3DInput::Q3DMouseEvent>(uri, 2, 0, "MouseEvent", QStringLiteral("Events cannot be created")); + qmlRegisterUncreatableType<Qt3DInput::Q3DWheelEvent>(uri, 2, 0, "WheelEvent", QStringLiteral("Events cannot be created")); + qmlRegisterType<Qt3DInput::QMouseInput>(uri, 2, 0, "MouseInput"); + qmlRegisterType<Qt3DInput::QMouseController>(uri, 2, 0, "MouseController"); } QT_END_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 79aa2b4e5..72506c8aa 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -508,7 +508,7 @@ void Scene3DItem::setAspects(const QStringList &aspects) if (aspect == QStringLiteral("render")) // This one is hardwired anyway continue; if (aspect == QStringLiteral("input")) { - m_aspectEngine->registerAspect(new Qt3D::QInputAspect); + m_aspectEngine->registerAspect(new Qt3DInput::QInputAspect); continue; } |