Changeset 2586 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/09/08 18:46:51 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• CombinedPreprocessor.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (1 diff)
• SamplingStrategy.cpp (modified) (4 diffs)
• ViewCellsManager.cpp (modified) (14 diffs)
• ViewCellsManager.h (modified) (2 diffs)

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

@@ -90 +90 @@
 
         cerr<<"Casting rays..."<<endl;
-        //      bool doubleRays = true;
+        
         bool doubleRays = true;
         CastRays(rays, vssRays, doubleRays, pruneInvalidRays);
         mTotalRaysCast += (int)vssRays.size();
+
         cerr<<"Done..."<<endl;
 

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

@@ -211 +211 @@
                 const float importance = log10(1e3*ray->mWeightedPvsContribution)/3.0f;
                 
-                glColor3f(1.0f, 0.0f, 0.0f);
-                //glColor3f(importance, importance, importance);
+                //glColor3f(1.0f, 0.0f, 0.0f);
+                glColor3f(importance, importance, importance);
                 glVertex3fv(&ray->mOrigin.x);
                 glVertex3fv(&ray->mTermination.x);

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

@@ -1230 +1230 @@
         {
 
-          mRayCaster->SortRays(rays);
-                cout<<"Rays sorted in "<<TimeDiff(t1, GetTime())<<" ms."<<endl;
+          //mRayCaster->SortRays(rays);
+        //      cout<<"Rays sorted in "<<TimeDiff(t1, GetTime())<<" ms."<<endl;
         }
 

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

@@ -75 +75 @@
                                 ++ samples;
                                 rays.push_back(ray);
+                                //cout << "d " << ray.mDirection << " ";
                         }
                 }
@@ -228 +229 @@
 
         direction = mPreprocessor.sceneBox.GetRandomPoint(Vector3(r[3],
-                                                                                                                                           r[4],
-                                                                                                                                           r[5])
-                                                                                                                           ) - origin;
+                                                                                                          r[4],
+                                                                                                          r[5])) - origin;
         
         const float c = Magnitude(direction);
-
+        
         if (c <= Limits::Small) 
                 return false;
@@ -242 +242 @@
         ray = SimpleRay(origin, direction, SPATIAL_BOX_BASED_DISTRIBUTION, pdf);
   
+        //cout << "d " << direction << " o: " << origin;
+        
         return true;
 }
@@ -576 +578 @@
         }
 
