Changeset 555

Timestamp:

01/19/06 14:49:56 (18 years ago)

Author:

mattausch

Message:

fixed bug in finalizeviewcells when loading view cells

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (4 diffs)
• src/ViewCellsManager.cpp (modified) (3 diffs)
• src/ViewCellsManager.h (modified) (1 diff)
• src/VspBspTree.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -30 +30 @@
         samplesPerPass  100000
         initialSamples 300000
-        vssSamples 1800000
-        vssSamplesPerPass 100000
+        vssSamples 1500000
+        vssSamplesPerPass 500000
         useImportanceSampling true
         loadInitialSamples  false
@@ -52 +52 @@
         maxDepth        40
         minPvs          30
-        minRays         800
+        minRays         400
         minSize         0.001
         maxCostRatio    1.5
@@ -170 +170 @@
 
 ViewCells {
-        loadFromFile false
-        exportToFile true
+        loadFromFile true
+        exportToFile false
         #type kdTree
         #type vspKdTree
@@ -259 +259 @@
 VspBspTree {
         Construction {
-                samples 1200000
+                samples 900000
                 epsilon 0.005
                 randomize false

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -259 +259 @@
                 Finalize(*it, createMesh);
         }
+
+        mTotalAreaValid = false;
 }
 
@@ -2473 +2475 @@
         mVspBspTree->mBox = GetViewSpaceBox();
         ResetViewCells();
-        CreateViewCellMeshes();
+        
+        mViewCellsFinished = true;
+
+        FinalizeViewCells(true);
 
         Debug << (int)mViewCells.size() << " view cells loaded" << endl;
-
-        mViewCellsFinished = true;
 
         return success;
@@ -2529 +2532 @@
 
 
-void VspBspViewCellsManager::Finalize(ViewCell *viewCell)
+void VspBspViewCellsManager::Finalize(ViewCell *viewCell, const bool createMesh)
 {
         BspViewCell *vc = dynamic_cast<BspViewCell *>(viewCell);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -606 +606 @@
         //float GetVolume(ViewCell *viewCell) const;
 
-        void Finalize(ViewCell *viewCell);
+        void Finalize(ViewCell *viewCell, const bool createMesh);
 
 protected:

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -1937 +1937 @@
                 bool isAdjacent = true;
 
+                
+#if 1
                 // test all planes of current node if still adjacent
                 for (int i = 0; (i < halfSpaces.size()) && isAdjacent && (node != n); ++ i)
@@ -1950 +1952 @@
                         }
                 }
-
+#else
+                // test all planes of current node if still adjacent
+                for (int i = 0; i < nodeGeom.size()) && isAdjacent && (node != n); ++ i)
+                {
+                        Polygon3 *poly = nodeGeom->mPolys[i];
+
+                        const int cf =
+                                Polygon3::ClassifyPlane(geom->mPolys,
+                                                                                poly->GetSupportingPlane(),
+                                                                                mEpsilon);
+
+                        if (cf == Polygon3::BACK_SIDE)
+                        {
+                                isAdjacent = false;
+                        }
+                }
+#endif
                 if (isAdjacent)
                 {