Changeset 1320 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp

Timestamp:

09/04/06 08:56:26 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp

@@ -25 +25 @@
 {
 
-enum Intersection
+enum BvhIntersection
 {
         OUTSIDE=0,
@@ -32 +32 @@
 };
 
-Intersection intersect( const Ray &one, const AxisAlignedBox &two )
+static BvhIntersection intersect( const Ray &one, const AxisAlignedBox &two )
 {
         // Null box?
@@ -99 +99 @@
 /** Checks how the second box intersects with the first.
 */
-Intersection intersect( const PlaneBoundedVolume &one, const AxisAlignedBox &two )
+static BvhIntersection intersect( const PlaneBoundedVolume &one, const AxisAlignedBox &two )
 {
         // Null box?
@@ -146 +146 @@
 /** Checks how the second box intersects with the first.
 */
-Intersection intersect( const AxisAlignedBox &one, const AxisAlignedBox &two )
+static BvhIntersection intersect( const AxisAlignedBox &one, const AxisAlignedBox &two )
 {
         // Null box?
@@ -180 +180 @@
 /** Checks how the box intersects with the sphere.
 */
-Intersection intersect( const Sphere &one, const AxisAlignedBox &two )
+static BvhIntersection intersect( const Sphere &one, const AxisAlignedBox &two )
 {
         // Null box?
@@ -1512 +1512 @@
         if ( !full )
         {
-                Intersection isect = intersect(box, node->_getWorldAABB());
+                BvhIntersection isect = intersect(box, node->_getWorldAABB());
 
                 if ( isect == OUTSIDE )
@@ -1536 +1536 @@
                                 else
                                 {
-                                        Intersection nsect = intersect(box, sn->_getWorldAABB());
+                                        BvhIntersection nsect = intersect(box, sn->_getWorldAABB());
 
                                         if ( nsect != OUTSIDE )