Changeset 693

Timestamp:

03/13/06 16:29:28 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• Preprocessing/src/Mesh.h (modified) (1 diff)
• Preprocessing/src/ViewCell.cpp (modified) (2 diffs)
• Preprocessing/src/ViewCellsManager.cpp (modified) (16 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (3 diffs)
• Preprocessing/src/VssPreprocessor.cpp (modified) (1 diff)
• Preprocessing/src/X3dParser.cpp (modified) (3 diffs)
• Preprocessing/src/main.cpp (modified) (2 diffs)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/Preprocessing/src/Mesh.h

@@ -78 +78 @@
   void AddRectangle(const Rectangle3 &triangle);
 
-        void Cleanup();
-        bool
-        ValidateFace(const int face);
+  void Cleanup();
+  
+  bool ValidateFace(const int face);
 
   void AddFace(Face *face) 

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

@@ -1280 +1280 @@
         const float vol = box.GetVolume();
 
+        Debug << "vsb volume: " << vol << endl;
+        Debug << "root volume: " << mRoot->GetVolume() << endl;
+        Debug << "root pvs: " << mRoot->GetPvs().GetSize() << endl;
+
         int totalPvs;
         float totalRenderCost, avgRenderCost, expectedCost;
@@ -1394 +1398 @@
         mRoot = root;
 }
-
 
 

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

@@ -136 +136 @@
 
 
+void ViewCellsManager::CollectEmptyViewCells()
+{
+        mEmptyViewCells.clear();
+        ViewCellContainer leaves;
+        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+        cout << "collecting empty view cells" << endl;
+        int i = 0;
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                if ((*it)->GetPvs().Empty())
+                {
+                        ++ i;
+                        mEmptyViewCells.push_back(*it);
+                }
+        }
+        cout << "view cells found: " << i << endl;
+}
+
+
+void ViewCellsManager::TestEmptyViewCells()
+{
+        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), mEmptyViewCells);
+
+        ViewCellContainer::const_iterator it, it_end = mEmptyViewCells.end();
+
+        char buf[50];
+        int i = 0;
+        for (it = mEmptyViewCells.begin(); it != it_end; ++ it)
+        {
+                if (!(*it)->GetPvs().Empty())
+                {
+                        sprintf(buf, "empty-viewcells-%09d.x3d", (*it)->GetId());
+                        Exporter *exporter = Exporter::GetExporter(buf);
+                        
+                        if (exporter && i < 20)
+                        {
+                                Debug << "view cell " << (*it)->GetId() << " not empty, pvs: " << (*it)->GetPvs().GetSize() << endl;
+                                ExportViewCellGeometry(exporter, *it);
+                        }
+
+                        ++ i;
+                }
+        }
+        Debug << "\nfound " << i << " new view cells (" << " of " << mEmptyViewCells.size() << ")" << endl << endl;
+}
+
+
 int ViewCellsManager::CastPassSamples(const int samplesPerPass, 
                                                                           const int sampleType, 
@@ -235 +285 @@
         }
 
-
         //-- guided rays are used for further sampling
         const int n = mConstructionSamples; //+initialSamples;
@@ -308 +357 @@
         // merge the view cells
         PostProcess(preprocessor->mObjects, postProcessSamples);
+
+        // only for testing
+        CollectEmptyViewCells();
 
 
@@ -441 +493 @@
                 disposeRays(evaluationSamples, NULL);
         }
+
+        // find empty view cells bug
+        TestEmptyViewCells();
 }
 
@@ -728 +783 @@
 {
         ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+
+        // volume and area of the view cells are recomputed and a view cell mesh is created
         for (it = mViewCells.begin(); it != it_end; ++ it)
         {
@@ -1146 +1203 @@
                 }
         }
-
 }
 
@@ -1418 +1474 @@
                 cout << "finished" << endl;
         }
+
+        
+        // only for testing
+        TestSubdivision();
 
         mColorCode = savedColorCode;
@@ -1692 +1752 @@
 
 
+void BspViewCellsManager::TestSubdivision()
+{
+        ViewCellContainer leaves;
+        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+        const float vol = mViewSpaceBox.GetVolume();
+        float subdivVol = 0;
+        float newVol = 0;
+
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                BspNodeGeometry geom;
+                BspLeaf *leaf = dynamic_cast<BspViewCell *>(*it)->mLeaf;
+                mBspTree->ConstructGeometry(leaf, geom);
+
+                const float lVol = geom.GetVolume();
+                
+                newVol += lVol;
+                subdivVol += (*it)->GetVolume();
+        }
+        
+        Debug << "exact volume: " << vol << endl;
+        Debug << "subdivision volume: " << subdivVol << endl;
+        Debug << "new volume: " << newVol << endl;
+}
+
+
 void BspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                                                                  ViewCell *vc,
@@ -1762 +1851 @@
         ViewCellContainer::const_iterator it, it_end = leaves.end();
 
