Changeset 1052

Timestamp:

06/25/06 06:54:53 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• Preprocessing/scripts/vienna.env (modified) (4 diffs)
• Preprocessing/src/ViewCellsManager.cpp (modified) (9 diffs)
• Preprocessing/src/VrmlExporter.cpp (modified) (1 diff)
• Preprocessing/src/VspOspTree.cpp (modified) (1 diff)
• Preprocessing/src/VssPreprocessor.cpp (modified) (3 diffs)
• shared/scripts/GtpVisibility.suo (modified) (previous)

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

@@ -112 +112 @@
 
         maxDepth        40
+
+
         minPvs          3
         minRays         30
@@ -222 +224 @@
                 refine false
                 compress false
-                merge true
-                emptyViewCellsMerge false
+                merge false
         }
 
@@ -251 +252 @@
                 samplingType box
                 histogram true
-                histoPasses 5000
+                histoStepSize 5000
         }
 
@@ -270 +271 @@
 }
 
-
-VspKdTree {
-        epsilon         1e-6
-
-        Construction {
-                samples 500000
-        }
-        
-        Termination {
-                maxDepth                40
-                minPvs                  0
-                minRays                 1
-                minSize                 0.001
-                maxCostRatio            5.9
-                maxViewCells            169
-                missTolerance           4
-                maxRayContribution      2.5
-        }
-        
-        maxTotalMemory  100
-        maxStaticMemory 40
-
-        splitType       regular
-        #splitType      heuristics
-        splitUseOnlyDrivingAxis true
-        ct_div_ci       0.0
-        
-        PostProcess {
-                maxCostRatio 0.005
-                minViewCells 10000
-                maxPvsSize   5000
-        }
-        
-        
-        Visualization {
-        }
-}
 
 VspBspTree {

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

@@ -4159 +4159 @@
         {       
                 // hack pvs
-                const int savedColorCode = mColorCode;
-                mColorCode = 1;
+                //const int savedColorCode = mColorCode;
+                //mColorCode = 1;
         
                 Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
@@ -4176 +4176 @@
                         }
 
-                        if (mExportGeometry)
+                        Material m; 
+
+                        m.mDiffuseColor.r = 0.0f;
+                        m.mDiffuseColor.g = 0.5f;
+                        m.mDiffuseColor.b = 0.5f;
+
+            exporter->SetForcedMaterial(m);
+
+                        if (0 && mExportGeometry)
                         {
                                 exporter->ExportGeometry(objects);
@@ -4184 +4192 @@
                         if (0 && mExportRays)
                         {
-                                exporter->ExportRays(visRays, RgbColor(0, 1, 0));
+                                exporter->ExportRays(visRays, RgbColor(1, 0, 0));
                         }
 
@@ -4191 +4199 @@
                         // HACK: export without clip plane
                         const bool b = mUseClipPlaneForViz;
-                        mUseClipPlaneForViz = false;
+                        //mUseClipPlaneForViz = false;
 
                         ExportViewCellsForViz(exporter);
@@ -4201 +4209 @@
                 }
 
-                mColorCode = savedColorCode;
+                //mColorCode = savedColorCode;
         }
 
@@ -4398 +4406 @@
                                 }
 
-                                Debug << "here233 " << (int)vcRays.size() << endl;
+                                //Debug << "#rays: " << (int)vcRays.size() << endl;
 
                                 //-- export rays piercing this view cell
@@ -4606 +4614 @@
                         mVspBspTree->ConstructGeometry(leaf, geom);
 
-                        const float eps = 0.00000001f;
+                        const float eps = 0.0001f;
                         const int cf = geom.Side(plane, eps);
 
@@ -5245 +5253 @@
 
                         // export rays
-                        if (0 && mExportRays)
+                        if (1 && mExportRays)
                         {
                                 exporter->ExportRays(visRays, RgbColor(0, 1, 0));
@@ -5253 +5261 @@
 
                         // HACK: export without clip plane
-                        //const bool b = mUseClipPlaneForViz;
-                        //mUseClipPlaneForViz = false;
+                        const bool b = mUseClipPlaneForViz;
+                        mUseClipPlaneForViz = false;
 
                         ExportViewCellsForViz(exporter);
                         
-                        //mUseClipPlaneForViz = b;
+                        mUseClipPlaneForViz = b;
                         delete exporter;
 

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

@@ -1238 +1238 @@
                                 SetForcedMaterial(RandomMaterial());
                         }
-
                         ExportIntersectable(*oit);
                 }
-
                 return;
         }

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

@@ -777 +777 @@
                         ++ contributingSamples;
                 
-                if (1) leaf->mVssRays.push_back(new VssRay(*ray));
+                if (0) leaf->mVssRays.push_back(new VssRay(*ray));
         }
 }

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

@@ -564 +564 @@
         box.SetMax(1, box.Min(1));
 
-  cout<<"mUseViewSpaceBox="<<mUseViewSpaceBox<<endl;
+  cout << "use view space box=" << mUseViewSpaceBox<<endl;
 
 
@@ -575 +575 @@
           else
           {
-                  // HACK: enlarge in y directon
                   mViewSpaceBox = new AxisAlignedBox3(mKdTree->GetBox());
 
-                  if (1) 
+                  if (0) 
                   {
-                          //Vector3 pmin = mViewSpaceBox->Min();
+                          // HACK: enlarge in y directon
                           Vector3 size = mViewSpaceBox->Size();
-                          //size[1] *= 1.25;
-                          //Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
-                          Vector3 enlarge(size[0] * 4.0f, 0.0f, 0.0f);
-
-                          //mViewSpaceBox->Enlarge(enlarge);
+                        
+                          size[1] *= 1.25;
+                          Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
+                          //Vector3 enlarge(size[0] * 4.0f, 0.0f, 0.0f);
+
+                          mViewSpaceBox->Enlarge(enlarge);
                           mViewSpaceBox->SetMax(mViewSpaceBox->Max() + enlarge);
                   } 
                   else 
                   {
+                          AxisAlignedBox3 tbox(*mViewSpaceBox);
+
+                          Vector3 size = mViewSpaceBox->Size();
+                          tbox.SetMax(0, mViewSpaceBox->Max(0) + size[0] * 0.5);
+                          tbox.SetMin(0, mViewSpaceBox->Min(0) + size[0]);
+                          *mViewSpaceBox = tbox;
+
                           // $$ JB temporary
-                          AxisAlignedBox3 tempbox = *mViewSpaceBox;
+                          /*AxisAlignedBox3 tempbox = *mViewSpaceBox;
                           
                           float s = tempbox.Size(0);
@@ -599 +606 @@
                           tempbox.SetMax(0, box.Max(0) + s*0.8f);
                           tempbox.SetMin(0, box.Min(0) + s*0.8f);
-                          *mViewSpaceBox = tempbox;
+                          *mViewSpaceBox = tempbox;*/
                   }             
           }