Changeset 1284

Timestamp:

08/25/06 10:14:56 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (1 diff)
• Pvs.cpp (modified) (2 diffs)
• ViewCell.cpp (modified) (2 diffs)
• ViewCell.h (modified) (4 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)
• ViewCellsManager.h (modified) (1 diff)
• ViewCellsParser.cpp (modified) (23 diffs)
• ViewCellsParserXerces.h (modified) (1 diff)
• main.cpp (modified) (1 diff)

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

@@ -574 +574 @@
         
                         const int colorCode = 0;
-                        const int maxPvs = 200;//mOspTree.GetStatistics().maxPvs;
-
-                        exporter->ExportOspTree(*mOspTree, colorCode == 0 ? 0 : maxPvs);
+                        const int maxPvs = 0;//mOspTree.GetStatistics().maxPvs;
+
+                        exporter->ExportOspTree(*mOspTree, 0);
 
                         delete exporter;

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

@@ -95 +95 @@
                         return 0;
                 }
-        }
-                                 
+        }                        
 
         // compute leaf pvs
@@ -120 +119 @@
                        
                                 // add #objects exclusivly in this node
-                                pvs += leaf->mObjects.size();
+                                pvs += (int)leaf->mObjects.size();
                         }
                         else // traverse tree

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

@@ -104 +104 @@
 ViewCell::ViewCell(): 
 MeshInstance(NULL), 
-mPiercingRays(0),
 mArea(-1),
 mVolume(-1),
@@ -118 +117 @@
 ViewCell::ViewCell(Mesh *mesh): 
 MeshInstance(mesh), 
-mPiercingRays(0),
 mArea(-1),
 mVolume(-1),

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

@@ -191 +191 @@
         bool AddPvsSample(Intersectable *sample, const float pdf, float &contribution);
   
-
         /// Rays piercing this view cell.
-        RayContainer mPiercingRays;
-
+        //RayContainer mPiercingRays;
 
         /** if this is a view cell correspending to a leaf in a hierarchy.
@@ -294 +292 @@
 {
         friend class ViewCellsManager;
+
 public:
         ViewCellInterior();
@@ -300 +299 @@
         ViewCellInterior(Mesh *mesh);
         
-
         /** Sets pointer from parent to child and vice versa.
         */
@@ -307 +305 @@
         bool IsLeaf() const;
 
-        ViewCellContainer mChildren;
-
-  void SetCost(const float c) {
-        mCost = c;
-  }
-  float GetCost() const {
-        return mCost;
-  }
+        void SetCost(const float c) {
+                mCost = c;
+        }
+        
+        float GetCost() const {
+                return mCost;
+        }
   
+  ViewCellContainer mChildren;
+
 protected:
   /** overall cost resulting from the merge */

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

@@ -264 +264 @@
 }
 
-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;
-        
-        for (it = leaves.begin(); it != it_end; ++ it)
-        {
-                if ((*it)->GetPvs().Empty())
-                {
-                        mEmptyViewCells.push_back(*it);
-                }
-        }
-        Debug << "empty view cells found: " << (int)mEmptyViewCells.size() << endl;
-}
-
 
 bool ViewCellsManager::EqualToSpatialNode(ViewCell *viewCell) const 
 { 
         return false;
-}
-
-
-void ViewCellsManager::TestEmptyViewCells(const ObjectContainer &obj)
-{
-        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", i/*(*it)->GetId()*/);
-                        Exporter *exporter = Exporter::GetExporter(buf);
-                        
-                        if (exporter && i < 20)
-                        {
-                                Ray *pray = (*it)->mPiercingRays[0];
-                                Debug << "view cell " << (*it)->GetId() << " not empty, pvs: " 
-                                          << (*it)->GetPvs().CountObjectsInPvs() << " " << (int)pray->intersections.size() << endl;
-
-                                exporter->ExportRays((*it)->mPiercingRays);
-                                                        
-                                exporter->SetFilled();
-                                exporter->SetForcedMaterial(RgbColor(0,0,1));
-
-                                for (int j = 0; j < (int)pray->intersections.size(); ++ j)
-                                {
-                                        if (pray->intersections[j].mObject)
-                                                exporter->ExportIntersectable(pray->intersections[j].mObject);
-                                }
-
-                                //exporter->SetWireframe();
-                                exporter->SetForcedMaterial(RgbColor(0,1,0));
-                                exporter->ExportGeometry(obj);
-
-                                exporter->SetFilled();
-
-                                exporter->SetForcedMaterial(RgbColor(1,0,0));
-                                ExportViewCellGeometry(exporter, *it);
-
-                                delete exporter;                
-                        }
-
-                
-                        ++ i;
-                }
-        }
-        Debug << "\nSampled " << i << " new view cells (" 
-                  << " of " << (int)mEmptyViewCells.size() << ")" << endl << endl;
 }
 
@@ -1582 +1511 @@
         vc->GetPvs().Merge(right->GetPvs());
 
