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

Timestamp:

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

Author:

mattausch

Message:

 

File:

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

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

@@ -17 +17 @@
 #include "ObjParser.h"
 #include "BvHierarchy.h"
+#include "HierarchyManager.h"
 
 #ifdef GTP_INTERNAL
@@ -125 +126 @@
 mVspBspTree(NULL),
 mVspTree(NULL),
-mOspTree(NULL),
-mBvHierarchy(NULL),
+mHierarchyManager(NULL),
 mViewCellsManager(NULL),
 mRenderSimulator(NULL),
-mPass(0)
+mPass(0),
+mRayCastMethod(0)
 {
         Environment::GetSingleton()->GetBoolValue("Preprocessor.useGlRenderer", mUseGlRenderer);
@@ -142 +143 @@
         Environment::GetSingleton()->GetBoolValue("Preprocessor.detectEmptyViewSpace", mDetectEmptyViewSpace);
         Environment::GetSingleton()->GetBoolValue("Preprocessor.exportVisibility", mExportVisibility );
+//#if GTP_INTERNAL // choose other ray cast method
         Environment::GetSingleton()->GetIntValue("Preprocessor.rayCastMethod", mRayCastMethod);
-
+//#endif
         char buffer[256];
         Environment::GetSingleton()->GetStringValue("Preprocessor.visibilityFile",  buffer);
@@ -177 +179 @@
   cout << "done.\n";
 
-  cout << "Deleting osp tree...\n";
-  DEL_PTR(mOspTree);
+  cout << "Deleting hierarchy manager...\n";
+  DEL_PTR(mHierarchyManager);
   cout << "done.\n";
 
@@ -479 +481 @@
         {
                 mVspTree = new VspTree();
-                //mOspTree = new OspTree();
-                
+                                
                 // HACK for testing if per kd evaluation works!!
-                mOspTree = new OspTree(*mKdTree);
-
-                mViewCellsManager = new VspOspViewCellsManager(vcTree, mVspTree, mOspTree);
+                const bool ishack = true;
+
+                if (ishack)
+                {
+                        mHierarchyManager = new HierarchyManager(mVspTree, mKdTree);
+                }
+                else
+                {
+                        mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::KD_BASED_OBJ_SUBDIV);
+                }
+
+                mViewCellsManager = new VspOspViewCellsManager(vcTree, mHierarchyManager);
         }
         else if (strcmp(name, "sceneDependent") == 0)
@@ -500 +510 @@
         }
 
-        //vcTree->SetViewCellsManager(mViewCellsManager);
         return mViewCellsManager;
 }
@@ -767 +776 @@
         //      return new ObjectsInteriorDistribution(*this);
         default: // no valid strategy
+                Debug << "warning: no valid sampling strategy" << endl;
                 return NULL;
         }
@@ -844 +854 @@
                 //Debug << "intel ray: " << *vssRay << endl;
         }
+
         //cout << "a";
         return hits;