Changeset 436 for trunk/VUT

Timestamp:

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

Author:

mattausch

Message:

bsptree view cells working in VssPreprocessor?

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (3 diffs)
• src/Polygon3.cpp (modified) (6 diffs)
• src/Polygon3.h (modified) (2 diffs)
• src/Ray.cpp (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (11 diffs)
• src/ViewCellBsp.h (modified) (1 diff)
• src/VssPreprocessor.cpp (modified) (4 diffs)
• src/X3dExporter.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -126 +126 @@
         #       input fromViewCells
         #       input fromSceneGeometry
-                samples 150000
+                samples 50000
                 sideTolerance 0.005
         }
@@ -164 +164 @@
         #splitPlaneStrategy 130
         
-        splitPlaneStrategy 1
-        
-        maxPolyCandidates 70
-        maxRayCandidates 100
+        splitPlaneStrategy 1024
+        
+        maxPolyCandidates 50
+        maxRayCandidates 50
         
         # factors for evaluating split plane costs
@@ -186 +186 @@
                 minRays 200
                 minPolygons -1
-                maxDepth 20
-                minPvs 100
+                maxDepth 30
+                minPvs 150
                 minArea 0.01
                 maxRayContribution 0.005

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -42 +42 @@
 void Polygon3::Split(const Plane3 &partition, 
                                          Polygon3 &front, 
-                                         Polygon3 &back, 
-                                         VertexContainer &splitPts)
+                                         Polygon3 &back)
 {
         Vector3 ptA = mVertices.back();
@@ -51 +50 @@
         VertexContainer::const_iterator it;
         
+        Vector3 lastSplit;
+
         bool foundSplit = false;
         // find line - plane intersections
@@ -68 +69 @@
                                 // test if split point not too close to previous split point
                                 if (!foundSplit || 
-                                        (SqrDistance(splitPt, splitPts.back()) > Vector3::sDistToleranceSqrt))
+                                        (SqrDistance(splitPt, lastSplit) > Vector3::sDistToleranceSqrt))
                                 {
                                         // add vertex to both polygons
@@ -74 +75 @@
                                         back.mVertices.push_back(splitPt);
                                         
-                                        splitPts.push_back(splitPt);
+                                        lastSplit = splitPt;
                                         foundSplit = true;
                                 }
@@ -89 +90 @@
                                         // test if split point not too close to previous split point
                                 if (!foundSplit || 
-                                        (SqrDistance(splitPt, splitPts.back()) > Vector3::sDistToleranceSqrt))
+                                        (SqrDistance(splitPt, lastSplit) > Vector3::sDistToleranceSqrt))
                                 {
                                         // add vertex to both polygons
@@ -95 +96 @@
                                         back.mVertices.push_back(splitPt);
 
-                                        splitPts.push_back(splitPt);
+                                        lastSplit = splitPt;
                                         foundSplit = true;
                                 }       

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.h

@@ -50 +50 @@
                 @param front returns the front the front polygon
                 @param back returns the back polygon
-                @param splitPts returns the split points
         */
         void Split(const Plane3 &partition, 
                            Polygon3 &front, 
-                           Polygon3 &back, 
-                           VertexContainer &splitPts);
+                           Polygon3 &back);
 
         /** Returns the area of this polygon.
@@ -65 +63 @@
         */
         int ClassifyPlane(const Plane3 &plane) const;
-
 
         

trunk/VUT/GtpVisibilityPreprocessor/src/Ray.cpp

@@ -229 +229 @@
                 dir = vssRay.GetDir() / dist;
 
-        if (!vssRay.mTerminationObject)
-                Debug << "error!" << endl;
-
         intersections.push_back(Intersection(dist, vssRay.mTerminationObject, 0));
 

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);
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -434 +434 @@
         void Construct(const ObjectContainer &objects);
 
+        void Construct(const ObjectContainer &objects,
+                                   const RayContainer &sampleRays);
+
         /** Constructs the tree from a given set of rays.
                 @param sampleRays the set of sample rays the construction is based on

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -440 +440 @@
   cout << "#totalRayStackSize=" << mVssRays.size() << endl <<flush;
         
-  int numExportRays = 10000;
-  //int numExportRays = 0;
+  //int numExportRays = 10000;
+  int numExportRays = 0;
 
   if (numExportRays) {
@@ -451 +451 @@
   //-- construct BSP view cells
   if (ViewCell::sHierarchy == ViewCell::BSP) 
-        {
+  {
           const int bspSamples = min((int)mVssRays.size(), mBspConstructionSamples);
                 
+          Debug << "bpssamples: " << bspSamples << endl;
           for (int i = 0; i < bspSamples; ++ i)
-                bspRays.push_back(new Ray(*mVssRays[i]));
-
+                  bspRays.push_back(new Ray(*mVssRays[i]));
+         
           //-- construct BSP tree using the samples
           mBspTree = new BspTree(&mUnbounded);  
 
+          ObjectContainer objects;
+          mSceneGraph->CollectObjects(&objects);
+          
           mBspTree->SetGenerateViewCells(true);
-          mBspTree->Construct(bspRays);
-
-          Exporter *exporter = Exporter::GetExporter("vccbsprays.x3d");
-                        
-          // export rays piercing this view cell
-          exporter->ExportRays(bspRays, 1000, RgbColor(0, 1, 0));
-
-          // cast remaining initial rays into BSP tree
-          for (int i = bspSamples; i < (int)mVssRays.size(); ++ i)
-                CastRay(*mBspTree, *mVssRays[i]);
+          mBspTree->Construct(objects, bspRays);
         }
 
@@ -587 +582 @@
   //-- cast ray to BSP tree to get intersection with view cells
   Ray ray(vssRay);
-
-  Debug << ray << endl;
-  if (ray.intersections.empty())
-        Debug << "empty ray" << endl;
-  else 
-        Debug << "intersection: " << ray.intersections[0].mT << " " << ray.intersections[0].mObject << endl;
-
   mBspTree->CastRay(ray);
                                 
@@ -601 +589 @@
                         
   if (!ray.intersections.empty()) // second intersection found
-        {
+  {
           //sampleContributions += 
           AddObjectSamples(ray.intersections[0].mObject, ray);
-        }
+  }
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -965 +965 @@
                         // do all the splits with the previous planes
                         for (int i = 0; i < (int)tData.mPlanes.size(); ++ i)
-                        {
-                                VertexContainer splitPts;
-                                
+                        {                               
                                 if (planePoly->ClassifyPlane(*tData.mPlanes[i]) == Polygon3::SPLIT)
                                 {
@@ -973 +971 @@
                                         Polygon3 *backPoly = new Polygon3();
 
-                                        planePoly->Split(*tData.mPlanes[i], *frontPoly, *backPoly, splitPts);
+                                        planePoly->Split(*tData.mPlanes[i], *frontPoly, *backPoly);
                                         DEL_PTR(planePoly);