-        for(; it != vssRays.end(); ++it) {
+        for(; it != vssRays.end(); ++it) 
+        {
                 VssRay *ray = *it;
-                for (i=0; i < mDistributions.size()-1; i++) {
+
+                //cout << " here4 " << ray->GetDir();
+
+                for (i=0; i < mDistributions.size()-1; i++) 
+                {
                         if (mDistributions[i]->mType == ray->mDistribution)
                                 break;

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

@@ -37 +37 @@
 
 
+#define MYSTATS 1
+
 
 namespace GtpVisibilityPreprocessor {
@@ -113 +115 @@
         mViewCellsTree->SetViewCellsManager(this);
         mSamplesStat.Reset();
-        mStats.open("mystats.log");
+        //mStats.open("mystats.log");
 }
 
@@ -146 +148 @@
         PrintPvsStatistics(mStats);
         
-        mStats <<
+        /*mStats <<
                 "#Pass\n" << pass ++ <<endl<<
                 "#Time\n" << time <<endl<<
                 "#TotalSamples\n" << totalRays << endl;
-        
+        */      
 
         totalRays += samplesPerPass;
@@ -204 +206 @@
         else
         {
-                //mStrategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
-
                 mStrategies.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
                 mStrategies.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
                         
                 mStrategies.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+                //mStrategies.push_back(SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION);
         }
                 
@@ -2554 +2555 @@
   s<<"#RATIO\n"<<pvsStat.renderCost / (pvsStat.mem + Limits::Small)<<endl;
   s<<"#CONTRIBUTING_RAYS\n"<<mSamplesStat.mContributingRays<<endl;
-
+  
   if (mSamplesStat.mRays) {
         s<<"#AVG_VIEWCELLS_PER_RAY\n"<<mSamplesStat.mViewCells/(float)mSamplesStat.mRays<<endl;
+    s<<"#AVG_RAY_LENGTHS\n"<<mSamplesStat.mRayLengths << endl;
+
   } else {
         s<<"#AVG_VIEWCELLS_PER_RAY\n 1 \n";
+        s<<"#AVG_RAY_LENGTHS\n 1 \n";
   }
   mSamplesStat.Reset();
@@ -2718 +2722 @@
 
 
-void ViewCellsManager::ComputeViewCellContribution(ViewCell *viewCell,
+bool ViewCellsManager::ComputeViewCellContribution(ViewCell *viewCell,
                                                                                                    VssRay &ray, 
                                                                                                    Intersectable *obj,
@@ -2728 +2732 @@
 #if 0
         if (!obj || !viewCell->GetValid())
-                return;
+                return false;
 #endif
 
+        bool hasContri = false;
         // if ray not outside of view space
         float relContribution = 0.0f;
@@ -2741 +2746 @@
                 hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf);
                 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
-#if 1
+#if MYSTATS
+                
                 if (hasAbsContribution)
                 {
                         UpdateStatsForViewCell(viewCell, obj);
-                        mVizBuffer.AddRay(&ray);
+                        hasContri = true;
                 }
 #endif
@@ -2755 +2761 @@
                         viewCell->GetPvs().GetSampleContribution(obj, ray.mPdf, relContribution);
         }
+
+        //cout << "here6: " << ray.GetDir() << " ";
 
         // $$ clear the relative contribution as it is currently not correct anyway
@@ -2787 +2795 @@
                 ray.mRelativePvsContribution = relContribution;
 #endif
+
+        return hasContri;
 }
 
@@ -2832 +2842 @@
 
         terminationObj = ray.mTerminationObject;
-
+        //cout << "rayd: " << ray.GetDir() << " ";
         ComputeViewCellContribution(currentViewCell, 
                                                                 ray, 
@@ -2864 +2874 @@
         ++ mSamplesStat.mRays;
 
+#if MYSTATS
+        mSamplesStat.mRayLengths += ray.Length();
+#endif
         if (!ray.mTerminationObject)
                 return 0.0f;
@@ -2907 +2920 @@
         viewCellCastTimer.Exit();
 #endif
+
         mSamplesStat.mViewCells += (int)viewCells.size();
 
@@ -2936 +2950 @@
 #endif
         
+        bool contri = false;
         ViewCellContainer::const_iterator it = viewCells.begin();
-
+//cout << "rayd: " << ray.GetDir() << " ";
         for (; it != viewCells.end(); ++ it) 
         {
-                ComputeViewCellContribution(*it, 
+                if (ComputeViewCellContribution(*it, 
                                                 ray, 
                                                                         terminationObj, 
                                                                         ray.mTermination, 
-                                                                        addRays);
+                                                                        addRays))
+                {
+                        contri = true;
+                }       
+
                 (*it)->IncNumPiercingRays();
-        }
-
+                
+        }
+
+#if MYSTATS
+        if (contri)
+        {
+                if (rand() < (RAND_MAX / 10))
+                        cout << "rayd: " /*<< ray.GetOrigin() << " " << ray.GetTermination() << " "*/ << Normalize(ray.GetDir()) << " " << endl;
+                mVizBuffer.AddRay(&ray);
+        }
+#endif
 #ifdef PERFTIMER  
         pvsTimer.Exit();

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

@@ -127 +127 @@
                 int mContributingRays;
                 int mPvsContributions;
+                float mRayLengths;
+
                 void Reset() 
                 {
+                        mRayLengths = 0.0f;
                         mRays = 0;
                         mViewCells = 0;
@@ -654 +657 @@
 protected:
 
-        void ComputeViewCellContribution(ViewCell *viewCell,
+        bool ComputeViewCellContribution(ViewCell *viewCell,
                                                                          VssRay &ray, 
                                                                          Intersectable *obj,