Move defaults and geometries out of Qt3DRender and into Qt3DExtras

QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.

Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

5 files changed, 21 insertions, 19 deletions

diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro
index 71fffe2e7..6126c1580 100644
--- a/src/plugins/sceneparsers/assimp/assimp.pro
+++ b/src/plugins/sceneparsers/assimp/assimp.pro
@@ -1,6 +1,6 @@
 TARGET = assimpsceneparser
 
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
 
 include(../../../3rdparty/assimp/assimp_dependency.pri)
 
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 33e1f9c1f..f21221883 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -49,9 +49,9 @@
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qtexture.h>
-#include <Qt3DRender/qdiffusemapmaterial.h>
-#include <Qt3DRender/qdiffusespecularmapmaterial.h>
-#include <Qt3DRender/qphongmaterial.h>
+#include <Qt3DExtras/qdiffusemapmaterial.h>
+#include <Qt3DExtras/qdiffusespecularmapmaterial.h>
+#include <Qt3DExtras/qphongmaterial.h>
 #include <QFileInfo>
 #include <QColor>
 #include <qmath.h>
@@ -63,6 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt3DCore;
+using namespace Qt3DExtras;
 
 namespace Qt3DRender {
 
@@ -529,8 +530,8 @@ void AssimpParser::loadMesh(uint meshIndex)
 
     QGeometryRenderer *geometryRenderer = new QGeometryRenderer();
     QGeometry *meshGeometry = new QGeometry(geometryRenderer);
-    QBuffer *vertexBuffer = new QBuffer(QBuffer::VertexBuffer, meshGeometry);
-    QBuffer *indexBuffer = new QBuffer(QBuffer::IndexBuffer, meshGeometry);
+    Qt3DRender::QBuffer *vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, meshGeometry);
+    Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, meshGeometry);
 
     geometryRenderer->setGeometry(meshGeometry);
 
diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro
index 675d127da..bc65c3426 100644
--- a/src/plugins/sceneparsers/gltf/gltf.pro
+++ b/src/plugins/sceneparsers/gltf/gltf.pro
@@ -1,6 +1,6 @@
 TARGET = gltfsceneparser
 
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
 
 HEADERS += \
     gltfparser.h
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index ca61debfc..b1a5ffb00 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -74,15 +74,16 @@
 #include <Qt3DRender/QTechnique>
 #include <Qt3DRender/QTexture>
 
-#include <Qt3DRender/QPhongMaterial>
-#include <Qt3DRender/QDiffuseMapMaterial>
-#include <Qt3DRender/QDiffuseSpecularMapMaterial>
-#include <Qt3DRender/QNormalDiffuseMapMaterial>
-#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial>
+#include <Qt3DExtras/QPhongMaterial>
+#include <Qt3DExtras/QDiffuseMapMaterial>
+#include <Qt3DExtras/QDiffuseSpecularMapMaterial>
+#include <Qt3DExtras/QNormalDiffuseMapMaterial>
+#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial>
 
 QT_BEGIN_NAMESPACE
 
 using namespace Qt3DCore;
+using namespace Qt3DExtras;
 
 namespace Qt3DRender {
 
@@ -872,11 +873,11 @@ void GLTFParser::processJSONBufferView(const QString &id, const QJsonObject& jso
     }
 
     int target = json.value(KEY_TARGET).toInt();
-    QBuffer::BufferType ty(QBuffer::VertexBuffer);
+    Qt3DRender::QBuffer::BufferType ty(Qt3DRender::QBuffer::VertexBuffer);
 
     switch (target) {
-    case GL_ARRAY_BUFFER:           ty = QBuffer::VertexBuffer; break;
-    case GL_ELEMENT_ARRAY_BUFFER:   ty = QBuffer::IndexBuffer; break;
+    case GL_ARRAY_BUFFER:           ty = Qt3DRender::QBuffer::VertexBuffer; break;
+    case GL_ELEMENT_ARRAY_BUFFER:   ty = Qt3DRender::QBuffer::IndexBuffer; break;
     default:
         qCWarning(GLTFParserLog) << Q_FUNC_INFO << "buffer" << id << "unsupported target:" << target;
         return;
@@ -896,7 +897,7 @@ void GLTFParser::processJSONBufferView(const QString &id, const QJsonObject& jso
                                  << "for view" << id;
     }
 
-    QBuffer *b(new QBuffer(ty));
+    Qt3DRender::QBuffer *b(new Qt3DRender::QBuffer(ty));
     b->setData(bytes);
     m_buffers[id] = b;
 }
@@ -1091,7 +1092,7 @@ void GLTFParser::processJSONMesh(const QString &id, const QJsonObject &json)
                 attributeName = attrName;
 
             //Get buffer handle for accessor
-            QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR);
+            Qt3DRender::QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR);
             if (buffer == Q_NULLPTR) {
                 qCWarning(GLTFParserLog) << "unknown buffer-view:" << m_accessorDict[k].bufferViewName << "processing accessor:" << id;
                 continue;
@@ -1114,7 +1115,7 @@ void GLTFParser::processJSONMesh(const QString &id, const QJsonObject &json)
                 qCWarning(GLTFParserLog) << "unknown index accessor:" << k << "on mesh" << id;
             } else {
                 //Get buffer handle for accessor
-                QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR);
+                Qt3DRender::QBuffer *buffer = m_buffers.value(m_accessorDict[k].bufferViewName, Q_NULLPTR);
                 if (buffer == Q_NULLPTR) {
                     qCWarning(GLTFParserLog) << "unknown buffer-view:" << m_accessorDict[k].bufferViewName << "processing accessor:" << id;
                     continue;
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.h b/src/plugins/sceneparsers/gltf/gltfparser.h
index e21bed8de..b878cc3d8 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser.h
@@ -193,7 +193,7 @@ private:
     QMap<QString, QMaterial*> m_materialCache;
 
     QMap<QString, BufferData> m_bufferDatas;
-    QMap<QString, QBuffer*> m_buffers;
+    QMap<QString, Qt3DRender::QBuffer*> m_buffers;
 
     QMap<QString, QString> m_shaderPaths;
     QMap<QString, QShaderProgram*> m_programs;