QAxisAlignedBoundingBox is used only in ObjLoader

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

4 files changed, 253 insertions, 2 deletions

diff --git a/src/render/io/io.pri b/src/render/io/io.pri
index bba72c4c2..e6e05ef29 100644
--- a/src/render/io/io.pri
+++ b/src/render/io/io.pri
@@ -4,6 +4,7 @@ HEADERS += \
     $$PWD/objloader_p.h \
     $$PWD/qabstractsceneloader.h \
     $$PWD/qabstractsceneloader_p.h \
+    $$PWD/qaxisalignedboundingbox_p.h \
     $$PWD/qsceneloader.h \
     $$PWD/scene_p.h \
     $$PWD/scenemanager_p.h \
@@ -15,6 +16,7 @@ HEADERS += \
 SOURCES += \
     $$PWD/objloader.cpp \
     $$PWD/qabstractsceneloader.cpp \
+    $$PWD/qaxisalignedboundingbox.cpp \
     $$PWD/qsceneloader.cpp \
     $$PWD/scene.cpp \
     $$PWD/scenemanager.cpp \
diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
index 7e58ae738..87085c1de 100644
--- a/src/render/io/objloader.cpp
+++ b/src/render/io/objloader.cpp
@@ -39,7 +39,7 @@
 #include "qmesh.h"
 #include "qbuffer.h"
 #include "qattribute.h"
-#include <Qt3DCore/qaxisalignedboundingbox.h>
+#include <Qt3DRender/private/qaxisalignedboundingbox_p.h>
 
 #include <Qt3DRender/private/renderlogging_p.h>
 #include <QFile>
@@ -458,7 +458,7 @@ void ObjLoader::center( QVector<QVector3D>& points )
     if ( points.isEmpty() )
         return;
 
-    Qt3DCore::QAxisAlignedBoundingBox bb(points);
+    QAxisAlignedBoundingBox bb(points);
     QVector3D center = bb.center();
 
     // Translate center of the AABB to the origin
