summaryrefslogtreecommitdiffstats
path: root/src/render/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/backend')
-rw-r--r--src/render/backend/boundingvolumedebug.cpp4
-rw-r--r--src/render/backend/boundingvolumedebug_p.h4
-rw-r--r--src/render/backend/entity.cpp32
-rw-r--r--src/render/backend/entity_p.h12
-rw-r--r--src/render/backend/managers_p.h2
-rw-r--r--src/render/backend/nodemanagers.cpp12
-rw-r--r--src/render/backend/nodemanagers_p.h10
7 files changed, 42 insertions, 34 deletions
diff --git a/src/render/backend/boundingvolumedebug.cpp b/src/render/backend/boundingvolumedebug.cpp
index ae2f08198..96302c3cb 100644
--- a/src/render/backend/boundingvolumedebug.cpp
+++ b/src/render/backend/boundingvolumedebug.cpp
@@ -36,7 +36,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-
+#if 0
#include "boundingvolumedebug_p.h"
#include <Qt3DRender/private/qboundingvolumedebug_p.h>
#include <Qt3DCore/qbackendnodepropertychange.h>
@@ -116,3 +116,5 @@ void BoundingVolumeDebug::setCenter(const QVector3D &center)
} // Qt3DRender
QT_END_NAMESPACE
+
+#endif
diff --git a/src/render/backend/boundingvolumedebug_p.h b/src/render/backend/boundingvolumedebug_p.h
index 6a5706567..f7a1903e9 100644
--- a/src/render/backend/boundingvolumedebug_p.h
+++ b/src/render/backend/boundingvolumedebug_p.h
@@ -51,6 +51,8 @@
// We mean it.
//
+#if 0
+
#include <Qt3DRender/private/backendnode_p.h>
#include <QVector3D>
@@ -89,4 +91,6 @@ private:
QT_END_NAMESPACE
+#endif
+
#endif // QT3DRENDER_RENDER_BOUNDINGVOLUMEDEBUG_H
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index b1a51f892..04cb606c5 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -315,8 +315,8 @@ void Entity::addComponent(Qt3DCore::QComponent *component)
m_boundingDirty = true;
} else if (qobject_cast<QObjectPicker *>(component) != Q_NULLPTR) {
m_objectPickerComponent = component->id();
- } else if (qobject_cast<QBoundingVolumeDebug *>(component) != Q_NULLPTR) {
- m_boundingVolumeDebugComponent = component->id();
+// } else if (qobject_cast<QBoundingVolumeDebug *>(component) != Q_NULLPTR) {
+// m_boundingVolumeDebugComponent = component->id();
} else if (qobject_cast<QComputeCommand *>(component) != Q_NULLPTR) {
m_computeComponent = component->id();
}
@@ -346,8 +346,8 @@ void Entity::addComponent(Qt3DCore::QNodeIdTypePair idAndType)
m_boundingDirty = true;
} else if (type->inherits(&QObjectPicker::staticMetaObject)) {
m_objectPickerComponent = id;
- } else if (type->inherits(&QBoundingVolumeDebug::staticMetaObject)) {
- m_boundingVolumeDebugComponent = id;
+// } else if (type->inherits(&QBoundingVolumeDebug::staticMetaObject)) {
+// m_boundingVolumeDebugComponent = id;
} else if (type->inherits(&QComputeCommand::staticMetaObject)) {
m_computeComponent = id;
}
@@ -370,8 +370,8 @@ void Entity::removeComponent(Qt3DCore::QNodeId nodeId)
m_boundingDirty = true;
} else if (m_objectPickerComponent == nodeId) {
m_objectPickerComponent = QNodeId();
- } else if (m_boundingVolumeDebugComponent == nodeId) {
- m_boundingVolumeDebugComponent = QNodeId();
+// } else if (m_boundingVolumeDebugComponent == nodeId) {
+// m_boundingVolumeDebugComponent = QNodeId();
} else if (m_lightComponents.contains(nodeId)) {
m_lightComponents.removeAll(nodeId);
} else if (m_computeComponent == nodeId) {
@@ -441,11 +441,11 @@ QList<HShaderData> Entity::componentsHandle<ShaderData>() const
return shaderDataHandles;
}
-template<>
-HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const
-{
- return m_nodeManagers->boundingVolumeDebugManager()->lookupHandle(m_boundingVolumeDebugComponent);
-}
+//template<>
+//HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const
+//{
+// return m_nodeManagers->boundingVolumeDebugManager()->lookupHandle(m_boundingVolumeDebugComponent);
+//}
template<>
QList<HLight> Entity::componentsHandle<Light>() const
@@ -525,11 +525,11 @@ QList<Light *> Entity::renderComponents<Light>() const
return lights;
}
-template<>
-BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const
-{
- return m_nodeManagers->boundingVolumeDebugManager()->lookupResource(m_boundingVolumeDebugComponent);
-}
+//template<>
+//BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const
+//{
+// return m_nodeManagers->boundingVolumeDebugManager()->lookupResource(m_boundingVolumeDebugComponent);
+//}
template<>
ComputeCommand *Entity::renderComponent<ComputeCommand>() const
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index fa940d171..d5010e923 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -205,8 +205,8 @@ QList<HLayer> Entity::componentsHandle<Layer>() const;
template<>
QList<HShaderData> Entity::componentsHandle<ShaderData>() const;
-template<>
-Q_AUTOTEST_EXPORT HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const;
+//template<>
+//Q_AUTOTEST_EXPORT HBoundingVolumeDebug Entity::componentHandle<BoundingVolumeDebug>() const;
template<>
QList<HLight> Entity::componentsHandle<Light>() const;
@@ -236,8 +236,8 @@ QList<Layer *> Entity::renderComponents<Layer>() const;
template<>
QList<ShaderData *> Entity::renderComponents<ShaderData>() const;
-template<>
-Q_AUTOTEST_EXPORT BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const;
+//template<>
+//Q_AUTOTEST_EXPORT BoundingVolumeDebug *Entity::renderComponent<BoundingVolumeDebug>() const;
template<>
QList<Light *> Entity::renderComponents<Light>() const;
@@ -267,8 +267,8 @@ Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<GeometryRenderer>() co
template<>
Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<ObjectPicker>() const;
-template<>
-Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<BoundingVolumeDebug>() const;
+//template<>
+//Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<BoundingVolumeDebug>() const;
template<>
Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<ComputeCommand>() const;
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index e2294fb1b..77f0e6650 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -337,6 +337,7 @@ class ObjectPickerManager : public Qt3DCore::QResourceManager<
{
};
+#if 0
class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager<
BoundingVolumeDebug,
Qt3DCore::QNodeId,
@@ -345,6 +346,7 @@ class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager<
Qt3DCore::ObjectLevelLockingPolicy>
{
};
+#endif
class LightManager : public Qt3DCore::QResourceManager<
Light,
diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp
index d3eb0b6aa..9e7627c1f 100644
--- a/src/render/backend/nodemanagers.cpp
+++ b/src/render/backend/nodemanagers.cpp
@@ -82,7 +82,7 @@ NodeManagers::NodeManagers()
, m_geometryManager(new GeometryManager())
, m_geometryRendererManager(new GeometryRendererManager)
, m_objectPickerManager(new ObjectPickerManager())
- , m_boundingVolumeDebugManager(new BoundingVolumeDebugManager())
+// , m_boundingVolumeDebugManager(new BoundingVolumeDebugManager())
, m_lightManager(new LightManager())
, m_computeJobManager(new ComputeCommandManager())
, m_renderStateManager(new RenderStateManager())
@@ -257,11 +257,11 @@ ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOEXCEPT
return m_objectPickerManager;
}
-template<>
-BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT
-{
- return m_boundingVolumeDebugManager;
-}
+//template<>
+//BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT
+//{
+// return m_boundingVolumeDebugManager;
+//}
template<>
LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT
diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h
index b5cb2a664..4ad7a8f0c 100644
--- a/src/render/backend/nodemanagers_p.h
+++ b/src/render/backend/nodemanagers_p.h
@@ -124,7 +124,7 @@ class Attribute;
class Geometry;
class GeometryRenderer;
class ObjectPicker;
-class BoundingVolumeDebug;
+//class BoundingVolumeDebug;
class Light;
class ComputeCommand;
class RenderStateNode;
@@ -196,7 +196,7 @@ public:
inline GeometryManager *geometryManager() const Q_DECL_NOEXCEPT { return m_geometryManager; }
inline GeometryRendererManager *geometryRendererManager() const Q_DECL_NOEXCEPT { return m_geometryRendererManager; }
inline ObjectPickerManager *objectPickerManager() const Q_DECL_NOEXCEPT { return m_objectPickerManager; }
- inline BoundingVolumeDebugManager *boundingVolumeDebugManager() const Q_DECL_NOEXCEPT { return m_boundingVolumeDebugManager; }
+ // inline BoundingVolumeDebugManager *boundingVolumeDebugManager() const Q_DECL_NOEXCEPT { return m_boundingVolumeDebugManager; }
inline LightManager *lightManager() const Q_DECL_NOEXCEPT { return m_lightManager; }
inline ComputeCommandManager *computeJobManager() const Q_DECL_NOEXCEPT { return m_computeJobManager; }
inline RenderStateManager *renderStateManager() const Q_DECL_NOEXCEPT { return m_renderStateManager; }
@@ -230,7 +230,7 @@ private:
GeometryManager *m_geometryManager;
GeometryRendererManager *m_geometryRendererManager;
ObjectPickerManager *m_objectPickerManager;
- BoundingVolumeDebugManager *m_boundingVolumeDebugManager;
+ // BoundingVolumeDebugManager *m_boundingVolumeDebugManager;
LightManager *m_lightManager;
ComputeCommandManager *m_computeJobManager;
RenderStateManager *m_renderStateManager;
@@ -322,8 +322,8 @@ QT3DRENDERSHARED_PRIVATE_EXPORT GeometryRendererManager *NodeManagers::manager<G
template<>
QT3DRENDERSHARED_PRIVATE_EXPORT ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOEXCEPT;
-template<>
-QT3DRENDERSHARED_PRIVATE_EXPORT BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT;
+//template<>
+//QT3DRENDERSHARED_PRIVATE_EXPORT BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT;
template<>
LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 22:12:10 +0000