Changeset 2342 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h

Timestamp:

05/02/07 17:28:26 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h

@@ -14 +14 @@
 #include "Timer/PerfTimer.h"
 
+
 #ifdef USE_SSE
 #include <xmmintrin.h>
 #endif
-
 
 
@@ -797 +797 @@
         float EvalRenderCostDecrease(VspSubdivisionCandidate &splitData, 
                                                                  float &normalizedOldRenderCost,
-                                                                 const float totalPvs,
-                                                                 const float pvsFront,
-                                                                 const float pvsBack) const;
+                                                                 const float totalRenderCost,
+                                                                 const float frontRenderCost,
+                                                                 const float backRenderCost) const;
 
         /** Collects view cells in the subtree under root.
@@ -1113 +1113 @@
         int CompressObjects(VspLeaf *leaf);
 
+
 #ifdef USE_SSE
-
-        struct RayPacket
-        {
-                union { float mOriginX[4]; __m128 mOriginX4; };
-                union { float mOriginY[4]; __m128 mOriginY4; };
-                union { float mOriginZ[4]; __m128 mOriginZ4; };
-
-                union { float mTerminationX[4]; __m128 mTerminationX4; };
-                union { float mTerminationY[4]; __m128 mTerminationY4; };
-                union { float mTerminationZ[4]; __m128 mTerminationZ4; };
-
-                ViewCellContainer mViewCells[4];
-        };
-
         struct PacketTraversalData
         {
@@ -1141 +1128 @@
                 PacketTraversalData () {}
                 PacketTraversalData (VspNode *n, 
-                                                         const __m128 &px, const __m128 &py, const __m128 &pz, 
-                                                         const __m128 &maxt,
-                                                         const __m128 &mask):
+                        const __m128 &px, const __m128 &py, const __m128 &pz, 
+                        const __m128 &maxt,
+                        const __m128 &mask):
                 mNode(n), 
-                mExitPointX4(px), mExitPointY4(py), mExitPointZ4(pz),
-                mMaxT4(maxt),
-                mMask4(mask)
+                        mExitPointX4(px), mExitPointY4(py), mExitPointZ4(pz),
+                        mMaxT4(maxt),
+                        mMask4(mask)
                 {}
         };
 
-        
-        int TraverseRayPacket(RayPacket &rp,
-                                                  const bool useMailboxing);
+
+        int TraverseRayPacket(RayPacket &rp, const bool useMailboxing);
 
 #endif
+
 
 protected: