Text archives Help

---

Author: abe
Date: Fri Dec  9 15:31:23 2005
New Revision: 757

Modified:
   trunk/Model/Groups/KDTree.h
   trunk/Model/Groups/TransparentKDTree.h
Log:

Fixed KDNODE_INTERNAL_MASK problem.

M    Groups/TransparentKDTree.h
M    Groups/KDTree.h


Modified: trunk/Model/Groups/KDTree.h
==============================================================================
--- trunk/Model/Groups/KDTree.h (original)
+++ trunk/Model/Groups/KDTree.h Fri Dec  9 15:31:23 2005
@@ -41,11 +41,6 @@
 #include <Model/Groups/KDTreeLoader.h>
 #include <Model/Groups/RayTriangleMailbox.h>
 
-#define KDNODE_AXIS_MASK        0x0003
-#define KDNODE_LEFT_CHILD_MASK  0x0008
-#define KDNODE_RIGHT_CHILD_MASK 0x0010
-#define KDNODE_INTERNAL_MASK    
(KDNODE_LEFT_CHILD_MASK|KDNODE_RIGHT_CHILD_MASK)
-
 #include "varray.h"
 
 namespace Manta {
@@ -54,6 +49,14 @@
   // in the namespace.
   namespace Kdtree {
 
+    // These values are used by both the KDTree and the TransparentKDTree
+    enum { KDNODE_AXIS_MASK = 0x0003,
+           KDNODE_LEFT_CHILD_MASK = 0x0008,
+           KDNODE_RIGHT_CHILD_MASK = 0x0010,
+           KDNODE_INTERNAL_MASK = ( KDNODE_LEFT_CHILD_MASK |
+                                    KDNODE_RIGHT_CHILD_MASK )
+    };
+    
     // Data is stored in 32 bit floats.
     typedef VectorT<float,3> Vectorf;
     typedef PointT <float,3> Pointf;

Modified: trunk/Model/Groups/TransparentKDTree.h
==============================================================================
--- trunk/Model/Groups/TransparentKDTree.h      (original)
+++ trunk/Model/Groups/TransparentKDTree.h      Fri Dec  9 15:31:23 2005
@@ -38,12 +38,6 @@
 #include <Model/Groups/Group.h>
 #include <Model/Primitives/PrimitiveCommon.h>
 
-#define KDNODE_AXIS_MASK 0x0003
-#define KDNODE_INTERNAL_MASK 0x0004
-#define KDNODE_LEFT_CHILD_MASK 0x0008
-#define KDNODE_RIGHT_CHILD_MASK 0x0010
-#define KDNODE_CHILD_MASK 0x0030
-
 #include <Model/Groups/varray.h>
 #include <Model/Groups/KDTree.h>
 

---

• [MANTA] r757 - trunk/Model/Groups, abe, 12/09/2005

---

Archive powered by MHonArc 2.6.16.