Changeset 242 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

08/17/05 18:01:16 (19 years ago)

Author:

mattausch

Message:

added output functions and castray method for bsp viewcells

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -7 +7 @@
 #include "Polygon3.h"
 #include "Ray.h"
-
+#include "AxisAlignedBox3.h"
 #include <stack>
 #include <time.h>
@@ -110 +110 @@
                 {
                         case Polygon3::COINCIDENT:
-                                break; // do nothing
+                                break; // TODO: compare normals
                         case Polygon3::FRONT_SIDE:
                                 frontPolys->push_back(poly);
@@ -676 +676 @@
 }
 
+AxisAlignedBox3 BspTree::GetBoundingBox() const
+{
+        return mBox;
+}
+
+BspNode *BspTree::GetRoot() const
+{
+        return mRoot;
+}
+
 void BspTree::EvaluateLeafStats(const BspTraversalData &data)
 {
@@ -723 +733 @@
         
         float position;
-
+        
         while (1) // endless loop
         {
@@ -742 +752 @@
                         if (entSide < 0)
                         {
-                                if(extSide > 0) // plane splits ray
-                                {
-                                        node = in->GetBack();
-                                        farChild = in->GetFront();
-                                } else
-                                {
-                                        node = in->GetBack();
+                                node = in->GetBack();
+
+                                if(extSide <= 0) 
                                         continue;
-                                } 
-                        }
+                                        
+                                farChild = in->GetFront(); // plane splits ray
+
                         } else if (entSide > 0)
                         {
-                                if (extSide < 0) // plane splits ray
-                                {
-                                        node = in->GetFront();
-                                        farChild = in->GetBack(); 
-                                } else
-                                {
-                                        node = in->GetFront();
+                                node = in->GetFront();
+
+                                if (extSide >= 0)
                                         continue;
-                                }
+
+                                farChild = in->GetBack();        // plane splits ray                    
                         }
-                        else // ray and plane are coincident // DOTO: WHAT IN THIS CASE ?
+                        else // ray and plane are coincident // WHAT TO DO IN THIS CASE ?
                         {
-                                //node = in->GetFront();
+                                node = in->GetFront();
                                 continue;
                         }
 
-                    // case N4 or P4
-                        float tdist = (position - ray.GetLoc(axis)) / ray.GetDir(axis);
-      tStack.push(RayTraversalData(farChild, extp, maxt));
-      extp = ray.GetLoc() + ray.GetDir()*tdist;
-      maxt = tdist;
-                        
-                        float tDist = 0;
-                        extp = splitPlane->FindIntersection(entp, extp, &t);
-
+                        //-- split
+
+                        // push data for far child
                         tStack.push(BspRayTraversalData(farChild, extp, maxt));
 
-                        
-
-                                maxt = tDist;
-                        }
+                        // find intersection with plane between ray origin and exit point
+                        extp = splitPlane->FindIntersection(ray.GetLoc(), extp, &maxt);
                 } else // compute intersections with objects in leaf
                 {
@@ -813 +809 @@
                         mint = maxt;
                         BspRayTraversalData &s  = tStack.top();
+
                         node = s.mNode;
                         extp = s.mExitPoint;