Move geometry related classes to their own directory

Change-Id: I74fdfceeeca4801c51fba3586404d5b5dab771b4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

38 files changed, 42 insertions, 37 deletions

diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 08d107d61..f1811b02b 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -24,19 +24,12 @@ HEADERS += \
     $$PWD/platformsurfacefilter_p.h \
     $$PWD/shaderdata_p.h \
     $$PWD/vsyncframeadvanceservice_p.h \
-    $$PWD/buffer_p.h \
-    $$PWD/buffermanager_p.h \
-    $$PWD/geometryrenderermanager_p.h \
     $$PWD/qraycastingservice.h \
     $$PWD/qraycastingservice_p.h \
     $$PWD/annotation_p.h \
-    $$PWD/attribute_p.h \
-    $$PWD/buffer_p.h \
     $$PWD/cameralens_p.h \
     $$PWD/effect_p.h \
     $$PWD/entity_p.h \
-    $$PWD/geometry_p.h \
-    $$PWD/geometryrenderer_p.h \
     $$PWD/layer_p.h \
     $$PWD/material_p.h \
     $$PWD/nodefunctor_p.h \
@@ -66,18 +59,12 @@ SOURCES += \
     $$PWD/scenemanager.cpp \
     $$PWD/attachmentpack.cpp \
     $$PWD/platformsurfacefilter.cpp \
-    $$PWD/buffermanager.cpp \
-    $$PWD/geometryrenderermanager.cpp \
     $$PWD/qraycastingservice.cpp \
     $$PWD/vsyncframeadvanceservice.cpp \
     $$PWD/annotation.cpp \
-    $$PWD/attribute.cpp \
-    $$PWD/buffer.cpp \
     $$PWD/cameralens.cpp \
     $$PWD/effect.cpp \
     $$PWD/entity.cpp \
-    $$PWD/geometry.cpp \
-    $$PWD/geometryrenderer.cpp \
     $$PWD/layer.cpp \
     $$PWD/material.cpp \
     $$PWD/parameter.cpp \
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 56d7de7d0..391952602 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -6,7 +6,6 @@ HEADERS += \
     $$PWD/qrenderaspect.h \
     $$PWD/qrenderaspect_p.h \
     $$PWD/qmaterial.h \
-    $$PWD/qmesh.h \
     $$PWD/qrenderpass.h \
     $$PWD/qshaderprogram.h \
     $$PWD/qshaderprogram_p.h \
@@ -19,10 +18,6 @@ HEADERS += \
     $$PWD/qsceneloader.h \
     $$PWD/qparameter.h \
     $$PWD/qparameter_p.h \
-    $$PWD/qcylindermesh.h \
-    $$PWD/qtorusmesh.h \
-    $$PWD/qspheremesh.h \
-    $$PWD/qmesh_p.h \
     $$PWD/qabstractlight.h \
     $$PWD/qpointlight.h \
     $$PWD/qspotlight.h \
@@ -39,8 +34,6 @@ HEADERS += \
     $$PWD/qlayer.h \
     $$PWD/qlayer_p.h \
     $$PWD/qopenglfilter.h \
-    $$PWD/qplanemesh.h \
-    $$PWD/qcuboidmesh.h \
     $$PWD/qrenderattachment.h \
     $$PWD/qrenderattachment_p.h \
     $$PWD/qrendertarget.h \
@@ -58,19 +51,12 @@ HEADERS += \
     $$PWD/qabstracttextureimage_p.h \
     $$PWD/qtextureimage.h \
     $$PWD/qtextureproviders.h \
-    $$PWD/qgeometryrenderer.h \
-    $$PWD/qgeometry.h \
-    $$PWD/qgeometryrenderer_p.h \
     $$PWD/qwindow.h \
-    $$PWD/qwindow_p.h \
-    $$PWD/qcylindergeometry.h \
-    $$PWD/qcylindergeometry_p.h \
-    $$PWD/qgeometry_p.h
+    $$PWD/qwindow_p.h
 
 SOURCES += \
     $$PWD/qrenderaspect.cpp \
     $$PWD/qmaterial.cpp \
