summaryrefslogtreecommitdiffstats
path: root/src/render/backend/jobs/updateboundingvolumejob.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-08-31 15:14:17 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-13 07:15:15 +0000
commitaf40840eedf35404ba4b39e890c158e2328ff6ec (patch)
treece4ac1f925c34b56704c99bd332e0436e68dbecc /src/render/backend/jobs/updateboundingvolumejob.cpp
parent0269afd106da5d4d999585b3bdb1332a2c01af12 (diff)
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/jobs/updateboundingvolumejob.cpp')
-rw-r--r--src/render/backend/jobs/updateboundingvolumejob.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp
index 49ddc9cc1..a346a0bee 100644
--- a/src/render/backend/jobs/updateboundingvolumejob.cpp
+++ b/src/render/backend/jobs/updateboundingvolumejob.cpp
@@ -47,14 +47,14 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DRender {
namespace Render {
namespace {
-void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node)
+void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node)
{
- Qt3D::Render::RenderEntity *currentNode = node;
+ Qt3DRender::Render::RenderEntity *currentNode = node;
QStack<int> childIndexStack;
forever {
@@ -68,15 +68,15 @@ void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node)
return;
// Initialize parent bounding volume to be equal to that of the first child
- Qt3D::Render::RenderEntity *parentNode = currentNode->parent();
- Qt3D::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume();
+ Qt3DRender::Render::RenderEntity *parentNode = currentNode->parent();
+ Qt3DRender::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume();
*(parentBoundingVolume) = *(currentNode->worldBoundingVolume());
// Expand the parent bounding volume by each of remaining the siblings
QVector<RenderEntity *> siblings = parentNode->children();
const int siblingCount = siblings.count();
for (int i = 1; i < siblingCount; ++i) {
- Qt3D::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume();
+ Qt3DRender::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume();
parentBoundingVolume->expandToContain(*siblingBoundingVolume);
}
@@ -111,6 +111,6 @@ void UpdateBoundingVolumeJob::run()
}
} // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
QT_END_NAMESPACE