diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-11 14:58:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:30 +0000 |
| commit | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (patch) | |
| tree | 77a1ed41c16262f5cc7aa9ddb2d66d3f9b61a719 /src/render/backend/entity.cpp | |
| parent | 8677f62fa690efa29fbb6f870af1ea2b4e7111cf (diff) | |
Move defaults and geometries out of Qt3DRender and into Qt3DExtras
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/entity.cpp')
| -rw-r--r-- | src/render/backend/entity.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
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 |