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

Timestamp:

01/13/06 14:17:46 (18 years ago)

Author:

bittner

Message:

vss preprocessor void space identification fixed - by default it is off

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -15 +15 @@
 
 bool use2dSampling = false;
-bool useViewspacePlane = true;
+bool useViewspacePlane = false;
 
 VssPreprocessor::VssPreprocessor():
@@ -78 +78 @@
   float bsize = Magnitude(box.Size());
 
+
+  if (!mDetectEmptyViewSpace)
+        ray.mFlags &= ~Ray::CULL_BACKFACES;
   
   if (mKdTree->CastRay(ray)) {
@@ -92 +95 @@
   }
 
-  bool detectEmptyViewSpace = true;
         
-  if (detectEmptyViewSpace) {
+  if (mDetectEmptyViewSpace) {
         SetupRay(ray, pointA, -direction);
   } else
         SetupRay(ray, viewPoint, -direction);
-        
-        
+  
+  if (!mDetectEmptyViewSpace)
+        ray.mFlags &= ~Ray::CULL_BACKFACES;
+
   if (mKdTree->CastRay(ray)) {
         objectB = ray.intersections[0].mObject;
@@ -111 +115 @@
           return 0;
   }
-
+  
   //  if (objectA == NULL && objectB != NULL) {
-  if (1) {
+  if (mDetectEmptyViewSpace) {
         // cast again to ensure that there is no objectA
         SetupRay(ray, pointB, direction);
@@ -121 +125 @@
         }
   }
-  
+
   
   VssRay *vssRay  = NULL;
 
   bool validSample = (objectA != objectB);
-  if (0 && detectEmptyViewSpace) {   // consider all samples valid
+  if (0 && mDetectEmptyViewSpace) {   // consider all samples valid
         // check if the viewpoint lies on the line segment AB
         if (Distance(pointA, pointB) <
@@ -183 +187 @@
   Vector3 point;
   if (!use2dSampling) {
-        Vector3 normal;
-        int i = (int)RandomValue(0, (Real)((int)mObjects.size()-1));
-        Intersectable *object = mObjects[i];
-        object->GetRandomSurfacePoint(point, normal);
+        if (0) {
+          Vector3 normal;
+          int i = Random((int)mObjects.size());
+          Intersectable *object = mObjects[i];
+          object->GetRandomSurfacePoint(point, normal);
+        } else
+          point = mKdTree->GetBox().GetRandomPoint();
+        //        point = viewpoint + UniformRandomVector();
+
   } else {
         AxisAlignedBox3 box;
@@ -226 +235 @@
         num = vssTree->GenerateRays(p, rays);
   } else {
-        int leaves = vssTree->stat.Leaves()/2;
+        int leaves = vssTree->stat.Leaves();
         num = vssTree->GenerateRays(desiredSamples, leaves, rays);
   }
@@ -243 +252 @@
 {
   cout<<"Exporting vss rays..."<<endl<<flush;
-
-  float prob = number/(float)vssRays.size();
-
 
   Exporter *exporter = NULL;
@@ -261 +267 @@
   }
 
-  VssRayContainer rays; for (int i=0; i < vssRays.size(); i++)
-        if (RandomValue(0,1) < prob)
-          rays.push_back(vssRays[i]);
-
+  VssRayContainer rays;
+  vssRays.SelectRays(number, rays);
+  
   exporter->ExportRays(rays, RgbColor(1, 0, 0));
 
@@ -411 +416 @@
 
   AxisAlignedBox3 *box = new AxisAlignedBox3(mKdTree->GetBox());
-
+  
   if (!useViewspacePlane) {
         float size = 0.05f;
@@ -430 +435 @@
         box->SetMax(1, box->Min(1));
 
+  cout<<"mUseViewSpaceBox="<<mUseViewSpaceBox<<endl;
   if (mUseViewSpaceBox)
   {
@@ -440 +446 @@
         mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
   }
-
+  
   //-- load view cells from file if requested
   if (mLoadViewCells)
@@ -464 +470 @@
   else
   {
-          while (totalSamples < mInitialSamples) {
+        
+        while (totalSamples < mInitialSamples) {
                 int passContributingSamples = 0;
                 int passSampleContributions = 0;
@@ -476 +483 @@
                 for (int k=0; k < s; k++) {
                         // changed by matt
-                        //Vector3 viewpoint = GetViewpoint(mViewSpaceBox);
                         Vector3 viewpoint; 
+                        //                      viewpoint = GetViewpoint(mViewSpaceBox);
                         mViewCellsManager->GetViewPoint(viewpoint);
                         Vector3 direction = GetDirection(viewpoint, mViewSpaceBox);
-                
+
                         sampleContributions = CastRay(viewpoint, direction, mVssRays);
 
@@ -514 +521 @@
  
           cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
+
+
+          
   }
   
@@ -537 +547 @@
   }
 
-  //int numExportRays = 10000;
-  int numExportRays = 0;
+  
+  int numExportRays = 5000;
+  //int numExportRays = 0;
 
   if (numExportRays) {