Changeset 556 for trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

Timestamp:

01/19/06 15:30:44 (18 years ago)

Author:

bittner

Message:

debug version looking for glrenderer bug...

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp (modified) (9 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -85 +85 @@
   if (!mDetectEmptyViewSpace)
         ray.mFlags &= ~Ray::CULL_BACKFACES;
+  else
+        ray.mFlags |= Ray::CULL_BACKFACES;
+
 
   // cast ray to KD tree to find intersection with other objects
@@ -113 +116 @@
   if (!mDetectEmptyViewSpace)
         ray.mFlags &= ~Ray::CULL_BACKFACES;
+  else
+        ray.mFlags |= Ray::CULL_BACKFACES;
 
   if (mKdTree->CastRay(ray)) {
@@ -130 +135 @@
         // cast again to ensure that there is no objectA
         SetupRay(ray, pointB, direction);
+        ray.mFlags |= Ray::CULL_BACKFACES;
         if (mKdTree->CastRay(ray)) {
           objectA = ray.intersections[0].mObject;
@@ -315 +321 @@
   //    exporter->ExportKdTree(*mKdTree);
   exporter->SetFilled();
-  // temporarily do not export the scene
-  if (0)
+  // $$JB temporarily do not export the scene
+  if (1)
         exporter->ExportScene(mSceneGraph->mRoot);
   exporter->SetWireframe();
@@ -459 +465 @@
         //      renderer->mRenderingFinished.wait(&mutex);
         //      mutex.unlock();
+
         renderer->EvalPvsStat();
         mStats <<
@@ -470 +477 @@
 RssPreprocessor::ComputeVisibility()
 {
+
+  if (renderer)
+        renderer->InitGL();
   
   //  connect(this, SIGNAL(EvalPvsStat()), renderer, SLOT(EvalPvsStat()) );
@@ -698 +708 @@
                 Vector3 direction = GetDirection(viewpoint, mViewSpaceBox);
                 rays.push_back(SimpleRay(viewpoint, direction, 1.0f));
-                rays.mSumProbabilities+=1.0f;
+                rays.mSumPdf += 1.0f;
           }
         } else {
@@ -704 +714 @@
         }
 
-        rays.NormalizeProbabilities();
+        rays.NormalizePdf();
         
         for (int i=0; i < rays.size(); i++)
-          CastRay(rays[i].mOrigin, rays[i].mDirection, rays[i].mProbability, vssRays);
+          CastRay(rays[i].mOrigin, rays[i].mDirection, rays[i].mPdf, vssRays);
 
         
@@ -802 +812 @@
   if (mUseViewcells) {
 
-
-  //-- render simulation after merge
-  cout << "\nevaluating bsp view cells render time after merge ... ";
-  
-  mRenderSimulator->RenderScene();
-  SimulationStatistics ss;
-  mRenderSimulator->GetStatistics(ss);
-
-  cout << " finished" << endl;
-  cout << ss << endl;
-  Debug << ss << endl;
-
-  }
-
+        
+        //-- render simulation after merge
+        cout << "\nevaluating bsp view cells render time after merge ... ";
+        
+        mRenderSimulator->RenderScene();
+        SimulationStatistics ss;
+        mRenderSimulator->GetStatistics(ss);
+        
+        cout << " finished" << endl;
+        cout << ss << endl;
+        Debug << ss << endl;
+        
+  }
+
+  cerr<<"Deleting RSS tree...\n";
   delete rssTree;
+  cerr<<"Done.\n";
+
   
   return true;