From fd4feb449b5e97c32dc5d94ba2f96b8a5e9f4454 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Tue, 3 Nov 2015 17:41:03 +0100 Subject: QBoundingVolumeSpecifier added Change-Id: Idf19ce106ab400b50cc457d7263e9568eb1ad906 Reviewed-by: Paul Lemire Reviewed-by: Andy Nichols --- src/render/geometry/geometry.pri | 6 +- src/render/geometry/qboundingvolumespecifier.cpp | 78 ++++++++++++++++++++++++ src/render/geometry/qboundingvolumespecifier.h | 74 ++++++++++++++++++++++ 3 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 src/render/geometry/qboundingvolumespecifier.cpp create mode 100644 src/render/geometry/qboundingvolumespecifier.h (limited to 'src/render/geometry') diff --git a/src/render/geometry/geometry.pri b/src/render/geometry/geometry.pri index b0082c77a..81ee39c81 100644 --- a/src/render/geometry/geometry.pri +++ b/src/render/geometry/geometry.pri @@ -33,7 +33,8 @@ HEADERS += \ $$PWD/qcuboidgeometry.h \ $$PWD/qcuboidgeometry_p.h \ $$PWD/qplanegeometry.h \ - $$PWD/qplanegeometry_p.h + $$PWD/qplanegeometry_p.h \ + $$PWD/qboundingvolumespecifier.h SOURCES += \ $$PWD/attribute.cpp \ @@ -56,5 +57,6 @@ SOURCES += \ $$PWD/qtorusgeometry.cpp \ $$PWD/qspheregeometry.cpp \ $$PWD/qcuboidgeometry.cpp \ - $$PWD/qplanegeometry.cpp + $$PWD/qplanegeometry.cpp \ + $$PWD/qboundingvolumespecifier.cpp diff --git a/src/render/geometry/qboundingvolumespecifier.cpp b/src/render/geometry/qboundingvolumespecifier.cpp new file mode 100644 index 000000000..2c6662eee --- /dev/null +++ b/src/render/geometry/qboundingvolumespecifier.cpp @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2015 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 "qboundingvolumespecifier.h" +#include +#include + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +class QBoundingVolumeSpecifierPrivate : public QObjectPrivate +{ +public: + QBoundingVolumeSpecifierPrivate() + : QObjectPrivate() + , m_positionAttribute(Q_NULLPTR) + {} + + Qt3DCore::QAbstractAttribute *m_positionAttribute; +}; + +QBoundingVolumeSpecifier::QBoundingVolumeSpecifier(QObject *parent) + : QObject(*new QBoundingVolumeSpecifierPrivate(), parent) +{ +} + +Qt3DCore::QAbstractAttribute *QBoundingVolumeSpecifier::positionAttribute() const +{ + Q_D(const QBoundingVolumeSpecifier); + return d->m_positionAttribute; +} + +void QBoundingVolumeSpecifier::setPositionAttribute(Qt3DCore::QAbstractAttribute *positionAttribute) +{ + Q_D(QBoundingVolumeSpecifier); + if (positionAttribute != d->m_positionAttribute) { + d->m_positionAttribute = positionAttribute; + emit positionAttributeChanged(); + } +} + +} // Qt3DRender + +QT_END_NAMESPACE diff --git a/src/render/geometry/qboundingvolumespecifier.h b/src/render/geometry/qboundingvolumespecifier.h new file mode 100644 index 000000000..3ff43a262 --- /dev/null +++ b/src/render/geometry/qboundingvolumespecifier.h @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2015 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_QBOUNDINGVOLUMESPECIFIER_H +#define QT3DRENDER_QBOUNDINGVOLUMESPECIFIER_H + +#include +#include + +QT_BEGIN_NAMESPACE + +namespace Qt3DCore { +class QAbstractAttribute; +} + +namespace Qt3DRender { + +class QBoundingVolumeSpecifierPrivate; + +class QT3DRENDERSHARED_EXPORT QBoundingVolumeSpecifier : public QObject +{ + Q_OBJECT + Q_PROPERTY(Qt3DCore::QAbstractAttribute *positionAttribute READ positionAttribute WRITE setPositionAttribute NOTIFY positionAttributeChanged) +public: + explicit QBoundingVolumeSpecifier(QObject *parent = 0); + + Qt3DCore::QAbstractAttribute *positionAttribute() const; + void setPositionAttribute(Qt3DCore::QAbstractAttribute *positionAttribute); + +Q_SIGNALS: + void positionAttributeChanged(); + +private: + Q_DECLARE_PRIVATE(QBoundingVolumeSpecifier) +}; + +} // Qt3DRender + +QT_END_NAMESPACE + +#endif // QT3DRENDER_QBOUNDINGVOLUMESPECIFIER_H -- cgit v1.2.3