Changeset 1284 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp (modified) (23 diffs)

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);
                 }
         }