Changeset 1749

Timestamp:

11/14/06 15:33:59 (18 years ago)

Author:

mattausch

Message:

removed bug from exportviewcells

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (3 diffs)
• HierarchyManager.cpp (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)
• SamplingPreprocessor.cpp (modified) (1 diff)
• ViewCell.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (3 diffs)
• VspTree.cpp (modified) (1 diff)

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

@@ -296 +296 @@
         mMemoryConst = (float)sizeof(ObjectContainer);
 
-        /*cout << "bvh memcost: " << mMemoryConst << endl;
-        cout << "triangle: " << sizeof(TriangleIntersectable) << endl;
-        cout << "triangle: " << sizeof(Intersectable) << endl;
-        cout << "triangle: " << sizeof(ObjectContainer) << endl;
-        cout << "triangle: " << sizeof(float) << endl;
-        cout << "triangle: " << sizeof(int) << endl;
-*/
     mUseBboxAreaForSah = true;
 
@@ -328 +321 @@
         Debug << "minimal rays for visibility: " << mMinRaysForVisibility << endl;
         Debug << "bvh mem const: " << mMemoryConst << endl;
-cout << "here10 " << mRenderCostDecreaseWeight << endl;
+
         Debug << endl;
 }
@@ -611 +604 @@
         }
 
-        //splitCandidate.SetOldCost(oldRenderCost);
+        // hack: don't allow empty splits to be taken
+        if (splitCandidate.mFrontObjects.empty() || splitCandidate.mBackObjects.empty())
+                priority = 0;
         // compute global decrease in render cost
         splitCandidate.SetPriority(priority);

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

@@ -1897 +1897 @@
                 if (useFilter)
                 {
+                        ViewCellLeaf dummy;
+                        dummy.SetPvs(pvs);
                         ObjectPvs filteredPvs;
-                        mVspTree->mViewCellsManager->ApplyFilter2(vc, false, 1.0f, filteredPvs);
+                        mVspTree->mViewCellsManager->ApplyFilter2(&dummy, false, 1.0f, filteredPvs);
                         ComputePvs(filteredPvs, rc, pvsEntries);
                 }
@@ -1904 +1906 @@
                 {
                         ComputePvs(pvs, rc, pvsEntries);
-                }               
+                }
 
                 rc *= vc->GetVolume();

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

@@ -153 +153 @@
     
         mVisibilityFileName = buffer;
-        Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilityFilter", mApplyVisibilityFilter );
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilityFilter", mApplyVisibilityFilter);
         Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilitySpatialFilter",
                                                                                           mApplyVisibilitySpatialFilter );

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

@@ -121 +121 @@
 
           if (vssRays.size()!=32) {
-                cerr<<"wrong number of rays "<<vssRays.size()<<endl;
+                cerr<<"wrong number of rays "<<(int)vssRays.size()<<endl;
                 exit(1);
           }

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

@@ -2367 +2367 @@
         while (it.HasMoreEntries())
         {
-                ObjectPvsEntry entry;
+                ObjectPvsEntry entry = it.Next();
                 Intersectable *obj = entry.mObject;
 

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

@@ -580 +580 @@
         disposeRays(postProcessSamples, outRays);
 
-        
+                
+        // write view cells to disc
+        if (mExportViewCells)
+        {
+                char filename[100];
+                Environment::GetSingleton()->GetStringValue("ViewCells.filename", filename);
+                ExportViewCells(filename, mExportPvs, mPreprocessor->mObjects);
+        }
+
         ////////////////
         //-- Evaluation of the resulting view cell partition. 
@@ -589 +597 @@
                 EvalViewCellPartition();
         }
-                
-        // write view cells to disc
-        if (1 && mExportViewCells)
-        {
-                char filename[100];
-                Environment::GetSingleton()->GetStringValue("ViewCells.filename", filename);
-                ExportViewCells(filename, mExportPvs, mPreprocessor->mObjects);
-        }
-
+        
         /////////////////
         //-- Finally, we do some visualization
@@ -6063 +6063 @@
                         Debug << "statistics computed in " << timeDiff * 1e-3 << " secs" << endl;
 
-#if 0
+#if 1
                         ////////////////////////////
                         // filtered stats

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

@@ -504 +504 @@
 
         Debug << "vsp mem const: " << mMemoryConst << endl;
-cout << "here11 " << mRenderCostDecreaseWeight << endl;
+
         Debug << endl;
 }