QMesh geometry loading via plugin system

Ported ObjLoader to a plugin based system.

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

7 files changed, 226 insertions, 738 deletions

diff --git a/src/render/io/io.pri b/src/render/io/io.pri
index 6078b9718..aca983d4b 100644
--- a/src/render/io/io.pri
+++ b/src/render/io/io.pri
@@ -1,7 +1,6 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/objloader_p.h \
     $$PWD/qaxisalignedboundingbox_p.h \
     $$PWD/qsceneloader.h \
     $$PWD/qsceneloader_p.h \
@@ -14,10 +13,11 @@ HEADERS += \
     $$PWD/qsceneimportfactory_p.h \
     $$PWD/qsceneexportfactory_p.h \
     $$PWD/qsceneexporter_p.h \
-    $$PWD/qsceneexportplugin_p.h
+    $$PWD/qsceneexportplugin_p.h \
+    $$PWD/qgeometryloaderfactory_p.h \
+    $$PWD/qgeometryloaderinterface_p.h
 
 SOURCES += \
-    $$PWD/objloader.cpp \
     $$PWD/qaxisalignedboundingbox.cpp \
     $$PWD/qsceneloader.cpp \
     $$PWD/qurlhelper.cpp \
@@ -29,4 +29,5 @@ SOURCES += \
     $$PWD/qsceneimportfactory.cpp \
     $$PWD/qsceneexportfactory.cpp \
     $$PWD/qsceneexporter.cpp \