-        //-- merge ray sets
-        if (0)
-        {
-                stable_sort(left->mPiercingRays.begin(), left->mPiercingRays.end());
-                stable_sort(right->mPiercingRays.begin(), right->mPiercingRays.end());
-
-                std::merge(left->mPiercingRays.begin(), left->mPiercingRays.end(),
-                                   right->mPiercingRays.begin(), right->mPiercingRays.end(),
-                                   vc->mPiercingRays.begin());
-        }
-
         // set only links to child (not from child to parent, maybe not wished!!)
         vc->mChildren.push_back(left);
@@ -2003 +1921 @@
 {
         if (ViewCellsTreeConstructed())
+        {
                 mViewCellsTree->CreateUniqueViewCellsIds();
-        else
+        }
+        else // no view cells tree, handle view cells "myself"
+        {
                 for (int i = 0; i < (int)mViewCells.size(); ++ i)
+                {
                         mViewCells[i]->SetId(i);
+                }
+        }
 }
 

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

@@ -671 +671 @@
         bool mShowVisualization;
 
-        // HACK in order to detect empty view cells
-        void CollectEmptyViewCells();
-        void TestEmptyViewCells(const ObjectContainer &obj);
-
-        ViewCellContainer mEmptyViewCells;
-
         int mRenderCostEvaluationType;
 

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

@@ -311 +311 @@
                                                                                                                           AttributeList& attributes)
 {
-        //if (!mViewCellsManager)return;
-
         //-- use cell type according to the chosen method
-
         switch (mObjectSpaceHierarchyType)
         {
@@ -336 +333 @@
         if (element == "Interior") 
         {
-                Debug << "[";
+                cout << "[";
                 StartViewCellInterior(attributes);
         }
@@ -342 +339 @@
         if (element == "Leaf") 
         {
-                Debug << "l";
+                cout << "l";
                 StartViewCellLeaf(attributes);
         }
@@ -390 +387 @@
         if (element == "BoundingBox")
         {
-                Debug << "b";
+                cout << "b";
                 StartBoundingBox(attributes);
         }
@@ -415 +412 @@
 
 
-void ViewCellsParseHandlers::StartViewCell(ViewCell *viewCell, 
-                                                                                   AttributeList&  attributes)
+void ViewCellsParseHandlers::ParseViewCellPvs(ViewCell *viewCell, 
+                                                                                          AttributeList&  attributes)
 {
         int len = attributes.getLength();
@@ -468 +465 @@
                                 else
                                 {
-                                        Debug << "error: object with id " << objId << " does not exist" << endl;
+                                        cout << "error: object with id " << objId << " does not exist" << endl;
                                 }
                         }
@@ -524 +521 @@
                         if (strcmp(ptr, "bsp") == 0)
                         {
-                                cout << "view space hierarchy: Bsp" << endl;
+                                cout << "\nview space hierarchy: Bsp" << endl;
                                 mViewSpaceHierarchyType = BSP;
                         }
                         else if (strcmp(ptr, "vsp") == 0)
                         {
-                                Debug << "view space hierarchy: Vsp" << endl;
+                                cout << "\nview space hierarchy: Vsp" << endl;
                                 mViewSpaceHierarchyType = VSP;
                         }
@@ -557 +554 @@
 
         Vector3 bmin, bmax;
-
+cout << "here3" << endl;
         for (int i = 0; i < len; ++ i) 
         {
@@ -569 +566 @@
                         if (strcmp(ptr, "osp") == 0)
                         {
-                                Debug << "object space hierarchy: Osp" << endl;
-                                mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::KD_BASED_OBJ_SUBDIV);
+                                cout << "\nobject space hierarchy: Osp" << endl;
+                                mHierarchyManager = 
+                                        new HierarchyManager(mVspTree, HierarchyManager::KD_BASED_OBJ_SUBDIV);
                         }
                         else if (strcmp(ptr, "bvh") == 0)
                         {
-                                Debug << "object space hierarchy: Bvh" << endl;
-                                mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
+                                cout << "\nobject space hierarchy: Bvh" << endl;
+                                mHierarchyManager = 
+                                        new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
                         }
                 }
@@ -650 +649 @@
                 }
         }
-
         
         if (viewCellId >= 0) // valid view cell found
@@ -665 +663 @@
                 if (viewCell->GetId() == viewCellId)
                 {
+                        // create new view cell for bsp nodes
                         leaf->SetViewCell(viewCell);
                         viewCell->mLeaf = leaf;
@@ -670 +669 @@
                 else
                 {
-                        Debug << "error: view cell does not exist" << endl;
+                        cout << "error: view cell does not exist" << endl;
                 }
         }
@@ -724 +723 @@
 void ViewCellsParseHandlers::StartViewCellLeaf(AttributeList& attributes)
 {
-        BspViewCell *viewCell = new BspViewCell();
+        ViewCellLeaf *viewCell = new ViewCellLeaf();
 
         if (mCurrentViewCell) // replace front or (if not NULL) back child
         {
-                ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(mCurrentViewCell);
+                ViewCellInterior *interior = 
+                        dynamic_cast<ViewCellInterior *>(mCurrentViewCell);
                 interior->SetupChildLink(viewCell);
         }
@@ -736 +736 @@
         }
 
