summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-03 10:50:48 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-04-10 21:09:31 +0000
commit35cfc13c21c7fa8d276178649df14aa1ba7c7a5a (patch)
treec722ba04860e2d5e8a65d5c3b489b5634e169a96
parentdc8b69bb2ff262709e66254acd4993b103b5b8b2 (diff)
QClipPlane creates creation changes
Change-Id: Ie7c2490664a7efc7704b547f9fa7bf92d29653d5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/renderstates/qclipplane.cpp29
-rw-r--r--src/render/renderstates/qclipplane.h1
-rw-r--r--src/render/renderstates/qclipplane_p.h84
-rw-r--r--src/render/renderstates/renderstates.pri3
4 files changed, 100 insertions, 17 deletions
diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp
index 14810fe17..2c5792f81 100644
--- a/src/render/renderstates/qclipplane.cpp
+++ b/src/render/renderstates/qclipplane.cpp
@@ -38,27 +38,13 @@
****************************************************************************/
#include "qclipplane.h"
-#include <Qt3DRender/private/qrenderstate_p.h>
+#include "qclipplane_p.h"
+#include <Qt3DRender/private/qrenderstatecreatedchange_p.h>
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QClipPlanePrivate : public QRenderStatePrivate
-{
-public:
- QClipPlanePrivate()
- : QRenderStatePrivate(QRenderStatePrivate::ClipPlane)
- , m_planeIndex(0)
- , m_normal()
- , m_distance(0.0f)
- {}
-
- int m_planeIndex;
- QVector3D m_normal;
- float m_distance;
-};
-
/*!
\class Qt3DRender::QClipPlane
\inmodule Qt3DRender
@@ -159,6 +145,17 @@ void QClipPlane::copy(const QNode *ref)
d_func()->m_distance = refClip->distance();
}
+Qt3DCore::QNodeCreatedChangeBasePtr QClipPlane::createNodeCreationChange() const
+{
+ auto creationChange = QRenderStateCreatedChangePtr<QClipPlaneData>::create(this);
+ auto &data = creationChange->data;
+ Q_D(const QClipPlane);
+ data.normal = d->m_normal;
+ data.distance = d->m_distance;
+ data.planeIndex = d->m_planeIndex;
+ return creationChange;
+}
+
} // namespace Qt3DRender
QT_END_NAMESPACE
diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h
index a914b0e3e..2f3a81dc1 100644
--- a/src/render/renderstates/qclipplane.h
+++ b/src/render/renderstates/qclipplane.h
@@ -79,6 +79,7 @@ Q_SIGNALS:
private:
Q_DECLARE_PRIVATE(QClipPlane)
QT3D_CLONEABLE(QClipPlane)
+ Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
};
} // namespace Qt3DRender
diff --git a/src/render/renderstates/qclipplane_p.h b/src/render/renderstates/qclipplane_p.h
new file mode 100644
index 000000000..ff8bb7b98
--- /dev/null
+++ b/src/render/renderstates/qclipplane_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 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_QCLIPPLANE_P_H
+#define QT3DRENDER_QCLIPPLANE_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 <Qt3DRender/private/qrenderstate_p.h>
+#include <Qt3DRender/qalphatest.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+
+class QClipPlanePrivate : public QRenderStatePrivate
+{
+public:
+ QClipPlanePrivate()
+ : QRenderStatePrivate(QRenderStatePrivate::ClipPlane)
+ , m_planeIndex(0)
+ , m_normal()
+ , m_distance(0.0f)
+ {}
+
+ int m_planeIndex;
+ QVector3D m_normal;
+ float m_distance;
+};
+
+struct QClipPlaneData
+{
+ QVector3D normal;
+ float distance;
+ int planeIndex;
+};
+
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_QCLIPPLANE_P_H
diff --git a/src/render/renderstates/renderstates.pri b/src/render/renderstates/renderstates.pri
index 5bea8203c..bd3a6819f 100644
--- a/src/render/renderstates/renderstates.pri
+++ b/src/render/renderstates/renderstates.pri
@@ -30,7 +30,8 @@ HEADERS += \
$$PWD/qnodepthmask.h \
$$PWD/qalphatest_p.h \
$$PWD/qblendequation_p.h \
- $$PWD/qblendequationarguments_p.h
+ $$PWD/qblendequationarguments_p.h \
+ $$PWD/qclipplane_p.h
SOURCES += \