Changeset 1877 for GTP

Timestamp:

12/11/06 08:31:01 (18 years ago)

Author:

bittner

Message:

sampling updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• AxisAlignedBox3.h (modified) (1 diff)
• BvHierarchy.cpp (modified) (1 diff)
• BvHierarchy.h (modified) (1 diff)
• Environment.cpp (modified) (1 diff)
• Intersectable.h (modified) (1 diff)
• IntersectableWrapper.cpp (modified) (1 diff)
• IntersectableWrapper.h (modified) (2 diffs)
• Makefile (modified) (1 diff)
• Pvs.h (modified) (6 diffs)
• QtGlRenderer.cpp (modified) (1 diff)
• Ray.h (modified) (1 diff)
• RssPreprocessor.cpp (modified) (16 diffs)
• RssTree.cpp (modified) (9 diffs)
• RssTree.h (modified) (4 diffs)
• SamplingStrategy.cpp (modified) (4 diffs)
• SamplingStrategy.h (modified) (4 diffs)
• ViewCell.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (12 diffs)
• ViewCellsManager.h (modified) (1 diff)
• default.env (modified) (4 diffs)
• run_test2 (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/AxisAlignedBox3.h

@@ -184 +184 @@
   Vector3 GetRandomPoint() const;
   Vector3 GetRandomSurfacePoint() const;
-        Vector3 GetUniformRandomSurfacePoint() const;
+  Vector3 GetUniformRandomSurfacePoint() const;
 
   Vector3 GetPoint(const Vector3 &p) const {

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

@@ -2504 +2504 @@
 
 
-void BvHierarchy::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
+void BvHierarchy::CollectObjects(const AxisAlignedBox3 &box,
+                                                                 ObjectContainer &objects)
 {
   stack<BvhNode *> nodeStack;
-
+  
   nodeStack.push(mRoot);
 
-  while (!nodeStack.empty()) 
-        {
+  while (!nodeStack.empty()) {
         BvhNode *node = nodeStack.top();
         
         nodeStack.pop();
-        
-        if (node->IsLeaf()) 
-          {
-                BvhLeaf *leaf = (BvhLeaf *)node;
-                if (Overlap(box, leaf->GetBoundingBox())) {
-                  Intersectable *object = leaf;
-                  if (!object->Mailed()) {
-                        object->Mail();
-                        objects.push_back(object);
-                  }
-                }
-          } 
+        if (node->IsLeaf()) {
+          BvhLeaf *leaf = (BvhLeaf *)node;
+          if (Overlap(box, leaf->GetBoundingBox())) {
+                Intersectable *object = leaf;
+                if (!object->Mailed()) {
+                  object->Mail();
+                  objects.push_back(object);
+                }
+          }
+        } 
         else 
           {
                 BvhInterior *interior = (BvhInterior *)node;
-                
-                if (Overlap(box, interior->GetBoundingBox()))
-                  nodeStack.push(interior->GetFront());
-                
-                if (Overlap(box, interior->GetBoundingBox()))
-                  nodeStack.push(interior->GetBack());
+                if (Overlap(box, interior->GetBoundingBox())) {
+                  bool pushed = false;
+                  if (!interior->GetFront()->Mailed()) {
+                        nodeStack.push(interior->GetFront());
+                        pushed = true;
+                  }
+                  if (!interior->GetBack()->Mailed()) {
+                        nodeStack.push(interior->GetBack());
+                        pushed = true;
+                  }
+                  // avoid traversal of this node in the next query
+                  if (!pushed)
+                        interior->Mail();
+                }
           }
-        }
+  }
 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

@@ -221 +221 @@
         int NumberOfFaces() const { return 6; };
         
-        int GetRandomSurfacePoint(GtpVisibilityPreprocessor::Vector3 &point, 
+  int GetRandomSurfacePoint(GtpVisibilityPreprocessor::Vector3 &point, 
                                                           GtpVisibilityPreprocessor::Vector3 &normal)
         {

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

@@ -1915 +1915 @@
                                         "false");
 
+        RegisterOption("RssPreprocessor.distributions",
+                                   optString,
+                                   "rss_distributions=",
+                                   "rss+spatial+object");
+        
         RegisterOption("RssTree.hybridDepth", optInt, "hybrid_depth=", "10");
         RegisterOption("RssTree.maxDepth", optInt, "kd_depth=", "12");

GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h

@@ -113 +113 @@
   virtual float GetArea() const {return 0; }
   virtual int GetRandomSurfacePoint(Vector3 &point, Vector3 &normal) = 0;
+  virtual int GetRandomSurfacePoint(const float u,
+                                                                        const float v,
+                                                                        Vector3 &point,
+                                                                        Vector3 &normal) {
+        cerr<<"GetRandomSurfacePoint(u,v...) not yet implemented"<<endl;
+        return 1;
+  }
 
   virtual int GetRandomEdgePoint(Vector3 &point,

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

@@ -87 +87 @@
 
 
+int
+TriangleIntersectable::GetRandomSurfacePoint(const float u,
+                                                                                         const float v,
+                                                                                         Vector3 &point,
+                                                                                         Vector3 &normal)
+{
+  // random barycentric coordinates
+  float a = u;
+  float b = v;
+  float c = 1.0f - u - v;
+  
+  point = mItem.mVertices[0] * a + mItem.mVertices[1] * b + mItem.mVertices[2] * c;
+  normal = mItem.GetNormal();
+  
+  return 0;
+}
+
+
+
 int TriangleIntersectable::GetRandomVisibleSurfacePoint(Vector3 &point,
                                                                                                                 Vector3 &normal,

GTP/trunk/Lib/Vis/Preprocessing/src/IntersectableWrapper.h

@@ -136 +136 @@
 
 
+
 template<typename T>
 int IntersectableWrapper<T>::GetRandomEdgePoint(Vector3 &point,
@@ -203 +204 @@
         int GetRandomSurfacePoint(Vector3 &point, Vector3 &normal);
 
+        int GetRandomSurfacePoint(const float u,
+                                                          const float v,
+                                                          Vector3 &point, Vector3 &normal);
+
+        
         int GetRandomVisibleSurfacePoint(Vector3 &point,
                                                                          Vector3 &normal,

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: pá 8. XII 21:21:57 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ne 10. XII 21:55:07 2006
 # Project:  preprocessor.pro
 # Template: app

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

@@ -184 +184 @@
         int Compress() {return 0;}
         int GetSize() const {return (int)mEntries.size();}
-        bool Empty() const {return mEntries.empty();}
-
+  bool Empty() const {return mEntries.empty();}
+
+  void Reserve(const int n) { mEntries.reserve(n); }
         /** Normalize the visibility of entries in order to get 
                 comparable results.
@@ -231 +232 @@
         */
         void Sort();
+
+  /** Sort pvs entries assume that the pvs contains unique entries
+   */
+  void SimpleSort();
 
         /** Adds sample to PVS. Assumes that the pvs is sorted
@@ -307 +312 @@
                 // way we can achieve logarithmic behaviour for insertion and find
                 const int dirtySize = (int)mEntries.size() - mLastSorted;
-                return dirtySize > (int)(log((double)mEntries.size()) / log(2.0));
+                return dirtySize > 4*(int)(log((double)mEntries.size()) / log(2.0));
         }
 
@@ -362 +367 @@
         mEntries = newPvs.mEntries;
         mLastSorted = (int)mEntries.size();
+}
+
+template <typename T, typename S>
+void Pvs<T, S>::SimpleSort()
+{
+  sort(mEntries.begin(), mEntries.end());
+  mLastSorted = (int)mEntries.size();
 }
 
@@ -587 +599 @@
                                          const bool checkDirty)
 {
-        bool found = false;
-
-        PvsEntry<T, S> dummy(sample, PvsData());
-
-        // only check clean part
-        // $$ TMP JB
-        // mLastSorted = 0;
-        vector<PvsEntry<T, S> >::iterator sorted_end = mEntries.begin() + mLastSorted;
-
-        // binary search
-        it = lower_bound(mEntries.begin(), sorted_end, dummy);
-
-        if ((it != mEntries.end()) && ((*it).mObject == sample))
-                found = true;
-
-        // sample not found yet => search further in the unsorted part
-        if (!found && checkDirty)
-        {
-                vector<PvsEntry<T, S> >::const_iterator dit, dit_end = mEntries.end();
-
-                for (dit = sorted_end; (dit != dit_end) && ((*dit).mObject != sample); ++ dit) ;
-                
-                if ((dit != mEntries.end()) && ((*dit).mObject == sample))
-                        found = true;
-        }
-        
-        return found;
+  bool found = false;
+  
+  PvsEntry<T, S> dummy(sample, PvsData());
+  
+  // only check clean part
+  vector<PvsEntry<T, S> >::iterator sorted_end = mEntries.begin() + mLastSorted;
+  
+  // binary search
+  it = lower_bound(mEntries.begin(), sorted_end, dummy);
+  
+  if ((it != mEntries.end()) && ((*it).mObject == sample))
+        found = true;
+  
+  // sample not found yet => search further in the unsorted part
+  if (!found && checkDirty) {
+        vector<PvsEntry<T, S> >::const_iterator dit, dit_end = mEntries.end();
+        
+        for (dit = sorted_end; (dit != dit_end) && ((*dit).mObject != sample); ++ dit) ;
+        
+        if (dit != dit_end)
+          found = true;
+  }
+  
+  return found;
 }
 
@@ -698 +707 @@
         const bool entryFound = Find(sample, it);
 
-        if (entryFound)
-        {
-                S &data = (*it).mData;
-
-                data.mSumPdf += pdf;
-                //contribution = pdf / data.mSumPdf;
-
-                return false;
-        }
-        else 
-        {
-                AddSampleDirty(sample, pdf);
-                //contribution = 1.0f;
-
-                return true;
+        if (entryFound) {
+          S &data = (*it).mData;
+          
+          data.mSumPdf += pdf;
+          //contribution = pdf / data.mSumPdf;
+          
+          return false;
+        }
+        else {
+          AddSampleDirty(sample, pdf);
+          //contribution = 1.0f;
+          return true;
         }
 }

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

@@ -148 +148 @@
         
   if (viewcell) {
-                mViewCellsManager->ApplyFilter2(viewcell,
-                                                                                                                                                false,
-                                                                                                                                                1.0f,
-                                                                                                                                                pvs);
-                
-                pvsSize = 0;
-                SetupCamera();
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-                glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_FALSE);
+        mViewCellsManager->ApplyFilter2(viewcell,
+                                                                        false,
+                                                                        1.0f,
+                                                                        pvs);
+        
+        pvsSize = 0;
+        SetupCamera();
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_FALSE);
                 
           

GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h

@@ -324 +324 @@
   static int sSimpleRayId;
   SimpleRay(): mType(Ray::LOCAL_RAY) {
-        mId = sSimpleRayId++;
+        //      mId = sSimpleRayId++;
   }
   
   SimpleRay(const Vector3 &o, const Vector3 &d, const float p=1.0f):
         mOrigin(o), mDirection(d), mPdf(p), mType(Ray::LOCAL_RAY) {     
-        mId = sSimpleRayId++;
+        //      mId = sSimpleRayId++;
   }
         

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

@@ -68 +68 @@
   case SamplingStrategy::RSS_BASED_DISTRIBUTION:
   case SamplingStrategy::RSS_SILHOUETTE_BASED_DISTRIBUTION:
-                if (mRssTree) {
-                  result = GenerateImportanceRays(mRssTree, number, rays);
-                }
-                break;
-                
+        if (mRssTree) {
+          result = GenerateImportanceRays(mRssTree, number, rays);
+        }
+        break;
+        
   default:
         result = Preprocessor::GenerateRays(number, strategy, rays);
@@ -411 +411 @@
   for (int i=0; i < distributions.size(); i++) {
         distributions[i]->mRatio = distributions[i]->mContribution/
-          (TIME_WEIGHT*distributions[i]->mTime +
-           (1 - TIME_WEIGHT)*distributions[i]->mRays);
+          (Limits::Small +
+           (TIME_WEIGHT*distributions[i]->mTime +
+                (1 - TIME_WEIGHT)*distributions[i]->mRays)
+           );
 
 #if 1
@@ -438 +440 @@
         Halton<4> halton;
 
-//      for (int i=1; i < 7; i++) 
-//        cout<<i<<" prime= "<<FindPrime(i)<<endl;
+        //      for (int i=1; i < 7; i++) 
+        //        cout<<i<<" prime= "<<FindPrime(i)<<endl;
         
         Material mA, mB;
@@ -467 +469 @@
   
   // use ray buffer to export ray animation
-  const bool useRayBuffer = true;
+  const bool useRayBuffer = false;
   
   vector<VssRayContainer> rayBuffer(50);
@@ -492 +494 @@
   int rssSamples = 0;
 
-  if (mUseRssTree)
-                mDistributions.push_back(new RssBasedDistribution(*this));
-
-  
-  if (1) {
-        // mDistributions.push_back(new SpatialBoxBasedDistribution(*this));
-        //  mDistributions.push_back(new DirectionBasedDistribution(*this));
-        mDistributions.push_back(new ObjectDirectionBasedDistribution(*this));
-        //  mDistributions.push_back(new ReverseObjectBasedDistribution(*this));
-        mDistributions.push_back(new ObjectBasedDistribution(*this));
-        mDistributions.push_back(new ReverseViewSpaceBorderBasedDistribution(*this));
-  } else {
-        mDistributions.push_back(new GlobalLinesDistribution(*this));
-        mDistributions.push_back(new SpatialBoxBasedDistribution(*this));
+  // now decode distribution string
+  char buff[1024];
+  Environment::GetSingleton()->GetStringValue("RssPreprocessor.distributions",
+                                                                                          buff);
+  
+  char *curr = buff;
+  mUseRssTree = false;
+  while (1) {
+        char *e = strchr(curr,'+');
+        if (e!=NULL) {
+          *e=0;
+        }
+        
+        if (strcmp(curr, "rss")==0) {
+          mDistributions.push_back(new RssBasedDistribution(*this));
+          mUseRssTree = true;
+        } else
+          if (strcmp(curr, "object")==0) {
+                mDistributions.push_back(new ObjectBasedDistribution(*this));
+          } else
+                if (strcmp(curr, "spatial")==0) {
+                  mDistributions.push_back(new SpatialBoxBasedDistribution(*this));
+                } else
+                  if (strcmp(curr, "global")==0) {
+                        mDistributions.push_back(new GlobalLinesDistribution(*this));
+                  } else
+                        if (strcmp(curr, "direction")==0) {
+                          mDistributions.push_back(new DirectionBasedDistribution(*this));
+                        } else
+                          if (strcmp(curr, "object_direction")==0) {
+                                mDistributions.push_back(new ObjectDirectionBasedDistribution(*this));
+                          } else
+                                if (strcmp(curr, "reverse_object")==0) {
+                                  mDistributions.push_back(new ReverseObjectBasedDistribution(*this));
+                                } else
+                                  if (strcmp(curr, "reverse_viewspace_border")==0) {
+                                        mDistributions.push_back(new ReverseViewSpaceBorderBasedDistribution(*this));
+                                  } 
+        
+        if (e==NULL)
+          break;
+        curr = e+1;
   }
   
@@ -517 +547 @@
         cout<<"Generating initial rays..."<<endl<<flush;
         
-        if (mUseImportanceSampling) {
-          int count = 0;
-          int i;
-
-          // Generate initial samples
-          for (i=0; i < mDistributions.size(); i++)
-                if (mDistributions[i]->mType != SamplingStrategy::RSS_BASED_DISTRIBUTION)
-                  count++;
-          
-          for (i=0; i < mDistributions.size(); i++)
-                if (mDistributions[i]->mType != SamplingStrategy::RSS_BASED_DISTRIBUTION)
-                  GenerateRays(mInitialSamples/count,
-                                           *mDistributions[i],
-                                           rays);
-          
-        } else {
-          int rayType = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
-          if (mObjectBasedSampling)
-                rayType = SamplingStrategy::OBJECT_BASED_DISTRIBUTION;
-          else
-                if (mDirectionalSampling)
-                  rayType = SamplingStrategy::DIRECTION_BASED_DISTRIBUTION;
-          cout<<"Generating rays..."<<endl;
-
-          Preprocessor::GenerateRays(mRssSamplesPerPass, rayType, rays);
-        }
+        int count = 0;
+        int i;
+        
+        // Generate initial samples
+        for (i=0; i < mDistributions.size(); i++)
+          if (mDistributions[i]->mType != SamplingStrategy::RSS_BASED_DISTRIBUTION)
+                count++;
+        
+        for (i=0; i < mDistributions.size(); i++)
+          if (mDistributions[i]->mType != SamplingStrategy::RSS_BASED_DISTRIBUTION)
+                GenerateRays(mInitialSamples/count,
+                                         *mDistributions[i],
+                                         rays);
+        
+        
         
         
         cout<<"Casting initial rays..."<<endl<<flush;
         CastRays(rays, mVssRays, true, pruneInvalidRays);
-
+        
         ExportObjectRays(mVssRays, 1546);
   }
@@ -574 +593 @@
   }
         
-  if (mUseViewcells) {
-
-        cout<<"Computing sample contributions..."<<endl<<flush;
-        // evaluate contributions of the intitial rays
-        mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
-        cout<<"done.\n"<<flush;
-
-        long time = GetTime();
-        totalTime = TimeDiff(startTime, time)*1e-3f;
-        lastTime = time;
-        
-        mStats <<
-          "#Pass\n" <<mPass<<endl<<
-          "#RssPass\n" <<rssPass<<endl<<
-          "#Time\n" << totalTime <<endl<<
-          "#TotalSamples\n" <<totalSamples<<endl<<
-          "#RssSamples\n" <<rssSamples<<endl;
-
-        {
-          VssRayContainer contributingRays;
-          mVssRays.GetContributingRays(contributingRays, 0);
-          mStats<<"#NUM_CONTRIBUTING_RAYS\n"<<(int)contributingRays.size()<<endl;
-          if (mExportRays) {
-                char filename[64];
-                sprintf(filename, "rss-crays-%04d.x3d", 0);
-                ExportRays(filename, contributingRays, mExportNumRays);
-          }
-        }
-        
-          
-        // viewcells->UpdatePVS(newVssRays);
-        Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
-        // cull viewcells with PVS > median (0.5f)
-        //mViewCellsManager->SetValidityPercentage(0, 0.5f); 
-        //      mViewCellsManager->SetValidityPercentage(0, 1.0f); 
-        Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
-
-        mVssRays.PrintStatistics(mStats);
-        mViewCellsManager->PrintPvsStatistics(mStats);
-
-
-        if (0) {
-          char str[64];
-          sprintf(str, "tmp/v-");
-          
-          // visualization
-          const bool exportRays = true;
-          const bool exportPvs = true;
-          ObjectContainer objects;
-          mViewCellsManager->ExportSingleViewCells(objects,
-                                                                                           1000,
-                                                                                           false,
-                                                                                           exportPvs,
-                                                                                           exportRays,
-                                                                                           10000,
-                                                                                           str);
-        }
-          
+  cout<<"Computing sample contributions..."<<endl<<flush;
+  // evaluate contributions of the intitial rays
+  mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
+  cout<<"done.\n"<<flush;
+  
+  long time = GetTime();
+  totalTime = TimeDiff(startTime, time)*1e-3f;
+  lastTime = time;
+  
+  mStats <<
+        "#Pass\n" <<mPass<<endl<<
+        "#RssPass\n" <<rssPass<<endl<<
+        "#Time\n" << totalTime <<endl<<
+        "#TotalSamples\n" <<totalSamples<<endl<<
+        "#RssSamples\n" <<rssSamples<<endl;
+  
+  {
+        VssRayContainer contributingRays;
+        mVssRays.GetContributingRays(contributingRays, 0);
+        mStats<<"#NUM_CONTRIBUTING_RAYS\n"<<(int)contributingRays.size()<<endl;
+        if (mExportRays) {
+          char filename[64];
+          sprintf(filename, "rss-crays-%04d.x3d", 0);
+          ExportRays(filename, contributingRays, mExportNumRays);
+        }
+  }
+  
+  
+  // viewcells->UpdatePVS(newVssRays);
+  Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
+  // cull viewcells with PVS > median (0.5f)
+  //mViewCellsManager->SetValidityPercentage(0, 0.5f); 
+  //    mViewCellsManager->SetValidityPercentage(0, 1.0f); 
+  Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
+  
+  mVssRays.PrintStatistics(mStats);
+  mViewCellsManager->PrintPvsStatistics(mStats);
+  
+  
+  if (0) {
+        char str[64];
+        sprintf(str, "tmp/v-");
+        
+        // visualization
+        const bool exportRays = true;
+        const bool exportPvs = true;
+        ObjectContainer objects;
+        mViewCellsManager->ExportSingleViewCells(objects,
+                                                                                         1000,
+                                                                                         false,
+                                                                                         exportPvs,
+                                                                                         exportRays,
+                                                                                         10000,
+                                                                                         str);
+  }
+  
+  if (renderer) {
         ComputeRenderError();
   }
-
-  //  return 1;
   
   rssPass++;
@@ -647 +663 @@
   //  mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
 
-  if (mUseImportanceSampling) {
-
-        if (mUseRssTree) {
-          mRssTree->Construct(mObjects, mVssRays);
-        
-          mRssTree->stat.Print(mStats);
-          cout<<"RssTree root PVS size = "<<mRssTree->GetRootPvsSize()<<endl;
-          
-          if (mExportRssTree) {
-                ExportRssTree("rss-tree-100.x3d", mRssTree, Vector3(1,0,0));
-                ExportRssTree("rss-tree-001.x3d", mRssTree, Vector3(0,0,1));
-                ExportRssTree("rss-tree-101.x3d", mRssTree, Vector3(1,0,1));
-                ExportRssTree("rss-tree-101m.x3d", mRssTree, Vector3(-1,0,-1));
-                ExportRssTreeLeaves(mRssTree, 10);
-          }
-        }
-
-        if (mExportPvs) {
-          ExportPvs("rss-pvs-initial.x3d", mRssTree);
-        }
-  }
-
+  if (mUseRssTree) {
+        mRssTree->Construct(mObjects, mVssRays);
+        
+        mRssTree->stat.Print(mStats);
+        cout<<"RssTree root PVS size = "<<mRssTree->GetRootPvsSize()<<endl;
+        
+        if (mExportRssTree) {
+          ExportRssTree("rss-tree-100.x3d", mRssTree, Vector3(1,0,0));
+          ExportRssTree("rss-tree-001.x3d", mRssTree, Vector3(0,0,1));
+          ExportRssTree("rss-tree-101.x3d", mRssTree, Vector3(1,0,1));
+          ExportRssTree("rss-tree-101m.x3d", mRssTree, Vector3(-1,0,-1));
+          ExportRssTreeLeaves(mRssTree, 10);
+        }
+  }
+  
+  if (mExportPvs) {
+        ExportPvs("rss-pvs-initial.x3d", mRssTree);
+  }
+  
+  
   // keep only rss
   //  mDistributions.resize(1);
@@ -678 +692 @@
         static VssRayContainer tmpVssRays;
 
-        rays.reserve((int)(1.1f*mRssSamplesPerPass));
+        cout<<"H1"<<endl<<flush;
+
+        //rays.reserve((int)(1.1f*mRssSamplesPerPass));
+
+        cout<<"H10"<<endl<<flush;
 
         rays.clear();
         vssRays.clear();
         tmpVssRays.clear();
-
+        
         int castRays = 0;
-        if (mUseImportanceSampling) {
-
-          NormalizeRatios(mDistributions);
-          
-          long t1;
-
-          for (int i=0; i < mDistributions.size(); i++) {
-                t1 = GetTime();
-                rays.clear();
-                tmpVssRays.clear();
-                if (mDistributions[i]->mRatio != 0) {
-                  GenerateRays(int(mRssSamplesPerPass*mDistributions[i]->mRatio),
-                                           *mDistributions[i],
-                                           rays);
-                  
-                  rays.NormalizePdf((float)rays.size());
-                  
-                  CastRays(rays, tmpVssRays, true, pruneInvalidRays);
-                  castRays += (int)rays.size();
-
-                  cout<<"Computing sample contributions..."<<endl<<flush;
-
+
+        cout<<"H11"<<endl<<flush;
+
+        NormalizeRatios(mDistributions);
+        
+        long t1;
+        cout<<"H2"<<endl<<flush;
+        for (int i=0; i < mDistributions.size(); i++) {
+          t1 = GetTime();
+          rays.clear();
+          tmpVssRays.clear();
+          if (mDistributions[i]->mRatio != 0) {
+                GenerateRays(int(mRssSamplesPerPass*mDistributions[i]->mRatio),
+                                         *mDistributions[i],
+                                         rays);
+                
+                rays.NormalizePdf((float)rays.size());
+                
+                CastRays(rays, tmpVssRays, true, pruneInvalidRays);
+                castRays += (int)rays.size();
+                
+                cout<<"Computing sample contributions..."<<endl<<flush;
+                
 #if ADD_RAYS_IN_PLACE 
-                  mDistributions[i]->mContribution =
-                        mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
+                float contribution =
+                  mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
 #else
-                  mDistributions[i]->mContribution =
-                        mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
+                float contribution =
+                  mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
 #endif
-                  cout<<"done."<<endl;
-                }
-
-                mDistributions[i]->mTime = TimeDiff(t1, GetTime());
-                //              mDistributions[i]->mRays = (int)rays.size();
-                mDistributions[i]->mRays = (int)tmpVssRays.size() + 1;
-                //              mStats<<"#RssRelContrib"<<endl<<contributions[0]/nrays[0]<<endl;
-                vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
-          }
-
-          EvaluateRatios(mDistributions);
-          
-          // add contributions of all rays at once...
-#if !ADD_RAYS_IN_PLACE 
-          mViewCellsManager->AddSampleContributions(vssRays);
-#endif    
-        }
-        else {
-                int rayType = SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION;
-          if (mObjectBasedSampling)
-                  rayType = SamplingStrategy::OBJECT_BASED_DISTRIBUTION;
-          else
-                if (mDirectionalSampling)
-                        rayType = SamplingStrategy::DIRECTION_BASED_DISTRIBUTION;
-
-          cout<<"Generating rays..."<<endl;
-
-          Preprocessor::GenerateRays(mRssSamplesPerPass, rayType, rays);
-          cout<<"done."<<endl;
-
-          cout<<"Casting rays..."<<endl;          CastRays(rays, vssRays, true);
-          cout<<"done."<<endl;
-          castRays += (int)rays.size();
-          if (mUseViewcells) {
-                /// compute view cell contribution of rays
-                cout<<"Computing sample contributions..."<<endl;
-                mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
+                mDistributions[i]->mContribution = contribution;
+                mDistributions[i]->mTotalContribution += contribution;
+                
                 cout<<"done."<<endl;
           }
-                
           
-        }
+          mDistributions[i]->mTime = TimeDiff(t1, GetTime());
+          //            mDistributions[i]->mRays = (int)rays.size();
+          mDistributions[i]->mRays = (int)tmpVssRays.size();
+          mDistributions[i]->mTotalRays = (int)tmpVssRays.size();
+
+          //            mStats<<"#RssRelContrib"<<endl<<contributions[0]/nrays[0]<<endl;
+          vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
+        }
+        
+        EvaluateRatios(mDistributions);
+        
+        // add contributions of all rays at once...
+#if !ADD_RAYS_IN_PLACE 
+        mViewCellsManager->AddSampleContributions(vssRays);
+#endif    
+        
+  
         totalSamples += castRays;
         rssSamples += (int)vssRays.size();
-
+        
         cout<<"Generated "<<castRays<<" rays, progress "<<100.0f*totalSamples/((float) mRssSamples +
                                                                                                                                                    mInitialSamples)<<"%\n";
         
-
+        
         long time = GetTime();
         totalTime += TimeDiff(lastTime, time);
@@ -773 +773 @@
           "#TotalSamples\n" <<totalSamples<<endl<<
           "#RssSamples\n" <<rssSamples<<endl;
-
-
-        if (mUseViewcells) {
-          Debug<<"Print statistics...\n"<<flush;
-          vssRays.PrintStatistics(mStats);
-          mViewCellsManager->PrintPvsStatistics(mStats);
-          Debug<<"done.\n"<<flush;
-        }
-
-
+        
+        
+        Debug<<"Print statistics...\n"<<flush;
+        vssRays.PrintStatistics(mStats);
+        mViewCellsManager->PrintPvsStatistics(mStats);
+        Debug<<"done.\n"<<flush;
+        
         if (renderer && mPass > 0) {
+          Debug<<"Computing render errror..."<<endl<<flush;
           char buf[100];
-          if (mUseImportanceSampling)
-                {
-                  sprintf(buf, "snap/i-%02d-", mPass);
-                  
-                  renderer->SetSnapPrefix(buf);
-                }
-          else
-                {
-                  sprintf(buf, "snap/r-%02d-", mPass);
-                  
-                  renderer->SetSnapPrefix(buf);
-                }
+          sprintf(buf, "snap/i-%02d-", mPass);
+          
+          renderer->SetSnapPrefix(buf);
           
           renderer->SetSnapErrorFrames(true);
-        }
-        
-        ComputeRenderError();
+          ComputeRenderError();
+          Debug<<"done."<<endl<<flush;
+        }
         
         // epxort rays before adding them to the tree -> some of them can be deleted
-
+        
         if (mExportRays) {
+          Debug<<"Exporting rays..."<<endl<<flush;
           char filename[64];
-          if (mUseImportanceSampling)
-                sprintf(filename, "rss-rays-i%04d.x3d", rssPass);
-          else
-                sprintf(filename, "rss-rays-%04d.x3d", rssPass);
+          sprintf(filename, "rss-rays-i%04d.x3d", rssPass);
           
-          
-
           if (useRayBuffer)
                 vssRays.SelectRays(mExportNumRays, rayBuffer[mPass], true);
@@ -825 +810 @@
           sprintf(filename, "rss-crays-%04d.x3d", rssPass);
           ExportRays(filename, contributingRays, mExportNumRays);
+
+          Debug<<"done."<<endl<<flush;
         }
 
@@ -831 +818 @@
         // already when adding into the tree
         // do not add those rays which have too low or no contribution....
-
-        
-        if (mUseRssTree && mUseImportanceSampling) {
+        if (mUseRssTree) {
           Debug<<"Adding rays...\n"<<flush;
           mRssTree->AddRays(vssRays);
@@ -856 +841 @@
         
         
-        if (!mUseImportanceSampling || !mUseRssTree)
+        if (!mUseRssTree)
           CLEAR_CONTAINER(vssRays);
         // otherwise the rays get deleted by the rss tree update according to RssTree.maxRays ....
@@ -869 +854 @@
   }
   
-  if (mUseViewcells) {
-
-        if(0) {
-          VssRayContainer selectedRays;
-          int desired = mViewCellsManager->GetVisualizationSamples();
-          
-          mVssRays.SelectRays(desired, selectedRays);
-          
-          mViewCellsManager->Visualize(mObjects, selectedRays);
-          }
-        
-        // view cells after sampling
-        mViewCellsManager->PrintStatistics(Debug);
-        
-        EvalViewCellHistogram();
-        
-        //-- render simulation after merge
-        cout << "\nevaluating bsp view cells render time after sampling ... ";
-        
-        mRenderSimulator->RenderScene();
-        SimulationStatistics ss;
-        mRenderSimulator->GetStatistics(ss);
-        
-        cout << " finished" << endl;
-        cout << ss << endl;
-        Debug << ss << endl;
-  }
-
-
-  if (useRayBuffer && mExportRays && mUseImportanceSampling) {
+  if(0) {
+        VssRayContainer selectedRays;
+        int desired = mViewCellsManager->GetVisualizationSamples();
+        
+        mVssRays.SelectRays(desired, selectedRays);
+        
+        mViewCellsManager->Visualize(mObjects, selectedRays);
+  }
+  
+  // view cells after sampling
+  mViewCellsManager->PrintStatistics(Debug);
+
+  EvalViewCellHistogram();
+  
+  //-- render simulation after merge
+  cout << "\nEvaluating view cells render time after sampling ... ";
+  
+  mRenderSimulator->RenderScene();
+  SimulationStatistics ss;
+  mRenderSimulator->GetStatistics(ss);
+  
+  cout << " finished" << endl;
+  cout << ss << endl;
+  Debug << ss << endl;
+  
+  if (useRayBuffer && mExportRays) {
         char filename[64];
         sprintf(filename, "rss-rays-i.x3d");
@@ -905 +886 @@
         ExportRayAnimation(filename, rayBuffer);
   }
-          
-
+  
+  
   // do not delete rss tree now - can be used for visualization..
 #if 0
@@ -914 +895 @@
 #endif
 
-  //mViewCellsManager->ExportViewCells("visibility.xml",
-  //                                                                     true);
-  
   
   return true;

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

@@ -675 +675 @@
           float oldCost = (float)leaf->rays.size()*pvsSize;
           info.costRatio = newCost/oldCost;
+          break;
         }
         }
@@ -1416 +1417 @@
 
   int inactive=0;
+  Debug<<"Deleting rays..."<<endl<<flush;
 
   for(VssRayContainer::const_iterator ri = remove.begin();
@@ -1428 +1430 @@
   }
 
+  Debug<<"done."<<endl<<flush;
 
   //  cout<<"all/inactive"<<remove.size()<<"/"<<inactive<<endl;
-  
+  Debug<<"Adding rays..."<<endl<<flush;
+
   for(VssRayContainer::const_iterator ri = add.begin();
       ri != add.end();
@@ -1439 +1443 @@
   }
 
+  Debug<<"done."<<endl<<flush;
+
   stat.rayRefs += add.size() - remove.size();
 
+  Debug<<"Updating statistics..."<<endl<<flush;
   UpdateTreeStatistics();
+  Debug<<"done."<<endl<<flush;
+
   // check whether the tree should be prunned
   if (stat.rayRefs > mMaxRays) {
+        Debug<<"Prunning rays..."<<endl<<flush;
         PruneRays(mMaxRays);
+        Debug<<"done."<<endl<<flush;
         //      UpdateTreeStatistics();
   }
-  
+
 }
 
@@ -2486 +2497 @@
 
 int
-RssTree::PruneRays(RssTreeLeaf *leaf,
-                                   const float contributionThreshold)
+RssTree::PruneRaysRandom(RssTreeLeaf *leaf,
+                                                 const float ratio)
 {
   int i;
@@ -2493 +2504 @@
   
   for (j=0, i=0; i < leaf->rays.size(); i++) {
-        
-        if (leaf->rays[i].mRay->mWeightedPvsContribution > contributionThreshold) {
-          // copy a valid sample
-          leaf->rays[j] = leaf->rays[i];
-          j++;
-        } else {
-          // delete the ray
-          leaf->rays[i].mRay->Unref();
-          if (leaf->rays[i].mRay->RefCount() != 0) {
-                cerr<<"Error: refcount!=0, but"<<leaf->rays[j].mRay->RefCount()<<endl;
-                exit(1);
-          }
-          delete leaf->rays[i].mRay;
-        }
-  }
-
-
-  leaf->rays.resize(j);
-  int removed = (i-j);
-  stat.rayRefs -= removed;
-  return removed;
-}
-
-int
-RssTree::PruneRaysRandom(RssTreeLeaf *leaf,
-                                                 const float ratio)
-{
-  int i;
-  int j;
-  
-  for (j=0, i=0; i < leaf->rays.size(); i++) {
-        
         if (Random(1.0f) < ratio) {
           // copy a valid sample
@@ -2586 +2565 @@
                                    )
 {
-  bool globalPrunning = false;
 
   stack<RssTreeNode *> tstack;
@@ -2596 +2574 @@
   Debug<<"Prunning rays...\nOriginal size "<<stat.rayRefs<<endl<<flush;
 
-  if (globalPrunning) {
-        VssRayContainer allRays;
-        allRays.reserve(stat.rayRefs);
-        CollectRays(allRays);
-        sort(allRays.begin(),
-                 allRays.end(),
-                 GreaterWeightedPvsContribution);
-        
-        if ( maxRays >= allRays.size() )
-          return 0;
-
-        float contributionThreshold = allRays[desired]->mWeightedPvsContribution;
-        
-        PushRoots(tstack);
-        
-        while (!tstack.empty()) {
-          RssTreeNode *node = tstack.top();
-          tstack.pop();
-          
-          if (node->IsLeaf()) {
-                RssTreeLeaf *leaf = (RssTreeLeaf *)node;
-                prunned += PruneRays(leaf, contributionThreshold);
-          } else {
-                RssTreeInterior *in = (RssTreeInterior *)node;
-                // both nodes for directional splits
-                tstack.push(in->front);
-                tstack.push(in->back);
-          }
-        }
-  } else {
-        // prune random rays from each leaf so that the ratio's remain the same
-        PushRoots(tstack);
-
-        if ( maxRays >= stat.rayRefs )
-          return 0;
-        
-        float ratio = desired/(float)stat.rayRefs;
-        
-        while (!tstack.empty()) {
-          RssTreeNode *node = tstack.top();
-          tstack.pop();
-          
-          if (node->IsLeaf()) {
-                RssTreeLeaf *leaf = (RssTreeLeaf *)node;
-                // prunned += PruneRaysRandom(leaf, ratio);
-                prunned += PruneRaysContribution(leaf, ratio);
-          } else {
-                RssTreeInterior *in = (RssTreeInterior *)node;
-                // both nodes for directional splits
-                tstack.push(in->front);
-                tstack.push(in->back);
-          }
-        }
-
-        
-
-
-  }
-  
-  
+  // prune random rays from each leaf so that the ratio's remain the same
+  PushRoots(tstack);
+  
+  if ( maxRays >= stat.rayRefs )
+        return 0;
+  
+  float ratio = desired/(float)stat.rayRefs;
+  
+  while (!tstack.empty()) {
+        RssTreeNode *node = tstack.top();
+        tstack.pop();
+        
+        if (node->IsLeaf()) {
+          RssTreeLeaf *leaf = (RssTreeLeaf *)node;
+          prunned += PruneRaysRandom(leaf, ratio);
+          //prunned += PruneRaysContribution(leaf, ratio);
+        } else {
+          RssTreeInterior *in = (RssTreeInterior *)node;
+          // both nodes for directional splits
+          tstack.push(in->front);
+          tstack.push(in->back);
+        }
+  }
   
   Debug<<"Remained "<<stat.rayRefs<<" rays"<<endl<<flush;
@@ -2836 +2777 @@
 RssTree::ComputeImportance(RssTreeLeaf *leaf) 
 {
+  if (leaf->mTotalRays)
+        leaf->mImportance = leaf->mTotalContribution / leaf->mTotalRays;
+  else
+        leaf->mImportance = 0.0f;
+  return;
+  
   if (0) 
         leaf->mImportance = leaf->GetAvgRayContribution();

GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.h

@@ -433 +433 @@
   RayInfoContainer rays;
   int mTotalRays;
-        
+  float mTotalContribution;
+  
   bool mValidPvs;
   
@@ -440 +441 @@
   RssTreeLeaf(RssTreeInterior *p,
                           const int nRays
-                          ):RssTreeNode(p), rays(), mPvsSize(0), mTotalRays(0), mValidPvs(false) {
+                          ):RssTreeNode(p), rays(), mPvsSize(0), mTotalRays(0),
+                                mTotalContribution(0.0f), mValidPvs(false) {
     rays.reserve(nRays);
   }
@@ -455 +457 @@
   
   void AddRay(const RayInfo &data) {
-                mValidPvs = false;
-    rays.push_back(data);
-                mTotalRays++;
-                data.mRay->Ref();
+        mValidPvs = false;
+        rays.push_back(data);
+        mTotalRays++;
+        mTotalContribution +=
+          ABS_CONTRIBUTION_WEIGHT*data.mRay->mPvsContribution +
+          (1.0f - ABS_CONTRIBUTION_WEIGHT)*data.mRay->mRelativePvsContribution;
+        data.mRay->Ref();
   }
         
@@ -1066 +1071 @@
 
   int
-  PruneRays(RssTreeLeaf *leaf,
-                        const float contributionThreshold);
-  int
   PruneRaysRandom(RssTreeLeaf *leaf,
                                   const float ratio);

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

@@ -11 +11 @@
 
 SamplingStrategy::SamplingStrategy(const Preprocessor &preprocessor): 
-  mPreprocessor(preprocessor), mRatio(1.0f)
-{
+  mPreprocessor(preprocessor), mRatio(1.0f),  mTotalRays(0), mTotalContribution(0.0f)
+{
+  
 }
 
@@ -71 +72 @@
         Vector3 origin, direction; 
 
-        mPreprocessor.mViewCellsManager->GetViewPoint(origin);
-
+        float r[5];
+        mHalton.GetNext(5, r);
+
+        mPreprocessor.mViewCellsManager->GetViewPoint(origin, Vector3(r[2],r[3],r[4]));
+        
         Vector3 point;
         Vector3 normal;
-        //cout << "y";
-        const int i = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
+
+        r[0] *= mPreprocessor.mObjects.size()-1;
+        const int i = (int)r[0];
 
         Intersectable *object = mPreprocessor.mObjects[i];
 
-        object->GetRandomSurfacePoint(point, normal);
+        // take the remainder as a parameter over objects surface
+        r[0] -= (float)i;
+        
+        object->GetRandomSurfacePoint(r[0], r[1], point, normal);
+
         direction = point - origin;
-
-        // $$ jb the pdf is yet not correct for all sampling methods!
-        const float c = Magnitude(direction);
-
+        
+        const float c = Magnitude(direction);
+        
         if (c <= Limits::Small) 
                 return false;
@@ -176 +184 @@
 
   float r[6];
-  halton.GetNext(r);
+  mHalton.GetNext(6, r);
   mPreprocessor.mViewCellsManager->GetViewPoint(origin, Vector3(r[0],r[1],r[2]));
   
@@ -405 +413 @@
   for (i=0; i < tries; i++) {
         float r[4];
-        halton.GetNext(r);
+        mHalton.GetNext(4, r);
         
 #if 0

GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.h

@@ -57 +57 @@
         int mType;
         int mRays;
-        float mContribution;
+        float mContribution;
         float mTime;
         float mRatio;
 
+  int mTotalRays;
+  float mTotalContribution;
 protected:
 
@@ -71 +73 @@
 {
  public:
-        
+  HaltonSequence mHalton;
+  
   ObjectBasedDistribution(const Preprocessor &preprocessor):
         SamplingStrategy(preprocessor) {
@@ -136 +139 @@
 {
  public:
-  Halton<6> halton;
+  HaltonSequence mHalton;
   SpatialBoxBasedDistribution(const Preprocessor &preprocessor):
         SamplingStrategy(preprocessor){
@@ -205 +208 @@
 {
 public:
-  Halton<4> halton;
+  HaltonSequence mHalton;
   //HaltonSequence mHalton;
 

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

@@ -120 +120 @@
 mPvsCost(0),
 mEntriesInPvs(0),
-mPvsSizeValid(false)
+mPvsSizeValid(false),
+mFilteredPvsSize(0)
 {
         mId = -100;
@@ -133 +134 @@
 mMergeCost(0),
 mPvsCost(0),
-mPvsSizeValid(false)
+mPvsSizeValid(false),
+mFilteredPvsSize(0)
 //mMailbox(0)
 {

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

@@ -27 +27 @@
 
 
-// warning: Should not count origin object for sampling 
-// because it disturbs heuristics
-#define SAMPLE_ORIGIN_OBJECTS 0  // matt temp
 
 // $$JB HACK
@@ -1871 +1868 @@
                 
                 if (evaluateFilter) {
-                  ObjectPvs filteredPvs = viewcell->GetPvs();
+                  ObjectPvs filteredPvs;
                   PvsFilterStatistics fstat = ApplyFilter2(viewcell,
-                                                                                                                                                                                         false,
-                                                                                                                                                                                         2.0f,
-                                                                                                                                                                                         filteredPvs);
+                                                                                                   false,
+                                                                                                   2.0f,
+                                                                                                   filteredPvs);
                   
                   float filteredCost = filteredPvs.EvalPvsCost();
                   stat.avgFilteredPvs += filteredCost;
                   stat.avgFilterContribution += filteredCost - pvsCost;
-
+                  
                   stat.avgFilterRadius += fstat.mAvgFilterRadius;
                   int sum = fstat.mGlobalFilterCount + fstat.mLocalFilterCount;
@@ -1887 +1884 @@
                           (float) sum;
                   }
-                  
                   
                 } else {
@@ -2012 +2008 @@
 
 
-float ViewCellsManager::ComputeSampleContribution(VssRay &ray,
+
+#define PVS_ADD_DIRTY 1
+
+float
+ViewCellsManager::ComputeSampleContribution(VssRay &ray,
                                                                                                   const bool addRays,
                                                                                                   const bool storeViewCells)
@@ -2018 +2018 @@
   ray.mPvsContribution = 0;
   ray.mRelativePvsContribution = 0.0f;
-
+  
   if (ray.mTerminationObject==NULL)
         return 0.0f;
@@ -2026 +2026 @@
   static Ray hray;
   hray.Init(ray);
-  //hray.mFlags |= Ray::CULL_BACKFACES;
-  //Ray hray(ray);
-  
+
   float tmin = 0, tmax = 1.0;
   
@@ -2039 +2037 @@
   ViewCell::NewMail();
   
-  //    if (ray.mPdf!=1.0f)
-  //      cout<<ray.mPdf<<" ";
-  
-  
   // traverse the view space subdivision
   CastLineSegment(origin, termination, viewcells);
   
   if (storeViewCells)
-        {       // copy viewcells memory efficiently
+        {       
+          // copy viewcells memory efficiently
           ray.mViewCells.reserve(viewcells.size());
           ray.mViewCells = viewcells;
         }
-  
-  Intersectable *obj = GetIntersectable(ray, true);
   
   ViewCellContainer::const_iterator it = viewcells.begin();
   
+  Intersectable *terminationObj = GetIntersectable(ray, true);
+  
+  
   for (; it != viewcells.end(); ++ it) 
         {
           ViewCell *viewcell = *it;
-          // tests if view cell is in valid view space
+          
           if (viewcell->GetValid())
-                {
+                {       // if ray not outside of view space
                   float contribution;
                   
-                  if (ray.mTerminationObject)  {                        
-                        if (viewcell->GetPvs().GetSampleContribution(obj,
-                                                                                                                 ray.mPdf,
-                                                                                                                 contribution)) {
-                          ++ ray.mPvsContribution;
+                  if (terminationObj) 
+                        {
+                          // todo: maybe not correct for kd node pvs
+                          if (viewcell->GetPvs().GetSampleContribution(
+                                                                                                                   terminationObj, ray.mPdf, contribution))
+                                {
+                                  ++ ray.mPvsContribution;
+                                  if (addRays) {
+#if PVS_ADD_DIRTY
+                                        viewcell->GetPvs().AddSampleDirtyCheck(terminationObj, ray.mPdf);
+                                        if (viewcell->GetPvs().RequiresResort()) {
+                                          viewcell->GetPvs().SimpleSort();
+                                        }
+#else
+                                        viewcell->GetPvs().AddSample(terminationObj, ray.mPdf);
+#endif
+                                  }
+                                }
+                          
+                          ray.mRelativePvsContribution += contribution;
                         }
-                        
-                        ray.mRelativePvsContribution += contribution;
-                        // $$ test of different contribution measure
-                        //                                      ray.mRelativePvsContribution += 1.0f/(viewcell->GetPvs().GetSize() + 10.0f);
-                        
-                  }
-                  
-#if SAMPLE_ORIGIN_OBJECTS
-                  
-                  // for directional sampling it is important to count only contributions
-                  // made in one direction!!!
-                  // the other contributions of this sample will be counted for the oposite ray!
-
-                        if (ray.mOriginObject && 
-                                viewcell->GetPvs().GetSampleContribution(ray.mOriginObject,
-                                                                                                                                                                                                 ray.mPdf,
-                                                                                                                                                                                                 contribution))
-                                {
-                                        ++ ray.mPvsContribution;
-                                        ray.mRelativePvsContribution += contribution;
-                                }
-#endif
-                }
-        }
-
-        // if true, the sampled entities are stored in the pvs
-        if (addRays)
-        {
-                for (it = viewcells.begin(); it != viewcells.end(); ++ it) 
-                {
-                        ViewCell *viewcell = *it;
-            
-                        if (viewcell->GetValid())
-                        {
-                                // if view point is valid, add new object to the pvs
-                          if (ray.mTerminationObject)
-                                { 
-                                  viewcell->GetPvs().AddSample(obj, ray.mPdf);
-                                }                               
-#if SAMPLE_ORIGIN_OBJECTS
-                                 if (ray.mOriginObject)
-                                 { 
-                                         viewcell->GetPvs().AddSample(ray.mOriginObject, ray.mPdf);
-                                 }
-#endif
-                        }
-                }
-        }
-
-        return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
-          (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
-}
+                }
+        }
+  
+  return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
+        (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
+}
+
 
 
@@ -2627 +2593 @@
 
 
-#if 1
 PvsFilterStatistics
 ViewCellsManager::ApplyFilter2(ViewCell *viewCell,
-                                                                                                                         const bool useViewSpaceFilter,
-                                                                                                                         const float filterSize,
-                                                                                                                         ObjectPvs &pvs,
-                                                                                                                         vector<AxisAlignedBox3> *filteredBoxes
-                                                                                                                         )
-{
-        //cout<<"y";
+                                                           const bool useViewSpaceFilter,
+                                                           const float filterSize,
+                                                           ObjectPvs &pvs,
+                                                           vector<AxisAlignedBox3> *filteredBoxes
+                                                           )
+{
+  //cout<<"y";
   PvsFilterStatistics stats;
 
@@ -2642 +2607 @@
   Vector3 center = vbox.Center();
   // copy the PVS
+  Intersectable::NewMail();
   ObjectPvs basePvs = viewCell->GetPvs();
-  Intersectable::NewMail();
-
   ObjectPvsIterator pit = basePvs.GetIterator();
 
+  pvs.Reserve(viewCell->GetFilteredPvsSize());
+
 #if !USE_KD_PVS
-  // first mark all object from this pvs
+  // first mark all objects from this pvs
   while (pit.HasMoreEntries()) {                
-                ObjectPvsEntry entry = pit.Next();
-                
-                Intersectable *object = entry.mObject;
-                object->Mail();
+        ObjectPvsEntry entry = pit.Next();
+        
+        Intersectable *object = entry.mObject;
+        object->Mail();
   }
 #endif
-
+  
   int pvsSize = 0;
   int nPvsSize = 0;
@@ -2681 +2647 @@
   
   if (useViewSpaceFilter) {
-                //      float radius = Max(viewCellRadius/100.0f, avgRadius - viewCellRadius);
-                float radius = viewCellRadius/100.0f;
-                vbox.Enlarge(radius);
-                cout<<"vbox = "<<vbox<<endl;
-                ViewCellContainer viewCells;
-                ComputeBoxIntersections(vbox, viewCells);
-                
-                ViewCellContainer::const_iterator it = viewCells.begin(),
-                        it_end = viewCells.end();
-                int i = 0;
-                for (i=0; it != it_end; ++ it, ++ i)
-                        if ((*it) != viewCell) {
-                                //cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
-                                basePvs.MergeInPlace((*it)->GetPvs());
-                        }
-                
-                // update samples and globalC
-                samples = (float)pvs.GetSamples();
-                //      cout<<"neighboring viewcells = "<<i-1<<endl;
-                //      cout<<"Samples' = "<<samples<<endl;
+        //      float radius = Max(viewCellRadius/100.0f, avgRadius - viewCellRadius);
+        float radius = viewCellRadius/100.0f;
+        vbox.Enlarge(radius);
+        cout<<"vbox = "<<vbox<<endl;
+        ViewCellContainer viewCells;
+        ComputeBoxIntersections(vbox, viewCells);
+        
+        ViewCellContainer::const_iterator it = viewCells.begin(),
+          it_end = viewCells.end();
+        int i = 0;
+        for (i=0; it != it_end; ++ it, ++ i)
+          if ((*it) != viewCell) {
+                //cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
+                basePvs.MergeInPlace((*it)->GetPvs());
+          }
+        
+        // update samples and globalC
+        samples = (float)pvs.GetSamples();
+        //      cout<<"neighboring viewcells = "<<i-1<<endl;
+        //      cout<<"Samples' = "<<samples<<endl;
   }
-        
+  
   // Minimal number of samples so that filtering takes place
 #define MIN_SAMPLES  50
-
+  
   if (samples > MIN_SAMPLES) {
-                float globalC = 2.0f*filterSize/sqrt(samples);
-                
-                pit = basePvs.GetIterator();
-                
-                ObjectContainer objects;
-                
-                while (pit.HasMoreEntries())
-                        {               
-                                ObjectPvsEntry entry = pit.Next();
-                                
-                                Intersectable *object = entry.mObject;
-                                // compute filter size based on the distance and the numebr of samples
-                                AxisAlignedBox3 box = object->GetBox();
-                                
-                                float distance = Distance(center, box.Center());
-                                float globalRadius = distance*globalC;
-                                
-                                int objectSamples = (int)entry.mData.mSumPdf;
-                                float localRadius = MAX_FLOAT;
-                                
-                                localRadius = filterSize*0.5f*Magnitude(box.Diagonal())/
-                                        sqrt((float)objectSamples);
-                                
-                                //      cout<<"lr="<<localRadius<<" gr="<<globalRadius<<endl;
-                                
-                                // now compute the filter size
-                                float radius;
-
+        float globalC = 2.0f*filterSize/sqrt(samples);
+        
+        pit = basePvs.GetIterator();
+        
+        ObjectContainer objects;
+        
+        while (pit.HasMoreEntries()) {          
+          ObjectPvsEntry entry = pit.Next();
+          
+          Intersectable *object = entry.mObject;
+          // compute filter size based on the distance and the numebr of samples
+          AxisAlignedBox3 box = object->GetBox();
+          
+          float distance = Distance(center, box.Center());
+          float globalRadius = distance*globalC;
+          
+          int objectSamples = (int)entry.mData.mSumPdf;
+          float localRadius = MAX_FLOAT;
+          
+          localRadius = filterSize*0.5f*Magnitude(box.Diagonal())/
+                sqrt((float)objectSamples);
+          
+          //    cout<<"lr="<<localRadius<<" gr="<<globalRadius<<endl;
+          
+          // now compute the filter size
+          float radius;
+          
 #if 0
-                                if (objectSamples <= 1) {
-                                        if (localRadius > globalRadius) {
-                                                radius = 0.5flRadius;
-                                                stats.mLocalFilterCount++;
-                                        } else {
-                                                radius = globalRadius;
-                                                stats.mGlobalFilterCount++;
-                                        }
-                                } else {
-                                        radius = localRadius;
-                                        stats.mLocalFilterCount++;
-                                }
+          if (objectSamples <= 1) {
+                if (localRadius > globalRadius) {
+                  radius = 0.5flRadius;
+                  stats.mLocalFilterCount++;
+                } else {
+                  radius = globalRadius;
+                  stats.mGlobalFilterCount++;
+                }
+          } else {
+                radius = localRadius;
+                stats.mLocalFilterCount++;
+          }
 #else
-                                radius = 0.5f*globalRadius + 0.5f*localRadius;
-                                stats.mLocalFilterCount++;
-                                stats.mGlobalFilterCount++;
+          radius = 0.5f*globalRadius + 0.5f*localRadius;
+          stats.mLocalFilterCount++;
+          stats.mGlobalFilterCount++;
 #endif
-                                
-                                stats.mAvgFilterRadius += radius;
-                                
-                                // cout<<"box = "<<box<<endl;
-                                //      cout<<"distance = "<<distance<<endl;
-                                //      cout<<"radiues = "<<radius<<endl;
-                                
-                                box.Enlarge(Vector3(radius));
-                                if (filteredBoxes)
-                                        filteredBoxes->push_back(box);
-                                objects.clear();
-                                // $$ warning collect objects takes only unmailed ones!
-                                CollectObjects(box, objects);
-                                //      cout<<"collected objects="<<objects.size()<<endl;
-                                ObjectContainer::const_iterator noi = objects.begin();
-                                for (; noi != objects.end(); ++ noi) {
-                                        Intersectable *o = *noi;
-                                        // $$ JB warning: pdfs are not correct at this point!     
-                                        pvs.AddSampleDirty(o, Limits::Small);
-                                }
-                        }
-                stats.mAvgFilterRadius /= (stats.mLocalFilterCount + stats.mGlobalFilterCount);
+          
+          stats.mAvgFilterRadius += radius;
+          
+          // cout<<"box = "<<box<<endl;
+          //    cout<<"distance = "<<distance<<endl;
+          //    cout<<"radiues = "<<radius<<endl;
+          
+          box.Enlarge(Vector3(radius));
+
+          if (filteredBoxes)
+                filteredBoxes->push_back(box);
+
+          objects.clear();
+          // $$ warning collect objects takes only unmailed ones!
+          CollectObjects(box, objects);
+          //    cout<<"collected objects="<<objects.size()<<endl;
+          ObjectContainer::const_iterator noi = objects.begin();
+          for (; noi != objects.end(); ++ noi) {
+                Intersectable *o = *noi;
+                // $$ JB warning: pdfs are not correct at this point!     
+                pvs.AddSampleDirty(o, Limits::Small);
+          }
+        }
+        stats.mAvgFilterRadius /= (stats.mLocalFilterCount + stats.mGlobalFilterCount);
   }
   
   Debug<<" nPvs size = "<<pvs.GetSize()<<endl;
-
+  
 #if !USE_KD_PVS
   // copy the base pvs to the new pvs
   pit = basePvs.GetIterator();
   while (pit.HasMoreEntries()) {                
-                ObjectPvsEntry entry = pit.Next();
-                pvs.AddSampleDirty(entry.mObject, entry.mData.mSumPdf);
+        ObjectPvsEntry entry = pit.Next();
+        pvs.AddSampleDirty(entry.mObject, entry.mData.mSumPdf);
   }
 #endif
+  
+  pvs.SimpleSort();
   viewCell->SetFilteredPvsSize(pvs.GetSize());
   
@@ -2792 +2761 @@
   return stats;
 }
-#else
-PvsFilterStatistics
-ViewCellsManager::ApplyFilter2(ViewCell *viewCell,
-                                                           const bool useViewSpaceFilter,
-                                                           const float filterSize,
-                                                           ObjectPvs &pvs
-                                                           )
-{
-        cout << "x";
-        PvsFilterStatistics stats;
-
-        AxisAlignedBox3 vbox = GetViewCellBox(viewCell);
-        Vector3 center = vbox.Center();
-        // copy the PVS
-        ObjectPvs basePvs;// = viewCell->GetPvs();
-        Intersectable::NewMail();
-
-        ObjectPvsIterator pit = viewCell->GetPvs().GetIterator();
-
-#if !USE_KD_PVS
-        // first mark all object from this pvs
-        while (pit.HasMoreEntries()) 
-        {               
-                ObjectPvsEntry entry = pit.Next();
-
-                Intersectable *object = entry.mObject;
-                object->Mail();
-        }
-#endif
-
-        int pvsSize = 0;
-        int nPvsSize = 0;
-        float samples = (float)viewCell->GetPvs().GetSamples();
-
-        Debug<<"f #s="<<samples<<"pvs size = "<<viewCell->GetPvs().GetSize();
-        //  cout<<"Filter size = "<<filterSize<<endl;
-        //  cout<<"vbox = "<<vbox<<endl;
-        //  cout<<"center = "<<center<<endl;
-
-
-        // Minimal number of local samples to take into account
-        // the local sampling density.
-        // The size of the filter is a minimum of the conservative
-        // local sampling density estimate (#rays intersecting teh viewcell and
-        // the object)
-        // and gobal estimate for the view cell
-        // (total #rays intersecting the viewcell)
-#define MIN_LOCAL_SAMPLES 5
-
-        float viewCellRadius = 0.5f*Magnitude(vbox.Diagonal());
-
-        // now compute the filter box around the current viewCell
-
-        if (useViewSpaceFilter) 
-        {
-                //      float radius = Max(viewCellRadius/100.0f, avgRadius - viewCellRadius);
-                float radius = viewCellRadius/100.0f;
-                vbox.Enlarge(radius);
-                cout<<"vbox = "<<vbox<<endl;
-                ViewCellContainer viewCells;
-                ComputeBoxIntersections(vbox, viewCells);
-                
-                MergeViewCellsEfficient(basePvs, viewCells);
-                cout << "basepvs size " << basePvs.GetSize() << endl;
-                // update samples and globalC
-                samples = (float)pvs.GetSamples();
-                //      cout<<"neighboring viewcells = "<<i-1<<endl;
-                //      cout<<"Samples' = "<<samples<<endl;
-        }
-        else
-        {
-                basePvs = viewCell->GetPvs();
-        }
-
-        // Minimal number of samples so that filtering takes place
-#define MIN_SAMPLES  100
-        if (samples > MIN_SAMPLES) 
-        {
-                float globalC = 2.0f*filterSize/sqrt(samples);
-
-                pit = basePvs.GetIterator();
-
-                ObjectContainer objects;
-
-                while (pit.HasMoreEntries())
-                {               
-                        ObjectPvsEntry entry = pit.Next();
-
-                        Intersectable *object = entry.mObject;
-                        // compute filter size based on the distance and the numebr of samples
-                        AxisAlignedBox3 box = object->GetBox();
-
-                        float distance = Distance(center, box.Center());
-                        float globalRadius = distance*globalC;
-
-                        int objectSamples = (int)entry.mData.mSumPdf;
-                        float localRadius = MAX_FLOAT;
-
-                        if (objectSamples > MIN_LOCAL_SAMPLES)
-                        {
-                                localRadius = filterSize*0.5f*Magnitude(box.Diagonal())/
-                                                                sqrt((float)objectSamples);
-                        }
-
-                        //      cout<<"lr="<<localRadius<<" gr="<<globalRadius<<endl;
-
-                        // now compute the filter size
-                        float radius;
-
-                        if (localRadius < globalRadius) 
-                        {
-                                radius = localRadius;
-                                stats.mLocalFilterCount++;
-                        } 
-                        else 
-                        {
-                                radius = globalRadius;
-                                stats.mGlobalFilterCount++;
-                        }
-
-                        stats.mAvgFilterRadius += radius;
-
-                        // cout<<"box = "<<box<<endl;
-                        //      cout<<"distance = "<<distance<<endl;
-                        //      cout<<"radiues = "<<radius<<endl;
-
-                        box.Enlarge(Vector3(radius));
-                        objects.clear();
-
-                        // $$ warning collect objects takes only unmailed ones!
-                        CollectObjects(box, objects);
-
-                        //      cout<<"collected objects="<<objects.size()<<endl;
-                        ObjectContainer::const_iterator noi = objects.begin();
-                        for (; noi != objects.end(); ++ noi) 
-                        {
-                                Intersectable *o = *noi;
-                                // $$ JB warning: pdfs are not correct at this point!     
-                                pvs.AddSampleDirty(o, Limits::Small);
-                        }
-                }
-
-                stats.mAvgFilterRadius /= (stats.mLocalFilterCount + stats.mGlobalFilterCount);
-        }
-
-        Debug<<" nPvs size = "<<pvs.GetSize()<<endl;
-
-#if !USE_KD_PVS
-        // copy the base pvs to the new pvs
-        pit = basePvs.GetIterator();
-        while (pit.HasMoreEntries()) 
-        {               
-                ObjectPvsEntry entry = pit.Next();
-                pvs.AddSampleDirty(entry.mObject, entry.mData.mSumPdf);
-        }
-#endif
-        viewCell->SetFilteredPvsSize(pvs.GetSize());
-
-        Intersectable::NewMail();
-        
-        return stats;
-}
-#endif
 
 
@@ -6043 +5849 @@
         
 
-#define PVS_ADD_DIRTY 1
-
-float
-VspOspViewCellsManager::ComputeSampleContribution(VssRay &ray,
-                                                                                                  const bool addRays,
-                                                                                                  const bool storeViewCells)
-{
-  ray.mPvsContribution = 0;
-  ray.mRelativePvsContribution = 0.0f;
-  
-  if (ray.mTerminationObject==NULL)
-        return 0.0f;
-  
-  ViewCellContainer viewcells;
-  
-  static Ray hray;
-  hray.Init(ray);
-
-  float tmin = 0, tmax = 1.0;
-  
-  if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
-        return 0;
-  
-  Vector3 origin = hray.Extrap(tmin);
-  Vector3 termination = hray.Extrap(tmax);
-  
-  ViewCell::NewMail();
-  
-  // traverse the view space subdivision
-  CastLineSegment(origin, termination, viewcells);
-  
-  if (storeViewCells)
-        {       
-          // copy viewcells memory efficiently
-          ray.mViewCells.reserve(viewcells.size());
-          ray.mViewCells = viewcells;
-        }
-  
-  ViewCellContainer::const_iterator it = viewcells.begin();
-  
-  Intersectable *terminationObj = GetIntersectable(ray, true);
-  
-#if SAMPLE_ORIGIN_OBJECTS
-  Intersectable *originObj = GetIntersectable(ray, false);
-#endif
-  
-  for (; it != viewcells.end(); ++ it) 
-        {
-          ViewCell *viewcell = *it;
-          
-          if (viewcell->GetValid())
-                {       // if ray not outside of view space
-                  float contribution;
-                  
-                  if (terminationObj) 
-                        {
-                          // todo: maybe not correct for kd node pvs
-                          if (viewcell->GetPvs().GetSampleContribution(
-                                                                                                                   terminationObj, ray.mPdf, contribution))
-                                {
-                                  ++ ray.mPvsContribution;
-                                }
-                          
-                          ray.mRelativePvsContribution += contribution;
-                        }
-                  
-                  ////////////////
-                  //-- for directional sampling it is important to count 
-                  //-- only contributions made in one direction!
-                  //-- the other contributions of this sample will be counted for the opposite ray!
-                  
-#if SAMPLE_ORIGIN_OBJECTS
-                  
-                  if (originObj && 
-                          viewcell->GetPvs().GetSampleContribution(originObj,
-                                                                                                           ray.mPdf,
-                                                                                                           contribution))
-                        {
-                          ++ ray.mPvsContribution;
-                          ray.mRelativePvsContribution += contribution;
-                        }
-#endif
-                }
-        }
-  
-  if (!addRays) {
-        return ray.mRelativePvsContribution;
-  }
-  
-  // sampled objects are stored in the pvs
-  for (it = viewcells.begin(); it != viewcells.end(); ++ it)  {
-        ViewCell *viewCell = *it;
-        
-        if (!viewCell->GetValid())
-          break;
-        
-        //$$JB hack
-        
-#if PVS_ADD_DIRTY
-        viewCell->GetPvs().AddSampleDirtyCheck(terminationObj, ray.mPdf);
-#else
-        viewCell->GetPvs().AddSample(terminationObj, ray.mPdf);
-#endif
-        
-#if SAMPLE_ORIGIN_OBJECTS
-#if PVS_ADD_DIRTY
-        viewCell->GetPvs().AddSampleDirtyCheck(originObj, ray.mPdf);
-#else
-        viewCell->GetPvs().AddSample(originObj, ray.mPdf);
-#endif
-#endif
-        if (viewCell->GetPvs().RequiresResort()) {
-          viewCell->GetPvs().Sort();                    
-        }
-  }
-  
-  return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
-        (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
-}
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

@@ -1128 +1128 @@
         /** Stores sample contribution for kd cells or objects.
         */
-        virtual float ComputeSampleContribution(VssRay &ray, 
-                                                                                        const bool addRays,
-                                                                                        const bool storeViewCells);
+  //    virtual float ComputeSampleContribution(VssRay &ray, 
+  //                                                                                    const bool addRays,
+  //                                                                                    const bool storeViewCells);
 
         ViewCellsManager *LoadViewCells(const string &filename, 

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -89 +89 @@
 
 RssPreprocessor {
+
+        distributions rss+spatial+object
+
         samplesPerPass 1000
         initialSamples 2000000
-        vssSamples 20000000
-        vssSamplesPerPass 3000000
+        vssSamples 50000000
+        vssSamplesPerPass 2000000
         useImportanceSampling true
 
@@ -102 +105 @@
                 rssTree false
                 rays true
-                numRays 10000
+                numRays 5000
         }
 
@@ -128 +131 @@
         maxCostRatio 1.0
         maxRayContribution 1.0
-        maxRays         10000000
+        maxRays         1000000
         maxTotalMemory  400
         maxStaticMemory 200
@@ -137 +140 @@
         hybridDepth             10
         splitUseOnlyDrivingAxis false
-#false
         importanceBasedCost false
 

GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

@@ -2 +2 @@
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter+"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter-"
 
 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d"