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>

1 files changed, 0 insertions, 106 deletions

diff --git a/src/render/geometry/qtorusgeometry.h b/src/render/geometry/qtorusgeometry.h
deleted file mode 100644
index 64c5f885d..000000000
--- a/src/render/geometry/qtorusgeometry.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 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 QT3D_QTORUSGEOMETRY_H
-#define QT3D_QTORUSGEOMETRY_H
-
-#include <Qt3DRender/qt3drender_global.h>
-#include <Qt3DRender/qgeometry.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-class QTorusGeometryPrivate;
-class QAttribute;
-
-class QT3DRENDERSHARED_EXPORT QTorusGeometry : public QGeometry
-{
-    Q_OBJECT
-    Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
-    Q_PROPERTY(int slices READ slices WRITE setSlices NOTIFY slicesChanged)
-    Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
-    Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged)
-    Q_PROPERTY(Qt3DRender::QAttribute *positionAttribute READ positionAttribute CONSTANT)
-    Q_PROPERTY(Qt3DRender::QAttribute *normalAttribute READ normalAttribute CONSTANT)
-    Q_PROPERTY(Qt3DRender::QAttribute *texCoordAttribute READ texCoordAttribute CONSTANT)
-    Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT)
-
-public:
-    explicit QTorusGeometry(QNode *parent = Q_NULLPTR);
-    ~QTorusGeometry();
-
-    void updateVertices();
-    void updateIndices();
-
-    int rings() const;
-    int slices() const;
-    float radius() const;
-    float minorRadius() const;
-
-    QAttribute *positionAttribute() const;
-    QAttribute *normalAttribute() const;
-    QAttribute *texCoordAttribute() const;
-    QAttribute *indexAttribute() const;
-
-public Q_SLOTS:
-    void setRings(int rings);
-    void setSlices(int slices);
-    void setRadius(float radius);
-    void setMinorRadius(float minorRadius);
-
-Q_SIGNALS:
-    void radiusChanged(float radius);
-    void ringsChanged(int rings);
-    void slicesChanged(int slices);
-    void minorRadiusChanged(float minorRadius);
-
-
-protected:
-    QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent = Q_NULLPTR);
-
-private:
-    Q_DECLARE_PRIVATE(QTorusGeometry)
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3D_QTORUSGEOMETRY_H