Changeset 2722 for GTP/trunk

Timestamp:

05/28/08 01:24:20 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_demo_vienna (modified) (1 diff)
• scripts/run_gvs_vps.sh (modified) (2 diffs)
• src/GtpVisibility05.vcproj.UNKNOWN.matt.user (modified) (1 diff)
• src/Preprocessor.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_demo_vienna

@@ -40 +40 @@
  -preprocessor_detect_empty_viewspace+ \
  -preprocessor_use_vbos- \
- -preprocessor_ray_cast_method=3 \
+ -preprocessor_ray_cast_method=1 \
  -view_cells_random_viewpoint_list=$VIEWPOINTS \
  demo1.env

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

@@ -2 +2 @@
 
 # add bin to path
-export PATH=../bin:$PATH
+export PATH=../bin:../:$PATH
 
 #TARGET=debug
@@ -14 +14 @@
 SCENE=../data/Arena/arena_trees.obj
 VIEWCELLS=../data/Arena/arena-high-lods-5000-viewcells.xml.gz
-#SCENE=../data/vienna/vienna_cropped.obj
-#SCENE=../data/roofs_new.obj
+SCENE=../data/vienna/vienna_cropped.obj
 #SCENE=../data/vienna/city_full_hp.obj
 #SCENE=../data/vienna/vienna_rep.obj

GTP/trunk/Lib/Vis/Preprocessing/src/GtpVisibility05.vcproj.UNKNOWN.matt.user

@@ -62 +62 @@
                         />
                 </Configuration>
+                <Configuration
+                        Name="Engine|Win32"
+                        >
+                        <DebugSettings
+                                Command=""
+                                WorkingDirectory=""
+                                CommandArguments=""
+                                Attach="false"
+                                DebuggerType="3"
+                                Remote="1"
+                                RemoteMachine="UNKNOWN"
+                                RemoteCommand=""
+                                HttpUrl=""
+                                PDBPath=""
+                                SQLDebugging=""
+                                Environment=""
+                                EnvironmentMerge="true"
+                                DebuggerFlavor=""
+                                MPIRunCommand=""
+                                MPIRunArguments=""
+                                MPIRunWorkingDirectory=""
+                                ApplicationCommand=""
+                                ApplicationArguments=""
+                                ShimCommand=""
+                                MPIAcceptMode=""
+                                MPIAcceptFilter=""
+                        />
+                </Configuration>
         </Configurations>
 </VisualStudioUserFile>

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

@@ -1698 +1698 @@
 float Preprocessor::_HackComputeRenderCost(ViewCell *vc)
 {
-        ObjectPvs basePvs;
-        
-        basePvs = vc->CopyPvs();
-        ObjectPvsIterator pit = basePvs.GetIterator();
+        ObjectPvsIterator pit = vc->GetPvs().GetIterator();
 
         float renderCost = 0;
-
+        int i = 0;
+        cout<<"size: " << vc->GetPvs().GetSize() << endl;
         // first mark all objects from this pvs
         while (pit.HasMoreEntries())    
         {
                 Intersectable *obj = pit.Next();
-
                 if (obj->Type() == Intersectable::KD_INTERSECTABLE)
                 {
-                        KdIntersectable *kdObj = static_cast<KdIntersectable *>(pit.Next());
+                        KdIntersectable *kdObj = static_cast<KdIntersectable *>(obj);
 
                         /*if (mShowDistanceWeightedPvs)
@@ -1756 +1753 @@
   int maxPlanes = 0;
   int allEntries = 0;
+
+  int viewCells = 0;
+
   // now search for pvss which contained any mailed node
-  for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit) {
+  for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit) 
+  {
           ObjectPvs &pvs = (*vit)->GetPvs();
-          if (Overlap(box, (*vit)->GetBox())) {
+
+          bool pvsChanged = false;
+
+          if (Overlap(box, (*vit)->GetBox())) 
+          {
                   pvs.Clear();
                   removedEntries += pvs.GetSize();
-          } else {
+                  pvsChanged = true;
+          } 
+          else 
+          {
                   //    cout<<(*vit)->GetBox()<<" "<<box<<endl;
                   shadowVolume.Init((*vit)->GetBox(), box);
@@ -1769 +1777 @@
 
                   int j = 0;
-                  for (int i=0; i < pvs.mEntries.size(); i++) {
+                  for (int i=0; i < pvs.mEntries.size(); i++) 
+                  {
                           allEntries++;
                           Intersectable *o = pvs.mEntries[i].mObject;
-                          if (o == inter) {
+                          if (o == inter) 
+                          {
                                   removedSelfEntries++;
-                          } else {
-                                  if (!shadowVolume.TestIsInsideShaft(o->GetBox())) {
+                                  pvsChanged = true;
+                          } 
+                          else 
+                          {
+                                  if (!shadowVolume.TestIsInsideShaft(o->GetBox())) 
+                                  {
                                           if (j != i)
                                                   pvs.mEntries[j] = pvs.mEntries[i];
                                           j++;
-                                  } else {
+                                  } 
+                                  else 
+                                  {
                                           removedEntries++;
+                                          pvsChanged = true;
                                   }
                           }
                   }
+
                   // now the pvs has to be resorted
                   pvs.mLastSorted = 0;
                   if (j==0)
                           pvs.mEntries.clear();
-                  else {
+                  else 
+                  {
                           pvs.mEntries.resize(j);
                           if (j>1)
@@ -1795 +1814 @@
           }
 
-          ViewCell *vc = *vit;
-
-          // recompute render cost
-          float renderCost = _HackComputeRenderCost(vc);
-          vc->GetPvs().mStats.mWeightedTriangles = renderCost;
+          if (pvsChanged)
+          {
+                  ViewCell *vc = *vit;
+
+                  // recompute render cost
+                  float renderCost = _HackComputeRenderCost(vc);
+                  vc->GetPvs().mStats.mWeightedTriangles = renderCost;
+          }
   }
-  
+
   cerr<<"Number of removed pvs entries = "<<removedEntries<<" ("<<
         100.0f*removedEntries/(float)allEntries<<"%)"<<endl;