From 17706144e9dc6c2dfde580b7821f18c5f6924682 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Wed, 22 Jan 2020 21:35:32 +0000
Subject: Geometry refactoring

Move QBuffer, QAttribute, QGeometry to Qt3DCore.

Change-Id: I59dfd091eefadcada93350b3aba955f40b304385
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp     | 12 ++++++++++++
 src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/quick3d/imports')

diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 75fa7b2da..a15629b68 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -44,6 +44,9 @@
 #include <Qt3DCore/qskeletonloader.h>
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qjoint.h>
+#include <Qt3DCore/qattribute.h>
+#include <Qt3DCore/qbuffer.h>
+#include <Qt3DCore/qgeometry.h>
 #include <QtCore/qvariantanimation.h>
 
 #include <Qt3DQuick/private/quick3dnodev9_p.h>
@@ -53,6 +56,8 @@
 #include <Qt3DQuick/private/quick3djoint_p.h>
 #include <Qt3DQuick/private/qquaternionanimation_p.h>
 #include <Qt3DQuick/private/qt3dquick_global_p.h>
+#include <Qt3DQuick/private/quick3dbuffer_p.h>
+#include <Qt3DQuick/private/quick3dgeometry_p.h>
 
 #include <QtQml/qqml.h>
 
@@ -73,6 +78,13 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DCore::QArmature>(uri, 2, 10, "Armature");
     qmlRegisterUncreatableType<Qt3DCore::QAbstractSkeleton>(uri, 2, 10, "AbstractSkeleton", QStringLiteral("AbstractSkeleton is an abstract base class"));
     qmlRegisterType<Qt3DCore::QSkeletonLoader>(uri, 2, 10, "SkeletonLoader");
+    qmlRegisterType<Qt3DCore::QAttribute>(uri, 2, 0, "Attribute");
+    qmlRegisterType<Qt3DCore::QAttribute, 10>(uri, 2, 10, "Attribute");
+    qmlRegisterType<Qt3DCore::QAttribute, 11>(uri, 2, 11, "Attribute");
+    qmlRegisterUncreatableType<Qt3DCore::QBuffer>(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
+    qmlRegisterUncreatableType<Qt3DCore::QBuffer, 9>(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
+    qmlRegisterType<Qt3DCore::Quick::Quick3DBuffer>(uri, 2, 0, "Buffer");
+    Qt3DCore::Quick::registerExtendedType<Qt3DCore::QGeometry, Qt3DCore::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Core/Geometry", uri, 2, 0, "Geometry");
 
     qmlRegisterType<Qt3DCore::Quick::QQuaternionAnimation>(uri, 2, 0, "QuaternionAnimation");
     qRegisterAnimationInterpolator<QQuaternion>(Qt3DCore::Quick::q_quaternionInterpolator);
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index e42be550d..9992ace97 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -42,10 +42,8 @@
 #include <Qt3DRender/qabstractlight.h>
 #include <Qt3DRender/qalphacoverage.h>
 #include <Qt3DRender/qalphatest.h>
-#include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qblendequation.h>
 #include <Qt3DRender/qblendequationarguments.h>
-#include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbuffercapture.h>
 #include <Qt3DRender/qcamera.h>
 #include <Qt3DRender/qcameralens.h>
@@ -65,7 +63,6 @@
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qfrontface.h>
 #include <Qt3DRender/qfrustumculling.h>
-#include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qgeometryrenderer.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qlayer.h>
@@ -125,9 +122,7 @@
 
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DQuickRender/private/quick3dbuffer_p.h>
 #include <Qt3DQuickRender/private/quick3deffect_p.h>
-#include <Qt3DQuickRender/private/quick3dgeometry_p.h>
 #include <Qt3DQuickRender/private/quick3dlayerfilter_p.h>
 #include <Qt3DQuickRender/private/quick3dmaterial_p.h>
 #include <Qt3DQuickRender/private/quick3dmemorybarrier_p.h>
@@ -223,13 +218,6 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DRender::QShaderImage>(uri, 2, 14, "ShaderImage");
 
     // Geometry
-    qmlRegisterType<Qt3DRender::QAttribute>(uri, 2, 0, "Attribute");
-    qmlRegisterType<Qt3DRender::QAttribute, 10>(uri, 2, 10, "Attribute");
-    qmlRegisterType<Qt3DRender::QAttribute, 11>(uri, 2, 11, "Attribute");
-    qmlRegisterUncreatableType<Qt3DRender::QBuffer>(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
-    qmlRegisterUncreatableType<Qt3DRender::QBuffer, 9>(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
-    qmlRegisterType<Qt3DRender::Render::Quick::Quick3DBuffer>(uri, 2, 0, "Buffer");
-    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QGeometry, Qt3DRender::Render::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Render/Geometry", uri, 2, 0, "Geometry");
     qmlRegisterType<Qt3DRender::QGeometryRenderer>(uri, 2, 0, "GeometryRenderer");
     qmlRegisterType<Qt3DRender::QLevelOfDetail>(uri, 2, 9, "LevelOfDetail");
     qmlRegisterType<Qt3DRender::QLevelOfDetailSwitch>(uri, 2, 9, "LevelOfDetailSwitch");
-- 
cgit v1.2.3