Changeset 1288 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

08/28/06 03:42:51 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (3 diffs)

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

@@ -420 +420 @@
         else
         {
-                //-- parse type of view cell container
-
+                // parse type of view cell container
                 Environment::GetSingleton()->GetStringValue("ViewCells.type", buf);             
             mViewCellsManager = CreateViewCellsManager(buf);
@@ -456 +455 @@
 
 
+HierarchyManager *Preprocessor::CreateHierarchyManager(const char *name)
+{
+        HierarchyManager *hierarchyManager;
+
+        if (strcmp(name, "osp") == 0)
+        {
+                // HACK for testing if per kd evaluation works!!
+                const bool ishack = true;
+                if (ishack)
+                        hierarchyManager = new HierarchyManager(mVspTree, mKdTree);
+                else
+                        hierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::KD_BASED_OBJ_SUBDIV);
+        }
+        else if (strcmp(name, "bvh") == 0)
+        {
+                hierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
+        }
+
+        return hierarchyManager;
+}
+
+
 ViewCellsManager *Preprocessor::CreateViewCellsManager(const char *name)
 {
@@ -481 +502 @@
         {
                 mVspTree = new VspTree();
-                                
-                // HACK for testing if per kd evaluation works!!
-                const bool ishack = true;
-
-                /*if (ishack)
-                        mHierarchyManager = new HierarchyManager(mVspTree, mKdTree);
-                else
-                        mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::KD_BASED_OBJ_SUBDIV);
-                */
-                mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
-
+                char buf[100];          
+                Environment::GetSingleton()->GetStringValue("Hierarchy.type", buf);     
+
+                HierarchyManager *mHierarchyManager = CreateHierarchyManager(buf);
                 mViewCellsManager = new VspOspViewCellsManager(vcTree, mHierarchyManager);
         }