diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 11:49:13 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 21:16:10 +0200 |
| commit | c95de0fe0f73fec6cec90efe72e7290a77af2049 (patch) | |
| tree | 0fd314aedbc41c723d2c4e3334368fdcdba48913 /src/render/backend | |
| parent | 5b5c93f8979d3d7c5d5bee46c6108861066e2a6d (diff) | |
Moved most of the managers into a single header file
Makes the project smaller and easier to understand.
Change-Id: I2ee5f8c88a61c70b2173c2d69d62a1cd9a646141
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend')
65 files changed, 344 insertions, 2818 deletions
diff --git a/src/render/backend/attachmentmanager.cpp b/src/render/backend/attachmentmanager.cpp deleted file mode 100644 index 303472d47..000000000 --- a/src/render/backend/attachmentmanager.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "attachmentmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - - -AttachmentManager::AttachmentManager() - : QResourcesManager<RenderAttachment, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/attachmentmanager_p.h b/src/render/backend/attachmentmanager_p.h deleted file mode 100644 index d3c71721d..000000000 --- a/src/render/backend/attachmentmanager_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_ATTACHMENTMANAGER_P_H -#define QT3D_RENDER_ATTACHMENTMANAGER_P_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/renderattachment_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderAttachment, 16> HAttachment; - -class AttachmentManager : public QResourcesManager<RenderAttachment, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - AttachmentManager(); -}; - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_ATTACHMENTMANAGER_P_H diff --git a/src/render/backend/cameramanager.cpp b/src/render/backend/cameramanager.cpp deleted file mode 100644 index 8985a8bc1..000000000 --- a/src/render/backend/cameramanager.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "cameramanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -CameraManager::CameraManager() : - QResourcesManager<RenderCameraLens, - QUuid, - 8, - Qt3D::ListAllocatingPolicy>() -{ -} - -/*! Returns true if there is a RenderCamera associated to the entity - * QUuid \a id. False otherwise. - * \fn bool CameraManager::hasCamera(const QUuid &id) const - */ - -/*! - * Returns the camera associated to the Entity with QUuid \a id. - * If no camera has already been associated to \a id, one is implicitely - * created. - * Note that the Q_NULLPTR can be returned if for some reason the - * camera has been released internally. This could indicate a - * programming error somewhere. - * \fn RenderCamera *CameraManager::getOrCreateRenderCamera(const QUuid &id) - */ - -/*! - * Returns the camera associated to the Entity defined by \a id. - * Q_NULLPTR is returned if no camera is associated. - * \fn RenderCamera *CameraManager::renderCamera(const QUuid &id) - */ - -/*! - * Releases the RenderCamera associated with \a id. - * \fn void CameraManager::releaseRenderCamera(const QUuid &id) - */ - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/cameramanager_p.h b/src/render/backend/cameramanager_p.h deleted file mode 100644 index f6f6bf12d..000000000 --- a/src/render/backend/cameramanager_p.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_CAMERAMANAGER_H -#define QT3D_RENDER_CAMERAMANAGER_H - -#include <QtGlobal> -#include <Qt3DCore/qresourcesmanager.h> -#include <QUuid> -#include <Qt3DRenderer/private/rendercameralens_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderCameraLens, 8> HCamera; - -class CameraManager : public QResourcesManager<RenderCameraLens, - QUuid, - 8, - Qt3D::ListAllocatingPolicy> -{ -public: - CameraManager(); - inline bool hasCamera(const QUuid &id) { return contains(id); } - inline RenderCameraLens *getOrCreateRenderCamera(const QUuid &id) { return getOrCreateResource(id); } - inline RenderCameraLens *renderCamera(const QUuid &id) { return lookupResource(id); } - inline void releaseRenderCamera(const QUuid &id) { releaseResource(id); } -}; - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_CAMERAMANAGER_H diff --git a/src/render/backend/criterionmanager.cpp b/src/render/backend/criterionmanager.cpp deleted file mode 100644 index 321b248a4..000000000 --- a/src/render/backend/criterionmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "criterionmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -CriterionManager::CriterionManager() - : QResourcesManager<RenderCriterion, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/criterionmanager_p.h b/src/render/backend/criterionmanager_p.h deleted file mode 100644 index 9a69d6871..000000000 --- a/src/render/backend/criterionmanager_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_CRITERIONMANAGER_H -#define QT3D_RENDER_CRITERIONMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/rendercriterion_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderCriterion, 16> HCriterion; - -class CriterionManager : public QResourcesManager<RenderCriterion, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> - -{ -public: - CriterionManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderCriterion, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_CRITERIONMANAGER_H diff --git a/src/render/backend/effectmanager.cpp b/src/render/backend/effectmanager.cpp deleted file mode 100644 index d554e214d..000000000 --- a/src/render/backend/effectmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "effectmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -EffectManager::EffectManager() - : QResourcesManager<RenderEffect, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/effectmanager_p.h b/src/render/backend/effectmanager_p.h deleted file mode 100644 index c057564cd..000000000 --- a/src/render/backend/effectmanager_p.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_EFFECTMANAGER_H -#define QT3D_RENDER_EFFECTMANAGER_H - -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/private/rendereffect_p.h> -#include <Qt3DCore/qresourcesmanager.h> -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderEffect, 16> HEffect; - -class EffectManager : public QResourcesManager<RenderEffect, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - EffectManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderEffect, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_EFFECTMANAGER_H diff --git a/src/render/backend/entitymanager.cpp b/src/render/backend/entitymanager.cpp deleted file mode 100644 index faf1a04c7..000000000 --- a/src/render/backend/entitymanager.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "entitymanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -EntityManager::EntityManager() : - QResourcesManager<RenderEntity, QUuid, 16>() -{ -} - -/*! - * Returns true if there is a RenderNode associated to the Entity - * identified by \a id. Returns false otherwise. - * \fn bool RenderNodesManager::hasRenderNode(const QUuid &id) const - */ - -/*! - * Returns a RenderNode from an entity \a id. The RenderNode is - * created if needed but Q_NULLPTR can be returned if internally - * the RenderNode has been released. - * \fn RenderNode *RenderNodesManager::getOrCreateRenderNode(const QUuid &id) - */ - -/*! - * Returns the RenderNode associated with the Entity of id \a id. - * Q_NULLPTR if none could be found. - * \fn RenderNode *RenderNodesManager::renderNode(const QUuid &id) - */ - -/*! - * Releases the RenderNode resource associated to the Entity of id \a id. - * \fn void RenderNodesManager::releaseRenderNode(const QUuid &id) - */ - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/entitymanager_p.h b/src/render/backend/entitymanager_p.h deleted file mode 100644 index 019aa68da..000000000 --- a/src/render/backend/entitymanager_p.h +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_RENDERNODESMANAGER_H -#define QT3D_RENDER_RENDERNODESMANAGER_H - -#include <QtGlobal> -#include <QUuid> -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/renderentity_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderEntity, 16> HEntity; - -class EntityManager : public QResourcesManager<RenderEntity, QUuid, 16> -{ -public: - EntityManager(); - - inline bool hasRenderNode(const QUuid &id) { return contains(id); } - inline RenderEntity *getOrCreateRenderNode(const QUuid &id) { return getOrCreateResource(id); } - inline RenderEntity *renderNode(const QUuid &id) { return lookupResource(id); } - inline void releaseRenderNode(const QUuid &id) { releaseResource(id); } - - -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderEntity, Q_REQUIRES_CLEANUP); - -} // Qt3D - - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_RENDERNODESMANAGER_H diff --git a/src/render/backend/framegraph/framegraphnode.cpp b/src/render/backend/framegraph/framegraphnode.cpp index 5f9a0eb76..2817ebd3e 100644 --- a/src/render/backend/framegraph/framegraphnode.cpp +++ b/src/render/backend/framegraph/framegraphnode.cpp @@ -41,7 +41,6 @@ #include "framegraphnode_p.h" #include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/framegraphmanager_p.h> #include <Qt3DRenderer/qframegraph.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/framegraphnode_p.h b/src/render/backend/framegraph/framegraphnode_p.h index 4c0ca615b..2c69f9a71 100644 --- a/src/render/backend/framegraph/framegraphnode_p.h +++ b/src/render/backend/framegraph/framegraphnode_p.h @@ -44,9 +44,9 @@ #include <Qt3DCore/qhandle.h> #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qframegraphitem.h> #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/private/framegraphmanager_p.h> +#include <Qt3DRenderer/qframegraphitem.h> +#include <Qt3DRenderer/private/managers_p.h> #include <qglobal.h> #include <QVector> #include <QUuid> @@ -60,7 +60,9 @@ class QHandle; namespace Render { -class Renderer; +class FrameGraphNode; + +typedef QHandle<FrameGraphNode *, 8> HFrameGraphNode; class FrameGraphNode : public QBackendNode { diff --git a/src/render/backend/framegraph/sortcriterion.cpp b/src/render/backend/framegraph/sortcriterion.cpp index eba492a2d..c9cfecb8e 100644 --- a/src/render/backend/framegraph/sortcriterion.cpp +++ b/src/render/backend/framegraph/sortcriterion.cpp @@ -41,7 +41,7 @@ #include "sortcriterion_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/sortcriterionmanager_p.h> +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/techniquefilternode.cpp b/src/render/backend/framegraph/techniquefilternode.cpp index eb0f91a49..7bf7cf320 100644 --- a/src/render/backend/framegraph/techniquefilternode.cpp +++ b/src/render/backend/framegraph/techniquefilternode.cpp @@ -42,7 +42,7 @@ #include "techniquefilternode_p.h" #include "qcriterion.h" #include "qtechniquefilter.h" -#include <Qt3DRenderer/private/criterionmanager_p.h> +#include <Qt3DRenderer/private/managers_p.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraphmanager.cpp b/src/render/backend/framegraphmanager.cpp deleted file mode 100644 index 92aed1c11..000000000 --- a/src/render/backend/framegraphmanager.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "framegraphmanager_p.h" -#include <Qt3DRenderer/private/framegraphnode_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -FrameGraphManager::FrameGraphManager() : QResourcesManager<FrameGraphNode *, - QUuid, - 8, - Qt3D::ArrayAllocatingPolicy>() -{ -} - -// TO DO : Implement cleanup mecanism in FrameGraphNode - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/framegraphmanager_p.h b/src/render/backend/framegraphmanager_p.h deleted file mode 100644 index c4f49b39b..000000000 --- a/src/render/backend/framegraphmanager_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_FRAMEGRAPHMANAGER_H -#define QT3D_RENDER_FRAMEGRAPHMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -class FrameGraphNode; - -typedef QHandle<FrameGraphNode *, 8> HFrameGraphNode; - -class FrameGraphManager : public QResourcesManager<FrameGraphNode *, - QUuid, - 8, - Qt3D::ArrayAllocatingPolicy> -{ -public: - FrameGraphManager(); -}; - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_FRAMEGRAPHMANAGER_H diff --git a/src/render/backend/jobs/loadmeshdatajob.cpp b/src/render/backend/jobs/loadmeshdatajob.cpp index 72913567e..8fcbfab43 100644 --- a/src/render/backend/jobs/loadmeshdatajob.cpp +++ b/src/render/backend/jobs/loadmeshdatajob.cpp @@ -45,8 +45,8 @@ #include <qmesh.h> #include <sphere.h> #include <Qt3DRenderer/private/renderer_p.h> +#include <Qt3DRenderer/private/managers_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> -#include <Qt3DRenderer/private/meshmanager_p.h> #include <QThread> #include "renderlogging.h" diff --git a/src/render/backend/layermanager.cpp b/src/render/backend/layermanager.cpp deleted file mode 100644 index 2d771e3c8..000000000 --- a/src/render/backend/layermanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "layermanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -LayerManager::LayerManager() - : QResourcesManager<RenderLayer, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/layermanager_p.h b/src/render/backend/layermanager_p.h deleted file mode 100644 index 3cb001eed..000000000 --- a/src/render/backend/layermanager_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_LAYERMANAGER_H -#define QT3D_RENDER_LAYERMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/renderlayer_p.h> -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderLayer, 16> HLayer; - -class LayerManager : public QResourcesManager<RenderLayer, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - LayerManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderLayer, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_LAYERMANAGER_H diff --git a/src/render/backend/lightmanager.cpp b/src/render/backend/lightmanager.cpp deleted file mode 100644 index d2ddabbf3..000000000 --- a/src/render/backend/lightmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "lightmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -LightManager::LightManager() - : QResourcesManager<RenderLight, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/lightmanager_p.h b/src/render/backend/lightmanager_p.h deleted file mode 100644 index 3a1c271df..000000000 --- a/src/render/backend/lightmanager_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_LIGHTMANAGER_H -#define QT3D_RENDER_LIGHTMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/renderlight_p.h> -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderLight, 16> HLight; - -class LightManager : public QResourcesManager<RenderLight, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - LightManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderLight, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_LIGHTMANAGER_H diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h new file mode 100644 index 000000000..27719c675 --- /dev/null +++ b/src/render/backend/managers_p.h @@ -0,0 +1,313 @@ +/**************************************************************************** +** +** 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: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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 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 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3D_RENDER_MANAGERS_P_H +#define QT3D_RENDER_MANAGERS_P_H + +#include <Qt3DCore/qresourcesmanager.h> +#include <Qt3DRenderer/private/renderattachment_p.h> +#include <Qt3DRenderer/private/rendercameralens_p.h> +#include <Qt3DRenderer/private/rendercriterion_p.h> +#include <Qt3DRenderer/private/rendereffect_p.h> +#include <Qt3DRenderer/private/renderentity_p.h> +#include <Qt3DRenderer/private/renderlayer_p.h> +#include <Qt3DRenderer/private/renderlight_p.h> +#include <Qt3DRenderer/private/rendermaterial_p.h> +#include <Qt3DRenderer/private/rendermesh_p.h> +#include <Qt3DRenderer/private/rendershader_p.h> +#include <Qt3DRenderer/private/sortcriterion_p.h> +#include <Qt3DRenderer/private/rendertechnique_p.h> +#include <Qt3DRenderer/private/rendertexture_p.h> +#include <Qt3DRenderer/private/rendertransform_p.h> +#include <Qt3DRenderer/private/rendertarget_p.h> +#include <Qt3DRenderer/private/renderrenderpass_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3D { + +class QMeshData; + +namespace Render { + +class RenderShader; +class FrameGraphNode; + +typedef QHandle<RenderAttachment, 16> HAttachment; +typedef QHandle<RenderCameraLens, 8> HCamera; +typedef QHandle<RenderCriterion, 16> HCriterion; +typedef QHandle<RenderEffect, 16> HEffect; +typedef QHandle<RenderEntity, 16> HEntity; +typedef QHandle<FrameGraphNode *, 8> HFrameGraphNode; +typedef QHandle<RenderLayer, 16> HLayer; +typedef QHandle<RenderLight, 16> HLight; +typedef QHandle<RenderMaterial, 16> HMaterial; +typedef QHandle<QMatrix4x4, 16> HMatrix; +typedef QHandle<RenderShader, 16> HShader; +typedef QHandle<QOpenGLVertexArrayObject*, 16> HVao; +typedef QHandle<QMeshData, 16> HMeshData; +typedef QHandle<RenderShader, 16> HShader; +typedef QHandle<SortCriterion, 8> HSortCriterion; +typedef QHandle<RenderTechnique, 16> HTechnique; +typedef QHandle<RenderTexture, 16> HTexture; +typedef QHandle<RenderTransform, 16> HTransform; +typedef QHandle<RenderMesh, 16> HMesh; +typedef QHandle<RenderTarget, 8> HTarget; +typedef QHandle<RenderRenderPass, 16> HRenderPass; + +class AttachmentManager : public QResourcesManager< + RenderAttachment, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + AttachmentManager() {} +}; + +class CameraManager : public QResourcesManager< + RenderCameraLens, + QUuid, + 8, + Qt3D::ListAllocatingPolicy> +{ +public: + CameraManager() {} +}; + +class CriterionManager : public QResourcesManager< + RenderCriterion, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> + +{ +public: + CriterionManager() {} +}; + +class EffectManager : public QResourcesManager< + RenderEffect, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + EffectManager() {} +}; + +class EntityManager : public QResourcesManager<RenderEntity, QUuid, 16> +{ +public: + EntityManager() {} +}; + +class FrameGraphManager : public QResourcesManager< + FrameGraphNode *, + QUuid, + 8, + Qt3D::ArrayAllocatingPolicy> +{ +public: + FrameGraphManager() {} +}; + +class LayerManager : public QResourcesManager< + RenderLayer, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + LayerManager() {} +}; + +class LightManager : public QResourcesManager< + RenderLight, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + LightManager() {} +}; + +class MaterialManager : public QResourcesManager< + RenderMaterial, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + MaterialManager() {} +}; + +class MatrixManager : public QResourcesManager<QMatrix4x4, QUuid, 16> +{ +public: + MatrixManager() {} +}; + +class MeshManager : public QResourcesManager< + RenderMesh, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + MeshManager() {} +}; + +class ShaderManager : public QResourcesManager< + RenderShader, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + ShaderManager() {} +}; + +class SortCriterionManager : public QResourcesManager< + SortCriterion, + QUuid, + 8, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + SortCriterionManager() {} +}; + +class TechniqueManager : public QResourcesManager< + RenderTechnique, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + TechniqueManager() {} +}; + +class TextureManager : public QResourcesManager< + RenderTexture, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + TextureManager() {} +}; + +class TransformManager : public QResourcesManager< + RenderTransform, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + TransformManager() {} +}; + +class VAOManager : public QResourcesManager< + QOpenGLVertexArrayObject *, + QPair<HMeshData, HShader>, + 16> +{ +public: + VAOManager() {} +}; + +class RenderTargetManager : public QResourcesManager< + RenderTarget, + QUuid, + 8, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + RenderTargetManager() {} +}; + +class RenderPassManager : public QResourcesManager< + RenderRenderPass, + QUuid, + 16, + Qt3D::ArrayAllocatingPolicy, + Qt3D::ObjectLevelLockingPolicy> +{ +public: + RenderPassManager() {} +}; + +} // Render + +Q_DECLARE_RESOURCE_INFO(Render::RenderCriterion, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderEffect, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderEntity, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderLayer, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderLight, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderMaterial, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderMesh, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderShader, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::SortCriterion, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderTarget, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderTechnique, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderTexture, Q_REQUIRES_CLEANUP); +Q_DECLARE_RESOURCE_INFO(Render::RenderRenderPass, Q_REQUIRES_CLEANUP); + +} // Qt3D + +QT_END_NAMESPACE + + +#endif // QT3D_RENDER_MANAGERS_P_H diff --git a/src/render/backend/materialmanager.cpp b/src/render/backend/materialmanager.cpp deleted file mode 100644 index 253a41275..000000000 --- a/src/render/backend/materialmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "materialmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -MaterialManager::MaterialManager() : - QResourcesManager<RenderMaterial, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/materialmanager_p.h b/src/render/backend/materialmanager_p.h deleted file mode 100644 index 99d77d2b0..000000000 --- a/src/render/backend/materialmanager_p.h +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_MATERIALMANAGER_H -#define QT3D_RENDER_MATERIALMANAGER_H - -#include <QtGlobal> -#include <QUuid> -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/rendermaterial_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -class QMaterial; - -namespace Render { - -typedef QHandle<RenderMaterial, 16> HMaterial; - -class MaterialManager : public QResourcesManager<RenderMaterial, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - MaterialManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderMaterial, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_MATERIALMANAGER_H diff --git a/src/render/backend/matrixmanager.cpp b/src/render/backend/matrixmanager.cpp deleted file mode 100644 index afd813015..000000000 --- a/src/render/backend/matrixmanager.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "matrixmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -MatrixManager::MatrixManager() : QResourcesManager<QMatrix4x4, QUuid, 16>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/matrixmanager_p.h b/src/render/backend/matrixmanager_p.h deleted file mode 100644 index 0b53e083f..000000000 --- a/src/render/backend/matrixmanager_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_MATRIXMANAGER_H -#define QT3D_RENDER_MATRIXMANAGER_H - -#include <QMatrix4x4> -#include <QUuid> -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DCore/qhandle.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -typedef QHandle<QMatrix4x4, 16> HMatrix; - -namespace Render { - -class MatrixManager : public QResourcesManager<QMatrix4x4, QUuid, 16> -{ -public: - MatrixManager(); -}; - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_MATRIXMANAGER_H diff --git a/src/render/backend/meshmanager.cpp b/src/render/backend/meshmanager.cpp deleted file mode 100644 index c5c8c59ae..000000000 --- a/src/render/backend/meshmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "meshmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -MeshManager::MeshManager() - : QResourcesManager<RenderMesh, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/meshmanager_p.h b/src/render/backend/meshmanager_p.h deleted file mode 100644 index f2566b0ca..000000000 --- a/src/render/backend/meshmanager_p.h +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_MESHMANAGER_H -#define QT3D_RENDER_MESHMANAGER_H - -#include <Qt3DCore/qhandle.h> -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/rendermesh_p.h> -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderMesh, 16> HMesh; - -class MeshManager : public QResourcesManager<RenderMesh, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - MeshManager(); - - inline bool hasRenderMesh(const QUuid &id) { return contains(id); } - inline RenderMesh *getOrCreateRenderMesh(const QUuid &id) { return getOrCreateResource(id); } - inline RenderMesh *renderMesh(const QUuid &id) { return lookupResource(id); } - inline void releaseRenderMesh(const QUuid &id) { releaseResource(id); } - -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderMesh, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_MESHMANAGER_H diff --git a/src/render/backend/qgraphicscontext.cpp b/src/render/backend/qgraphicscontext.cpp index f99ab99d8..c7a514493 100644 --- a/src/render/backend/qgraphicscontext.cpp +++ b/src/render/backend/qgraphicscontext.cpp @@ -53,7 +53,7 @@ #include <Qt3DRenderer/private/rendertarget_p.h> #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h> #include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/texturemanager_p.h> +#include <Qt3DRenderer/private/managers_p.h> #include <Qt3DRenderer/private/attachmentpack_p.h> #include <QOpenGLShaderProgram> diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri index 49d36dc9f..bd4993847 100644 --- a/src/render/backend/render-backend.pri +++ b/src/render/backend/render-backend.pri @@ -27,44 +27,26 @@ HEADERS += \ $$PWD/qgraphicshelpergl2_p.h \ $$PWD/renderview_p.h \ $$PWD/rendercommand_p.h \ - $$PWD/cameramanager_p.h \ $$PWD/renderqueues_p.h \ - $$PWD/materialmanager_p.h \ - $$PWD/meshmanager_p.h \ - $$PWD/matrixmanager_p.h \ - $$PWD/vaomanager_p.h \ - $$PWD/shadermanager_p.h \ - $$PWD/techniquemanager_p.h \ $$PWD/rendereffect_p.h \ - $$PWD/effectmanager_p.h \ $$PWD/renderrenderpass_p.h \ - $$PWD/renderpassmanager_p.h \ $$PWD/parameterpack_p.h \ - $$PWD/texturemanager_p.h \ $$PWD/texturedatamanager_p.h \ $$PWD/renderlayer_p.h \ - $$PWD/layermanager_p.h \ $$PWD/renderlight_p.h \ - $$PWD/lightmanager_p.h \ $$PWD/renderentity_p.h \ - $$PWD/entitymanager_p.h \ $$PWD/rendercriterion_p.h \ - $$PWD/criterionmanager_p.h \ - $$PWD/framegraphmanager_p.h \ $$PWD/rendertransform_p.h \ - $$PWD/transformmanager_p.h \ $$PWD/renderstate_p.h \ $$PWD/rendertarget_p.h \ $$PWD/renderattachment_p.h \ - $$PWD/rendertargetmanager_p.h \ $$PWD/renderscene_p.h \ $$PWD/scenemanager_p.h \ $$PWD/attachmentpack_p.h \ - $$PWD/attachmentmanager_p.h \ - $$PWD/sortcriterionmanager_p.h \ $$PWD/shadervariables_p.h \ $$PWD/qgraphicsutils_p.h \ - $$PWD/rendernodefunctor_p.h + $$PWD/rendernodefunctor_p.h \ + $$PWD/managers_p.h SOURCES += \ $$PWD/rendereraspect.cpp \ @@ -88,38 +70,19 @@ SOURCES += \ $$PWD/qgraphicshelpergl2.cpp \ $$PWD/renderview.cpp \ $$PWD/rendercommand.cpp \ - $$PWD/cameramanager.cpp \ $$PWD/renderqueues.cpp \ - $$PWD/materialmanager.cpp \ - $$PWD/meshmanager.cpp \ - $$PWD/matrixmanager.cpp \ - $$PWD/vaomanager.cpp \ - $$PWD/shadermanager.cpp \ - $$PWD/techniquemanager.cpp \ $$PWD/rendereffect.cpp \ - $$PWD/effectmanager.cpp \ $$PWD/renderrenderpass.cpp \ - $$PWD/renderpassmanager.cpp \ $$PWD/parameterpack.cpp \ - $$PWD/texturemanager.cpp \ $$PWD/texturedatamanager.cpp \ $$PWD/renderlayer.cpp \ - $$PWD/layermanager.cpp \ $$PWD/renderlight.cpp \ - $$PWD/lightmanager.cpp \ $$PWD/renderentity.cpp \ - $$PWD/entitymanager.cpp \ $$PWD/rendercriterion.cpp \ - $$PWD/criterionmanager.cpp \ - $$PWD/framegraphmanager.cpp \ $$PWD/rendertransform.cpp \ - $$PWD/transformmanager.cpp \ $$PWD/renderstate.cpp \ $$PWD/rendertarget.cpp \ $$PWD/renderattachment.cpp \ - $$PWD/rendertargetmanager.cpp \ $$PWD/renderscene.cpp \ $$PWD/scenemanager.cpp \ - $$PWD/attachmentpack.cpp \ - $$PWD/attachmentmanager.cpp \ - $$PWD/sortcriterionmanager.cpp + $$PWD/attachmentpack.cpp diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp index 7ec545a15..d1661064f 100644 --- a/src/render/backend/renderattachment.cpp +++ b/src/render/backend/renderattachment.cpp @@ -42,7 +42,7 @@ #include <Qt3DRenderer/private/renderattachment_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/private/attachmentmanager_p.h> +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendercameralens.cpp b/src/render/backend/rendercameralens.cpp index 32f346972..def37c8d2 100644 --- a/src/render/backend/rendercameralens.cpp +++ b/src/render/backend/rendercameralens.cpp @@ -41,7 +41,6 @@ #include "rendercameralens_p.h" #include "renderlogging.h" -#include "cameramanager_p.h" #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qcameralens.h> diff --git a/src/render/backend/rendercriterion.cpp b/src/render/backend/rendercriterion.cpp index f1fb2ee3f..2bbe746f6 100644 --- a/src/render/backend/rendercriterion.cpp +++ b/src/render/backend/rendercriterion.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "rendercriterion_p.h" -#include "criterionmanager_p.h" #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendereffect.cpp b/src/render/backend/rendereffect.cpp index 07e267491..3c30d3988 100644 --- a/src/render/backend/rendereffect.cpp +++ b/src/render/backend/rendereffect.cpp @@ -40,9 +40,7 @@ ****************************************************************************/ #include <Qt3DRenderer/private/rendereffect_p.h> -#include <Qt3DRenderer/private/effectmanager_p.h> #include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/techniquemanager_p.h> #include <Qt3DRenderer/qeffect.h> #include <Qt3DRenderer/qparameter.h> diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp index f16d12287..dc64b1785 100644 --- a/src/render/backend/renderentity.cpp +++ b/src/render/backend/renderentity.cpp @@ -40,17 +40,8 @@ ****************************************************************************/ #include "renderentity_p.h" -#include <Qt3DRenderer/private/cameramanager_p.h> -#include <Qt3DRenderer/private/entitymanager_p.h> -#include <Qt3DRenderer/private/layermanager_p.h> -#include <Qt3DRenderer/private/lightmanager_p.h> -#include <Qt3DRenderer/private/materialmanager_p.h> -#include <Qt3DRenderer/private/matrixmanager_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> -#include <Qt3DRenderer/private/meshmanager_p.h> #include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/transformmanager_p.h> -#include <Qt3DRenderer/private/entitymanager_p.h> #include <Qt3DRenderer/qabstractlight.h> #include <Qt3DRenderer/qabstractshapemesh.h> #include <Qt3DRenderer/qlayer.h> diff --git a/src/render/backend/renderentity_p.h b/src/render/backend/renderentity_p.h index 393699d05..7dd763c0d 100644 --- a/src/render/backend/renderentity_p.h +++ b/src/render/backend/renderentity_p.h @@ -43,18 +43,8 @@ #ifndef QT3D_RENDER_RENDERNODE_H #define QT3D_RENDER_RENDERNODE_H -#include <Qt3DRenderer/private/rendermesh_p.h> -#include <Qt3DRenderer/private/meshmanager_p.h> -#include <Qt3DRenderer/private/renderlayer_p.h> #include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/layermanager_p.h> -#include <Qt3DRenderer/private/lightmanager_p.h> -#include <Qt3DRenderer/private/cameramanager_p.h> -#include <Qt3DRenderer/private/rendertransform_p.h> -#include <Qt3DRenderer/private/transformmanager_p.h> -#include <Qt3DRenderer/private/materialmanager_p.h> - -#include <Qt3DCore/private/qobserverinterface_p.h> +#include <Qt3DRenderer/private/managers_p.h> #include <Qt3DCore/qhandle.h> #include <QVector> #include <QUuid> @@ -71,18 +61,23 @@ class QNode; class QEntity; class QComponent; -typedef QHandle<QMatrix4x4, 16> HMatrix; - -namespace Render { -class RenderEntity; -} - -typedef QHandle<Render::RenderEntity, 16> HEntity; - namespace Render { class Renderer; class EntityManager; +class RenderLight; +class RenderEntity; +class RenderLayer; +class RenderMesh; +class RenderTransform; + +typedef QHandle<RenderCameraLens, 8> HCamera; +typedef QHandle<RenderEntity, 16> HEntity; +typedef QHandle<RenderLayer, 16> HLayer; +typedef QHandle<RenderLight, 16> HLight; +typedef QHandle<QMatrix4x4, 16> HMatrix; +typedef QHandle<RenderTransform, 16> HTransform; +typedef QHandle<RenderMesh, 16> HMesh; class RenderEntity : public QBackendNode { diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index fb5cb9d1a..c55777fe4 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -59,19 +59,9 @@ #include <Qt3DRenderer/qeffect.h> #include <Qt3DRenderer/private/blendstate_p.h> -#include <Qt3DRenderer/private/cameramanager_p.h> #include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/criterionmanager_p.h> -#include <Qt3DRenderer/private/effectmanager_p.h> -#include <Qt3DRenderer/private/entitymanager_p.h> -#include <Qt3DRenderer/private/framegraphmanager_p.h> #include <Qt3DRenderer/private/framegraphvisitor_p.h> -#include <Qt3DRenderer/private/layermanager_p.h> -#include <Qt3DRenderer/private/lightmanager_p.h> -#include <Qt3DRenderer/private/materialmanager_p.h> -#include <Qt3DRenderer/private/matrixmanager_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> -#include <Qt3DRenderer/private/meshmanager_p.h> #include <Qt3DRenderer/private/qgraphicscontext_p.h> #include <Qt3DRenderer/private/rendercameralens_p.h> #include <Qt3DRenderer/private/rendercommand_p.h> @@ -79,7 +69,6 @@ #include <Qt3DRenderer/private/rendermaterial_p.h> #include <Qt3DRenderer/private/rendermesh_p.h> #include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderpassmanager_p.h> #include <Qt3DRenderer/private/renderqueues_p.h> #include <Qt3DRenderer/private/rendershader_p.h> #include <Qt3DRenderer/private/renderstate_p.h> @@ -87,18 +76,10 @@ #include <Qt3DRenderer/private/rendertextureprovider_p.h> #include <Qt3DRenderer/private/renderthread_p.h> #include <Qt3DRenderer/private/renderview_p.h> -#include <Qt3DRenderer/private/shadermanager_p.h> #include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/techniquemanager_p.h> #include <Qt3DRenderer/private/texturedatamanager_p.h> -#include <Qt3DRenderer/private/texturemanager_p.h> -#include <Qt3DRenderer/private/transformmanager_p.h> -#include <Qt3DRenderer/private/rendertargetmanager_p.h> #include <Qt3DRenderer/private/scenemanager_p.h> -#include <Qt3DRenderer/private/vaomanager_p.h> #include <Qt3DRenderer/private/viewportnode_p.h> -#include <Qt3DRenderer/private/attachmentmanager_p.h> -#include <Qt3DRenderer/private/sortcriterionmanager_p.h> #include <Qt3DRenderer/private/abstractsceneparser_p.h> #include <Qt3DCore/qcameralens.h> diff --git a/src/render/backend/rendereraspect.cpp b/src/render/backend/rendereraspect.cpp index e22ae70b6..193e1f588 100644 --- a/src/render/backend/rendereraspect.cpp +++ b/src/render/backend/rendereraspect.cpp @@ -42,7 +42,6 @@ #include "rendereraspect.h" #include <Qt3DRenderer/private/rendermesh_p.h> -#include <Qt3DRenderer/private/meshmanager_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/scenemanager_p.h> @@ -70,37 +69,21 @@ #include <Qt3DRenderer/qeffect.h> #include <Qt3DCore/qcameralens.h> -#include <Qt3DRenderer/private/cameramanager_p.h> #include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/criterionmanager_p.h> -#include <Qt3DRenderer/private/effectmanager_p.h> -#include <Qt3DRenderer/private/entitymanager_p.h> #include <Qt3DRenderer/private/layerfilternode_p.h> -#include <Qt3DRenderer/private/layermanager_p.h> -#include <Qt3DRenderer/private/lightmanager_p.h> -#include <Qt3DRenderer/private/materialmanager_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> -#include <Qt3DRenderer/private/meshmanager_p.h> #include <Qt3DRenderer/private/rendercriterion_p.h> #include <Qt3DRenderer/private/renderentity_p.h> #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderpassmanager_p.h> #include <Qt3DRenderer/private/rendertargetselectornode_p.h> -#include <Qt3DRenderer/private/shadermanager_p.h> #include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/techniquemanager_p.h> -#include <Qt3DRenderer/private/transformmanager_p.h> #include <Qt3DRenderer/private/viewportnode_p.h> #include <Qt3DRenderer/private/rendertarget_p.h> -#include <Qt3DRenderer/private/rendertargetmanager_p.h> #include <Qt3DRenderer/private/scenemanager_p.h> -#include <Qt3DRenderer/private/attachmentmanager_p.h> -#include <Qt3DRenderer/private/texturemanager_p.h> #include <Qt3DRenderer/private/clearbuffer_p.h> #include <Qt3DRenderer/private/sortmethod_p.h> #include <Qt3DRenderer/private/sortcriterion_p.h> -#include <Qt3DRenderer/private/sortcriterionmanager_p.h> #include <Qt3DRenderer/private/rendernodefunctor_p.h> #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DCore/qentity.h> diff --git a/src/render/backend/renderlayer.cpp b/src/render/backend/renderlayer.cpp index a39cfe66f..c1b9b3ce7 100644 --- a/src/render/backend/renderlayer.cpp +++ b/src/render/backend/renderlayer.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include "renderlayer_p.h" -#include "layermanager_p.h" #include "qlayer.h" #include <Qt3DCore/qscenepropertychange.h> +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderlight.cpp b/src/render/backend/renderlight.cpp index e52c68005..64b40921f 100644 --- a/src/render/backend/renderlight.cpp +++ b/src/render/backend/renderlight.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include "renderlight_p.h" -#include "lightmanager_p.h" #include "qabstractlight.h" #include <Qt3DCore/qscenepropertychange.h> +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendermaterial.cpp b/src/render/backend/rendermaterial.cpp index ea6563915..38f1c98c5 100644 --- a/src/render/backend/rendermaterial.cpp +++ b/src/render/backend/rendermaterial.cpp @@ -48,7 +48,6 @@ #include "qtechnique.h" #include "qmaterial.h" #include "qeffect.h" -#include "materialmanager_p.h" #include <Qt3DCore/qscenepropertychange.h> #include <QOpenGLShaderProgram> diff --git a/src/render/backend/rendermesh.cpp b/src/render/backend/rendermesh.cpp index 77868411f..0c09d495c 100644 --- a/src/render/backend/rendermesh.cpp +++ b/src/render/backend/rendermesh.cpp @@ -42,11 +42,11 @@ #include "rendermesh_p.h" #include "rendereraspect.h" -#include "meshmanager_p.h" #include "meshdatamanager_p.h" #include "qmesh.h" #include <Qt3DRenderer/private/qgraphicscontext_p.h> +#include <Qt3DRenderer/private/managers_p.h> #include <Qt3DRenderer/qmeshdata.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/backend/renderpassmanager.cpp b/src/render/backend/renderpassmanager.cpp deleted file mode 100644 index f43993391..000000000 --- a/src/render/backend/renderpassmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "renderpassmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -RenderPassManager::RenderPassManager() - : QResourcesManager<RenderRenderPass, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/renderpassmanager_p.h b/src/render/backend/renderpassmanager_p.h deleted file mode 100644 index 8984b8b51..000000000 --- a/src/render/backend/renderpassmanager_p.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_RENDERPASSMANAGER_H -#define QT3D_RENDER_RENDERPASSMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/renderrenderpass_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -class QAbstractRenderPass; - -namespace Render { - -typedef QHandle<RenderRenderPass, 16> HRenderPass; - -class RenderPassManager : public QResourcesManager<RenderRenderPass, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - RenderPassManager(); - -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderRenderPass, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_RENDERPASSMANAGER_H diff --git a/src/render/backend/renderrenderpass.cpp b/src/render/backend/renderrenderpass.cpp index 4b7136f66..063748c5c 100644 --- a/src/render/backend/renderrenderpass.cpp +++ b/src/render/backend/renderrenderpass.cpp @@ -41,8 +41,6 @@ ****************************************************************************/ #include "renderrenderpass_p.h" -#include "renderpassmanager_p.h" -#include <Qt3DRenderer/private/criterionmanager_p.h> #include <Qt3DRenderer/private/rendercriterion_p.h> #include <Qt3DRenderer/qparametermapper.h> #include <Qt3DRenderer/qrenderstate.h> diff --git a/src/render/backend/rendershader.cpp b/src/render/backend/rendershader.cpp index 26783510b..6c0073861 100644 --- a/src/render/backend/rendershader.cpp +++ b/src/render/backend/rendershader.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "rendershader_p.h" -#include "shadermanager_p.h" #include <QDebug> #include <QFile> diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index 97ffa06a7..55af6654a 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -43,7 +43,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DRenderer/qrendertarget.h> #include <Qt3DRenderer/qrenderattachment.h> -#include <Qt3DRenderer/private/rendertargetmanager_p.h> +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/rendertargetmanager.cpp b/src/render/backend/rendertargetmanager.cpp deleted file mode 100644 index 6b067f179..000000000 --- a/src/render/backend/rendertargetmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "rendertargetmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -RenderTargetManager::RenderTargetManager() - : QResourcesManager<RenderTarget, - QUuid, - 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/rendertargetmanager_p.h b/src/render/backend/rendertargetmanager_p.h deleted file mode 100644 index 74ad80d1b..000000000 --- a/src/render/backend/rendertargetmanager_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_RENDERTARGETMANAGER_P_H -#define QT3D_RENDER_RENDERTARGETMANAGER_P_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/rendertarget_p.h> -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderTarget, 8> HTarget; - -class RenderTargetManager : public QResourcesManager<RenderTarget, - QUuid, - 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - RenderTargetManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderTarget, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_RENDERTARGETMANAGER_P_H diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp index 8b6c0664d..2ca0256c9 100644 --- a/src/render/backend/rendertechnique.cpp +++ b/src/render/backend/rendertechnique.cpp @@ -45,15 +45,12 @@ #include <Qt3DRenderer/qtechnique.h> #include <Qt3DRenderer/qopenglfilter.h> #include <Qt3DRenderer/rendereraspect.h> -#include <Qt3DRenderer/private/criterionmanager_p.h> #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/rendercriterion_p.h> -#include <Qt3DRenderer/private/renderpassmanager_p.h> #include <Qt3DRenderer/private/rendershader_p.h> #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include "techniquemanager_p.h" #include <QDebug> diff --git a/src/render/backend/rendertexture.cpp b/src/render/backend/rendertexture.cpp index 8936a39e9..09082c812 100644 --- a/src/render/backend/rendertexture.cpp +++ b/src/render/backend/rendertexture.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "rendertexture_p.h" -#include "texturemanager_p.h" #include <QDebug> #include <QOpenGLFunctions> diff --git a/src/render/backend/rendertransform.cpp b/src/render/backend/rendertransform.cpp index 999258532..774d91d62 100644 --- a/src/render/backend/rendertransform.cpp +++ b/src/render/backend/rendertransform.cpp @@ -46,7 +46,6 @@ #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qtransform.h> #include <Qt3DRenderer/rendereraspect.h> -#include <Qt3DRenderer/private/transformmanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 7445e51d9..5176a044a 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -47,19 +47,11 @@ #include <Qt3DRenderer/qtexture.h> #include <Qt3DRenderer/qrendertarget.h> -#include <Qt3DRenderer/private/cameramanager_p.h> #include <Qt3DRenderer/private/cameraselectornode_p.h> -#include <Qt3DRenderer/private/criterionmanager_p.h> -#include <Qt3DRenderer/private/effectmanager_p.h> -#include <Qt3DRenderer/private/entitymanager_p.h> #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DRenderer/private/layerfilternode_p.h> -#include <Qt3DRenderer/private/layermanager_p.h> -#include <Qt3DRenderer/private/lightmanager_p.h> -#include <Qt3DRenderer/private/materialmanager_p.h> #include <Qt3DRenderer/private/qmeshdata_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> -#include <Qt3DRenderer/private/meshmanager_p.h> #include <Qt3DRenderer/private/qparameter_p.h> #include <Qt3DRenderer/private/qparametermapper_p.h> #include <Qt3DRenderer/private/rendercameralens_p.h> @@ -70,20 +62,12 @@ #include <Qt3DRenderer/private/renderlayer_p.h> #include <Qt3DRenderer/private/renderlight_p.h> #include <Qt3DRenderer/private/renderpassfilternode_p.h> -#include <Qt3DRenderer/private/renderpassmanager_p.h> #include <Qt3DRenderer/private/renderrenderpass_p.h> -#include <Qt3DRenderer/private/shadermanager_p.h> #include <Qt3DRenderer/private/techniquefilternode_p.h> -#include <Qt3DRenderer/private/techniquemanager_p.h> -#include <Qt3DRenderer/private/texturemanager_p.h> -#include <Qt3DRenderer/private/vaomanager_p.h> #include <Qt3DRenderer/private/viewportnode_p.h> #include <Qt3DRenderer/private/rendertargetselectornode_p.h> -#include <Qt3DRenderer/private/rendertargetmanager_p.h> -#include <Qt3DRenderer/private/attachmentmanager_p.h> #include <Qt3DRenderer/private/clearbuffer_p.h> #include <Qt3DRenderer/private/sortmethod_p.h> -#include <Qt3DRenderer/private/sortcriterionmanager_p.h> #include <Qt3DRenderer/sphere.h> #include <Qt3DRenderer/qalphatest.h> diff --git a/src/render/backend/shadermanager.cpp b/src/render/backend/shadermanager.cpp deleted file mode 100644 index 880da8b8b..000000000 --- a/src/render/backend/shadermanager.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "shadermanager_p.h" -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -ShaderManager::ShaderManager() - : QResourcesManager<RenderShader, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/shadermanager_p.h b/src/render/backend/shadermanager_p.h deleted file mode 100644 index 3bf916e80..000000000 --- a/src/render/backend/shadermanager_p.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_SHADERMANAGER_H -#define QT3D_RENDER_SHADERMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DCore/qhandle.h> -#include <Qt3DRenderer/private/rendershader_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderShader, 16> HShader; - -class ShaderManager : public QResourcesManager<RenderShader, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - ShaderManager(); - -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderShader, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_SHADERMANAGER_H diff --git a/src/render/backend/sortcriterionmanager.cpp b/src/render/backend/sortcriterionmanager.cpp deleted file mode 100644 index 600fdd03b..000000000 --- a/src/render/backend/sortcriterionmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "sortcriterionmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -SortCriterionManager::SortCriterionManager() - : QResourcesManager<SortCriterion, - QUuid, - 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/sortcriterionmanager_p.h b/src/render/backend/sortcriterionmanager_p.h deleted file mode 100644 index b070f9a30..000000000 --- a/src/render/backend/sortcriterionmanager_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_SORTCRITERIONMANAGER_P_H -#define QT3D_RENDER_SORTCRITERIONMANAGER_P_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/sortcriterion_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<SortCriterion, 8> HSortCriterion; - -class SortCriterionManager : public QResourcesManager<SortCriterion, - QUuid, - 8, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - SortCriterionManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::SortCriterion, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_SORTCRITERIONMANAGER_P_H diff --git a/src/render/backend/techniquemanager.cpp b/src/render/backend/techniquemanager.cpp deleted file mode 100644 index c2ce43f97..000000000 --- a/src/render/backend/techniquemanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "techniquemanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -TechniqueManager::TechniqueManager() - : QResourcesManager<RenderTechnique, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/techniquemanager_p.h b/src/render/backend/techniquemanager_p.h deleted file mode 100644 index d63735d10..000000000 --- a/src/render/backend/techniquemanager_p.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_TECHNIQUEMANAGER_H -#define QT3D_RENDER_TECHNIQUEMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DCore/qhandle.h> -#include <Qt3DRenderer/private/rendertechnique_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -class QAbstractEffect; - -namespace Render { - -typedef QHandle<RenderTechnique, 16> HTechnique; - -class TechniqueManager : public QResourcesManager<RenderTechnique, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - TechniqueManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderTechnique, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_TECHNIQUEMANAGER_H diff --git a/src/render/backend/texturemanager.cpp b/src/render/backend/texturemanager.cpp deleted file mode 100644 index 212ef7f37..000000000 --- a/src/render/backend/texturemanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "texturemanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -TextureManager::TextureManager() - : QResourcesManager<RenderTexture, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/texturemanager_p.h b/src/render/backend/texturemanager_p.h deleted file mode 100644 index 35f6f3450..000000000 --- a/src/render/backend/texturemanager_p.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_TEXTUREMANAGER_H -#define QT3D_RENDER_TEXTUREMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/rendertexture_p.h> - -#include <QUuid> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderTexture, 16> HTexture; - -class TextureManager : public QResourcesManager<RenderTexture, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - TextureManager(); -}; - -} // Render - -Q_DECLARE_RESOURCE_INFO(Render::RenderTexture, Q_REQUIRES_CLEANUP); - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_TEXTUREMANAGER_H diff --git a/src/render/backend/transformmanager.cpp b/src/render/backend/transformmanager.cpp deleted file mode 100644 index 640d19106..000000000 --- a/src/render/backend/transformmanager.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "transformmanager_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -TransformManager::TransformManager() - : QResourcesManager<RenderTransform, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/transformmanager_p.h b/src/render/backend/transformmanager_p.h deleted file mode 100644 index fb1c3a818..000000000 --- a/src/render/backend/transformmanager_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_TRANSFORMMANAGER_H -#define QT3D_RENDER_TRANSFORMMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DRenderer/private/rendertransform_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -typedef QHandle<RenderTransform, 16> HTransform; - -class TransformManager : public QResourcesManager<RenderTransform, - QUuid, - 16, - Qt3D::ArrayAllocatingPolicy, - Qt3D::ObjectLevelLockingPolicy> -{ -public: - TransformManager(); -}; - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_TRANSFORMMANAGER_H diff --git a/src/render/backend/vaomanager.cpp b/src/render/backend/vaomanager.cpp deleted file mode 100644 index a536a25e3..000000000 --- a/src/render/backend/vaomanager.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "vaomanager_p.h" -#include <QOpenGLVertexArrayObject> - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -namespace Render { - -VAOManager::VAOManager() : QResourcesManager<QOpenGLVertexArrayObject*, QPair<HMeshData, HShader>, 16>() -{ -} - -} // Render - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/render/backend/vaomanager_p.h b/src/render/backend/vaomanager_p.h deleted file mode 100644 index 686b68f00..000000000 --- a/src/render/backend/vaomanager_p.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** 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: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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 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 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_RENDER_VAOMANAGER_H -#define QT3D_RENDER_VAOMANAGER_H - -#include <Qt3DCore/qresourcesmanager.h> -#include <Qt3DCore/qhandle.h> - -QT_BEGIN_NAMESPACE - -class QOpenGLVertexArrayObject; - -namespace Qt3D { - -class QMeshData; - -namespace Render { - -class RenderShader; - -typedef QHandle<QOpenGLVertexArrayObject*, 16> HVao; -typedef QHandle<QMeshData, 16> HMeshData; -typedef QHandle<RenderShader, 16> HShader; - -class VAOManager : public QResourcesManager<QOpenGLVertexArrayObject*, QPair<HMeshData, HShader>, 16> -{ -public: - VAOManager(); -}; - -} // Render - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_RENDER_VAOMANAGER_H |