Changeset 2633 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

01/23/08 01:38:11 (16 years ago)

Author:

mattausch

Message:

revived hash pvs

File:

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

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

@@ -17 +17 @@
 {
   
-#define GVS_DEBUG 1
+#define GVS_DEBUG 0
 
 struct VizStruct
@@ -37 +37 @@
 mCurrentViewCell(NULL),
 mCurrentViewPoint(Vector3(0.0f, 0.0f, 0.0f))
+//,mGenericStats(0)
 {
         Environment::GetSingleton()->GetIntValue("GvsPreprocessor.totalSamples", mTotalSamples);
@@ -219 +220 @@
                 return false;
 
+//      cout << "t";
         if (0 && GVS_DEBUG)
                 mVssRays.push_back(new VssRay(*vssRay));
@@ -592 +594 @@
 
         //CLEAR_CONTAINER(invalidSamples);
-        Debug << "generated " <<  numSamples << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+        //Debug << "generated " <<  numSamples << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
         return (int)simpleRays.size();
 }
@@ -606 +608 @@
 
                 HandleRay(ray);
-
-                //if (!HandleRay(ray));
-                //      invalidSamples.push_back(ray);
+                //if (!HandleRay(ray)) invalidSamples.push_back(ray);
         }
 }
@@ -675 +675 @@
 
 
-//void GvsPreprocessor::VisualizeViewCell(ViewCell *vc)
 void GvsPreprocessor::VisualizeViewCell(const ObjectContainer &objects)
 {
     Intersectable::NewMail();
-
         Material m;
         
@@ -760 +758 @@
         int passSamples = 0;
 
-        //if (mCurrentViewCell->GetId() != 82975 )return;
+        mGenericStats = 0;
 
         //while (mGvsStats.mPerViewCellSamples < mTotalSamples) 
@@ -789 +787 @@
                         cout << "\nPass " << mPass << " #samples: " << mGvsStats.mPerViewCellSamples << endl;
                         cout << "contribution=" << mGvsStats.mPassContribution << " (of " << mMinContribution << ")" << endl;
+
+                        //mGenericStats = GvsStats.mGvsStats.mPassContribution;
 
                         // termination criterium
@@ -964 +964 @@
 }
 
-/*
-void GvsPreprocessor::ComputeRenderError()
-{
-        cout << "computing gvs render error" << endl;
-        vector<ViewCellPoints *> *vcPoints = mViewCellsManager->GetViewCellPoints();
-
-        vector<ViewCellPoints *>::const_iterator vit, vit_end = vcPoints->end();
-
-        for (vit = vcPoints->begin(); vit != vit_end; ++ vit)
-        {
-                ViewCellPoints *vcPoints = *vit;
-                
-                renderer->EvalPvsStat(vcPoints->second);
-
-                mStats <<
-                        "#ViewCell\n" << vcPoints->first->GetId() << endl <<
-                        "#AvgPvsRenderError\n" <<renderer->mPvsStat.GetAvgError() << endl <<
-                        "#AvgPixelError\n" << renderer->GetAvgPixelError() << endl <<
-                        "#MaxPixelError\n" << renderer->GetMaxPixelError() << endl <<
-                        "#MaxPvsRenderError\n" << renderer->mPvsStat.GetMaxError() << endl <<
-                        "#ErrorFreeFrames\n" << renderer->mPvsStat.GetErrorFreeFrames() << endl <<
-                        "#AvgRenderPvs\n" << renderer->mPvsStat.GetAvgPvs() << endl;
-        }
-}
-*/
 
 void GvsPreprocessor::UpdatePvs(ViewCell *currentViewCell)
@@ -1300 +1275 @@
         mGvsStats.mTotalTime += mGvsStats.mTimePerViewCell;
 
-        //lastTime = currentTime;
-
         mGvsStats.Stop();
         mGvsStats.Print(mGvsStatsStream);