Changeset 611 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

02/10/06 13:04:39 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (7 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -426 +426 @@
                                                           prop,
                                                           geom);
-
+#if OCTREE_HACK
+tData.mAxis = 0;
+#endif
         // first node is kd node, i.e. an axis aligned box
         if (1)
@@ -528 +530 @@
                 VspBspTraversalData tFrontData;
                 VspBspTraversalData tBackData;
-
+#if OCTREE_HACK
+                //Debug << "new axis:" << (tData.mAxis + 1) % 3 << endl;
+
+                tFrontData.mAxis = (tData.mAxis + 1) % 3;
+                tBackData.mAxis = (tData.mAxis + 1) % 3;
+#endif
                 // create new interior node and two leaf nodes
                 // or return leaf as it is (if maxCostRatio missed)
@@ -537 +544 @@
                         if (1)
                         {
-                                float cFront = tFrontData.mPvs * tFrontData.mProbability;
-                                float cBack = tBackData.mPvs * tBackData.mProbability;
-                                float cData = tData.mPvs * tData.mProbability;;
+                                float cFront = (float)tFrontData.mPvs * tFrontData.mProbability;
+                                float cBack = (float)tBackData.mPvs * tBackData.mProbability;
+                                float cData = (float)tData.mPvs * tData.mProbability;;
 
                 float costDecr = 
                                         (cFront + cBack - cData) / mBox.GetVolume();
-
-                                int pvsFront = tFrontData.mPvs * tFrontData.mProbability;
-                                int pvsBack = tBackData.mPvs * tBackData.mProbability;
-                                int pvsData = tData.mPvs * tData.mProbability;;
 
                                 mTotalCost += costDecr;
@@ -979 +982 @@
                         box.Include((*ri).ExtrapTermination());
         }
-
+#if OCTREE_HACK
+        //Debug << "choosing axis:" << tData.mAxis << endl;
+        const int sAxis = tData.mAxis;
+#else
         const int sAxis = mUseRandomAxis ? Random(3) : box.Size().DrivingAxis();
-
+#endif
         for (axis = 0; axis < 3; ++ axis)
         {
@@ -1130 +1136 @@
 
         // cost ratio miss
-        if (!mUsePolygonSplitIfAvailable || data.mPolygons->empty())
+        if (mUsePolygonSplitIfAvailable && !data.mPolygons->empty())
         {
                 frontData.mIsKdNode = backData.mIsKdNode = false;
@@ -1183 +1189 @@
         // cost ratio miss
         if (lowestCost > mTermMaxCostRatio)
+        {
                 return false;
+        }
 
         return true;
@@ -1629 +1637 @@
         if (data.mDepth >= mTermMaxDepth)
                 ++ mBspStats.maxDepthNodes;
+
         // accumulate rays to compute rays /  leaf
         mBspStats.accumRays += (int)data.mRays->size();