Changeset 177 for trunk/VUT

Timestamp:

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

Author:

bittner

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/preprocessor.pro (modified) (1 diff)
• src/AxisAlignedBox3.cpp (modified) (1 diff)
• src/AxisAlignedBox3.h (modified) (4 diffs)
• src/Environment.cpp (modified) (1 diff)
• src/KdTree.cpp (modified) (2 diffs)
• src/KdTree.h (modified) (2 diffs)
• src/Makefile (added)
• src/MeshKdTree.cpp (added)
• src/MeshKdTree.h (added)
• src/Plane3.h (modified) (1 diff)
• src/Pvs.cpp (added)
• src/Pvs.h (added)
• src/SamplingPreprocessor.cpp (modified) (4 diffs)
• src/default.env (modified) (2 diffs)
• src/preprocessor.pro (modified) (1 diff)
• support (added)

trunk/VUT/GtpVisibilityPreprocessor/scripts/preprocessor.pro

@@ -4 +4 @@
 TARGET = preprocessor
 
-INCLUDEPATH += ../include
+INCLUDEPATH += ../src 
 
 # debuc config

trunk/VUT/GtpVisibilityPreprocessor/src/AxisAlignedBox3.cpp

@@ -1508 +1508 @@
 
 
+int
+AxisAlignedBox3::Side(const Plane3 &plane) const
+{
+  Vector3 v;
+  int i, m=3, M=-3, s;
+  
+  for (i=0;i<8;i++) {
+    GetVertex(i, v);
+    if((s = plane.Side(v)) < m)
+      m=s;
+    if(s > M)
+      M=s;
+    if (m && m==-M)
+      return 0;
+  }
+  
+  return (m == M) ? m : m + M;
+}

trunk/VUT/GtpVisibilityPreprocessor/src/AxisAlignedBox3.h

@@ -104 +104 @@
 
   
+  int
+  Side(const Plane3 &plane) const;
 
   // Overlap returns 1 if the two axis-aligned boxes overlap .. even weakly
@@ -123 +125 @@
 
   virtual int IsInside(const Vector3 &v) const;
-
+  
   // Test if the box is really sensefull
   virtual bool IsCorrect();
@@ -167 +169 @@
   //    1 ... the cube contains fully the box
   int MutualPositionWithCube(const Vector3 &center, float halfSize) const;
+
+
+  Vector3 GetRandomPoint() {
+    Vector3 size = Size();
+    return mMin + Vector3(RandomValue(0, size.x),
+                          RandomValue(0, size.y),
+                          RandomValue(0, size.z)); 
+  }
   
   // Returns the smallest axis-aligned box that includes all points
@@ -181 +191 @@
                                           const Matrix4x4 &tform);
 
+  
   // returns true when two boxes are completely equal
   friend inline int operator== (const AxisAlignedBox3 &A, const AxisAlignedBox3 &B);

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1141 +1141 @@
                  "0.1");
 
+  RegisterOption("Sampling.totalSamples",
+                 optInt,
+                 "-total_samples=",
+                 "1000000");
+
+  RegisterOption("Sampling.samplesPerPass",
+                 optInt,
+                 "-total_samples=",
+                 "10");
+
   
 }

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

@@ -7 +7 @@
 
 
-
-
-KdNode::KdNode(KdInterior *parent):mParent(parent)
+int KdNode::mailID = 1;
+
+
+KdNode::KdNode(KdInterior *parent):mParent(parent), mailbox(0)
 {
   if (parent)
@@ -633 +634 @@
   }
 }
+
+// Find random neighbor which was not mailed
+KdNode *
+KdTree::FindRandomNeighbor(KdNode *n,
+                           bool onlyUnmailed
+                           )
+{
+  stack<KdNode *> nodeStack;
+  
+  nodeStack.push(mRoot);
+
+  AxisAlignedBox3 box = GetBox(n);
+  int mask = rand();
+
+  while (!nodeStack.empty()) {
+    KdNode *node = nodeStack.top();
+    nodeStack.pop();
+    if (node->IsLeaf()) {
+      if ( node != n && (!onlyUnmailed || !node->Mailed()) )
+        return node;
+    } else {
+      KdInterior *interior = (KdInterior *)node;
+      if (interior->mPosition > box.Max(interior->mAxis))
+        nodeStack.push(interior->mBack);
+      else
+        if (interior->mPosition < box.Min(interior->mAxis))
+          nodeStack.push(interior->mFront);
+        else {
+          // random decision
+          if (mask&1)
+            nodeStack.push(interior->mBack);
+          else
+            nodeStack.push(interior->mFront);
+          mask = mask>>1;
+        }
+    }
+  }
+  
+  return NULL;
+}

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.h

@@ -86 +86 @@
 class KdNode {
 public:
+  static int mailID;
+  int mailbox;
+  
+  void Mail() { mailbox = mailID; }
+  static void NewMail() { mailID++; }
+  bool Mailed() const { return mailbox == mailID; }
+
+
   KdNode(KdInterior *parent);
 
@@ -277 +285 @@
   }
 
+  KdNode *
+  FindRandomNeighbor(KdNode *n,
+                     bool onlyUnmailed
+                     );
+
+  int
+  FindNeighbors(KdNode *n,
+                vector<KdNode *> &neighbors,
+                bool onlyUnmailed
+                );
+  
 protected:
 

trunk/VUT/GtpVisibilityPreprocessor/src/Plane3.h

@@ -23 +23 @@
   }
 
+  float Distance(const Vector3 &v) const {
+    return DotProd(v, mNormal) + mD;
+  }
+
+  int Side(const Vector3 &v, const float threshold = 1e-6) const {
+    return signum(Distance(v), threshold);
+  }
+  
   friend ostream &operator<<(ostream &s, const Plane3 p) {
     s<<p.mNormal<<" "<<p.mD;

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;

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -8 +8 @@
 #       filename glasgow1.x3d
 #       filename vienna.x3d
-#       filename atlanta2.x3d
-        filename soda.dat
+        filename atlanta2.x3d
+#       filename soda.dat
 
 }
@@ -52 +52 @@
 
 
-SamplingPreprocessor {
-
-
+Sampling {
+        totalSamples    500000
+        samplesPerPass  2
 }

trunk/VUT/GtpVisibilityPreprocessor/src/preprocessor.pro

@@ -8 +8 @@
 INCLUDEPATH += ../src ../support/xerces/include  ../support/zlib/include ../support/boost
 
-win32:LIBPATH += ../support/expat/lib ../support/xerces/lib
+win32:LIBPATH += ../support/xerces/lib
 
 #win32:LIBPATH += c:/STLport-4.6.2/lib