Changeset 710 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

03/20/06 00:11:27 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (19 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 
-#define SAMPLE_AFTER_SUBDIVISION 1
+#define SAMPLE_AFTER_SUBDIVISION 0
 #define TEST_EMPTY_VIEW_CELLS 0
 
@@ -62 +62 @@
         environment->GetFloatValue("ViewCells.maxPvsRatio", mMaxPvsRatio);
         
-        bool emptyViewCells = false;
-        environment->GetBoolValue("ViewCells.pruneEmptyViewCells", emptyViewCells);
-        mMinPvsSize = emptyViewCells ? 1 : 0;
+        environment->GetBoolValue("ViewCells.pruneEmptyViewCells", mPruneEmptyViewCells);
+
+        // HACK
+        if (0)
+                mMinPvsSize = mPruneEmptyViewCells ? 1 : 0;
+        else
+                mMinPvsSize = 0;
 
         environment->GetBoolValue("ViewCells.processOnlyValidViewCells", mOnlyValidViewCells);
@@ -85 +89 @@
         environment->GetIntValue("ViewCells.Filter.maxSize", mMaxFilterSize);
         environment->GetFloatValue("ViewCells.Filter.width", mFilterWidth);
-//mSampleEmptyViewCells = true;
+
         char buf[100];
         environment->GetStringValue("ViewCells.samplingType", buf);
@@ -112 +116 @@
 
 
+
         Debug << "***********View Cells options ****************" << endl;
         Debug << "color code: " << mColorCode << endl;
@@ -119 +124 @@
         Debug << "max pvs ratio: " << mMaxPvsRatio << endl;
         
-        Debug << "prune empty view cells: " << emptyViewCells << endl;
+        Debug << "prune empty view cells: " << mPruneEmptyViewCells << endl;
         
         Debug << "process only valid view cells: " << mOnlyValidViewCells << endl;
@@ -137 +142 @@
         Debug << "show visualization: " << mShowVisualization << endl;
         Debug << "filter width: " << mFilterWidth << endl;
-
+        Debug << "sample after subdivision: " << SAMPLE_AFTER_SUBDIVISION << endl;
         Debug << endl;
 }
@@ -427 +432 @@
 
         // needed to fix empty view cells
-    SetValidity(0, 99999999999);
+    //SetValidity(0, 99999999999);
 
         if (mEvaluateViewCells)
@@ -618 +623 @@
 {
 
-  if ((vc->GetPvs().GetSize() > maxPvsSize) ||
-          (vc->GetPvs().GetSize() < minPvsSize))
-        {
-          return false;
-        }
-
-  return true;
-}
-
+        if ((vc->GetPvs().GetSize() > maxPvsSize) ||
+                (vc->GetPvs().GetSize() < minPvsSize))
+        {
+                return false;
+        }
+
+        return true;
+}
+
+
+bool ViewCellsManager::EqualToSpatialNode(ViewCell *viewCell) const 
+{ 
+        return false;
+}
+
+int ViewCellsManager::ComputeBoxIntersections(const AxisAlignedBox3 &box, 
+                                                                                          ViewCellContainer &viewCells) const
+{
+        return 0;
+};
 
 AxisAlignedBox3 ViewCellsManager::GetFilterBBox(const Vector3 &viewPoint, 
@@ -944 +960 @@
         // generate parent view cell
         ViewCellInterior *vc = new ViewCellInterior();//GenerateViewCell();
-        
+
         vc->GetPvs() = left->GetPvs();
-
         // merge pvs
         vc->GetPvs().Merge(right->GetPvs());
@@ -961 +976 @@
         }
 
-        vc->SetupChildLink(left);
-        vc->SetupChildLink(right);
-        
+        // set only links to child (not from child to parent, maybe not wished!!)
+        vc->mChildren.push_back(left);
+        vc->mChildren.push_back(right);
+
         return vc;
 }
@@ -978 +994 @@
                 // merge pvs
                 vc->GetPvs().Merge((*it)->GetPvs());
-
-                vc->SetupChildLink(*it);
+                vc->mChildren.push_back(*it);
+                //vc->SetupChildLink(*it);
         }
 
@@ -2902 +2918 @@
                                                                                                  const VssRayContainer &rays)
 {
+        mMaxPvsSize = (int)(mMaxPvsRatio * (float)objects.size());
+
         // if view cells were already constructed
         if (ViewCellsConstructed())
@@ -2923 +2941 @@
         Debug << "saved rays: " << (int)savedRays.size() << endl;
 
-        mMaxPvsSize = (int)(mMaxPvsRatio * (float)objects.size());
 
         //TODO: remove
@@ -2968 +2985 @@
                                                                                         const ObjectContainer &objects)
 {
-        //-- post processing of bsp view cells
     int vcSize = 0;
         int pvsSize = 0;
 
         //-- merge view cells
-        
         cout << "starting merge using " << mPostProcessSamples << " samples ... " << endl;
         long startTime = GetTime();
@@ -2981 +2996 @@
         {
                 // TODO: should be done BEFORE the ray casting
+                // compute tree by merging the nodes based on cost heuristics
                 mViewCellsTree->ConstructMergeTree(rays, objects);
         }
         else
         {
-                mViewCellsTree->SetRoot(ConstructSpatialMergeTree(mVspBspTree->GetRoot()));
+                // compute tree by merging the nodes of the spatial hierarchy
+                ViewCell *root = ConstructSpatialMergeTree(mVspBspTree->GetRoot());
+                mViewCellsTree->SetRoot(root);
         }
 
@@ -3162 +3180 @@
         }
 
-
         // check if new view cells turned invalid
-        Debug << "setting validity, min: " << mMinPvsSize << " max: " << mMaxPvsSize << endl;
-        cout << "setting validity, min: " << mMinPvsSize << " max: " << mMaxPvsSize << endl;
-        SetValidity(mMinPvsSize, mMaxPvsSize); 
+        int minPvs, maxPvs;
+
+        if (0)
+        {
+                minPvs = mMinPvsSize;
+                maxPvs = mMaxPvsSize;
+        }
+        else
+        {
+                minPvs = mPruneEmptyViewCells ? 1 : 0;
+                maxPvs = mMaxPvsSize;
+        }
+        Debug << "setting validity, min: " << minPvs << " max: " << maxPvs << endl;
+        cout << "setting validity, min: " << minPvs << " max: " << maxPvs << endl;
+        
+        SetValidity(minPvs, maxPvs); 
+
         // update valid view space according to valid view cells
         if (0)
@@ -3190 +3221 @@
         MergeViewCells(postProcessRays, objects);
         
-
         // only for testing
         TestSubdivision();
@@ -3749 +3779 @@
                         mVspBspTree->ConstructGeometry(leaf, geom);
 
-                        const int cf = Polygon3::ClassifyPlane(geom.GetPolys(), *clipPlane, 0.00000001f);
-
-                        if (cf == Polygon3::BACK_SIDE)
+                        const float eps = 0.00000001f;
+                        const int cf = geom.Side(*clipPlane, eps);
+
+                        if (cf == -1)
                         {
                                 exporter->ExportPolygons(geom.GetPolys());
                         }
-                        else if (cf == Polygon3::SPLIT)
+                        else if (cf == 0)
                         {
                                 geom.SplitGeometry(front,
@@ -3761 +3792 @@
                                                                    *clipPlane,
                                                                    mViewSpaceBox, 
-                                                                   0.00000001f);
+                                                                   eps);
         
                                 //Debug << "geo size: " << geom.Size() << endl;