diff options
Diffstat (limited to 'src/render/backend/renderentity.cpp')
| -rw-r--r-- | src/render/backend/renderentity.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp index 0212fdba2..563142caf 100644 --- a/src/render/backend/renderentity.cpp +++ b/src/render/backend/renderentity.cpp @@ -131,12 +131,12 @@ void RenderEntity::updateFromPeer(QNode *peer) m_worldTransform = m_renderer->worldMatrixManager()->getOrAcquireHandle(peerUuid()); // TO DO: Suboptimal -> Maybe have a Hash<QComponent, QEntityList> instead - m_transformComponent = QNodeUuid(); - m_materialComponent = QNodeUuid(); - m_meshComponent = QNodeUuid(); - m_cameraComponent = QNodeUuid(); - m_layerComponent = QNodeUuid(); - m_lightComponent = QNodeUuid(); + m_transformComponent = QNodeId(); + m_materialComponent = QNodeId(); + m_meshComponent = QNodeId(); + m_cameraComponent = QNodeId(); + m_layerComponent = QNodeId(); + m_lightComponent = QNodeId(); Q_FOREACH (QComponent *comp, entity->components()) addComponent(comp); @@ -245,17 +245,17 @@ void RenderEntity::addComponent(QComponent *component) void RenderEntity::removeComponent(QComponent *component) { if (qobject_cast<QTransform *>(component) != Q_NULLPTR) - m_transformComponent = QNodeUuid(); + m_transformComponent = QNodeId(); else if (qobject_cast<QAbstractMesh *>(component) != Q_NULLPTR) - m_meshComponent = QNodeUuid(); + m_meshComponent = QNodeId(); else if (qobject_cast<QCameraLens *>(component) != Q_NULLPTR) - m_cameraComponent = QNodeUuid(); + m_cameraComponent = QNodeId(); else if (qobject_cast<QLayer *>(component) != Q_NULLPTR) - m_layerComponent = QNodeUuid(); + m_layerComponent = QNodeId(); else if (qobject_cast<QAbstractLight *>(component) != Q_NULLPTR) - m_lightComponent = QNodeUuid(); + m_lightComponent = QNodeId(); else if (qobject_cast<QMaterial *>(component) != Q_NULLPTR) - m_materialComponent = QNodeUuid(); + m_materialComponent = QNodeId(); } template<> @@ -331,22 +331,22 @@ RenderTransform *RenderEntity::renderComponent<RenderTransform>() const } template<> -QNodeUuid RenderEntity::componentUuid<RenderTransform>() const { return m_transformComponent; } +QNodeId RenderEntity::componentUuid<RenderTransform>() const { return m_transformComponent; } template<> -QNodeUuid RenderEntity::componentUuid<RenderCameraLens>() const { return m_cameraComponent; } +QNodeId RenderEntity::componentUuid<RenderCameraLens>() const { return m_cameraComponent; } template<> -QNodeUuid RenderEntity::componentUuid<RenderLayer>() const { return m_layerComponent; } +QNodeId RenderEntity::componentUuid<RenderLayer>() const { return m_layerComponent; } template<> -QNodeUuid RenderEntity::componentUuid<RenderMaterial>() const { return m_materialComponent; } +QNodeId RenderEntity::componentUuid<RenderMaterial>() const { return m_materialComponent; } template<> -QNodeUuid RenderEntity::componentUuid<RenderLight>() const { return m_lightComponent; } +QNodeId RenderEntity::componentUuid<RenderLight>() const { return m_lightComponent; } template<> -QNodeUuid RenderEntity::componentUuid<RenderMesh>() const { return m_meshComponent; } +QNodeId RenderEntity::componentUuid<RenderMesh>() const { return m_meshComponent; } RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer) : m_renderer(renderer) |