Changeset 74 for trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

Timestamp:

05/01/05 23:29:27 (19 years ago)

Author:

mattausch

Message:

added support for release mode

File:

• trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp (modified) (10 diffs)

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -2 +2 @@
 #include "OgreVisibilityOctreeSceneManager.h"
 #include <OgreOctree.h>
-//#include <windows.h>
+#include <windows.h>
 
 namespace Ogre {
@@ -19 +19 @@
         RenderNode(node);
         
-        for(int i=0; i<8; i++)
+        for(int i=0; i<8; ++i)
         {
                 Octree *nextChild = 
                         static_cast<Octree *>(node)->mChildren[(i & 4) >> 2][(i & 2) >> 1][i & 1];
 
-                if(nextChild)
+        if (nextChild)
                 {
                         mDistanceQueue->push(nextChild);
@@ -31 +31 @@
 }
 //-----------------------------------------------------------------------
-bool OctreeHierarchyInterface::IsLeaf(GtpVisibility::HierarchyNode *node)
+bool OctreeHierarchyInterface::IsLeaf(GtpVisibility::HierarchyNode *node) const
 {
         Octree *octant = static_cast<Octree *>(node);
@@ -37 +37 @@
         for(int i=0; i<8; i++)
         {
-                if(octant->mChildren[(i & 4) >> 2][(i & 2) >> 1][i & 1])
+                if (octant->mChildren[(i & 4) >> 2][(i & 2) >> 1][i & 1])
                         return false;
         }
@@ -44 +44 @@
 }
 //-----------------------------------------------------------------------
-bool OctreeHierarchyInterface::HasGeometry(GtpVisibility::HierarchyNode *node)
+bool OctreeHierarchyInterface::HasGeometry(GtpVisibility::HierarchyNode *node) const
 {
         return static_cast<Octree *>(node)->numNodes() > 0;
@@ -55 +55 @@
 //-----------------------------------------------------------------------
 bool OctreeHierarchyInterface::HasGreaterDistance(GtpVisibility::HierarchyNode *node1, 
-                                                                                                  GtpVisibility::HierarchyNode *node2)
+                                                                                                  GtpVisibility::HierarchyNode *node2) const
 {
         // matt: change this (inefficient)
@@ -66 +66 @@
 }
 //-----------------------------------------------------------------------
-Real OctreeHierarchyInterface::GetSquaredViewDepth(const Camera* cam, const AxisAlignedBox* box) const
+Real OctreeHierarchyInterface::GetSquaredViewDepth(const Camera* cam, 
+                                                                                                   const AxisAlignedBox* box) const
 {
-        Vector3 mid  = ((box->getMinimum() - box->getMaximum()) * 0.5) + box->getMinimum();
+        Vector3 mid = ((box->getMinimum() - box->getMaximum()) * 0.5) + box->getMinimum();
         return (cam->getDerivedPosition() - mid).squaredLength();                                                                   
 }
 //-----------------------------------------------------------------------
-void OctreeHierarchyInterface::SetNodeVisible(GtpVisibility::HierarchyNode *node, const bool visible)
+void OctreeHierarchyInterface::SetNodeVisible(GtpVisibility::HierarchyNode *node, 
+                                                                                          const bool visible)
 {
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
@@ -79 +81 @@
 }
 //-----------------------------------------------------------------------
-void OctreeHierarchyInterface::SetLastVisited(GtpVisibility::HierarchyNode *node, const int frameId)
+void OctreeHierarchyInterface::SetLastVisited(GtpVisibility::HierarchyNode *node, 
+                                                                                          const unsigned int frameId)
 {
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
@@ -117 +120 @@
 }
 //-----------------------------------------------------------------------
-bool OctreeHierarchyInterface::IsNodeVisible(GtpVisibility::HierarchyNode *node)
+bool OctreeHierarchyInterface::IsNodeVisible(GtpVisibility::HierarchyNode *node) const
 {
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
@@ -126 +129 @@
 }
 //-----------------------------------------------------------------------
-int OctreeHierarchyInterface::LastVisited(GtpVisibility::HierarchyNode *node)
+unsigned int OctreeHierarchyInterface::LastVisited(GtpVisibility::HierarchyNode *node) const
 {
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE