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

Timestamp:

11/25/05 17:16:26 (19 years ago)

Author:

mattausch

Message:

bsptree view cells working in VssPreprocessor?

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -143 +143 @@
                 Polygon3 *front_piece = NULL;
                 Polygon3 *back_piece = NULL;
-        
-                VertexContainer splitVertices;
 
                 switch (cf)
@@ -164 +162 @@
                                 poly->Split(mPlane, 
                                                         *front_piece, 
-                                                        *back_piece, 
-                                                        splitVertices);
+                                                        *back_piece);
                                         
                                 ++ splits; // increase number of splits
@@ -698 +695 @@
         facePolyMap.clear();
 
-        // compue bounding box
+        // compute bounding box
         Polygon3::IncludeInBox(*polys, mBox);
 
@@ -721 +718 @@
 }
 
+void BspTree::Construct(const ObjectContainer &objects, const RayContainer &sampleRays)
+{
+    mStat.nodes = 1;
+        mBox.Initialize();      // initialise BSP tree bounding box
+        
+        BoundedRayContainer *rays = new BoundedRayContainer();
+        PolygonContainer *polys = new PolygonContainer();
+        
+        // copy mesh instance polygons into one big polygon soup
+        mStat.polys = AddToPolygonSoup(objects, *polys);
+
+        RayContainer::const_iterator rit, rit_end = sampleRays.end();
+
+        //-- store rays
+        for (rit = sampleRays.begin(); rit != rit_end; ++ rit)
+        {
+                Ray *ray = *rit;
+        ray->SetId(-1); // reset id
+
+                float minT, maxT;
+                if (BoundRay(*ray, minT, maxT))
+                        rays->push_back(new BoundedRay(ray, minT, maxT));
+        }
+
+        Debug << "tree has " << (int)polys->size() << " polys, " << (int)sampleRays.size() << " rays" << endl;
+        Construct(polys, rays);
+}
+
 void BspTree::Construct(PolygonContainer *polys, BoundedRayContainer *rays)
 {
@@ -736 +761 @@
 
         mStat.Start();
-        cout << "**** Contructing bsp tree ****\n";
-
+        cout << "Contructing bsp tree ... ";
+        long startTime = GetTime();
         while (!tStack.empty()) 
         {
                 tData = tStack.top();
+
             tStack.pop();
 
                 // subdivide leaf node
-                BspNode *subRoot = Subdivide(tStack, tData);
-        }
+                BspNode *r = Subdivide(tStack, tData);
+
+                if (r == mRoot)
+                        Debug << "BSP tree construction time spent at root: " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
+        }
+
+        cout << "finished\n";
 
         mStat.Stop();
@@ -1452 +1483 @@
         float pFront = 0;
         float pBack = 0;
-Debug << "here" << endl;
+
         if (mSplitPlaneStrategy & PVS)
         {
@@ -1573 +1604 @@
 
                 // give penalty to unbalanced split
-                if (0)
+                if (1)
                 if (((pFront * 0.2 + Limits::Small) > pBack) || (pFront < (pBack * 0.2 + Limits::Small)))
                         val += 0.5;
@@ -1583 +1614 @@
                   << " backpvs: " << backPvs << " pBack: " << pBack << endl << endl;
 #endif
-        Debug << "here2" << endl;
         return val;
 }
@@ -2195 +2225 @@
                                         backPoly = new Polygon3();
 
-                                        candidatePolys[i]->Split(halfSpaces[j], *frontPoly, 
-                                                                                         *backPoly, splitPts);
+                                        candidatePolys[i]->Split(halfSpaces[j], 
+                                                                                         *frontPoly, 
+                                                                                         *backPoly);
 
                                         DEL_PTR(candidatePolys[i]);
@@ -2450 +2481 @@
                                         Polygon3 *backPoly = new Polygon3();
                                 
-                                        VertexContainer splitPts;
-                                                
-                                        poly->Split(splitPlane, *frontPoly, *backPoly, splitPts);
+                                        poly->Split(splitPlane, *frontPoly, *backPoly);
 
                                         DEL_PTR(poly);
@@ -2507 +2536 @@
                         case Polygon3::SPLIT:
                                 {
-                                        VertexContainer splitPts;
-                                
                                         Polygon3 *frontPoly = new Polygon3();
                                         Polygon3 *backPoly = new Polygon3();
 
-                                        planePoly->Split(plane, *frontPoly, *backPoly, splitPts);
+                                        planePoly->Split(plane, *frontPoly, *backPoly);
                                         DEL_PTR(planePoly);