Changeset 336 for trunk/VUT

Timestamp:

10/18/05 02:20:58 (19 years ago)

Author:

mattausch

Message:

added balanced rays / least ray split criteria

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• ViewCellBsp.cpp (modified) (5 diffs)
• ViewCellBsp.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -41 +41 @@
 
 /** Evaluates split plane classification with respect to the plane's 
-        contribution for a balanced tree.
+        contribution for a minimum number splits in the tree.
 */
 float BspTree::sLeastSplitsTable[] = {0, 0, 1, 0};
 /** Evaluates split plane classification with respect to the plane's 
-        contribution for a minimum number splits in the tree.
+        contribution for a balanced tree.
 */
-float BspTree::sBalancedPolysTable[] = {-1, 1, 0, 0};
+float BspTree::sBalancedTreeTable[] = {-1, 1, 0, 0};
 
 /****************************************************************/
@@ -1108 +1108 @@
 
                 if (sSplitPlaneStrategy & BALANCED_POLYS)
-                        sumBalancedPolys += sBalancedPolysTable[classification];
+                        sumBalancedPolys += sBalancedTreeTable[classification];
                 
                 if (sSplitPlaneStrategy & LEAST_SPLITS)
@@ -1126 +1126 @@
                         if (classification == Plane3::COINCIDENT)
                                 sumBlockedRays += blockedRays;
-                        Debug << "adding rays: " << blockedRays << endl;
-
+                        
                         totalBlockedRays += blockedRays;
                 }
@@ -1139 +1138 @@
                         {
                                 viewCell->Mail();
-
-                                if (classification == Plane3::FRONT_SIDE)
-                                        sumBalancedViewCells += 1.0f;
-                                else if (viewCell && (classification == Plane3::BACK_SIDE))
-                                        sumBalancedViewCells -= 1.0f;
+                                sumBalancedViewCells += sBalancedTreeTable[classification];
+
                                 ++ totalViewCells;
                         }
@@ -1185 +1181 @@
         for (rit = rays.begin(); rit != rays.end(); ++ rit)
         {
+                Ray *ray = *rit;
+
+                float maxT = 1e6;
+                float minT = 0;
+        
+                // test with tree bounding box
+                /*if (!mBox.GetMinMaxT(*ray, &minT, &maxT))
+                        continue;
+                if (minT < 0) // start ray from origin
+                        minT = 0;*/
+
+                // bound ray
+                if ((ray->GetType() == Ray::LOCAL_RAY) && 
+                        (!ray->intersections.empty())      &&
+                        (ray->intersections[0].mT <= maxT))
+                {
+                        maxT = ray->intersections[0].mT;
+                }
+
+                int classification = ray->ClassifyPlane(candidatePlane, minT, maxT);
+
                 if (sSplitPlaneStrategy & LEAST_RAY_SPLITS)
                 {
-                }
-
+                        sumBalancedRays += sBalancedTreeTable[classification];
+                }
+                
                 if (sSplitPlaneStrategy & BALANCED_RAYS)
                 {
+                        sumRaySplits += sLeastSplitsTable[classification];
                 }
         }

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -635 +635 @@
                 contribution for a minimum number splits in the tree.
         */
-        static float sBalancedPolysTable[4];
+        static float sBalancedTreeTable[4];
 };