-    $$PWD/qmesh.cpp \
     $$PWD/qrenderpass.cpp \
     $$PWD/qshaderprogram.cpp \
     $$PWD/qtechnique.cpp \
@@ -80,17 +66,12 @@ SOURCES += \
     $$PWD/qeffect.cpp \
     $$PWD/qsceneloader.cpp \
     $$PWD/qparameter.cpp \
-    $$PWD/qcylindermesh.cpp \
-    $$PWD/qtorusmesh.cpp \
-    $$PWD/qspheremesh.cpp \
     $$PWD/qabstractlight.cpp \
     $$PWD/qpointlight.cpp \
     $$PWD/qspotlight.cpp \
     $$PWD/qdirectionallight.cpp \
     $$PWD/qlayer.cpp \
     $$PWD/qopenglfilter.cpp \
-    $$PWD/qplanemesh.cpp \
-    $$PWD/qcuboidmesh.cpp \
     $$PWD/qrenderattachment.cpp \
     $$PWD/qrendertarget.cpp \
     $$PWD/qannotation.cpp \
@@ -101,7 +82,4 @@ SOURCES += \
     $$PWD/qabstracttextureimage.cpp \
     $$PWD/qtextureimage.cpp \
     $$PWD/qtextureproviders.cpp \
-    $$PWD/qgeometryrenderer.cpp \
-    $$PWD/qgeometry.cpp \
-    $$PWD/qwindow.cpp \
-    $$PWD/qcylindergeometry.cpp
+    $$PWD/qwindow.cpp
diff --git a/src/render/backend/attribute.cpp b/src/render/geometry/attribute.cpp
index 00e1e577a..00e1e577a 100644
--- a/src/render/backend/attribute.cpp
+++ b/src/render/geometry/attribute.cpp
diff --git a/src/render/backend/attribute_p.h b/src/render/geometry/attribute_p.h
index 2600d85db..2600d85db 100644
--- a/src/render/backend/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
diff --git a/src/render/backend/buffer.cpp b/src/render/geometry/buffer.cpp
index 16ba51602..16ba51602 100644
--- a/src/render/backend/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
diff --git a/src/render/backend/buffer_p.h b/src/render/geometry/buffer_p.h
index ac42362b9..ac42362b9 100644
--- a/src/render/backend/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
diff --git a/src/render/backend/buffermanager.cpp b/src/render/geometry/buffermanager.cpp
index e8411fe02..e8411fe02 100644
--- a/src/render/backend/buffermanager.cpp
+++ b/src/render/geometry/buffermanager.cpp
diff --git a/src/render/backend/buffermanager_p.h b/src/render/geometry/buffermanager_p.h
index 44772bbec..44772bbec 100644
--- a/src/render/backend/buffermanager_p.h
+++ b/src/render/geometry/buffermanager_p.h
diff --git a/src/render/backend/geometry.cpp b/src/render/geometry/geometry.cpp
index 320d357e0..320d357e0 100644
--- a/src/render/backend/geometry.cpp
+++ b/src/render/geometry/geometry.cpp
diff --git a/src/render/geometry/geometry.pri b/src/render/geometry/geometry.pri
new file mode 100644
index 000000000..81155f086
--- /dev/null
+++ b/src/render/geometry/geometry.pri
@@ -0,0 +1,39 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/attribute_p.h \
+    $$PWD/buffer_p.h \
+    $$PWD/buffermanager_p.h \
+    $$PWD/geometry_p.h \
+    $$PWD/geometryrenderer_p.h \
+    $$PWD/geometryrenderermanager_p.h \
+    $$PWD/qcuboidmesh.h \
+    $$PWD/qcylindergeometry.h \
+    $$PWD/qcylindergeometry_p.h \
+    $$PWD/qcylindermesh.h \
+    $$PWD/qgeometry.h \
+    $$PWD/qgeometry_p.h \
+    $$PWD/qgeometryrenderer.h \
+    $$PWD/qgeometryrenderer_p.h \
+    $$PWD/qmesh_p.h \
+    $$PWD/qmesh.h \
+    $$PWD/qplanemesh.h \
+    $$PWD/qspheremesh.h \
+    $$PWD/qtorusmesh.h
+
+SOURCES += \
+    $$PWD/attribute.cpp \
+    $$PWD/buffer.cpp \
+    $$PWD/buffermanager.cpp \
+    $$PWD/geometry.cpp \
+    $$PWD/geometryrenderer.cpp \
+    $$PWD/geometryrenderermanager.cpp \
+    $$PWD/qcuboidmesh.cpp \
+    $$PWD/qcylindergeometry.cpp \
+    $$PWD/qcylindermesh.cpp \
+    $$PWD/qgeometry.cpp \
+    $$PWD/qgeometryrenderer.cpp \
+    $$PWD/qmesh.cpp \
+    $$PWD/qplanemesh.cpp \
+    $$PWD/qspheremesh.cpp \
+    $$PWD/qtorusmesh.cpp
diff --git a/src/render/backend/geometry_p.h b/src/render/geometry/geometry_p.h
index 2e91d944b..2e91d944b 100644
--- a/src/render/backend/geometry_p.h
+++ b/src/render/geometry/geometry_p.h
diff --git a/src/render/backend/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 583a23d34..583a23d34 100644
--- a/src/render/backend/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
diff --git a/src/render/backend/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 4982dbe7c..4982dbe7c 100644
--- a/src/render/backend/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
diff --git a/src/render/backend/geometryrenderermanager.cpp b/src/render/geometry/geometryrenderermanager.cpp
index 9acbfcd8f..9acbfcd8f 100644
--- a/src/render/backend/geometryrenderermanager.cpp
+++ b/src/render/geometry/geometryrenderermanager.cpp
diff --git a/src/render/backend/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h
index f989b1258..f989b1258 100644
--- a/src/render/backend/geometryrenderermanager_p.h
+++ b/src/render/geometry/geometryrenderermanager_p.h
diff --git a/src/render/frontend/qcuboidmesh.cpp b/src/render/geometry/qcuboidmesh.cpp
index 85435c893..85435c893 100644
--- a/src/render/frontend/qcuboidmesh.cpp
+++ b/src/render/geometry/qcuboidmesh.cpp
diff --git a/src/render/frontend/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h
index 293c948d0..293c948d0 100644
--- a/src/render/frontend/qcuboidmesh.h
+++ b/src/render/geometry/qcuboidmesh.h
diff --git a/src/render/frontend/qcylindergeometry.cpp b/src/render/geometry/qcylindergeometry.cpp
index a1fff8a5f..a1fff8a5f 100644
--- a/src/render/frontend/qcylindergeometry.cpp
+++ b/src/render/geometry/qcylindergeometry.cpp
diff --git a/src/render/frontend/qcylindergeometry.h b/src/render/geometry/qcylindergeometry.h
index 3f381c609..3f381c609 100644
--- a/src/render/frontend/qcylindergeometry.h
+++ b/src/render/geometry/qcylindergeometry.h
diff --git a/src/render/frontend/qcylindergeometry_p.h b/src/render/geometry/qcylindergeometry_p.h
index 4fea1b5ba..4fea1b5ba 100644
--- a/src/render/frontend/qcylindergeometry_p.h
+++ b/src/render/geometry/qcylindergeometry_p.h
diff --git a/src/render/frontend/qcylindermesh.cpp b/src/render/geometry/qcylindermesh.cpp
index 8d9783493..8d9783493 100644
--- a/src/render/frontend/qcylindermesh.cpp
+++ b/src/render/geometry/qcylindermesh.cpp
diff --git a/src/render/frontend/qcylindermesh.h b/src/render/geometry/qcylindermesh.h
index 648ebf2de..648ebf2de 100644
--- a/src/render/frontend/qcylindermesh.h
+++ b/src/render/geometry/qcylindermesh.h
diff --git a/src/render/frontend/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index e59e195a1..e59e195a1 100644
--- a/src/render/frontend/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
diff --git a/src/render/frontend/qgeometry.h b/src/render/geometry/qgeometry.h
index f8774aba6..f8774aba6 100644
--- a/src/render/frontend/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
diff --git a/src/render/frontend/qgeometry_p.h b/src/render/geometry/qgeometry_p.h
index 9f298585b..9f298585b 100644
--- a/src/render/frontend/qgeometry_p.h
+++ b/src/render/geometry/qgeometry_p.h
diff --git a/src/render/frontend/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 8ba50b1b1..8ba50b1b1 100644
--- a/src/render/frontend/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
diff --git a/src/render/frontend/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 5bf581111..5bf581111 100644
--- a/src/render/frontend/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
diff --git a/src/render/frontend/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h
index 5989382c5..5989382c5 100644
--- a/src/render/frontend/qgeometryrenderer_p.h
+++ b/src/render/geometry/qgeometryrenderer_p.h
diff --git a/src/render/frontend/qmesh.cpp b/src/render/geometry/qmesh.cpp
index e35ee1dd0..e35ee1dd0 100644
--- a/src/render/frontend/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
diff --git a/src/render/frontend/qmesh.h b/src/render/geometry/qmesh.h
index fd5b686f6..fd5b686f6 100644
--- a/src/render/frontend/qmesh.h
+++ b/src/render/geometry/qmesh.h
diff --git a/src/render/frontend/qmesh_p.h b/src/render/geometry/qmesh_p.h
index 0adadaa3f..0adadaa3f 100644
--- a/src/render/frontend/qmesh_p.h
+++ b/src/render/geometry/qmesh_p.h
diff --git a/src/render/frontend/qplanemesh.cpp b/src/render/geometry/qplanemesh.cpp
index 40a057a50..40a057a50 100644
--- a/src/render/frontend/qplanemesh.cpp
+++ b/src/render/geometry/qplanemesh.cpp
diff --git a/src/render/frontend/qplanemesh.h b/src/render/geometry/qplanemesh.h
index 70d9c8518..70d9c8518 100644
--- a/src/render/frontend/qplanemesh.h
+++ b/src/render/geometry/qplanemesh.h
diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/geometry/qspheremesh.cpp
index 6e5b6ce4f..6e5b6ce4f 100644
--- a/src/render/frontend/qspheremesh.cpp
+++ b/src/render/geometry/qspheremesh.cpp
diff --git a/src/render/frontend/qspheremesh.h b/src/render/geometry/qspheremesh.h
index e96ad94e8..e96ad94e8 100644
--- a/src/render/frontend/qspheremesh.h
+++ b/src/render/geometry/qspheremesh.h
diff --git a/src/render/frontend/qtorusmesh.cpp b/src/render/geometry/qtorusmesh.cpp
index fcd10b24e..fcd10b24e 100644
--- a/src/render/frontend/qtorusmesh.cpp
+++ b/src/render/geometry/qtorusmesh.cpp
diff --git a/src/render/frontend/qtorusmesh.h b/src/render/geometry/qtorusmesh.h
index b1cca55f9..b1cca55f9 100644
--- a/src/render/frontend/qtorusmesh.h
+++ b/src/render/geometry/qtorusmesh.h
diff --git a/src/render/render.pro b/src/render/render.pro
index c0479d343..6682ddb01 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -12,6 +12,7 @@ MODULE_PLUGIN_TYPES = \
 load(qt_module)
 
 include (backend/render-backend.pri)
+include (geometry/geometry.pri)
 include (graphicshelpers/graphicshelpers.pri)
 include (frontend/render-frontend.pri)
 include (renderstates/renderstates.pri)