Make local variables and method parameters const where possible

mosra · Nov 20, 2015 · 2beaaaf · 2beaaaf
1 parent 76ddb5d
commit 2beaaaf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/src/Magnum/Octree/Octree.h b/src/Magnum/Octree/Octree.h
@@ -113,7 +113,7 @@ class /* MAGNUM_OCTREE_EXPORT */Octree {
          * @param maxDepth    The maximal depth of the octree
          * @return Reference to self (for method chaining)
          */
-        Octree<T>& build(const std::vector<Shapes::AxisAlignedBox3D>& entries, std::vector<T>& data, const Int maxDepth) {
+        Octree<T>& build(const std::vector<Shapes::AxisAlignedBox3D>& entries, const std::vector<T>& data, const Int maxDepth) {
             CORRADE_ASSERT(data.size() == entries.size(), "Entries and data need to be same size.", *this);
 
             auto entryItor = entries.begin();

diff --git a/src/Magnum/Octree/Octree.hpp b/src/Magnum/Octree/Octree.hpp
@@ -35,7 +35,7 @@ namespace Magnum { namespace Octree {
 
 /* Function is called for the root node only, to create the initial bounding box */
 template <typename T>
-Octree<T>& Octree<T>::createInitialBounds(const std::vector<Shapes::AxisAlignedBox3D>& points, Int maxDepth) {
+Octree<T>& Octree<T>::createInitialBounds(const std::vector<Shapes::AxisAlignedBox3D>& points, const Int maxDepth) {
 
     _center = {0, 0, 0};
     _radius = 0.f;
@@ -64,7 +64,7 @@ Octree<T>& Octree<T>::createInitialBounds(const std::vector<Shapes::AxisAlignedB
 
 /* insert operation. At the moment every leaf has exactly one data point. Depth is unlimited. */
 template <typename T>
-Octree<T>& Octree<T>::insert(const Shapes::AxisAlignedBox3D& point, T data) {
+Octree<T>& Octree<T>::insert(const Shapes::AxisAlignedBox3D& point, const T data) {
 
     /*
      * Use a simple code for making traversion simple, by using bitwise or operations
@@ -106,13 +106,13 @@ Octree<T>& Octree<T>::insert(const Shapes::AxisAlignedBox3D& point, T data) {
              * {+0.5, +0.5, -0.5},
              * {+0.5, +0.5, +0.5}
              */
-            Int octContainingBox = getOctantContainingBox(point);
-            Int octContainingOldBox = getOctantContainingBox(oldPoint);
+            const Int octContainingBox = getOctantContainingBox(point);
+            const Int octContainingOldBox = getOctantContainingBox(oldPoint);
 
             if((octContainingOldBox != -1) || (octContainingBox != -1)) {
 
                 for(UnsignedByte i = 0; i < 8; ++i) {
-                    Vector3 l = Math::lerp(Vector3{0.5f}, Vector3{-0.5f}, Math::BoolVector<3>{i});
+                    const Vector3 l = Math::lerp(Vector3{0.5f}, Vector3{-0.5f}, Math::BoolVector<3>{i});
 
                     _children[i] = new Octree{
                         _center + (_radius * l),
@@ -143,7 +143,7 @@ Octree<T>& Octree<T>::insert(const Shapes::AxisAlignedBox3D& point, T data) {
     } else {
         /* Node is an inner node. Insert recursively into the appropriate child octant */
 
-        Int octContainingBox = getOctantContainingBox(point);
+        const Int octContainingBox = getOctantContainingBox(point);
 
         if(octContainingBox != -1) {
             _children[octContainingBox]->insert(point, data);
@@ -201,8 +201,8 @@ Octree<T>& Octree<T>::points(std::vector<T>& resultData, const Vector3& min, con
     if(!isLeafNode()) {
         for(UnsignedInt i = 0; i < 8; ++i) {
             /* Compute the min/max corners of this child octant */
-            Vector3 cmin = _children[i]->_center - Vector3{_children[i]->_radius};
-            Vector3 cmax = _children[i]->_center + Vector3{_children[i]->_radius};
+            const Vector3 cmin = _children[i]->_center - Vector3{_children[i]->_radius};
+            const Vector3 cmax = _children[i]->_center + Vector3{_children[i]->_radius};
 
             /* If query rectangle doesn't intersect this child octants bounding box, continue. */
             if(Math::max(max, cmin) != max) {
@@ -225,14 +225,14 @@ template <typename T>
 Octree<T>& Octree<T>::points(std::vector<T>& resultData, const Vector4 (&frustum)[6]) {
 
     // 0: no corners inside frustum, 1: part of the corners inside, 2: all corners inside
-    Int octantStatus = cubeInFrustum(frustum);
+    const Int octantStatus = cubeInFrustum(frustum);
     if(octantStatus == 2) {
         if(isLeafNode()) {
             resultData.insert(resultData.end(), data().begin(), data().end());
         } else {
             //traverse to leafnode or maybe just call points(found, min, max) with bounds of current octant as min, max?
-            Vector3 min {(center().x() - radius()), (center().y() - radius()), (center().z() - radius())};
-            Vector3 max {(center().x() + radius()), (center().y() + radius()), (center().z() + radius())};
+            const Vector3 min {(center().x() - radius()), (center().y() - radius()), (center().z() - radius())};
+            const Vector3 max {(center().x() + radius()), (center().y() + radius()), (center().z() + radius())};
             points(resultData, min, max);
         }
     } else if(octantStatus == 1) {
@@ -274,7 +274,7 @@ Int Octree<T>::cubeInFrustum(const Vector4 (&frustum)[6]) {
         cornersInsideFrustumCount = 0;
 
         for(UnsignedByte i = 0; i < 8; ++i) {
-            Vector3 corner = Math::lerp(Vector3{center().x() + radius(), center().y() + radius(), center().z() + radius()},
+            const Vector3 corner = Math::lerp(Vector3{center().x() + radius(), center().y() + radius(), center().z() + radius()},
                 Vector3{center().x() - radius(), center().y() - radius(), center().z() - radius()},
                 Math::BoolVector<3>{i});
 

diff --git a/src/Magnum/SceneGraph/OctreeDrawableGroup.hpp b/src/Magnum/SceneGraph/OctreeDrawableGroup.hpp
@@ -76,15 +76,15 @@ template<class T> OctreeDrawableGroup<T>& OctreeDrawableGroup<T>::cull(Camera<3,
         this->remove((*this)[i]);
     }
 
-    Matrix4 projection = Matrix4(camera.projectionMatrix()).transposed();
-    Vector4 left{projection[3] + projection[0]};
-    Vector4 right{projection[3] - projection[0]};
-    Vector4 bottom{projection[3] + projection[1]};
-    Vector4 top{projection[3] - projection[1]};
-    Vector4 near{projection[2]};
-    Vector4 far{projection[3] - projection[2]};
-
-    Vector4 frustum[6] = {left, right, top, bottom, near, far};
+    const Matrix4 projection = Matrix4(camera.projectionMatrix()).transposed();
+    const Vector4 left{projection[3] + projection[0]};
+    const Vector4 right{projection[3] - projection[0]};
+    const Vector4 bottom{projection[3] + projection[1]};
+    const Vector4 top{projection[3] - projection[1]};
+    const Vector4 near{projection[2]};
+    const Vector4 far{projection[3] - projection[2]};
+
+    const Vector4 frustum[6] = {left, right, top, bottom, near, far};
     std::vector<Drawable<3, T>*> visibleDrawables;
 
     _octree->points(visibleDrawables, frustum);