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

Timestamp:

01/29/07 19:00:03 (17 years ago)

Author:

mattausch

Message:

debug version: something wrong with the pvs!

File:

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

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

@@ -742 +742 @@
         vector<int>::const_iterator iit, iit_end = strategies.end();
 
+        cout << "===============================\n" << endl;
         for (iit = strategies.begin(); iit != iit_end; ++ iit)
         {
@@ -762 +763 @@
                  << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
+        cout << "===============================\n" << endl;
         return (int)passSamples.size();
 }
@@ -1810 +1812 @@
 {
 
-        if ((vc->GetPvs().EvalPvsCost() > maxPvsSize) ||
-                (vc->GetPvs().EvalPvsCost() < minPvsSize))
-        {
+        const float pvsCost = vc->GetPvs().EvalPvsCost();
+
+        if ((pvsCost > maxPvsSize) || (pvsCost < minPvsSize))
+        {
+                cout << "err: " << pvsCost << " " << minPvsSize << " " << maxPvsSize << endl;
                 return false;
         }
@@ -2687 +2691 @@
                                                                           const bool useHitObjects)
 {
-  if (!useHitObjects) {
-        VssRayContainer::const_iterator it, it_end = rays.end();
-        for (it = rays.begin(); it != it_end; ++ it) {
-          VssRay *vssRay = *it;
-          // set only the termination object
-          vssRay->mTerminationObject = GetIntersectable(
-                                                                                                        *vssRay,
-                                                                                                        true);
-        }
-  }
+        if (!useHitObjects) 
+        {
+                VssRayContainer::const_iterator it, it_end = rays.end();
+        
+                for (it = rays.begin(); it != it_end; ++ it) 
+                {
+                        VssRay *vssRay = *it;
+                        // set only the termination object
+                        vssRay->mTerminationObject = GetIntersectable(
+                                *vssRay,
+                                true);
+                }
+        }
 }
 
@@ -2756 +2763 @@
 
         if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax)) {
-          //      cerr<<"ray outside view space box\n";
+          // cerr<<"ray outside view space box\n";
           return 0;
         }
@@ -2785 +2792 @@
         if (storeViewCells)
         {       
-          cerr<<"Store viewcells should not be used in the test!"<<endl;
+          // cerr << "Store viewcells should not be used in the test!" << endl;
           // copy viewcells memory efficiently
 #if VSS_STORE_VIEWCELLS
@@ -5320 +5327 @@
                 {
                         cout << "exporting view cells after post process ... ";
+
                         if (0)
                         {       // export view space box
@@ -6306 +6314 @@
                         if (!node->IsLeaf())
                         {
-                                cout << "error, can only do leaves" << endl;
+                                cout << "error, can only process leaves" << endl;
                                 return 0;
                         }
@@ -6372 +6380 @@
                 const int savedColorCode = mColorCode;
 
-                const float maxRenderCost = UpdateObjectCosts();
+                const float maxRenderCost = -1;//UpdateObjectCosts();
                 cout << "maxRenderCost: " << maxRenderCost << endl;
                 mColorCode = 0; // 0 = random, 1 = export pvs
-
-                if (0)
-                mHierarchyManager->ExportObjectSpaceHierarchy(exporter, objects, 
-                                                                                                          CLAMP_TO_BOX ? &bbox : NULL, maxRenderCost, false);
-                
-
-                //ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
-                ExportViewCellsForViz(exporter, NULL, mColorCode, GetClipPlane());
-
-                delete exporter;
-
-                cout << "finished in " << TimeDiff(starttime, GetTime()) * 1e-3f << " secs" << endl;
-                mColorCode = savedColorCode;
-        }
-
-        exporter = Exporter::GetExporter("final_object_partition.wrl");
-
-        if (exporter)
-        {
-                if (CLAMP_TO_BOX)
-                {       
-                        exporter->mClampToBox = true;   
-                }
-
-                EvaluateViewCellsStats();
-
-                const long starttime = GetTime();
-                cout << "exporting final objects (after initial construction + post process) ... ";
-
-                // matt: hack for clamping scene
-                AxisAlignedBox3 bbox = mViewSpaceBox;
-                bbox.Scale(scale);
-
-                // hack color code (show pvs size)
-                const int savedColorCode = mColorCode;
-
-                mColorCode = 1; // 0 = random, 1 = export pvs
-                // don't visualize render cost
-                const float maxRenderCost = -1;
 
                 if (1)
@@ -6420 +6389 @@
                 
 
-                //ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
-                if (0)
+                if (1)
+                {
+                        //ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
                         ExportViewCellsForViz(exporter, NULL, mColorCode, GetClipPlane());
+                }
+
+                delete exporter;
+
+                cout << "finished in " << TimeDiff(starttime, GetTime()) * 1e-3f << " secs" << endl;
+                mColorCode = savedColorCode;
+        }
+
+        exporter = Exporter::GetExporter("final_object_partition.wrl");
+
+        if (exporter)
+        {
+                if (CLAMP_TO_BOX)
+                {       
+                        exporter->mClampToBox = true;   
+                }
+
+                EvaluateViewCellsStats();
+
+                const long starttime = GetTime();
+                cout << "exporting final objects (after initial construction + post process) ... ";
+
+                // matt: hack for clamping scene
+                AxisAlignedBox3 bbox = mViewSpaceBox;
+                bbox.Scale(scale);
+
+                // hack color code (show pvs size)
+                const int savedColorCode = mColorCode;
+
+                mColorCode = 1; // 0 = random, 1 = export pvs
+                // don't visualize render cost
+                const float maxRenderCost = -1;
+
+                if (1)
+                mHierarchyManager->ExportObjectSpaceHierarchy(exporter, objects, 
+                                                                                                          CLAMP_TO_BOX ? &bbox : NULL, maxRenderCost, false);
+                
+
+                if (1)
+                {
+                        ExportViewCellsForViz(exporter, NULL, mColorCode, GetClipPlane());
+                        //ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
+                }
 
                 delete exporter;