-    $$PWD/qsceneexportplugin.cpp
+    $$PWD/qsceneexportplugin.cpp \
+    $$PWD/qgeometryloaderfactory.cpp
diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
deleted file mode 100644
index fedb2a0ab..000000000
--- a/src/render/io/objloader.cpp
+++ /dev/null
@@ -1,574 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "objloader_p.h"
-
-#include "qmesh.h"
-#include "qbuffer.h"
-#include "qattribute.h"
-
-#include <private/qlocale_tools_p.h>
-#include <Qt3DRender/private/qaxisalignedboundingbox_p.h>
-
-#include <Qt3DRender/private/renderlogging_p.h>
-#include <QFile>
-#include <QTextStream>
-#include <QVector>
-#include <QRegExp>
-
-#include <Qt3DRender/qgeometry.h>
-#include <Qt3DRender/qattribute.h>
-#include <Qt3DRender/qbuffer.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-struct Entry
-{
-    int start;
-    int size;
-};
-QT3D_DECLARE_TYPEINFO(Qt3DRender, Entry, Q_PRIMITIVE_TYPE)
-
-/*
- * A helper class to split a QByteArray and access its sections without
- * additional memory allocations.
- */
-
-class ByteArraySplitter
-{
-public:
-    explicit ByteArraySplitter(const char *begin, const char *end, char delimiter, QString::SplitBehavior splitBehavior)
-        : m_input(begin)
-    {
-        int position = 0;
-        int lastPosition = 0;
-        for (auto it = begin; it != end; ++it) {
-            if (*it == delimiter) {
-                if (position > lastPosition || splitBehavior == QString::KeepEmptyParts) { // skip multiple consecutive delimiters
-                    const Entry entry = { lastPosition, position - lastPosition };
-                    m_entries.append(entry);
-                }
-                lastPosition = position + 1;
-            }
-
-            ++position;
-        }
-
-        const Entry entry = { lastPosition, position - lastPosition };
-        m_entries.append(entry);
-    }
-
-    int size() const
-    {
-        return m_entries.size();
-    }
-
-    const char* charPtrAt(int index) const
-    {
-        return m_input + m_entries[index].start;
-    }
-
-    float floatAt(int index) const
-    {
-        return qstrntod(m_input + m_entries[index].start, m_entries[index].size, nullptr, nullptr);
-    }
-
-    int intAt(int index) const
-    {
-        return strtol(m_input + m_entries[index].start, nullptr, 10);
-    }
-
-    QString stringAt(int index) const
-    {
-        return QString::fromLatin1(m_input + m_entries[index].start, m_entries[index].size);
-    }
-
-    ByteArraySplitter splitterAt(int index, char delimiter, QString::SplitBehavior splitBehavior) const
-    {
-        return ByteArraySplitter(m_input + m_entries[index].start, m_input + m_entries[index].start + m_entries[index].size, delimiter, splitBehavior);
-    }
-
-private:
-    QVarLengthArray<Entry, 16> m_entries;
-    const char *m_input;
-};
-
-inline uint qHash(const FaceIndices &faceIndices)
-{
-    return faceIndices.positionIndex
-            + 10 * faceIndices.texCoordIndex
-            + 100 * faceIndices.normalIndex;
-}
-
-ObjLoader::ObjLoader()
-    : m_loadTextureCoords( true ),
-      m_generateTangents( true ),
-      m_centerMesh( false )
-{
-}
-
-bool ObjLoader::load(const QString& fileName , const QString &subMesh)
-{
-    QFile file(fileName);
-    if (!file.open(::QIODevice::ReadOnly|::QIODevice::Text)) {
-        qCDebug(Render::Io) << "Could not open file" << fileName << "for reading";
-        return false;
-    }
-
-    return load(&file, subMesh);
-}
-
-static void addFaceVertex(const FaceIndices &faceIndices,
-                          QVector<FaceIndices> &faceIndexVector,
-                          QHash<FaceIndices, unsigned int> &faceIndexMap)
-{
-    if (faceIndices.positionIndex != std::numeric_limits<unsigned int>::max()) {
-        faceIndexVector.append(faceIndices);
-        if (!faceIndexMap.contains(faceIndices))
-            faceIndexMap.insert(faceIndices, faceIndexMap.size());
-    } else {
-        qCWarning(Render::Io) << "Missing position index";
-    }
-}
-
-bool ObjLoader::load(::QIODevice *ioDev, const QString &subMesh)
-{
-    Q_CHECK_PTR(ioDev);
-    if (!ioDev->isOpen()) {
-        qCWarning(Render::Io) << "iodevice" << ioDev << "not open for reading";
-        return false;
-    }
-
-    int faceCount = 0;
-
-    // Parse faces taking into account each vertex in a face can index different indices
-    // for the positions, normals and texture coords;
-    // Generate unique vertices (in OpenGL parlance) and output to m_points, m_texCoords,
-    // m_normals and calculate mapping from faces to unique indices
-    QVector<QVector3D> positions;
-    QVector<QVector3D> normals;
-    QVector<QVector2D> texCoords;
-    QHash<FaceIndices, unsigned int> faceIndexMap;
-    QVector<FaceIndices> faceIndexVector;
-
-    bool skipping = false;
-    int positionsOffset = 0;
-    int normalsOffset = 0;
-    int texCoordsOffset = 0;
-
-    QRegExp subMeshMatch(subMesh);
-    if (!subMeshMatch.isValid())
-        subMeshMatch.setPattern(QLatin1String("^(") + subMesh + QLatin1String(")$"));
-    Q_ASSERT(subMeshMatch.isValid());
-
-    char lineBuffer[1024];
-    const char *line;
-    QByteArray longLine;
-    while (!ioDev->atEnd()) {
-        // try to read into lineBuffer first, if the line fits (common case) we can do this without expensive allocations
-        // if not, fall back to dynamically allocated QByteArrays
-        auto lineSize = ioDev->readLine(lineBuffer, sizeof(lineBuffer));
-        if (lineSize == sizeof(lineBuffer) - 1 && lineBuffer[lineSize - 1] != '\n') {
-            longLine = QByteArray(lineBuffer, lineSize);
-            longLine += ioDev->readLine();
-            line = longLine.constData();
-            lineSize = longLine.size();
-        } else {
-            line = lineBuffer;
-        }
-
-        if (lineSize > 0 && line[0] != '#') {
-            if (line[lineSize - 1] == '\n')
-                --lineSize; // chop newline
-            while (lineSize > 0 && line[lineSize-1] == ' ')
-                --lineSize; // trim trailing whitespaces
-
-            const ByteArraySplitter tokens(line, line + lineSize, ' ', QString::SkipEmptyParts);
-
-            if (qstrncmp(tokens.charPtrAt(0), "v ", 2) == 0) {
-                if (tokens.size() < 4) {
-                    qCWarning(Render::Io) << "Unsupported number of components in vertex";
-                } else {
-                    if (!skipping) {
-                        float x = tokens.floatAt(1);
-                        float y = tokens.floatAt(2);
-                        float z = tokens.floatAt(3);
-                        positions.append(QVector3D( x, y, z ));
-                    } else {
-                        positionsOffset++;
-                    }
-                }
-            } else if (m_loadTextureCoords && qstrncmp(tokens.charPtrAt(0), "vt ", 3) == 0) {
-                if (tokens.size() < 3) {
-                    qCWarning(Render::Io) << "Unsupported number of components in texture coordinate";
-                } else {
-                    if (!skipping) {
-                        // Process texture coordinate
-                        float s = tokens.floatAt(1);
-                        float t = tokens.floatAt(2);
-                        texCoords.append(QVector2D( s, t ));
-                    } else {
-                        texCoordsOffset++;
-                    }
-                }
-            } else if (qstrncmp(tokens.charPtrAt(0), "vn ", 3) == 0) {
-                if (tokens.size() < 4) {
-                    qCWarning(Render::Io) << "Unsupported number of components in vertex normal";
-                } else {
-                    if (!skipping) {
-                        float x = tokens.floatAt(1);
-                        float y = tokens.floatAt(2);
-                        float z = tokens.floatAt(3);
-                        normals.append(QVector3D( x, y, z ));
-                    } else {
-                        normalsOffset++;
-                    }
-                }
-            } else if (!skipping && qstrncmp(tokens.charPtrAt(0), "f ", 2) == 0) {
-                // Process face
-                ++faceCount;
-
-                int faceVertices = tokens.size() - 1;
-
-                QVarLengthArray<FaceIndices, 4> face; // try to avoid allocations in the common case of triangulated data
-                face.reserve(faceVertices);
-
-                for (int i = 0; i < faceVertices; i++) {
-                    FaceIndices faceIndices;
-                    const ByteArraySplitter indices = tokens.splitterAt(i + 1, '/', QString::KeepEmptyParts);
-                    switch (indices.size()) {
-                    case 3:
-                        faceIndices.normalIndex = indices.intAt(2) - 1 - normalsOffset;  // fall through
-                    case 2:
-                        faceIndices.texCoordIndex = indices.intAt(1) - 1 - texCoordsOffset; // fall through
-                    case 1:
-                        faceIndices.positionIndex = indices.intAt(0) - 1 - positionsOffset;
-                        break;
-                    default:
-                        qCWarning(Render::Io) << "Unsupported number of indices in face element";
-                    }
-
-                    face.append(faceIndices);
-                }
-
-                // If number of edges in face is greater than 3,
-                // decompose into triangles as a triangle fan.
-                FaceIndices v0 = face[0];
-                FaceIndices v1 = face[1];
-                FaceIndices v2 = face[2];
-
-                // First face
-                addFaceVertex(v0, faceIndexVector, faceIndexMap);
-                addFaceVertex(v1, faceIndexVector, faceIndexMap);
-                addFaceVertex(v2, faceIndexVector, faceIndexMap);
-
-                for ( int i = 3; i < face.size(); ++i ) {
-                    v1 = v2;
-                    v2 = face[i];
-                    addFaceVertex(v0, faceIndexVector, faceIndexMap);
-                    addFaceVertex(v1, faceIndexVector, faceIndexMap);
-                    addFaceVertex(v2, faceIndexVector, faceIndexMap);
-                }
-
-                // end of face
-            } else if (qstrncmp(tokens.charPtrAt(0), "o ", 2) == 0) {
-                if (tokens.size() < 2) {
-                    qCWarning(Render::Io) << "Missing submesh name";
-                } else {
-                    if (!subMesh.isEmpty() ) {
-                        const QString objName = tokens.stringAt(1);
-                        skipping = subMeshMatch.indexIn(objName) < 0;
-                    }
-                }
-            }
-        } // empty input line
-    } // while (!ioDev->atEnd())
-
-    updateIndices(positions, normals, texCoords, faceIndexMap, faceIndexVector);
-
-    if (m_normals.isEmpty())
-        generateAveragedNormals(m_points, m_normals, m_indices);
-
-    if (m_generateTangents && !m_texCoords.isEmpty())
-        generateTangents(m_points, m_normals, m_indices, m_texCoords, m_tangents);
-
-    if (m_centerMesh)
-        center(m_points);
-
-    qCDebug(Render::Io) << "Loaded mesh:";
-    qCDebug(Render::Io) << " " << m_points.size() << "points";
-    qCDebug(Render::Io) << " " << faceCount << "faces";
-    qCDebug(Render::Io) << " " << m_indices.size() / 3 << "triangles.";
-    qCDebug(Render::Io) << " " << m_normals.size() << "normals";
-    qCDebug(Render::Io) << " " << m_tangents.size() << "tangents ";
-    qCDebug(Render::Io) << " " << m_texCoords.size() << "texture coordinates.";
-
-    return true;
-}
-
-QGeometry *ObjLoader::geometry() const
-{
-    QByteArray bufferBytes;
-    const int count = m_points.size();
-    const quint32 elementSize = 3 + (hasTextureCoordinates() ? 2 : 0)
-            + (hasNormals() ? 3 : 0)
-            + (hasTangents() ? 4 : 0);
-    const quint32 stride = elementSize * sizeof(float);
-    bufferBytes.resize(stride * count);
-    float* fptr = reinterpret_cast<float*>(bufferBytes.data());
-
-    for (int index = 0; index < count; ++index) {
-        *fptr++ = m_points.at(index).x();
-        *fptr++ = m_points.at(index).y();
-        *fptr++ = m_points.at(index).z();
-
-        if (hasTextureCoordinates()) {
-            *fptr++ = m_texCoords.at(index).x();
-            *fptr++ = m_texCoords.at(index).y();
-        }
-
-        if (hasNormals()) {
-            *fptr++ = m_normals.at(index).x();
-            *fptr++ = m_normals.at(index).y();
-            *fptr++ = m_normals.at(index).z();
-        }
-
-        if (hasTangents()) {
-            *fptr++ = m_tangents.at(index).x();
-            *fptr++ = m_tangents.at(index).y();
-            *fptr++ = m_tangents.at(index).z();
-            *fptr++ = m_tangents.at(index).w();
-        }
-    } // of buffer filling loop
-
-    QBuffer *buf(new QBuffer(QBuffer::VertexBuffer));
-    buf->setData(bufferBytes);
-
-    QGeometry *geometry = new QGeometry();
-    QAttribute *positionAttribute = new QAttribute(buf, QAttribute::defaultPositionAttributeName(), QAttribute::Float, 3, count, 0, stride);
-    geometry->addAttribute(positionAttribute);
-    quint32 offset = sizeof(float) * 3;
-
-    if (hasTextureCoordinates()) {
-        QAttribute *texCoordAttribute = new QAttribute(buf, QAttribute::defaultTextureCoordinateAttributeName(),  QAttribute::Float, 2, count, offset, stride);
-        geometry->addAttribute(texCoordAttribute);
-        offset += sizeof(float) * 2;
-    }
-
-    if (hasNormals()) {
-        QAttribute *normalAttribute = new QAttribute(buf, QAttribute::defaultNormalAttributeName(), QAttribute::Float, 3, count, offset, stride);
-        geometry->addAttribute(normalAttribute);
-        offset += sizeof(float) * 3;
-    }
-
-    if (hasTangents()) {
-        QAttribute *tangentAttribute = new QAttribute(buf, QAttribute::defaultTangentAttributeName(),QAttribute::Float, 4, count, offset, stride);
-        geometry->addAttribute(tangentAttribute);
-        offset += sizeof(float) * 4;
-    }
-
-    QByteArray indexBytes;
-    QAttribute::VertexBaseType ty;
-    if (m_indices.size() < 65536) {
-        // we can use USHORT
-        ty = QAttribute::UnsignedShort;
-        indexBytes.resize(m_indices.size() * sizeof(quint16));
-        quint16* usptr = reinterpret_cast<quint16*>(indexBytes.data());
-        for (int i=0; i<m_indices.size(); ++i)
-            *usptr++ = static_cast<quint16>(m_indices.at(i));
-    } else {
-        // use UINT - no conversion needed, but let's ensure int is 32-bit!
-        ty = QAttribute::UnsignedInt;
-        Q_ASSERT(sizeof(int) == sizeof(quint32));
-        indexBytes.resize(m_indices.size() * sizeof(quint32));
-        memcpy(indexBytes.data(), reinterpret_cast<const char*>(m_indices.data()), indexBytes.size());
-    }
-
-    QBuffer *indexBuffer(new QBuffer(QBuffer::IndexBuffer));
-    indexBuffer->setData(indexBytes);
-    QAttribute *indexAttribute = new QAttribute(indexBuffer, ty, 1, m_indices.size());
-    indexAttribute->setAttributeType(QAttribute::IndexAttribute);
-    geometry->addAttribute(indexAttribute);
-
-    return geometry;
-}
-
-void ObjLoader::updateIndices(const QVector<QVector3D> &positions,
-                              const QVector<QVector3D> &normals,
-                              const QVector<QVector2D> &texCoords,
-                              const QHash<FaceIndices, unsigned int> &faceIndexMap,
-                              const QVector<FaceIndices> &faceIndexVector)
-{
-    // Iterate over the faceIndexMap and pull out pos, texCoord and normal data
-    // thereby generating unique vertices of data (by OpenGL definition)
-    const int vertexCount = faceIndexMap.size();
-    const bool hasTexCoords = !texCoords.isEmpty();
-    const bool hasNormals = !normals.isEmpty();
-
-    m_points.resize(vertexCount);
-    m_texCoords.clear();
-    if (hasTexCoords)
-        m_texCoords.resize(vertexCount);
-    m_normals.clear();
-    if (hasNormals)
-        m_normals.resize(vertexCount);
-
-    for (QHash<FaceIndices, unsigned int>::const_iterator it = faceIndexMap.begin(), endIt = faceIndexMap.end(); it != endIt; ++it) {
-        m_points[it.value()] = positions[it.key().positionIndex];
-        if (hasTexCoords)
-            m_texCoords[it.value()] = std::numeric_limits<unsigned int>::max() != it.key().texCoordIndex ? texCoords[it.key().texCoordIndex] : QVector2D();
-        if (hasNormals)
-            m_normals[it.value()] = normals[it.key().normalIndex];
-    }
-
-    // Now iterate over the face indices and lookup the unique vertex index
-    const int indexCount = faceIndexVector.size();
-    m_indices.clear();
-    m_indices.reserve(indexCount);
-    for (const FaceIndices faceIndices : faceIndexVector) {
-        const unsigned int i = faceIndexMap.value(faceIndices);
-        m_indices.append(i);
-    }
-}
-
-void ObjLoader::generateAveragedNormals( const QVector<QVector3D>& points,
-                                         QVector<QVector3D>& normals,
-                                         const QVector<unsigned int>& faces ) const
-{
-    for ( int i = 0; i < points.size(); ++i )
-        normals.append( QVector3D() );
-
-    for ( int i = 0; i < faces.size(); i += 3 )
-    {
-        const QVector3D& p1 = points[ faces[i]   ];
-        const QVector3D& p2 = points[ faces[i+1] ];
-        const QVector3D& p3 = points[ faces[i+2] ];
-
-        QVector3D a = p2 - p1;
-        QVector3D b = p3 - p1;
-        QVector3D n = QVector3D::crossProduct( a, b ).normalized();
-
-        normals[ faces[i]   ] += n;
-        normals[ faces[i+1] ] += n;
-        normals[ faces[i+2] ] += n;
-    }
-
-    for ( int i = 0; i < normals.size(); ++i )
-        normals[i].normalize();
-}
-
-void ObjLoader::generateTangents( const QVector<QVector3D>& points,
-                                  const QVector<QVector3D>& normals,
-                                  const QVector<unsigned  int>& faces,
-                                  const QVector<QVector2D>& texCoords,
-                                  QVector<QVector4D>& tangents ) const
-{
-    tangents.clear();
-    QVector<QVector3D> tan1Accum;
-    QVector<QVector3D> tan2Accum;
-
-    tan1Accum.resize(points.size());
-    tan2Accum.resize(points.size());
-    tangents.resize(points.size());
-
-    // Compute the tangent vector
-    for ( int i = 0; i < faces.size(); i += 3 )
-    {
-        const QVector3D& p1 = points[ faces[i] ];
-        const QVector3D& p2 = points[ faces[i+1] ];
-        const QVector3D& p3 = points[ faces[i+2] ];
-
-        const QVector2D& tc1 = texCoords[ faces[i] ];
-        const QVector2D& tc2 = texCoords[ faces[i+1] ];
-        const QVector2D& tc3 = texCoords[ faces[i+2] ];
-
-        QVector3D q1 = p2 - p1;
-        QVector3D q2 = p3 - p1;
-        float s1 = tc2.x() - tc1.x(), s2 = tc3.x() - tc1.x();
-        float t1 = tc2.y() - tc1.y(), t2 = tc3.y() - tc1.y();
-        float r = 1.0f / ( s1 * t2 - s2 * t1 );
-        QVector3D tan1( ( t2 * q1.x() - t1 * q2.x() ) * r,
-                        ( t2 * q1.y() - t1 * q2.y() ) * r,
-                        ( t2 * q1.z() - t1 * q2.z() ) * r );
-        QVector3D tan2( ( s1 * q2.x() - s2 * q1.x() ) * r,
-                        ( s1 * q2.y() - s2 * q1.y() ) * r,
-                        ( s1 * q2.z() - s2 * q1.z() ) * r );
-        tan1Accum[ faces[i]   ] += tan1;
-        tan1Accum[ faces[i+1] ] += tan1;
-        tan1Accum[ faces[i+2] ] += tan1;
-        tan2Accum[ faces[i]   ] += tan2;
-        tan2Accum[ faces[i+1] ] += tan2;
-        tan2Accum[ faces[i+2] ] += tan2;
-    }
-
-    for ( int i = 0; i < points.size(); ++i )
-    {
-        const QVector3D& n = normals[i];
-        const QVector3D& t1 = tan1Accum[i];
-        const QVector3D& t2 = tan2Accum[i];
-
-        // Gram-Schmidt orthogonalize
-        tangents[i] = QVector4D( QVector3D( t1 - QVector3D::dotProduct( n, t1 ) * n ).normalized(), 0.0f );
-
-        // Store handedness in w
-        tangents[i].setW( ( QVector3D::dotProduct( QVector3D::crossProduct( n, t1 ), t2 ) < 0.0f ) ? -1.0f : 1.0f );
-    }
-}
-
-void ObjLoader::center( QVector<QVector3D>& points )
-{
-    if ( points.isEmpty() )
-        return;
-
-    QAxisAlignedBoundingBox bb(points);
-    QVector3D center = bb.center();
-
-    // Translate center of the AABB to the origin
-    for ( int i = 0; i < points.size(); ++i )
-    {
-        QVector3D& point = points[i];
-        point = point - center;
-    }
-}
-
-}
-
-QT_END_NAMESPACE
diff --git a/src/render/io/objloader_p.h b/src/render/io/objloader_p.h
deleted file mode 100644
index 10979240b..000000000
--- a/src/render/io/objloader_p.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef OBJLOADER_H
-#define OBJLOADER_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <Qt3DCore/qt3dcore_global.h>
-
-#include <QVector>
-#include <QVector2D>
-#include <QVector3D>
-#include <QVector4D>
-
-#include <limits>
-
-QT_BEGIN_NAMESPACE
-
-class QString;
-class QIODevice;
-
-namespace Qt3DRender {
-
-class QGeometry;
-
-struct FaceIndices
-{
-    FaceIndices()
-        : positionIndex(std::numeric_limits<unsigned int>::max())
-        , texCoordIndex(std::numeric_limits<unsigned int>::max())
-        , normalIndex(std::numeric_limits<unsigned int>::max())
-    {}
-
-    FaceIndices(unsigned int posIndex, unsigned int tcIndex, unsigned int nIndex)
-        : positionIndex(posIndex)
-        , texCoordIndex(tcIndex)
-        , normalIndex(nIndex)
-    {}
-
-    bool operator == (const FaceIndices &other) const
-    {
-        return positionIndex == other.positionIndex &&
-               texCoordIndex == other.texCoordIndex &&
-               normalIndex == other.normalIndex;
-    }
-
-    unsigned int positionIndex;
-    unsigned int texCoordIndex;
-    unsigned int normalIndex;
-};
-QT3D_DECLARE_TYPEINFO(Qt3DRender, FaceIndices, Q_PRIMITIVE_TYPE)
-
-class Q_AUTOTEST_EXPORT ObjLoader
-{
-public:
-    ObjLoader();
-
-    void setLoadTextureCoordinatesEnabled( bool b ) { m_loadTextureCoords = b; }
-    bool isLoadTextureCoordinatesEnabled() const { return m_loadTextureCoords; }
-
-    void setTangentGenerationEnabled( bool b ) { m_generateTangents = b; }
-    bool isTangentGenerationEnabled() const { return m_generateTangents; }
-
-    void setMeshCenteringEnabled( bool b ) { m_centerMesh = b; }
-    bool isMeshCenteringEnabled() const { return m_centerMesh; }
-
-    bool hasNormals() const { return !m_normals.isEmpty(); }
-    bool hasTextureCoordinates() const { return !m_texCoords.isEmpty(); }
-    bool hasTangents() const { return !m_tangents.isEmpty(); }
-
-    bool load( const QString& fileName, const QString& subMesh = QString() );
-    bool load( ::QIODevice* ioDev, const QString& subMesh = QString() );
-
-    QVector<QVector3D> vertices() const { return m_points; }
-    QVector<QVector3D> normals() const { return m_normals; }
-    QVector<QVector2D> textureCoordinates() const { return m_texCoords; }
-    QVector<QVector4D> tangents() const { return m_tangents; }
-    QVector<unsigned int> indices() const { return m_indices; }
-
-    QGeometry *geometry() const;
-
-private:
-    void updateIndices(const QVector<QVector3D> &positions,
-                       const QVector<QVector3D> &normals,
-                       const QVector<QVector2D> &texCoords,
-                       const QHash<FaceIndices, unsigned int> &faceIndexMap,
-                       const QVector<FaceIndices> &faceIndexVector);
-    void generateAveragedNormals( const QVector<QVector3D>& points,
-                                  QVector<QVector3D>& normals,
-                                  const QVector<unsigned int>& faces ) const;
-    void generateTangents( const QVector<QVector3D>& points,
-                           const QVector<QVector3D>& normals,
-                           const QVector<unsigned int>& faces,
-                           const QVector<QVector2D>& texCoords,
-                           QVector<QVector4D>& tangents ) const;
-    void center( QVector<QVector3D>& points );
-
-    bool m_loadTextureCoords;
-    bool m_generateTangents;
-    bool m_centerMesh;
-
-    QVector<QVector3D> m_points;
-    QVector<QVector3D> m_normals;
-    QVector<QVector2D> m_texCoords;
-    QVector<QVector4D> m_tangents;
-    QVector<unsigned int> m_indices;
-};
-
-}
-
-QT_END_NAMESPACE
-
-#endif // OBJLOADER_H
diff --git a/src/render/io/qaxisalignedboundingbox_p.h b/src/render/io/qaxisalignedboundingbox_p.h
index c7a4d3767..7a88190b7 100644
--- a/src/render/io/qaxisalignedboundingbox_p.h
+++ b/src/render/io/qaxisalignedboundingbox_p.h
@@ -55,6 +55,8 @@
 #include <QVector>
 #include <QVector3D>
 
