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

Timestamp:

06/21/06 09:44:39 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -181 +181 @@
 
 
-        Debug << "***********View Cells options ****************" << endl;
+        Debug << "************ View Cells options ***************" << endl;
         Debug << "color code: " << mColorCode << endl;
 
@@ -417 +417 @@
                   << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
-//return 0;
+
         // take post processing time
         startTime = GetTime();
@@ -1727 +1727 @@
 {
         mViewSpaceBox = box;
-
+        Debug << "here111 " << mViewSpaceBox << endl;
+        // hack: create clip plane relative to new view space box
         CreateClipPlane();
-        
+        // the total area of the view space has changed
         mTotalAreaValid = false;
 }
@@ -2928 +2929 @@
                                                                                                  const Plane3 *clipPlane) const
 {
+        // export mesh if available
         if (vc->GetMesh())
         {
                 exporter->ExportMesh(vc->GetMesh());
-        
                 return;
         }
-
-        
+        // otherwise construct from leaves
         if (clipPlane)
         {
@@ -4787 +4787 @@
 ViewCellsManager(), mVspTree(vspTree), mOspTree(ospTree)
 {
-        Environment::GetSingleton()->GetIntValue("VspBspTree.Construction.samples", mInitialSamples);
+        mHierarchyManager = new HierarchyManager(*vspTree, *ospTree);
+        Environment::GetSingleton()->GetIntValue("VspTree.Construction.samples", mInitialSamples);
         mVspTree->SetViewCellsManager(this);
         mVspTree->mViewCellsTree = mViewCellsTree;
@@ -4795 +4796 @@
 VspOspViewCellsManager::~VspOspViewCellsManager()
 {
+        DEL_PTR(mHierarchyManager);
 }
 
@@ -4835 +4837 @@
         mMaxPvsSize = (int)(mMaxPvsRatio * (float)objects.size());
 
+        Debug << "here125 view space box " << mViewSpaceBox << endl;
+
         // if view cells were already constructed
         if (ViewCellsConstructed())
@@ -4858 +4862 @@
         long startTime;
 
-#if TODO
-        if (1)
-                mVspTree->Construct(constructionRays, &mViewSpaceBox);
-        else
-                mVspTree->Construct(rays, &mViewSpaceBox);
-#endif
-        // collapse invalid regions
-        cout << "collapsing invalid tree regions ... ";
-        startTime = GetTime();
-        const int collapsedLeaves = mVspTree->CollapseTree();
-        Debug << "collapsed in " << TimeDiff(startTime, GetTime()) * 1e-3 
-                  << " seconds" << endl;
-
-    cout << "finished" << endl;
-
+        mHierarchyManager->Construct(constructionRays, objects, &mViewSpaceBox);
+
+        
         //-- stats
         Debug << mVspTree->GetStatistics() << endl;
@@ -4917 +4909 @@
 
 
-        // view cells already finished before post processing step 
-        // (i.e. because they were loaded)
+        // take this step only if 
+        // view cells already constructed before post processing step 
+        // (e.g., because they were loaded)
         if (mViewCellsFinished)
         {
@@ -5154 +5147 @@
 
 
+void VspOspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
+                                                                                                        ViewCell *vc,
+                                                                                                        const Plane3 *clipPlane) const
+{
+        ViewCellContainer leaves;
+
+        mViewCellsTree->CollectLeaves(vc, leaves);
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                VspViewCell *vspVc = dynamic_cast<VspViewCell *>(*it);
+                VspLeaf *l = vspVc->mLeaf;
+
+                const AxisAlignedBox3 box = mVspTree->GetBBox(vspVc->mLeaf);
+
+                if (!clipPlane || !box.Side(*clipPlane))
+                        exporter->ExportBox(box);
+        }
+}
+
+
 bool VspOspViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
@@ -5161 +5176 @@
 
   //    return mViewSpaceBox.IsInside(viewPoint) &&
-  //               mVspBspTree->ViewPointValid(viewPoint);
+  //               mVspTree->ViewPointValid(viewPoint);
 }
 
@@ -5170 +5185 @@
         if (!ViewCellsConstructed())
                 return;
-#if TODO
+
         VssRayContainer visRays;
         GetRaySets(sampleRays, mVisualizationSamples, visRays);
@@ -5208 +5223 @@
 
                         // HACK: export without clip plane
-                        const bool b = mUseClipPlaneForViz;
-                        mUseClipPlaneForViz = false;
+                        //const bool b = mUseClipPlaneForViz;
+                        //mUseClipPlaneForViz = false;
 
                         ExportViewCellsForViz(exporter);
                         
-                        mUseClipPlaneForViz = b;
+                        //mUseClipPlaneForViz = b;
                         delete exporter;
 
@@ -5220 +5235 @@
 
                 mColorCode = savedColorCode;
-        }
-
-
-        if (0)
-        {
-                cout << "exporting depth map ... ";
-
-                Exporter *exporter = Exporter::GetExporter("depth_map.x3d");
-                if (exporter)
-                {
-                        if (1)
-                        {
-                                exporter->SetWireframe();
-                                exporter->ExportBox(mViewSpaceBox);
-                                exporter->SetFilled();
-                        }
-
-                        if (mExportGeometry)
-                        {
-                                exporter->ExportGeometry(objects);
-                        }
-
-                        const int maxDepth = mVspBspTree->mBspStats.maxDepth;
-
-                        ViewCellContainer::const_iterator vit, vit_end = mViewCells.end();
-
-                        for (vit = mViewCells.begin(); vit != mViewCells.end(); ++ vit)
-                        {
-                                ViewCell *vc = *vit;
-
-                                ViewCellContainer leaves;
-                                mViewCellsTree->CollectLeaves(vc, leaves);
-
-                                ViewCellContainer::const_iterator lit, lit_end = leaves.end();
-
-                                for (lit = leaves.begin(); lit != lit_end; ++ lit)
-                                {
-                                        BspLeaf *leaf = dynamic_cast<BspViewCell *>(*lit)->mLeaf;
-
-                                        Material m; 
-
-                                        float relDepth = (float)leaf->GetDepth() / (float)maxDepth;
-                                        m.mDiffuseColor.r = relDepth;
-                                        m.mDiffuseColor.g = 0.0f;
-                                        m.mDiffuseColor.b = 1.0f - relDepth;
-
-                    exporter->SetForcedMaterial(m);
-                                
-
-                                        BspNodeGeometry geom;
-                                        mVspBspTree->ConstructGeometry(leaf, geom);
-                                        exporter->ExportPolygons(geom.GetPolys());
-                                }
-                        }
-
-                        delete exporter;
-                }
-
-
-                cout << "finished" << endl;
-        }
-
-        //-- visualization of the BSP splits
-
-        bool exportSplits = false;
-        Environment::GetSingleton()->GetBoolValue("VspBspTree.Visualization.exportSplits", exportSplits);
-
-        if (exportSplits)
-        {
-                cout << "exporting splits ... ";
-                ExportSplits(objects, visRays);
-                cout << "finished" << endl;
         }
 
         //-- export single view cells
         ExportBspPvs(objects, visRays);
