Changeset 2394 for GTP/trunk/Lib

Timestamp:

05/24/07 18:33:00 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/gi_final.env (modified) (2 diffs)
• src/Exporter.cpp (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (11 diffs)
• src/ViewCellsManager.h (modified) (6 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env

@@ -266 +266 @@
         Construction {
 
-                samples 5000000
+                samples 6000000
 
                 # type 0 = sequential computation, 1 = interleaved, 2 = gradient
@@ -288 +288 @@
         Termination {
                 # maximal number of leaves
-                maxLeaves 100000
+                maxLeaves 200000
                 # maximal memory in MB
 #               maxMemory 4
-                maxMemory 20
+                maxMemory 35
                 # minimum ratio of global cost decrease
                 minGlobalCostRatio -1

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

@@ -153 +153 @@
                 SetFilled();
                 
-                if (1)
-                        ExportGeometry(leaf->mObjects, true, box);
-                else
-                        ExportBox(leaf->GetBoundingBox());
+                ExportGeometry(leaf->mObjects, true, box);
         }
 

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

@@ -3569 +3569 @@
 void ViewCellsManager::ExportColor(Exporter *exporter, 
                                                                    ViewCell *vc, 
-                                                                   bool colorCode) const
+                                                                   int colorCode) const
 {
         const bool vcValid = CheckValidity(vc, mMinPvsSize, mMaxPvsSize);
@@ -3576 +3576 @@
         static Material m;
         //cout << "color code: " << colorCode << endl;
-        switch (mColorCode)
+                
+        switch (colorCode)
         {
         case 0: // Random
@@ -3601 +3602 @@
                         if (mCurrentViewCellsStats.maxPvs)
                         {
-                                importance = (float)mViewCellsTree->GetTrianglesInPvs(vc) / 700;
-                                                         //(float)mCurrentViewCellsStats.maxPvs;
+                                importance = //(float)mViewCellsTree->GetTrianglesInPvs(vc) / 700;
+                                                         (float)mCurrentViewCellsStats.maxPvs;
                         }
                 }
@@ -3996 +3997 @@
         if (1) // export final view cells
         {
-                mColorCode = 1; // hack color code
+                mColorCode = 1; // 0 = pvs, 1 = random
                 Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
         
@@ -4073 +4074 @@
                                                                                                 const bool exportRays,
                                                                                                 const int maxRays,
-                                                                                                const string prefix,
+                                                                                                const string &prefix,
                                                                                                 VssRayContainer *visRays)
 {
@@ -4589 +4590 @@
                                                                                            const bool exportRays,
                                                                                            const int maxRays,
-                                                                                           const string prefix,
+                                                                                           const string &prefix,
                                                                                            VssRayContainer *visRays)
 {
@@ -5395 +5396 @@
                                                                                                    const bool exportRays,
                                                                                                    const int maxRays,
-                                                                                                   const string prefix,
+                                                                                                   const string &prefix,
                                                                                                    VssRayContainer *visRays)
 {       
@@ -6328 +6329 @@
         if (exporter)
         {
+                // clamp to a scene boudning box
                 if (CLAMP_TO_BOX)
-                {       
                         exporter->mClampToBox = true;   
-                }
-
-                EvaluateViewCellsStats();
-
+                
                 const long starttime = GetTime();
                 cout << "exporting final view cells (after initial construction + post process) ... " << endl;
@@ -6350 +6348 @@
                 const int savedColorCode = mColorCode;
 
-                const float maxRenderCost = UpdateObjectCosts();
-                cout << "maxRenderCost: " << maxRenderCost << endl;
-                mColorCode = 0; // 0 = random, 1 = export pvs
-
-                if (1)
-                mHierarchyManager->ExportObjectSpaceHierarchy(exporter, objects, 
-                                                                                                          CLAMP_TO_BOX ? &bbox : NULL, maxRenderCost, false);
-                
-
-                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;
-
+                const int colorCode = 0;
+
+                const float maxRenderCost = -1;//UpdateObjectCosts();
+                const bool exportBounds = false;
+
+                //cout << "maxRenderCost: " << maxRenderCost << endl;
                 if (1)
                 mHierarchyManager->ExportObjectSpaceHierarchy(exporter, 
@@ -6401 +6360 @@
                                                                                                           CLAMP_TO_BOX ? &bbox : NULL, 
                                                                                                           maxRenderCost, 
-                                                                                                          false);
+                                                                                                          exportBounds);
                 
-
-                if (1)
-                {
-                        ExportViewCellsForViz(exporter, NULL, mColorCode, GetClipPlane());
-                        //ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
-                }
-
+                //ExportViewCellsForViz(exporter, CLAMP_TO_BOX ? &bbox : NULL, mColorCode, GetClipPlane());
+                ExportViewCellsForViz(exporter, NULL, colorCode, GetClipPlane());
+                
                 delete exporter;
 
                 cout << "finished in " << TimeDiff(starttime, GetTime()) * 1e-3f << " secs" << endl;
-                mColorCode = savedColorCode;
-        }
-
-        // visualization of the merged view cells
-    if (0) 
-        {       
-                ExportMergedViewCells(objects);
+        }
+
+        if (1)
+        {
+                exporter = Exporter::GetExporter("final_object_partition.wrl");
+
+                if (exporter)
+                {
+                        if (CLAMP_TO_BOX)
+                        {       
+                                exporter->mClampToBox = true;   
+                        }
+
+                        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;
+
+                        EvaluateViewCellsStats();
+                        mColorCode = 1; // 0 = random, 1 = export pvs
+
+                        // don't visualize render cost
+                        const float maxRenderCost = -1;
+                        //const bool exportBounds = true;
+                        const bool exportBounds = false;
+
+                        if (1)
+                        mHierarchyManager->ExportObjectSpaceHierarchy(exporter, 
+                                                                      objects, 
+                                                                                                                  CLAMP_TO_BOX ? &bbox : NULL, 
+                                                                                                                  maxRenderCost, 
+                                                                                                                  exportBounds);
+
+
+                        delete exporter;
+
+                        cout << "finished in " << TimeDiff(starttime, GetTime()) * 1e-3f << " secs" << endl;
+                        mColorCode = savedColorCode;
+                }
         }
 
@@ -6447 +6439 @@
                                                                                                    const bool exportRays,
                                                                                                    const int maxRays,
-                                                                                                   const string prefix,
+                                                                                                   const string &prefix,
                                                                                                    VssRayContainer *visRays)
 {

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

@@ -655 +655 @@
                                                                            const bool exportRays,
                                                                            const int maxRays,
-                                                                           const string prefix,
+                                                                           const string &prefix,
                                                                            VssRayContainer *visRays = NULL) = NULL;
 
@@ -756 +756 @@
         virtual void ExportColor(Exporter *exporter, 
                                                          ViewCell *vc, 
-                                                         const bool colorCode) const;
+                                                         const int colorCode) const;
 
         /** Creates meshes from the view cells.
@@ -985 +985 @@
                                                            const bool exportRays,
                                                            const int maxRays,
-                                                           const string prefix,
+                                                           const string &prefix,
                                                            VssRayContainer *visRays = NULL);
 
@@ -1070 +1070 @@
                                                            const bool exportRays,
                                                            const int maxRays,
-                                                           const string prefix,
+                                                           const string &prefix,
                                                            VssRayContainer *visRays = NULL);
 
@@ -1159 +1159 @@
                                                            const bool exportRays,               
                                                            const int maxRays,
-                                                           const string prefix,
+                                                           const string &prefix,
                                                            VssRayContainer *visRays = NULL);
 
@@ -1292 +1292 @@
                                                            const bool exportRays,
                                                            const int maxRays,
-                                                           const string prefix,
+                                                           const string &prefix,
                                                            VssRayContainer *visRays = NULL);