Changeset 752 for GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

Timestamp:

04/20/06 13:25:41 (18 years ago)

Author:

mattausch

Message:

after rendering workshop submissioin
x3dparser can use def - use constructs
implemented improved evaluation (samples are only stored in leaves, only propagate pvs size)

File:

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

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

@@ -67 +67 @@
         }
         break;
+        
   default:
         result = Preprocessor::GenerateRays(number, sampleType, rays);
@@ -80 +81 @@
                                                   )
 {
-  for (int i=0; i < rays.size(); i++)
+  for (int i=0; i < rays.size(); i++) {
         CastRay(rays[i].mOrigin, rays[i].mDirection, rays[i].mPdf, vssRays);
+        if (i % 10000 == 0)
+          cout<<".";
+  }
+  cout<<endl;
 }
 
@@ -298 +303 @@
   exporter->SetFilled();
   // $$JB temporarily do not export the scene
-  if (1)
+  if (0)
         exporter->ExportScene(mSceneGraph->mRoot);
   exporter->SetWireframe();
@@ -435 +440 @@
 {
   // compute rendering error
-  if (renderer) {
+  if (renderer && renderer->mPvsStatFrames) {
         //      emit EvalPvsStat();
         //      QMutex mutex;
@@ -504 +509 @@
         SimpleRayContainer rays;
 
+        cout<<"Generating initial rays..."<<endl;
         GenerateRays(mInitialSamples/4, SPATIAL_BOX_BASED_DISTRIBUTION, rays);
         GenerateRays(mInitialSamples/4, OBJECT_BASED_DISTRIBUTION, rays);
@@ -509 +515 @@
         GenerateRays(mInitialSamples/4, OBJECT_DIRECTION_BASED_DISTRIBUTION, rays);
         
+        cout<<"Casting initial rays..."<<endl;
         CastRays(rays, mVssRays);
 
@@ -536 +543 @@
   if (mUseViewcells) {
 
+        cout<<"Computing sample contributions..."<<endl;
         // evaluate contributions of the intitial rays
         mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
-        
+        cout<<"done.\n";
         
         mStats <<
@@ -559 +567 @@
         Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
         // cull viewcells with PVS > median (0.5f)
-        mViewCellsManager->SetValidityPercentage(0, 0.5f); 
+        //mViewCellsManager->SetValidityPercentage(0, 0.5f); 
+        mViewCellsManager->SetValidityPercentage(0, 1.0f); 
         Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
         
@@ -571 +580 @@
   
   /// compute view cell contribution of rays if view cells manager already constructed
-  mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
+  //  mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
 
   if (mUseImportanceSampling) {
@@ -651 +660 @@
                 if (mDirectionalSampling)
                   rayType = DIRECTION_BASED_DISTRIBUTION;
-          
+
+          cout<<"Generating rays..."<<endl;
+
           GenerateRays(mRssSamplesPerPass, rayType, rays);
+          cout<<"done."<<endl;
+
+          cout<<"Casting rays..."<<endl;
           CastRays(rays, vssRays);
+          cout<<"done."<<endl;
           castRays += rays.size();
           if (mUseViewcells) {
                 /// compute view cell contribution of rays
+                cout<<"Computing sample contributions..."<<endl;
                 mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
+                cout<<"done."<<endl;
           }