-#endif
 }
 
@@ -5482 +5424 @@
 
 
-void VspOspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
-                                                    ViewCell *vc,
-                                                                                                        const Plane3 *clipPlane) const
-{
-        // matt: TODO
-}
-
-
 bool VspOspViewCellsManager::ExportViewCells(const string filename, 
                                                                                          const bool exportPvs, 
@@ -5537 +5471 @@
 
         //-- export the view cells and the pvs
-        stream << "<HierarchyType name=\"vspBspTree\" />" << endl;
+        stream << "<HierarchyType name=\"vspTree\" />" << endl;
 
         const int numViewCells = mCurrentViewCellsStats.viewCells;
@@ -5566 +5500 @@
 
 
-ViewCell *VspOspViewCellsManager::GetViewCell(const Vector3 &point, const bool active) const
+ViewCell *VspOspViewCellsManager::GetViewCell(const Vector3 &point, 
+                                                                                          const bool active) const
 {
         if (!ViewCellsConstructed())
@@ -5582 +5517 @@
         // matt: TODO
         Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
+
+        ViewCellContainer leaves;
+        mViewCellsTree->CollectLeaves(vc, leaves);
+
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+    for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaf;
+                const AxisAlignedBox3 box = mVspTree->GetBBox(leaf);
+
+        IncludeBoxInMesh(box, *mesh);
+        }
+
         vc->SetMesh(mesh);
 }
@@ -5596 +5545 @@
                                                                           const bool createMesh)
 {
-#if TODO
         float area = 0;
         float volume = 0;
@@ -5607 +5555 @@
     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();
-                const float lArea = geom.GetArea();
+                VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaf;
+                
+                const AxisAlignedBox3 box = mVspTree->GetBBox(leaf);
+
+                const float lVol = box.GetVolume();
+                const float lArea = box.SurfaceArea();
 
                 //(*it)->SetVolume(vol);
@@ -5625 +5573 @@
         viewCell->SetVolume(volume);
         viewCell->SetArea(area);
-#endif
 }