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

Timestamp:

02/15/07 00:35:41 (17 years ago)

Author:

mattausch

Message:

implemented hashpvs

File:

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

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

@@ -28 +28 @@
 
 
+
 #define USE_RAY_LENGTH_AS_CONTRIBUTION 0
 #define DIST_WEIGHTED_CONTRIBUTION 0
@@ -170 +171 @@
         }
                 
-    Debug << "casting initial strategies: ";
-
+    Debug << "casting strategies: ";
         for (int i = 0; i < (int)mStrategies.size(); ++ i)
                 Debug << mStrategies[i] << " ";
@@ -730 +730 @@
 {
         long startTime = GetTime();
-
+        
         SimpleRayContainer simpleRays;
         
@@ -1018 +1018 @@
 
 
-ViewCellsManager *ViewCellsManager::LoadViewCells(const string &filename, 
-                                                                                                  ObjectContainer &pvsObjects,
-                                                                                                  bool finalizeViewCells,
-                                                                                                  BoundingBoxConverter *bconverter)
-                                                                                                 
-{
-        ObjectContainer dummys;
-
-        return LoadViewCells(filename, 
-                                                 pvsObjects,
-                                                 dummys,
-                                                 finalizeViewCells,
-                                                 bconverter);
-}
 
 
@@ -1059 +1045 @@
         }
         
+        //cout << "viewcells parsed " <<endl;
+
         if (0)
         {
@@ -1127 +1115 @@
                 if (mUseKdPvs)
                 {
-                        vector<KdIntersectable *>::iterator kit, kit_end = 
-                                GetPreprocessor()->mKdTree->mKdIntersectables.end();
+                        vector<KdIntersectable *>::iterator kit, kit_end = GetPreprocessor()->mKdTree->mKdIntersectables.end();
 
                         int id = 0;
@@ -1138 +1125 @@
                                 obj->SetId(id);
         
-                                stream << "<BoundingBox" << " id=\""    << id  << "\""
-                                           << " min=\""      << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                           << " max=\""      << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                                stream << "<BoundingBox" << " id=\"" << id << "\""
+                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                           << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
                         }
                 }
@@ -1154 +1141 @@
                                 //-- the bounding boxes
 
-                                stream << "<BoundingBox" << " id=\""    << (*oit)->GetId()    << "\""
-                                           << " min=\""      << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                           << " max=\""      << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                                stream << "<BoundingBox" << " id=\"" << (*oit)->GetId() << "\""
+                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                           << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
                         }
                 }
@@ -1560 +1547 @@
                 
                 castSamples += samplesPerPass;
-                //HashPvs<int> dummy;
 
                 Real timeDiff = TimeDiff(startTime, GetTime());
@@ -2070 +2056 @@
                                                                                          const bool useHitObjects)
 {
-  float sum = 0.0f;
-
-  VssRayContainer::const_iterator it, it_end = rays.end();
-
-  for (it = rays.begin(); it != it_end; ++ it) 
-        {
-          if (!ViewCellsConstructed()) {
-                // view cells not yet constructed
-                // just take the lenghts of the rays as contributions
-                if ((*it)->mTerminationObject)
-                  sum += (*it)->Length();
-          } else {
-                sum += ComputeSampleContribution(*(*it), addRays, storeViewCells, useHitObjects);
-          }
-        }
-
-  //cout<<"view cell cast time:"<<viewCellCastTimer.TotalTime()<<" s"<<endl;
- // cout<<"pvs time:"<<pvsTimer.TotalTime()<<" s"<<endl;
-  
-  return sum;
+        float sum = 0.0f;
+
+        VssRayContainer::const_iterator it, it_end = rays.end();
+
+        for (it = rays.begin(); it != it_end; ++ it) 
+        {
+                if (!ViewCellsConstructed()) 
+                {
+                        // view cells not yet constructed
+                        // just take the lenghts of the rays as contributions
+                        if ((*it)->mTerminationObject)
+                        {
+                                sum += (*it)->Length();
+                        }
+                } 
+                else 
+                {
+                        sum += ComputeSampleContribution(*(*it), addRays, storeViewCells, useHitObjects);
+                }
+        }
+
+        cout << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl;
+        Debug << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl;
+
+        cout << "pvs time: " << pvsTimer.TotalTime() << " s" << endl;
+        Debug << "pvs time: " << pvsTimer.TotalTime() << " s" << endl;
+        
+        return sum;
 }