Changeset 1703 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

10/31/06 10:57:14 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -33 +33 @@
 #define KD_PVS_AREA (5*1e-4f)
 
+
+
 namespace GtpVisibilityPreprocessor {
 
@@ -38 +40 @@
 // HACK
 const static bool SAMPLE_AFTER_SUBDIVISION = true;
-const static bool CLAMP_TO_BOX = true;
+const static bool CLAMP_TO_BOX = false;
+
+int ViewCellsManager::sRenderCostEvaluationType = 0;
+
 
 template <typename T> class myless
@@ -101 +106 @@
         Environment::GetSingleton()->GetIntValue("ViewCells.Filter.maxSize", mMaxFilterSize);
         Environment::GetSingleton()->GetFloatValue("ViewCells.Filter.width", mFilterWidth);
-        Environment::GetSingleton()->GetIntValue("ViewCells.renderCostEvaluationType", mRenderCostEvaluationType);
+        Environment::GetSingleton()->GetIntValue("ViewCells.renderCostEvaluationType", sRenderCostEvaluationType);
 
         Environment::GetSingleton()->GetBoolValue("ViewCells.exportBboxesForPvs", mExportBboxesForPvs);
@@ -179 +184 @@
         if (strcmp(buf, "perobject") == 0)
         {
-                mRenderCostEvaluationType = ViewCellsManager::PER_OBJECT;
-        }
-        else if (strcmp(buf, "directional") == 0)
-        {
-                mRenderCostEvaluationType = ViewCellsManager::PER_TRIANGLE;
+                sRenderCostEvaluationType = ViewCellsManager::PER_OBJECT;
+        }
+        else if (strcmp(buf, "pertriangle") == 0)
+        {
+                sRenderCostEvaluationType = ViewCellsManager::PER_TRIANGLE;
         }
         else 
@@ -224 +229 @@
         Debug << "evaluate view cells: " << mEvaluateViewCells << endl;
         Debug << "sampling type: " << mSamplingType << endl;
-        Debug << "render cost evaluation type: " << mRenderCostEvaluationType << endl;
+        Debug << "render cost evaluation type: " << sRenderCostEvaluationType << endl;
         Debug << "evaluation sampling type: " << mEvaluationSamplingType << endl;
         Debug << "show visualization: " << mShowVisualization << endl;
@@ -1091 +1096 @@
 
 
-float ViewCellsManager::EvalRenderCost(Intersectable *obj) const
-{
-        switch (mRenderCostEvaluationType)
+float ViewCellsManager::EvalRenderCost(Intersectable *obj) //const
+{
+        switch (sRenderCostEvaluationType)
         {
         case PER_OBJECT:
-                //cout << "perobject" << endl;
                 return 1.0f;
         
         case PER_TRIANGLE:
-                {//cout << "pertriangle" << endl;
+                {
                         return (float)obj->NumberOfFaces();
                 }
@@ -5187 +5191 @@
                 AxisAlignedBox3 bbox = mViewSpaceBox;
                 bbox.Scale(Vector3(0.5, 1, 0.5));
+
                 if (CLAMP_TO_BOX)
                 {       
@@ -5204 +5209 @@
                 }
 
-                mHierarchyManager->ExportObjectSpaceHierarchy(exporter, objects, CLAMP_TO_BOX ? &bbox : NULL, false);
+                mHierarchyManager->ExportObjectSpaceHierarchy(exporter, 
+                                objects, CLAMP_TO_BOX ? &bbox : NULL, false);
                 ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, GetClipPlane());