diff --git a/src/render/io/qaxisalignedboundingbox.cpp b/src/render/io/qaxisalignedboundingbox.cpp
new file mode 100644
index 000000000..8e7aac191
--- /dev/null
+++ b/src/render/io/qaxisalignedboundingbox.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qaxisalignedboundingbox_p.h"
+
+#include <QDebug>
+#include <QMatrix4x4>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+
+void QAxisAlignedBoundingBox::update(const QVector<QVector3D> &points)
+{
+    if (points.isEmpty()) {
+        m_center = QVector3D();
+        m_radii = QVector3D();
+        return;
+    }
+
+    QVector3D minPoint = points.at( 0 );
+    QVector3D maxPoint = points.at( 0 );
+
+    for (int i = 1; i < points.size(); ++i)
+    {
+        const QVector3D &point = points.at(i);
+        if (point.x() > maxPoint.x())
+            maxPoint.setX(point.x());
+        if (point.y() > maxPoint.y())
+            maxPoint.setY(point.y());
+        if (point.z() > maxPoint.z())
+            maxPoint.setZ(point.z());
+        if (point.x() < minPoint.x())
+            minPoint.setX(point.x());
+        if (point.y() < minPoint.y())
+            minPoint.setY(point.y());
+        if (point.z() < minPoint.z())
+            minPoint.setZ(point.z());
+    }
+
+    m_center = 0.5 * (minPoint + maxPoint);
+    m_radii = 0.5 * (maxPoint - minPoint);
+#if 0
+    qDebug() << "AABB:";
+    qDebug() << "    min =" << minPoint;
+    qDebug() << "    max =" << maxPoint;
+    qDebug() << " center =" << m_center;
+    qDebug() << "  radii =" << m_radii;
+#endif
+}
+
+QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << "AABB ( min:" << c.minPoint() << ", max:" << c.maxPoint() << ')';
+    return dbg;
+}
+
+} //namespace Qt3DRender
+
+QT_END_NAMESPACE
diff --git a/src/render/io/qaxisalignedboundingbox_p.h b/src/render/io/qaxisalignedboundingbox_p.h
new file mode 100644
index 000000000..fec3eb8f5
--- /dev/null
+++ b/src/render/io/qaxisalignedboundingbox_p.h
@@ -0,0 +1,155 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DRENDER_QAXISALIGNEDBOUNDINGBOX_P_H
+#define QT3DRENDER_QAXISALIGNEDBOUNDINGBOX_P_H
+
+#include <QMatrix4x4>
+#include <QVector>
+#include <QVector3D>
+
+QT_BEGIN_NAMESPACE
+
+class QDebug;
+
+namespace Qt3DRender {
+
+class QAxisAlignedBoundingBox
+{
+public:
+    inline QAxisAlignedBoundingBox()
+        : m_center(),
+          m_radii()
+    {}
+
+    inline explicit QAxisAlignedBoundingBox(const QVector<QVector3D> &points)
+        : m_center(),
+          m_radii()
+    {
+        update(points);
+    }
+
+    void clear()
+    {
+        m_center = QVector3D();
+        m_radii = QVector3D();
+    }
+
+    bool isNull() const { return m_center.isNull() && m_radii.isNull(); }
+
+    void update(const QVector<QVector3D> &points);
+
+    inline QVector3D center() const { return m_center; }
+    inline QVector3D radii() const { return m_radii; }
+
+    inline QVector3D minPoint() const { return m_center - m_radii; }
+    inline QVector3D maxPoint() const { return m_center + m_radii; }
+
+    inline float xExtent() const { return 2.0f * m_radii.x(); }
+    inline float yExtent() const { return 2.0f * m_radii.y(); }
+    inline float zExtent() const { return 2.0f * m_radii.z(); }
+
+    inline float maxExtent() const { return qMax( xExtent(), qMax( yExtent(), zExtent() ) ); }
+    inline float minExtent() const { return qMin( xExtent(), qMin( yExtent(), zExtent() ) ); }
+
+    inline bool contains( const QVector3D& pt ) const
+    {
+        QVector3D minP(minPoint()), maxP(maxPoint());
+        if ((pt.x() < minP.x()) || (pt.x() > maxP.x()) ||
+            (pt.y() < minP.y()) || (pt.y() > maxP.y()) ||
+            (pt.z() < minP.z()) || (pt.z() > maxP.z()) )
+        {
+            return false;
+        }
+        return true;
+    }
+
+    inline void expandToContain(const QVector3D &pt)
+    {
+        QVector<QVector3D> pts = QVector<QVector3D>() << pt;
+        update(pts);
+    }
+
+    inline void expandToContain(const QAxisAlignedBoundingBox &other)
+    {
+        QVector<QVector3D> pts = QVector<QVector3D>() << other.minPoint() << other.maxPoint();
+        update(pts);
+    }
+
+    inline QAxisAlignedBoundingBox transformBy(const QMatrix4x4 &mat) const
+    {
+        QAxisAlignedBoundingBox r;
+        r.m_center = mat.map(m_center);
+        r.m_radii = mat.map(m_radii);
+        return r;
+    }
+
+    inline QAxisAlignedBoundingBox &transform(const QMatrix4x4 &mat)
+    {
+        m_center = mat.map(m_center);
+        m_radii = mat.map(m_radii);
+        return *this;
+    }
+
+private:
+    QVector3D m_center;
+    QVector3D m_radii;
+
+    friend bool intersects(const QAxisAlignedBoundingBox &a,
+                           const QAxisAlignedBoundingBox &b);
+};
+
+QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c);
+
+inline bool intersects(const QAxisAlignedBoundingBox &a,
+                       const QAxisAlignedBoundingBox &b)
+{
+    // Test y axis last as this is often the least discriminatory in OpenGL applications
+    // where worlds tend to be mostly in the xz-plane
+    if (qAbs(a.m_center[0] - b.m_center[0]) > a.m_radii[0] + b.m_radii[0])
+        return false;
+    if (qAbs(a.m_center[2] - b.m_center[2]) > a.m_radii[2] + b.m_radii[2])
+        return false;
+    if (qAbs(a.m_center[1] - b.m_center[1]) > a.m_radii[1] + b.m_radii[1])
+        return false;
+    return true;
+}
+
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_QAXISALIGNEDBOUNDINGBOX_P_H