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

Timestamp:

08/24/06 18:05:30 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -34 +34 @@
 #include "KdTree.h"
 #include "BvHierarchy.h"
+#include "HierarchyManager.h"
 
 
@@ -91 +92 @@
   , mObjects(objects)
   , mBoundingBoxConverter(bconverter)
+  , mHierarchyManager(NULL)
 {
         std::stable_sort(mObjects->begin(), mObjects->end(), ilt);
@@ -354 +356 @@
         if (element == "ViewCells")
         {
-                cout << "parsing view cells" << endl;
+                cout << "\nparsing view cells" << endl;
                 
                 mCurrentState = PARSE_VIEWCELLS;
@@ -372 +374 @@
         if (element == "ViewSpaceHierarchy")
         {               
-                cout << "parsing view space hierarchy" << endl;
+                cout << "\nparsing view space hierarchy" << endl;
                 mCurrentState = PARSE_VIEWSPACE_HIERARCHY;
                 StartViewSpaceHierarchy(attributes);
@@ -380 +382 @@
         if (element == "ObjectSpaceHierarchy")
         {
-                cout << "parsing object space hierarchy" << endl;
+                cout << "\nparsing object space hierarchy" << endl;
                 mCurrentState = PARSE_OBJECTSPACE_HIERARCHY;
                 StartObjectSpaceHierarchy(attributes);
@@ -565 +567 @@
                 if (attrName == "type")
                 {
-                        if (strcmp(ptr, "bsp") == 0)
+                        if (strcmp(ptr, "osp") == 0)
                         {
-                                Debug << "view space hierarchy: Bsp" << endl;
-                                mViewSpaceHierarchyType = BSP;
+                                Debug << "object space hierarchy: Osp" << endl;
+                                mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::KD_BASED_OBJ_SUBDIV);
                         }
-                        else if (strcmp(ptr, "vsp") == 0)
+                        else if (strcmp(ptr, "bvh") == 0)
                         {
-                                Debug << "view space hierarchy: Vsp" << endl;
-                                mViewSpaceHierarchyType = VSP;
+                                Debug << "object space hierarchy: Bvh" << endl;
+                                mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
                         }
                 }
@@ -778 +780 @@
 
                 mVspTree = new VspTree();
+
                 // set view space box
                 mVspTree->mBoundingBox = mViewSpaceBox;
+
+                // object space hierarchy already constructed
+                if (mHierarchyManager)
+                {
+                        mHierarchyManager->mVspTree = mVspTree;
+                        mVspTree->mHierarchyManager = mHierarchyManager;
+                }
         }
         
         cout << "\nview space box: " << mViewSpaceBox << endl;
-}
-
-
-void ViewCellsParseHandlers::CreateObjectSpaceHierarchy()
-{
-        if (mViewSpaceHierarchyType == OSP)
-        {
-                Debug << "object hierarchy type: Osp" << endl;
-
-                mOspTree = new OspTree();
-        }
-        else if (mViewSpaceHierarchyType == VSP) 
-        {
-                Debug << "object hierarchy type: Vsp" << endl;
-
-                mVspTree = new VspTree();
-        }
 }
 
@@ -814 +807 @@
         else if (mViewSpaceHierarchyType == VSP) 
         {
-                Debug << "vcreating view cells manager: VsOspp" << endl;
+                Debug << "creating view cells manager: VspOsp" << endl;
 
                 // hack
-                mViewCellsManager = new VspOspViewCellsManager(mViewCellsTree, mVspTree, mOspTree);
+                mViewCellsManager = new VspOspViewCellsManager(mViewCellsTree, mHierarchyManager);
         }
 
@@ -978 +971 @@
         else
         {
-                mOspTree->mRoot = interior;
+                mHierarchyManager->mOspTree->mRoot = interior;
         }
 
@@ -996 +989 @@
         else
         {
-                mOspTree->mRoot = leaf;
+                mHierarchyManager->mOspTree->mRoot = leaf;
         }
 }
@@ -1002 +995 @@
 
 void ViewCellsParseHandlers::StartBvhLeaf(AttributeList& attributes)
-{
+{/*
         KdLeaf * leaf = 
                 new KdLeaf(dynamic_cast<KdInterior *>(mCurrentKdNode), NULL);
@@ -1012 +1005 @@
         else
         {
-                mOspTree->mRoot = leaf;
-        }
+                mHierarchyManager->mBvHierarchy->mRoot = leaf;
+        }*/
 }
 
 
 void ViewCellsParseHandlers::StartBvhInterior(AttributeList& attributes)
-{
+{/*
         AxisAlignedPlane plane;
         int len = attributes.getLength();
@@ -1051 +1044 @@
         }
 
-        mCurrentKdNode = interior;
+        mCurrentKdNode = interior;*/
 }