Changeset 1757

Timestamp:

11/15/06 14:56:00 (18 years ago)

Author:

bittner

Message:

pvs updates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (2 diffs)
• Environment.cpp (modified) (2 diffs)
• IntelRayCaster.cpp (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)
• Pvs.h (modified) (5 diffs)
• QtGlRenderer.cpp (modified) (10 diffs)
• QtGlRenderer.h (modified) (1 diff)
• RayCaster.cpp (modified) (5 diffs)
• RssTree.cpp (modified) (2 diffs)
• SamplingPreprocessor.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (7 diffs)
• common.h (modified) (1 diff)
• default.env (modified) (3 diffs)
• preprocessor.pro (modified) (6 diffs)
• run_test2 (modified) (4 diffs)

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

@@ -2424 +2424 @@
 
 
-void BvHierarchy::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
+void BvHierarchy::CollectObjects(const AxisAlignedBox3 &box,
+                                                                 ObjectContainer &objects)
 {
   stack<BvhNode *> nodeStack;
@@ -2430 +2431 @@
   nodeStack.push(mRoot);
 
-  while (!nodeStack.empty()) 
-        {
-          BvhNode *node = nodeStack.top();
+  while (!nodeStack.empty()) {
+        BvhNode *node = nodeStack.top();
+        
+        nodeStack.pop();
+        
+        if (node->IsLeaf()) {
+          BvhLeaf *leaf = (BvhLeaf *)node;
+          if (Overlap(box, leaf->GetBoundingBox())) {
+                Intersectable *object = GetOrCreateBvhIntersectable(leaf);
+                if (!object->Mailed()) {
+                  object->Mail();
+                  objects.push_back(object);
+                }
+          }
+        } 
+        else  {
+          BvhInterior *interior = (BvhInterior *)node;
           
-          nodeStack.pop();
+          if (Overlap(box, interior->GetBoundingBox()))
+                nodeStack.push(interior->GetFront());
           
-          if (node->IsLeaf()) 
-                {
-                  BvhLeaf *leaf = (BvhLeaf *)node;
-                  if (Overlap(box, leaf->GetBoundingBox())) {
-                        Intersectable *object = GetOrCreateBvhIntersectable(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()))
+                nodeStack.push(interior->GetBack());
+        }
+  }
+}
+
+}

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

@@ -1732 +1732 @@
         RegisterOption("Preprocessor.useGlRenderer",
                                         optBool,
-                                        "preprocessor_use_gl_renderer=",
+                                        "preprocessor_use_gl_renderer",
                                         "false");
 
         RegisterOption("Preprocessor.useGlDebugger",
                                         optBool,
-                                        "preprocessor_use_gl_debugger=",
+                                        "preprocessor_use_gl_debugger",
                                         "false");
 
@@ -2625 +2625 @@
     strcpy(filename, "default.env");
   }
+
   
   if (useExePath) {

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

@@ -6 +6 @@
 #include "ArchModeler2MLRT.hxx"
 
-#define DEBUG_RAYCAST 0
+#define DEBUG_RAYCAST 0 
 
 
@@ -131 +131 @@
 
         for (i=0; i < num; i++) {
-                mlrtaStoreRayAS16(&rays[index + i].mOrigin.x,
-                        &rays[index + i].mDirection.x,
-                        i);
-        }
+          mlrtaStoreRayAS16(&rays[index + i].mOrigin.x,
+                                                &rays[index + i].mDirection.x,
+                                                i);
+        }
+
+#if DEBUG_RAYCAST
+                Debug<<"TA\n"<<flush;
+#endif
 
         mlrtaTraverseGroupAS16(&min.x,
-                &max.x,
-                forward_hit_triangles,
-                forward_dist);
-
+                                                   &max.x,
+                                                   forward_hit_triangles,
+                                                   forward_dist);
+        
         if (castDoubleRay)