-        for (it = leaves.begin(); it != it_end; ++ it)
+    for (it = leaves.begin(); it != it_end; ++ it)
         {
                 BspNodeGeometry geom;
@@ -1768 +1857 @@
                 mBspTree->ConstructGeometry(leaf, geom);
 
-                area += geom.GetArea();
-                volume += geom.GetVolume();
-                CreateMesh(*it);
+                float lVol = geom.GetVolume();
+                float lArea = geom.GetArea();
+
+                //(*it)->SetVolume(vol);
+                //(*it)->SetArea(area);
+
+                area += lArea;
+                volume += lVol;
+
+        CreateMesh(*it);
         }
 
@@ -2937 +3033 @@
         
 
+        Debug << "here4" << endl;
+        // only for testing
+        TestSubdivision();
+
         //-- refines the merged view cells
         if (0)
@@ -2953 +3053 @@
         cout << ss << endl;
         Debug << ss << endl;
-
 
 
@@ -3619 +3718 @@
         CreateUniqueViewCellIds();
 
-
         stream.open(filename.c_str());
         stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"<<endl;
@@ -3678 +3776 @@
         ViewCellContainer::const_iterator it, it_end = leaves.end();
 
-        for (it = leaves.begin(); it != it_end; ++ it)
+    for (it = leaves.begin(); it != it_end; ++ it)
         {
                 BspNodeGeometry geom;
@@ -3684 +3782 @@
                 mVspBspTree->ConstructGeometry(leaf, geom);
 
-                area += geom.GetArea();
-                volume += geom.GetVolume();
-                CreateMesh(*it);
+                float lVol = geom.GetVolume();
+                float lArea = geom.GetArea();
+
+                //(*it)->SetVolume(vol);
+                //(*it)->SetArea(area);
+
+                area += lArea;
+                volume += lVol;
+
+        CreateMesh(*it);
         }
 
@@ -3694 +3799 @@
 
 
+void VspBspViewCellsManager::TestSubdivision()
+{
+        ViewCellContainer leaves;
+        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+        const float vol = mViewSpaceBox.GetVolume();
+        float subdivVol = 0;
+        float newVol = 0;
+
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                BspNodeGeometry geom;
+                BspLeaf *leaf = dynamic_cast<BspViewCell *>(*it)->mLeaf;
+                mVspBspTree->ConstructGeometry(leaf, geom);
+
+                const float lVol = geom.GetVolume();
+                
+                newVol += lVol;
+                subdivVol += (*it)->GetVolume();
+        }
+        
+        Debug << "exact volume: " << vol << endl;
+        Debug << "subdivision volume: " << subdivVol << endl;
+        Debug << "new volume: " << newVol << endl;
+}
+
+
 void VspBspViewCellsManager::PrepareLoadedViewCells()
 {
         // TODO: do I still need this here?
         if (0)
-        mVspBspTree->RepairViewCellsLeafLists();
+                mVspBspTree->RepairViewCellsLeafLists();
 }
 

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

@@ -500 +500 @@
         bool mEvaluateViewCells;
 
-        bool mShowVisualization;        
+        bool mShowVisualization;
+
+        // HACK in order to detect empty view cells
+        void CollectEmptyViewCells();
+        void TestEmptyViewCells();
+
+        ViewCellContainer mEmptyViewCells;
 };
 
@@ -590 +596 @@
         void ExportBspPvs(const ObjectContainer &objects);
 
+        void TestSubdivision();
 };
 
@@ -827 +834 @@
                                           const VssRayContainer &rays);
 
+        void TestSubdivision();
 };
 

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

@@ -158 +158 @@
                 // cast again to ensure that there is no objectA
                 SetupRay(ray, pointB, direction);
-                ray.mFlags |= Ray::CULL_BACKFACESw;
+                ray.mFlags |= Ray::CULL_BACKFACES;
                 
                 if (mKdTree->CastRay(ray)) 

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

@@ -87 +87 @@
 }
 
+// HACK
+void RotateMesh(Mesh *mesh)
+{
+        VertexContainer::const_iterator it, it_end = mesh->mVertices.end();
+
+        const float angle = 30.0f * PI / 180.0f;
+        const Matrix4x4 rot = RotationYMatrix(30);
+
+        for (it = mesh->mVertices.begin(); it != it_end; ++ it)
+        {
+                const Vector3 pt = rot * (*it);
+        }
+}
+
+
 void
 X3dParseHandlers::EndShape()
@@ -109 +124 @@
                         
                         mesh->mFaces.push_back(new Face(vc));
+                        if (0)
+                                RotateMesh(mesh);
                         mesh->Preprocess();
                         // make an instance of this mesh
@@ -121 +138 @@
         }
         else
-        {
- 
+        { 
                 if (mCurrentMesh->mFaces.size()) 
                 {
+                        // HACK
+                        if (0)
+                                RotateMesh(mCurrentMesh);
                         mCurrentMesh->Preprocess();
                         // make an instance of this mesh

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

@@ -42 +42 @@
   environment->Parse(argc, argv, USE_EXE_PATH);
   MeshKdTree::ParseEnvironment();
-  
+
   char buff[128];
   environment->GetStringValue("Preprocessor.type", buff);
@@ -65 +65 @@
                   exit(1);
                 }
+
 
   QApplication *app = NULL;