diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-02 13:01:45 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-02 22:06:24 +0000 |
commit | 706e5e928022a407826b6f0c61ca2ff7cc2567a6 (patch) | |
tree | e5c50a5542f3837edf739043bf5b7eb2cdccf897 /src/render | |
parent | 30477428ec461be3fc09d6f2361befef8e1c7114 (diff) |
Turns out QAbstractFunctor is specific to Qt3DRender
Change-Id: Ida4d78d7ccd3c64eeedd38a3cba40ca099a2ecab
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/frontend/qabstractfunctor.cpp | 50 | ||||
-rw-r--r-- | src/render/frontend/qabstractfunctor.h | 92 | ||||
-rw-r--r-- | src/render/frontend/render-frontend.pri | 2 | ||||
-rw-r--r-- | src/render/geometry/qbufferfunctor.h | 4 | ||||
-rw-r--r-- | src/render/geometry/qgeometryfunctor.h | 4 | ||||
-rw-r--r-- | src/render/texture/qabstracttextureimage.h | 4 |
6 files changed, 150 insertions, 6 deletions
diff --git a/src/render/frontend/qabstractfunctor.cpp b/src/render/frontend/qabstractfunctor.cpp new file mode 100644 index 000000000..60b7816a0 --- /dev/null +++ b/src/render/frontend/qabstractfunctor.cpp @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** 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 "qabstractfunctor.h" + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +QAbstractFunctor::~QAbstractFunctor() +{ +} + +} // Qt3D + +QT_END_NAMESPACE + diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h new file mode 100644 index 000000000..da96da124 --- /dev/null +++ b/src/render/frontend/qabstractfunctor.h @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** 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_QABSTRACTFUNCTOR_H +#define QT3DRENDER_QABSTRACTFUNCTOR_H + +#include <Qt3DRender/qt3drender_global.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +// This will generate a unique id() function per type +// <=> 1 unique function address per type +template<class T> +struct FunctorType +{ + static qintptr id() + { + // The MSVC linker can under some cases optimize all the template + // functions into a single function. The code below is there to ensure + // that the linker won't collapse all these distincts functions into one + static T *t = 0; + return reinterpret_cast<qintptr>(t); + } +}; + +template<class T> +qintptr functorTypeId() +{ + return reinterpret_cast<qintptr>(&FunctorType<T>::id); +} + +#define QT3D_FUNCTOR(Class) \ + qintptr id() const Q_DECL_OVERRIDE { \ + return Qt3DRender::functorTypeId<Class>(); \ + } + + +class QT3DRENDERSHARED_EXPORT QAbstractFunctor +{ +public: + virtual ~QAbstractFunctor(); + virtual qintptr id() const = 0; + + template<class T> + const T *functor_cast(const QAbstractFunctor *other) const + { + if (other->id() == functorTypeId<T>()) + return static_cast<const T *>(other); + return Q_NULLPTR; + } +}; + +} // Qt3D + +QT_END_NAMESPACE + +#endif // QT3DRENDER_QABSTRACTFUNCTOR_H diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri index de8f41a68..d20f89a56 100644 --- a/src/render/frontend/render-frontend.pri +++ b/src/render/frontend/render-frontend.pri @@ -1,6 +1,7 @@ INCLUDEPATH += $$PWD HEADERS += \ + $$PWD/qabstractfunctor.h \ $$PWD/qrenderaspect.h \ $$PWD/qrenderaspect_p.h \ $$PWD/qitemmodelbuffer.h \ @@ -16,6 +17,7 @@ HEADERS += \ $$PWD/qboundingvolumedebug.h SOURCES += \ + $$PWD/qabstractfunctor.cpp \ $$PWD/qrenderaspect.cpp \ $$PWD/qitemmodelbuffer.cpp \ $$PWD/sphere.cpp \ diff --git a/src/render/geometry/qbufferfunctor.h b/src/render/geometry/qbufferfunctor.h index b3e1074cc..2bed2c894 100644 --- a/src/render/geometry/qbufferfunctor.h +++ b/src/render/geometry/qbufferfunctor.h @@ -38,14 +38,14 @@ #define QT3DRENDER_QBUFFERFUNCTOR #include <Qt3DRender/qt3drender_global.h> -#include <Qt3DCore/qabstractfunctor.h> +#include <Qt3DRender/qabstractfunctor.h> #include <QSharedPointer> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QBufferFunctor : public QAbstractFunctor { public: virtual ~QBufferFunctor() {} diff --git a/src/render/geometry/qgeometryfunctor.h b/src/render/geometry/qgeometryfunctor.h index 71b1ab672..38fe6ebfc 100644 --- a/src/render/geometry/qgeometryfunctor.h +++ b/src/render/geometry/qgeometryfunctor.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QGEOMETRYFUNCTOR #include <Qt3DRender/qt3drender_global.h> -#include <Qt3DCore/qabstractfunctor.h> +#include <Qt3DRender/qabstractfunctor.h> #include <QSharedPointer> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QGeometry; -class QT3DRENDERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QGeometryFunctor : public QAbstractFunctor { public: virtual ~QGeometryFunctor() {} diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index bb626fa35..dee69c3a2 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QABSTRACTTEXTUREIMAGE_H #define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H -#include <Qt3DCore/qabstractfunctor.h> +#include <Qt3DRender/qabstractfunctor.h> #include <Qt3DRender/qabstracttextureprovider.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { // We might also get rid of the layer, face, mipmap level from // TexImageDataPtr and store that in the functor directly // or use the QTextureImage instead -class QT3DRENDERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QTextureDataFunctor : public QAbstractFunctor { public: virtual ~QTextureDataFunctor() {} |