-        {
+          {
                 for (i=0; i < num; i++) 
-                {
+                  {
                         Vector3 dir = -rays[index + i].mDirection;
                         mlrtaStoreRayAS16(&rays[index+i].mOrigin.x,
-                                &dir.x,
-                                i);
-                }
+                                                          &dir.x,
+                                                          i);
+                  }
+
+#if DEBUG_RAYCAST
+                Debug<<"TB\n"<<flush;
+#endif
 
                 mlrtaTraverseGroupAS16(&min.x,
-                        &max.x,
-                        backward_hit_triangles,
-                        backward_dist);
-        }
+                                                           &max.x,
+                                                           backward_hit_triangles,
+                                                           backward_dist);
+          }
+
+#if DEBUG_RAYCAST
+        Debug<<"BBB\n"<<flush;
+#endif
 
         for (i=0; i < num; i++) 
-        {
+          {
                 Intersection hitA(rays[i].mOrigin), hitB(rays[i].mOrigin);
+
+#if DEBUG_RAYCAST
+          Debug<<"FH\n"<<flush;
+#endif
                 
                 if (forward_hit_triangles[i] != -1 ) {
-                        if (forward_hit_triangles[i] >= mPreprocessor.mFaceParents.size())
-                                cerr<<"Warning: triangle index out of range! "<<forward_hit_triangles[i]<<endl;
-                        else { 
-                                hitA.mObject = mPreprocessor.mFaceParents[forward_hit_triangles[i]].mObject;
-                                // Get the normal of that face
-                                hitA.mNormal = hitA.mObject->GetNormal(mPreprocessor.mFaceParents[forward_hit_triangles[i]].mFaceIndex);
-                                //-rays[index+i].mDirection; // $$ temporary
-                                hitA.mPoint = rays[index+i].Extrap(forward_dist[i]);
+                  if (forward_hit_triangles[i] >= mPreprocessor.mFaceParents.size())
+                        cerr<<"Warning: triangle index out of range! "<<forward_hit_triangles[i]<<endl;
+                  else { 
+                        hitA.mObject = mPreprocessor.mFaceParents[forward_hit_triangles[i]].mObject;
+                        // Get the normal of that face
+                        hitA.mNormal = hitA.mObject->GetNormal(mPreprocessor.mFaceParents[forward_hit_triangles[i]].mFaceIndex);
+                        //-rays[index+i].mDirection; // $$ temporary
+                        hitA.mPoint = rays[index+i].Extrap(forward_dist[i]);
                         }
+          }
+#if DEBUG_RAYCAST
+          Debug<<"BH\n"<<flush;
+#endif
+          
+          if (castDoubleRay && (backward_hit_triangles[i] != -1)) {
+                if (backward_hit_triangles[i] >= mPreprocessor.mFaceParents.size())
+                  cerr<<"Warning: triangle  index out of range! "<<backward_hit_triangles[i]<<endl;
+                else { 
+                  hitB.mObject = mPreprocessor.mFaceParents[backward_hit_triangles[i]].mObject;
+                  hitB.mNormal = hitB.mObject->GetNormal(mPreprocessor.mFaceParents[backward_hit_triangles[i]].mFaceIndex);
+                  
+                  // normalB = rays[index+i].mDirection; // $$ temporary
+                  hitB.mPoint = rays[index+i].Extrap(-backward_dist[i]);
                 }
-
-                if (castDoubleRay && (backward_hit_triangles[i] != -1)) {
-                        if (backward_hit_triangles[i] >= mPreprocessor.mFaceParents.size())
-                                cerr<<"Warning: triangle  index out of range! "<<backward_hit_triangles[i]<<endl;
-                        else { 
-                                hitB.mObject = mPreprocessor.mFaceParents[backward_hit_triangles[i]].mObject;
-                                hitB.mNormal = hitB.mObject->GetNormal(mPreprocessor.mFaceParents[forward_hit_triangles[i]].mFaceIndex);
-
-                                // normalB = rays[index+i].mDirection; // $$ temporary
-                                hitB.mPoint = rays[index+i].Extrap(-backward_dist[i]);
-                        }
-                }
-
-                ProcessRay(
-                        rays[index + i],
-                        hitA,
-                        hitB,
-                        vssRays,
-                        sbox,
-                        castDoubleRay,
-                        pruneInvalidRays
-                        );
-        }
-
+          }
+          
+#if DEBUG_RAYCAST
+          Debug<<"PR\n"<<flush;
+#endif
+          
+          ProcessRay(
+                                 rays[index + i],
+                                 hitA,
+                                 hitB,
+                                 vssRays,
+                                 sbox,
+                                 castDoubleRay,
+                                 pruneInvalidRays
+                                 );
+        }
+        
 #if DEBUG_RAYCAST
         Debug<<"C16F\n"<<flush;

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

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: po 13. XI 15:12:57 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: Tue Nov 14 23:59:07 2006
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
                 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \
                 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \

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

@@ -1059 +1059 @@
                                            )
 {
-        const long t1 = GetTime();
+  const long t1 = GetTime();
 
         for (int i = 0; i < (int)rays.size();)

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

@@ -159 +159 @@
 public:
 
-        Pvs(): mSamples(0), mEntries() {}
+        Pvs(): mSamples(0), mEntries(), mLastSorted(0) {}
 
         /** creates pvs and initializes it with the given entries. 
@@ -205 +205 @@
         */
         float AddSample(T sample, const float pdf);
-        
+
+  /** Adds sample to PVS without checking for presence of the sample
+          pvs remians unsorted!
+  */
+  void AddSampleDirty(T sample, const float pdf);
+
+  /** Sort pvs entries - this should always be called after a
+          sequence of AddSampleDirty calls */
+  void Sort();
+  
         /** Adds sample to PVS. Assumes that the pvs is sorted
                 @returns contribution of sample (0 or 1)
@@ -271 +280 @@
         /// Number of samples used to create the PVS
         int mSamples;
+  
+  /// Last sorted entry in the pvs (important for find and merge
+  int mLastSorted;
+  
 };
 
@@ -279 +292 @@
         mEntries.reserve(samples.size());
         mEntries = samples;
-}
-
+        mLastSorted = 0;
+}
+
+template <typename T, typename S>
+void Pvs<T, S>::Sort()
+{
+  std::vector<PvsEntry<T, S> >::iterator it = mEntries.begin();
+  it.inc(mLastSorted);
+  sort(it, mEntries.end());
+  mLastSorted = mEntries.size() - 1;
+}
 
 /**
@@ -500 +522 @@
 
 template <typename T, typename S>
+void Pvs<T, S>::AddSampleDirty(T sample, const float pdf)
+{
+  ++ mSamples;
+  mEntries.push_back(PvsEntry<T, S>(sample, pdf));
+}
+                                         
+
+template <typename T, typename S>
 typename vector< PvsEntry<T, S> >::iterator Pvs<T, S>::AddSample2(T sample, const float pdf)
 {

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

@@ -15 +15 @@
 #include "QtPreprocessorThread.h"
 
-
+#define USE_CG 1
+
+#ifdef USE_CG
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
+#endif
 
 #include <QVBoxLayout>
@@ -48 +51 @@
 }
 
-
+#if USE_CG
 static void handleCgError() 
 {
@@ -54 +57 @@
     exit(1);
 }
+#endif
 
 void
@@ -150 +154 @@
 QtGlRendererBuffer::~QtGlRendererBuffer()
 {
-        if (sCgFragmentProgram)
+#if USE_CG
+  if (sCgFragmentProgram)
                 cgDestroyProgram(sCgFragmentProgram);
         if (sCgContext)
                 cgDestroyContext(sCgContext);
+#endif
 }
 
@@ -604 +610 @@
         glEnable(GL_TEXTURE_2D);
         
+#if USE_CG
         // bind pixel shader implementing the front depth buffer functionality
         cgGLBindProgram(sCgFragmentProgram);
         cgGLEnableProfile(sCgFragmentProfile);
-
+#endif
 
         // 5. render all objects inside the beam 
@@ -752 +759 @@
         glEnable(GL_CULL_FACE);
         glDisable(GL_STENCIL_TEST);
+#if USE_CG
         cgGLDisableProfile(sCgFragmentProfile);
+#endif
         glDisable(GL_TEXTURE_2D);
 
@@ -822 +831 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
 
+#if USE_CG
         // cg initialization
         cgSetErrorCallback(handleCgError);
@@ -840 +850 @@
   }
 
-
  sCgFragmentProgram = cgCreateProgramFromFile(sCgContext,
                                                                                            CG_SOURCE, "../src/dual_depth.cg",
@@ -855 +864 @@
   Debug << "---- PROGRAM BEGIN ----\n" <<
           cgGetProgramString(sCgFragmentProgram, CG_COMPILED_PROGRAM) << "---- PROGRAM END ----\n";
+
+#endif
 
 #endif
@@ -1570 +1581 @@
           }
 
-          for (int i=0;  pow(10, i) < maxCost; i+=1) {
+          for (int i=0;  pow(10.0f, i) < maxCost; i+=1) {
                 float y = i*scaley;
                 //              QString s;

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

@@ -174 +174 @@
 struct PvsCache {
   PvsCache():mViewCell(NULL) {}
-  Reset() { mViewCell = NULL; mPvs.Clear(); }
+  void Reset() { mViewCell = NULL; mPvs.Clear(); }
   ViewCell *mViewCell;
   ObjectPvs mPvs;

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

@@ -88 +88 @@
 
 #if DEBUG_RAYCAST
-        Debug<<"PR ";
+        Debug<<"PRA"<<flush;
 #endif
         
@@ -101 +101 @@
         const bool validA = 
           ValidateRay(simpleRay.mOrigin, simpleRay.mDirection, box, hitA);
+
+#if DEBUG_RAYCAST
+        Debug<<"PR1"<<flush;
+#endif
         
         if (!validA && pruneInvalidRays)
@@ -116 +120 @@
 
         const bool validSample = !pruneInvalidRays || (hitA.mObject != hitB.mObject);
-        
+
+#if DEBUG_RAYCAST
+        Debug<<"PR2"<<flush;
+#endif
+
         if (validSample) 
         {
@@ -134 +142 @@
                   //cout << "vssray 1: " << *vssRay << " " << vssRay->mTermination - vssRay->mOrigin << endl;
                 }
-          
+
+#if DEBUG_RAYCAST
+        Debug<<"PR3"<<flush;
+#endif
+
           if (castDoubleRay && (!pruneInvalidRays || hitB.mObject))
                 {
@@ -151 +163 @@
                 }
         }
-        
+
+#if DEBUG_RAYCAST
+        Debug<<"PR4"<<flush;
+#endif
+
         return hits;
 }

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

@@ -2272 +2272 @@
   float density = 1.0f;
   float p = 1.0f/density; //(box.GetVolume()*dirBox.GetVolume())/i;
-  for (i=startIndex; i < rays.size(); i++) {
+  for (int i=startIndex; i < rays.size(); i++) {
         rays[i].mPdf = p;
   }
@@ -2461 +2461 @@
 
   float p = 1.0f/density; //(box.GetVolume()*dirBox.GetVolume())/i;
-  for (i=startIndex; i < rays.size(); i++) {
+  for (int i=startIndex; i < rays.size(); i++) {
         rays[i].mPdf = p;
   }

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

@@ -126 +126 @@
                 
           for (int j=0; j < vssRays.size(); j++) {
-                Intersectable *obj = mViewCellsManager->GetIntersectable(*(vssRays[j]), true);
+                Intersectable *obj = mViewCellsManager->GetIntersectable(*(vssRays[j]),
+                                                                                                                                 true);
                 if (obj) {
                   // if ray not outside of view space
@@ -148 +149 @@
         }
 
+#if 0
         Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
         mViewCellsManager->SetValidity(0, intersectables/2);
         Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
-
+#endif
+        
         //      mVssRays.PrintStatistics(mStats);
         mStats <<

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

@@ -1835 +1835 @@
           stat.avgPvs += pvsCost;
 
-          if (0) {
+          const bool evaluateFilter = true;
+          
+          if (evaluateFilter) {
                 ObjectPvs filteredPvs = viewcell->GetPvs();
                 ApplyFilter2(viewcell, false, 1.0f, filteredPvs);
@@ -1841 +1843 @@
                 stat.avgFilteredPvs += filteredCost;
                 stat.avgFilterContribution += filteredCost - pvsCost;
+          } else {
+                stat.avgFilteredPvs += pvsCost;
+                stat.avgFilterContribution += 0;
           }
           
@@ -2594 +2599 @@
   AxisAlignedBox3 vbox = GetViewCellBox(viewCell);
   Vector3 center = vbox.Center();
-  // first determine the average size of the filter
-
-  pvs = viewCell->GetPvs();
+  
+  // COpy the PVS
+  ObjectPvs basePvs = viewCell->GetPvs();
   Intersectable::NewMail();
-  
-  ObjectPvsIterator pit = pvs.GetIterator();
+
+  ObjectPvsIterator pit = basePvs.GetIterator();
 
   // first mark all object from this pvs
-  while (pit.HasMoreEntries())
-  {             
-          ObjectPvsEntry entry = pit.Next();
-
-          Intersectable *object = entry.mObject;
-          object->Mail();
+  while (pit.HasMoreEntries()) {                
+        ObjectPvsEntry entry = pit.Next();
+        
+        Intersectable *object = entry.mObject;
+        object->Mail();
   }
 
-  ObjectPvs nPvs;
+
   int pvsSize = 0;
   int nPvsSize = 0;
   float samples = (float)pvs.GetSamples();
-  cout<<"Samples = "<<samples<<endl;
-   cout<<"pvs size = "<<pvs.GetSize() <<endl;
+
+  //  cout<<"#s"<<samples<<endl;
+  //  cout<<"pvs size = "<<pvs.GetSize() <<endl;
   //  cout<<"Filter size = "<<filterSize<<endl;
   //  cout<<"vbox = "<<vbox<<endl;
@@ -2621 +2626 @@
 
 
+   // 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
 
-  // compute the average filter radius
   float globalC = 2.0f*filterSize/sqrt(samples);
-
-  float sumRadius = 0.0f;
-
-  ObjectPvsIterator pit2 = pvs.GetIterator();
-
-  // first mark all object from this pvs
-   for (; pit2.HasMoreEntries(); pvsSize++) {
-  ObjectPvsEntry entry = pit2.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 = 0.5f*Magnitude(box.Diagonal())/sqrt((float)objectSamples);
-        
-        // now compute the filter size
-        float radius = Min(localRadius, globalRadius);
-        
-        sumRadius +=radius;
-  }
-  
-  float avgRadius = sumRadius/pvsSize;
   float viewCellRadius = 0.5f*Magnitude(vbox.Diagonal());
-  cout<<"radius ratio = "<<avgRadius/viewCellRadius<<endl;
   
   // now compute the filter box around the current viewCell
-
+  
   if (useViewSpaceFilter) {
         //      float radius = Max(viewCellRadius/100.0f, avgRadius - viewCellRadius);
@@ -2666 +2648 @@
         ComputeBoxIntersections(vbox, viewCells);
         
-        //  cout<<"box="<<box<<endl;
-        ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();
-        
-        int i;
+        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;
-                  pvs.MergeInPlace((*it)->GetPvs());
+                basePvs.MergeInPlace((*it)->GetPvs());
           }
-
+        
         // update samples and globalC
         samples = (float)pvs.GetSamples();
         globalC = 2.0f*filterSize/sqrt(samples);
-        cout<<"neighboring viewcells = "<<i-1<<endl;
-        cout<<"Samples' = "<<samples<<endl;
+        //      cout<<"neighboring viewcells = "<<i-1<<endl;
+        //      cout<<"Samples' = "<<samples<<endl;
   }
   
-  pit = pvs.GetIterator();
-
-  // first mark all object from this pvs
+  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 = Min(localRadius, globalRadius);
-
-          // cout<<"box = "<<box<<endl;
-          //    cout<<"distance = "<<distance<<endl;
-          //    cout<<"radiues = "<<radius<<endl;
-
-          box.Enlarge(Vector3(radius));
-
-          
-          ObjectContainer objects;
-          // $$ 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!     
-                nPvs.AddSample(o, Limits::Small);
-                nPvsSize ++;
-          }
+        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 = Min(localRadius, globalRadius);
+        
+        // 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);
+        }
   }
-  cout<<"nPvs size = "<<nPvsSize<<endl;
-  
-  pvs.MergeInPlace(nPvs);
+
+  //  cout<<"nPvs size = "<<pvs.GetSize()<<endl;
+
+  // 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);
+  }
   
   Intersectable::NewMail();
@@ -3908 +3895 @@
                         exporter->ExportKdTree(*mKdTree);
 
-                        for (i = 0; i < pvsOut; i++)
+                        for (int i = 0; i < pvsOut; i++)
                                 exporter->ExportRays(rays[i], RgbColor(1, 0, 0));
 
@@ -3918 +3905 @@
                 {
                         Intersectable *object = objects[k];
-                        char str[64]; sprintf(str, "viewcell%04d.wrl", i);
+                        char str[64]; sprintf(str, "viewcell%04d.wrl", k);
 
                         Exporter *exporter = Exporter::GetExporter(str);

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

@@ -54 +54 @@
 #else // __WATCOMC__
 #define M_PI        3.14159265358979323846
-#define MAXFLOAT    3.40282347e+38F
+#define MAXFLOAT    3.40282347e+37F
 #endif // __WATCOMC__
 

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

@@ -75 +75 @@
 
 SamplingPreprocessor {
-        totalSamples 100000000
-        samplesPerPass 1000000
+        totalSamples 50000000
+        samplesPerPass 3000000
 }
 
@@ -82 +82 @@
         samplesPerPass 1000
         initialSamples 2000000
-        vssSamples 100000000
+        vssSamples 50000000
 #       vssSamples 1000000
         vssSamplesPerPass 3000000
@@ -289 +289 @@
 #       filename ../data/vienna/vsposp-seq-viewCells.xml.gz
 
-        filename ../data/vienna/vienna_cropped-gradient-2-viewcells.xml.gz
+        filename ../data/vienna/vienna_cropped-gradient-viewcells.xml.gz
 
 #       filename ../data/vienna/vienna_cropped-2-sequential-30000-viewcells.xml.gz

GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

@@ -1 @@
-CONFIG -= qt debug
-CONFIG  += console warn_off thread release mlrt qt
+CONFIG += qt release
+CONFIG += console warn_off thread mlrt qt
 
 TEMPLATE = app
-
 
 TARGET = preprocessor
@@ -20 +19 @@
 
 CONFIG(qt) {
-win32:INCLUDEPATH += "d:/Programs/NVIDIA Corporation/Cg/include"
+win32:INCLUDEPATH += "c:/Program Files/NVIDIA Corporation/Cg/include"
 }
 
@@ -32 +31 @@
 
 CONFIG(qt) {
-win32:LIBPATH += "d:/Programs/NVIDIA Corporation/Cg/lib"
-CONFIG(debug) {
-LIBPATH += QtRenderer/debug
-}
-
-CONFIG(release) {
-LIBPATH += QtRenderer/release
-}
+win32:LIBPATH += "c:/Program Files/NVIDIA Corporation/Cg/lib"
 }
 
@@ -47 +39 @@
 
 
-# RELEASE CONFIG
-#CONFIG         += windows warn_on thread release
 
 # DEPENDPATH    = ../../include
@@ -88 +78 @@
 CONFIG(qt) {
 win32:LIBS += cg.lib cgGL.lib
-#LIBS += QtRenderer.lib
 DEFINES += USE_QT
 }
@@ -116 +105 @@
 OspTree.cpp HierarchyManager.cpp ObjParser.cpp \
 BvHierarchy.cpp  \
-BoostPreprocessorThread.cpp InternalRayCaster.cpp IntelRayCaster.cpp \
+InternalRayCaster.cpp IntelRayCaster.cpp \
 RayCaster.cpp PreprocessorFactory.cpp GvsPreprocessor.cpp \
 Trackball.cpp ObjExporter.cpp SubdivisionCandidate.cpp
 
 
+SOURCES += BoostPreprocessorThread.cpp 
 
 CONFIG(qt) {
 HEADERS += QtPreprocessorThread.h QtGlRenderer.h
 SOURCES += OcclusionQuery.cpp QtPreprocessorThread.cpp QtGlRenderer.cpp
+} else {
+SOURCES += BoostPreprocessorThread.cpp 
 }
 

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+"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer-"
 
 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d"
@@ -27 +27 @@
 
 SCENE=../data/vienna/vienna_cropped.obj
-VIEWCELLS=../data/vienna/vienna_cropped-gradient-2-viewcells.xml.gz
+VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz
 
 PREFIX=../work/plots/osp-rss
@@ -37 +37 @@
 #mv stats.log $PREFIX-i-combined-b3.log
 
-# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -rss_use_importance+ -rss_update_subdivision+ -rss_split=regular \
-# -view_cells_filter_max_size=1
+#$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+#-rss_use_importance+ -rss_update_subdivision+ -rss_split=regular \
+#-view_cells_filter_max_size=1
  
-# mv stats.log $PREFIX-i-combined-update-ccb3.log 
+#mv stats.log $PREFIX-i-combined-update-ccb3.log 
 
 # $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
@@ -54 +54 @@
 
 
-# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -rss_use_importance+ -rss_update_subdivision+ -rss_split=hybrid -hybrid_depth=10 \
-# -view_cells_filter_max_size=1
-# mv stats.log $PREFIX-i-combined-update-ccb12.log 
+$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+ -rss_use_importance+ -rss_update_subdivision+ -rss_split=hybrid -hybrid_depth=10 \
+ -view_cells_filter_max_size=1
+ mv stats.log $PREFIX-i-combined-update-ccb12.log 
 
 
 
-# #######
-# #######
-# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -rss_use_importance- -rss_object_based_sampling- -rss_directional_sampling+ \
-# -view_cells_filter_max_size=1
-# mv stats.log $PREFIX-r-directional-based-b3.log
+#######
+#######
+$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+-rss_use_importance- -rss_object_based_sampling- -rss_directional_sampling+ \
+-view_cells_filter_max_size=1
+mv stats.log $PREFIX-r-directional-based-b3.log
 
 
-# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-# -rss_use_importance- -rss_object_based_sampling- -rss_directional_sampling- \
-# -view_cells_filter_max_size=1
-# mv stats.log $PREFIX-r-spatial-based-bb3.log
+$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+-rss_use_importance- -rss_object_based_sampling- -rss_directional_sampling- \
+-view_cells_filter_max_size=1
+mv stats.log $PREFIX-r-spatial-based-bb3.log
 
 
 
-#$COMMAND -scene_filename=$SCENE -rss_use_importance- -rss_object_based_sampling- -rss_directional_sampling+
-#mv stats.log $PREFIX-r-direction-based-b3.log
+$COMMAND -scene_filename=$SCENE -rss_use_importance- -rss_object_based_sampling- -rss_directional_sampling+
+mv stats.log $PREFIX-r-direction-based-b3.log