+#include <Qt3DRender/private/qt3drender_global_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QDebug;
@@ -84,7 +86,7 @@ public:
 
     bool isNull() const { return m_center.isNull() && m_radii.isNull(); }
 
-    void update(const QVector<QVector3D> &points);
+    void QT3DRENDERSHARED_PRIVATE_EXPORT update(const QVector<QVector3D> &points);
 
     inline QVector3D center() const { return m_center; }
     inline QVector3D radii() const { return m_radii; }
diff --git a/src/render/io/qgeometryloaderfactory.cpp b/src/render/io/qgeometryloaderfactory.cpp
new file mode 100644
index 000000000..c34469dc1
--- /dev/null
+++ b/src/render/io/qgeometryloaderfactory.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd and/or its subsidiary(-ies).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qgeometryloaderfactory_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+
+QGeometryLoaderFactory::QGeometryLoaderFactory(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QGeometryLoaderFactory::~QGeometryLoaderFactory()
+{
+}
+
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
diff --git a/src/render/io/qgeometryloaderfactory_p.h b/src/render/io/qgeometryloaderfactory_p.h
new file mode 100644
index 000000000..f6ede7610
--- /dev/null
+++ b/src/render/io/qgeometryloaderfactory_p.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd and/or its subsidiary(-ies).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DRENDER_QGEOMETRYLOADERFACTORY_P_H
+#define QT3DRENDER_QGEOMETRYLOADERFACTORY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QObject>
+#include <QtCore/QtPlugin>
+#include <QtCore/QFactoryInterface>
+
+#include <Qt3DRender/private/qt3drender_global_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+
+#define QGeometryLoaderFactory_iid "org.qt-project.Qt3DRender.QGeometryLoaderFactory 5.8"
+
+struct QGeometryLoaderInterface;
+
+class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderFactory : public QObject, public QFactoryInterface
+{
+    Q_OBJECT
+public:
+    explicit QGeometryLoaderFactory(QObject *parent = nullptr);
+    virtual ~QGeometryLoaderFactory();
+
+    virtual QGeometryLoaderInterface *create(const QString &ext) = 0;
+};
+
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_QGEOMETRYLOADERFACTORY_P_H
diff --git a/src/render/io/qgeometryloaderinterface_p.h b/src/render/io/qgeometryloaderinterface_p.h
new file mode 100644
index 000000000..22d4f8bea
--- /dev/null
+++ b/src/render/io/qgeometryloaderinterface_p.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd and/or its subsidiary(-ies).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DRENDER_QGEOMETRYLOADERINTERFACE_P_H
+#define QT3DRENDER_QGEOMETRYLOADERINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QObject>
+
+#include <Qt3DRender/private/qt3drender_global_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QIODevice;
+
+namespace Qt3DRender {
+
+class QGeometry;
+
+class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderInterface : public QObject
+{
+public:
+    virtual QGeometry *geometry() const = 0;
+
+    virtual bool load(QIODevice *ioDev, const QString &subMesh = QString()) = 0;
+};
+
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_QGEOMETRYLOADERINTERFACE_P_H