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

Timestamp:

11/10/06 02:09:56 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -2475 +2475 @@
   Intersectable::NewMail();
   
-  ObjectPvsMap::const_iterator oi;
+  ObjectPvsEntries::const_iterator oi;
   
   for (oi = pvs.mEntries.begin(); oi != pvs.mEntries.end(); ++ oi) 
@@ -2527 +2527 @@
 
   Intersectable::NewMail();
-  ObjectPvsMap::const_iterator oi;
+  ObjectPvsEntries::const_iterator oi;
   // first mark all object from this pvs
   for (oi = pvs.mEntries.begin(); oi != pvs.mEntries.end(); ++ oi) {
@@ -2537 +2537 @@
   int pvsSize = 0;
   int nPvsSize = 0;
-  float samples = pvs.mSamples;
+  float samples = (float)pvs.mSamples;
   cout<<"Samples = "<<samples<<endl;
   //  cout<<"Filter size = "<<filterSize<<endl;
@@ -2595 +2595 @@
 
         // update samples and globalC
-        samples = pvs.mSamples;
+        samples = (float)pvs.mSamples;
         globalC = 2.0f*filterSize/sqrt(samples);
         cout<<"neighboring viewcells = "<<i-1<<endl;
@@ -2780 +2780 @@
         for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit, ++ oit)
         {
-            ObjectPvsMap::iterator pit, pit_end = (*oit).mEntries.end();
+            ObjectPvsEntries::iterator pit, pit_end = (*oit).mEntries.end();
         
                 for (pit = (*oit).mEntries.begin(); pit != pit_end; ++ pit)
@@ -3268 +3268 @@
                 {
                         Intersectable::NewMail();
-                        ObjectPvsMap::const_iterator oit, oit_end = pvs.mEntries.end();
+                        ObjectPvsEntries::const_iterator oit, oit_end = pvs.mEntries.end();
                         
                         // output PVS of view cell
@@ -3769 +3769 @@
                         exporter->SetFilled();
 
-                        ObjectPvsMap::iterator it, it_end = vc->GetPvs().mEntries.end();
+                        ObjectPvsEntries::iterator it, it_end = vc->GetPvs().mEntries.end();
                         // -- output PVS of view cell
                         for (it = vc->GetPvs().mEntries.begin(); it != it_end; ++ it)
@@ -4617 +4617 @@
                         Intersectable::NewMail();
 
-                        ObjectPvsMap::const_iterator oit, oit_end = pvs.mEntries.end();
+                        ObjectPvsEntries::const_iterator oit, oit_end = pvs.mEntries.end();
                         cout << endl;
                         // output PVS of view cell
@@ -5448 +5448 @@
 
                         Intersectable::NewMail();
-                        ObjectPvsMap::const_iterator oit, oit_end = pvs.mEntries.end();
+                        ObjectPvsEntries::const_iterator oit, oit_end = pvs.mEntries.end();
                         
                         // output PVS of view cell