-        StartViewCell(viewCell, attributes);
+        ParseViewCellPvs(viewCell, attributes);
 
         // collect leaves
@@ -746 +746 @@
 {
         ViewCellInterior* interior = new ViewCellInterior();
-        
+        cout << "here7"<<endl;
         if (mCurrentViewCell) // replace NULL child of parent with current node
         {
@@ -760 +760 @@
         mCurrentViewCell = interior;
 
-        StartViewCell(interior, attributes);
+        ParseViewCellPvs(interior, attributes);
 }
 
@@ -766 +766 @@
 void ViewCellsParseHandlers::CreateViewSpaceHierarchy()
 {
+        ViewCellContainer::iterator it, it_end = mViewCells.end();
+        Debug << endl;
+        for (it = mViewCells.begin(); it != it_end; ++ it)
+        {
+                Debug << (*it)->GetId() << " ";
+        }
+Debug << endl;
         if (mViewSpaceHierarchyType == BSP)
         {
@@ -774 +781 @@
                 // set view space box
                 mVspBspTree->mBox = mViewSpaceBox;
+
+                ViewCellContainer::iterator vit, vit_end = mViewCells.end();
+
+                // reset view cells using the current node type
+                for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
+                {
+                        ViewCell *vc = *vit;
+
+                        BspViewCell *bspVc = new BspViewCell();
+                        bspVc->SetPvs(vc->GetPvs());
+                        bspVc->SetId(vc->GetId());
+
+                        if (vc->IsRoot())
+                        {
+                                mViewCellsTree->mRoot = bspVc;
+                        }
+                        else
+                        {
+                vc->GetParent()->SetupChildLink(bspVc);
+                                vc->GetParent()->RemoveChildLink(vc);
+                        }
+
+                        DEL_PTR(vc);
+                        (*vit) = bspVc;
+                }
+
         }
         else if (mViewSpaceHierarchyType == VSP) 
@@ -784 +817 @@
                 mVspTree->mBoundingBox = mViewSpaceBox;
 
-                // object space hierarchy already constructed
+                ViewCellContainer::iterator vit, vit_end = mViewCells.end();
+
+                // reset view cells using the current node type
+                for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
+                {
+                        ViewCell *vc = *vit;
+
+                        VspViewCell *vspVc = new VspViewCell();
+                        vspVc->SetPvs(vc->GetPvs());
+                        vspVc->SetId(vc->GetId());
+
+                        if (vc->IsRoot())
+                        {
+                                mViewCellsTree->mRoot = vspVc;
+                        }
+                        else
+                        {
+                vc->GetParent()->SetupChildLink(vspVc);
+                                vc->GetParent()->RemoveChildLink(vc);
+                        }
+                        
+                        DEL_PTR(vc);
+                        (*vit) = vspVc;
+                }
+
+                // if object space hierarchy already constructed
                 if (mHierarchyManager)
                 {
@@ -791 +849 @@
                 }
         }
-        
+        Debug << "************************" << endl;
+        it_end = mViewCells.end();
+        for (it = mViewCells.begin(); it != it_end; ++ it)
+        {
+                Debug << (*it)->GetId() << " ";
+        }
+        Debug << endl;
         cout << "\nview space box: " << mViewSpaceBox << endl;
 }
@@ -879 +943 @@
                 dummyVc.SetId(viewCellId);
 
+                cout << "\nsearching view cell with id " << viewCellId << endl;
+
                 ViewCellContainer::iterator vit =
                         lower_bound(mViewCells.begin(), mViewCells.end(), &dummyVc, vlt);
                         
+                if (vit == mViewCells.end())
+                        cout << "error: view cell " << viewCellId << " not found" << endl;
+
                 VspViewCell *viewCell = dynamic_cast<VspViewCell *>(*vit);
         
@@ -891 +960 @@
                 else
                 {
-                        Debug << "error: view cell does not exist" << endl;
+                        cout << "error: view cell does not exist" << endl;
                 }
         }
@@ -917 +986 @@
                 if (attrName == "plane") 
                 {
-                        sscanf(ptr, "%d %f",
-                                   &plane.mAxis, &plane.mPosition);
+                        sscanf(ptr, "%d %f", &plane.mAxis, &plane.mPosition);
                 }
         }

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

@@ -118 +118 @@
   void EndVspInterior();
 
-  void StartViewCell(ViewCell *viewCell, AttributeList&  attributes);
+  void ParseViewCellPvs(ViewCell *viewCell, AttributeList&  attributes);
   void EndViewCells();
   void EndBoundingBoxes();

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

@@ -134 +134 @@
 #endif
 
-  cerr<<"HERE!\n";
         int returnCode = 0;