Changeset 401 for trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

Timestamp:

11/10/05 09:55:50 (19 years ago)

Author:

bittner

Message:

vsspreprocessor updates

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp (modified) (10 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -39 +39 @@
 VssPreprocessor::CastRay(
                                                                                                  Vector3 &viewPoint,
-                                                                                                 Vector3 &direction
+                                                                                                 Vector3 &direction,
+                                                                                                 VssRayContainer &vssRays
                                                                                                  )
 {
@@ -60 +61 @@
                 box.ComputeMinMaxT(ray, &tmin, &tmax);
                 if (tmax > bsize) {
-                        cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
-                        cerr<<"ray"<<ray<<endl;
+                        //                      cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
+                        //                      cerr<<"ray"<<ray<<endl;
                 }
                 pointA = ray.Extrap(tmax);
@@ -85 +86 @@
                 box.ComputeMinMaxT(ray, &tmin, &tmax);
                 if (tmax > bsize) {
-                        cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
-                        cerr<<"ray"<<ray<<endl;
+                        //                      cerr<<"Warning: tmax > box size tmax="<<tmax<<" tmin="<<tmin<<" size="<<bsize<<endl;
+                        //                      cerr<<"ray"<<ray<<endl;
                 }
                 
@@ -108 +109 @@
                                                                                                         objectB,
                                                                                                         objectA);
-                        mVssRays.push_back(vssRay);
+                        vssRays.push_back(vssRay);
                         hits ++;
                 }
@@ -117 +118 @@
                                                                                                         objectA,
                                                                                                         objectB);
-                        mVssRays.push_back(vssRay);
+                        vssRays.push_back(vssRay);
                         hits ++;
                 }
@@ -150 +151 @@
 }
 
+int
+VssPreprocessor::RandomizedImportanceSampling(VssTree *vssTree,
+                                                                                                                                                                                        const int desiredSamples)
+{
+        float minRayContribution;
+        float maxRayContribution;
+        float avgRayContribution;
+
+        vssTree->GetRayContributionStatistics(minRayContribution,
+                                                                                                                                                                maxRayContribution,
+                                                                                                                                                                avgRayContribution);
+
+        cout<<
+                "#MIN_RAY_CONTRIB\n"<<minRayContribution<<endl<<
+                "#MAX_RAY_CONTRIB\n"<<maxRayContribution<<endl<<
+                "#AVG_RAY_CONTRIB\n"<<avgRayContribution<<endl;
+        
+        float p = desiredSamples/(float)(avgRayContribution*vssTree->stat.Leaves());
+        SimpleRayContainer rays;
+        int num = vssTree->GenerateRays(p, rays);
+        cout<<"Generated "<<num<<" rays."<<endl;
+        
+        VssRayContainer  vssRays;
+        
+        for (int i=0; i < rays.size(); i++)
+                CastRay(rays[i].mOrigin, rays[i].mDirection, vssRays);
+
+        vssTree->AddRays(vssRays);
+        return num;
+}
 
 
@@ -175 +206 @@
         }
         
-        bool useViewSpaceBox = true;
+        bool useViewSpaceBox = false;
         if (useViewSpaceBox)
                 viewSpaceBox = &box;
-        
+
+        VssTree *vssTree = NULL;
+
   while (totalSamples < mTotalSamples) {
                 int passContributingSamples = 0;
@@ -193 +226 @@
                         Vector3 direction = GetDirection(viewpoint);
                         
-                        sampleContributions = CastRay(viewpoint, direction);
+                        sampleContributions = CastRay(viewpoint, direction, mVssRays);
                         
                         
@@ -226 +259 @@
                         "#AvgPVS\n"<< pvsSize/(float)mObjects.size() << endl <<
                         "#AvgRayContrib\n" << avgRayContrib << endl;
+
+
+
+                
         }
         
@@ -257 +294 @@
         cout<<"done."<<endl<<flush;
 
-        VssTree *vssTree = new VssTree;
-
+
+
+
+        vssTree = new VssTree;
+        
         vssTree->Construct(mVssRays, viewSpaceBox);
 
         cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
-        
-
-
+
+        
+        int samples = 0;
+        for (int i=0; i < 50; i++) {
+                int num = 100000;
+                if (0) {
+                        VssRayContainer vssRays;
+                        for (int j=0; j < num; j++) {
+                                Vector3 viewpoint = GetViewpoint(viewSpaceBox);
+                                Vector3 direction = GetDirection(viewpoint);
+                                CastRay(viewpoint, direction, vssRays);
+                        }
+                        vssTree->AddRays(vssRays);
+                } else {
+                        num = RandomizedImportanceSampling(vssTree, num);
+                }
+                samples+=num;
+                float pvs = vssTree->GetAvgPvsSize();
+                cout<<samples<<" avgPVS ="<<pvs<<endl;
+        }
+
+        delete vssTree;
+        
   return true;
 }