Changeset 177 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

07/18/05 11:27:52 (19 years ago)

Author:

bittner

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -3 +3 @@
 #include "SamplingPreprocessor.h"
 #include "X3dExporter.h"
-
+#include "Environment.h"
 SamplingPreprocessor::SamplingPreprocessor()
 {
   // this should increase coherence of the samples
-  mSamplesPerPass = 1;
-  mTotalSamples = 1e8;
-  mKdPvsDepth = 10;
+  environment->GetIntValue("Sampling.samplesPerPass", mSamplesPerPass);
+  environment->GetIntValue("Sampling.totalSamples", mTotalSamples);
+  mKdPvsDepth = 100;
 
 }
@@ -75 +75 @@
     
     for (i =0; i < objects.size(); i++) {
+      KdNode *nodeToSample = NULL;
+      Intersectable *object = objects[i];
+
+      int pvsSize = object->mKdPvs.GetSize();
+      
+      if (0 && pvsSize) {
+        // mail all nodes from the pvs
+        Intersectable::NewMail();
+        KdPvsMap::iterator i = object->mKdPvs.mEntries.begin();
+        for (; i != object->mKdPvs.mEntries.end(); i++) {
+          KdNode *node = (*i).first;
+          node->Mail();
+        }
+        int maxTries = 2*pvsSize;
+        for (int tries = 0; tries < 10; tries++) {
+          int index = RandomValue(0, pvsSize - 1);
+          KdPvsData data;
+          KdNode *visibleNode;
+          object->mKdPvs.GetData(index, visibleNode, data);
+          nodeToSample = mKdTree->FindRandomNeighbor(visibleNode, true);
+          if (nodeToSample)
+            break;
+        }
+      }
+
+      if (pvsSize) {
+        // mail all nodes from the pvs
+        Intersectable::NewMail();
+        KdPvsMap::iterator i = object->mKdPvs.mEntries.begin();
+        for (; i != object->mKdPvs.mEntries.end(); i++) {
+          KdNode *node = (*i).first;
+          node->Mail();
+        }
+        vector<KdNode *> invisibleNeighbors;
+        // get all neighbors of all PVS nodes
+        KdPvsMap::iterator i = object->mKdPvs.mEntries.begin();
+        for (; i != object->mKdPvs.mEntries.end(); i++) {
+          KdNode *node = (*i).first;
+          mKdTree->FindNeighbors(visibleNode, invisibleNeighbors, true);
+        }
+
+        KdPvsData data;
+        KdNode *visibleNode;
+        object->mKdPvs.GetData(index, visibleNode, data);
+        nodeToSample = mKdTree->FindRandomNeighbor(visibleNode, true);
+        if (nodeToSample)
+          break;
+      }
+      
+
       for (int k=0; k < mSamplesPerPass; k++) {
-        Intersectable *object = objects[i];
         object->GetRandomSurfacePoint(point, normal);
-        direction = UniformRandomVector(normal);
+        if (nodeToSample) {
+          int maxTries = 5;
+          for (int tries = 0; tries < maxTries; tries++) {
+            direction = mKdTree->GetBox(nodeToSample).GetRandomPoint() - point;
+            if (DotProd(direction, normal) > Limits::Small)
+              break;
+          }
+          if (tries == maxTries)
+            direction = UniformRandomVector(normal);
+        } else
+          direction = UniformRandomVector(normal);
+        
         // construct a ray
         SetupRay(ray, point, direction);
@@ -114 +174 @@
     for (i=0; i < objects.size(); i++) {
       Intersectable *object = objects[i];
-      pvsSize += object->mKdPvs.mEntries.size();
+      pvsSize += object->mKdPvs.GetSize();
     }
     
@@ -120 +180 @@
     cout<<"#totalSamples="<<totalSamples/1000<<
       "k   #sampleContributions="<<passSampleContributions<<
-      " ("<<100*passContributingSamples/passSamples<<"%)"<<
-      " avgPVS="<<pvsSize/(float)objects.size()<<endl;
+      " ("<<100*passContributingSamples/(float)passSamples<<"%)"<<
+      " avgPVS="<<pvsSize/(float)objects.size()<<endl<<
+      "avg ray contrib="<<passSampleContributions/(float)passContributingSamples<<
+      endl;
   }
   bool exportRays = false;