Add RenderSurfaceSelectorNode to frame graph backend

Change-Id: Ibd50fe11628d766588097a684be9e46254a5371b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 165 insertions, 3 deletions

diff --git a/src/render/framegraph/framegraph.pri b/src/render/framegraph/framegraph.pri
index 899d36305..57d36e4f0 100644
--- a/src/render/framegraph/framegraph.pri
+++ b/src/render/framegraph/framegraph.pri
@@ -50,7 +50,8 @@ HEADERS += \
     $$PWD/qdispatchcompute.h \
     $$PWD/dispatchcompute_p.h \
     $$PWD/qrendersurfaceselector.h \
-    $$PWD/qrendersurfaceselector_p.h
+    $$PWD/qrendersurfaceselector_p.h \
+    $$PWD/rendersurfaceselector_p.h
 
 SOURCES += \
     $$PWD/cameraselectornode.cpp \
@@ -87,4 +88,5 @@ SOURCES += \
     $$PWD/lighting.cpp \
     $$PWD/qdispatchcompute.cpp \
     $$PWD/dispatchcompute.cpp \
-    $$PWD/qrendersurfaceselector.cpp
+    $$PWD/qrendersurfaceselector.cpp \
+    $$PWD/rendersurfaceselector.cpp
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index 764314438..9c4998729 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -83,7 +83,8 @@ public:
         NoDraw,
         FrustumCulling,
         Lighting,
-        ComputeDispatch
+        ComputeDispatch,
+        Surface
     };
     FrameGraphNodeType nodeType() const { return m_nodeType; }
 
diff --git a/src/render/framegraph/rendersurfaceselector.cpp b/src/render/framegraph/rendersurfaceselector.cpp
new file mode 100644
index 000000000..b32a93be0
--- /dev/null
+++ b/src/render/framegraph/rendersurfaceselector.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#include "rendersurfaceselector_p.h"
+#include <Qt3DRender/qrendersurfaceselector.h>
+
+#include <Qt3DCore/qscenepropertychange.h>
+
+#include <QtGui/qwindow.h>
+#include <QtGui/qoffscreensurface.h>
+
+QT_BEGIN_NAMESPACE
+
+using namespace Qt3DCore;
+
+namespace Qt3DRender {
+namespace Render {
+
+RenderSurfaceSelector::RenderSurfaceSelector()
+    : FrameGraphNode(FrameGraphNode::Surface)
+    , m_surface(Q_NULLPTR)
+{
+}
+
+void RenderSurfaceSelector::updateFromPeer(Qt3DCore::QNode *peer)
+{
+    QRenderSurfaceSelector *selector = static_cast<QRenderSurfaceSelector *>(peer);
+    m_surface = selector->surface();
+    setEnabled(selector->isEnabled());
+}
+
+void RenderSurfaceSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+{
+    qCDebug(Render::Framegraph) << Q_FUNC_INFO;
+    if (e->type() == NodeUpdated) {
+        QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
+        if (propertyChange->propertyName() == QByteArrayLiteral("surface"))
+            m_surface = propertyChange->value().value<QSurface *>();
+        else if (propertyChange->propertyName() == QByteArrayLiteral("enabled"))
+            setEnabled(propertyChange->value().toBool());
+    }
+}
+
+} // namespace Render
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
diff --git a/src/render/framegraph/rendersurfaceselector_p.h b/src/render/framegraph/rendersurfaceselector_p.h
new file mode 100644
index 000000000..1c5afc3a6
--- /dev/null
+++ b/src/render/framegraph/rendersurfaceselector_p.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** 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_RENDER_RENDERSURFACENODE_H
+#define QT3DRENDER_RENDER_RENDERSURFACENODE_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/framegraphnode_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QSurface;
+
+namespace Qt3DRender {
+namespace Render {
+
+class RenderSurfaceSelector : public Qt3DRender::Render::FrameGraphNode
+{
+public:
+    RenderSurfaceSelector();
+
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+
+    QSurface *surface() const { return m_surface; }
+
+private:
+    QSurface *m_surface;
+};
+
+} // namespace Render
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_RENDER_RENDERSURFACENODE_H