Changeset 2691 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

05/21/08 01:18:40 (17 years ago)

Author:

mattausch

Message:

fixed several errors

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• data/soda/soda.kdf (modified) (previous)
• scripts/run_demo_vienna (modified) (1 diff)
• scripts/run_gvs_vps.sh (modified) (1 diff)
• src/AxisAlignedBox3.cpp (modified) (1 diff)
• src/AxisAlignedBox3.h (modified) (1 diff)
• src/GvsPreprocessor.cpp (modified) (24 diffs)
• src/GvsPreprocessor.h (modified) (3 diffs)
• src/KdTree.cpp (modified) (3 diffs)
• src/KdTree.h (modified) (2 diffs)
• src/Mesh.h (modified) (1 diff)
• src/ObjParser.cpp (modified) (2 diffs)
• src/Preprocessor.cpp (modified) (1 diff)
• src/Preprocessor.h (modified) (1 diff)
• src/SamplingStrategy.cpp (modified) (3 diffs)
• src/SamplingStrategy.h (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_demo_vienna

@@ -25 +25 @@
 #PREFIX=../work/plots/atlanta2-rss9
 
-DISTRIBUTIONS=mutation+object_direction+spatial
+#DISTRIBUTIONS=mutation+object_direction+spatial
+DISTRIBUTIONS=object_direction
 #DISTRIBUTIONS=spatial
 

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_gvs_vps.sh

@@ -36 +36 @@
 -gvs_initial_samples=16 \
 -gvs_max_viewcells=1 \
--gvs_min_contribution=1500 \
+-gvs_min_contribution=3000 \
 -gvs_per_viewcell=true \
 -gvs_stats=$LOG_PREFIX-gvsStats.log \

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

@@ -2372 +2372 @@
 }
 
+
+void AxisAlignedBox3::GetRandomEdgePoint(Vector3 &point,
+                                                                                 Vector3 &normal)
+{
+        // get random edge
+        const int idx = Random(12); 
+        Vector3 a, b;
+        GetEdge(idx, &a, &b);
+        
+        const float w = RandomValue(0.0f, 1.0f);
+
+        point = a * w + b * (1.0f - w);
+
+        // TODO
+        normal = Vector3(0);
+}
+
+
 Vector3
 AxisAlignedBox3::GetUniformRandomSurfacePoint() const

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

@@ -200 +200 @@
   Vector3 GetRandomSurfacePoint() const;
   Vector3 GetUniformRandomSurfacePoint() const;
+
+  void GetRandomEdgePoint(Vector3 &point, Vector3 &normal);
 
   Vector3 GetPoint(const Vector3 &p) const {

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

@@ -45 +45 @@
 GvsPreprocessor::GvsPreprocessor(): 
 Preprocessor(), 
-mSamplingType(SamplingStrategy::VIEWCELL_BASED_DISTRIBUTION),
 mProcessedViewCells(0),
 mCurrentViewCell(NULL),
-mCurrentViewPoint(Vector3(0.0f, 0.0f, 0.0f))
+mCurrentViewPoint(Vector3(0.0f, 0.0f, 0.0f)),
+mOnlyRandomSampling(false)
+//mOnlyRandomSampling(true)
 {
         Environment::GetSingleton()->GetIntValue("GvsPreprocessor.totalSamples", mTotalSamples);
@@ -70 +71 @@
         cout << "number of gvs samples per pass: " << mGvsSamplesPerPass << endl;
         cout << "number of samples per pass: " << mSamplesPerPass << endl;
+        cout << "only random sampling: " << mOnlyRandomSampling << endl;
 
         Debug << "Gvs preprocessor options" << endl;
@@ -81 +83 @@
         Debug << "min contribution: " << mMinContribution << endl;
 
-        if (1)
-                mOnlyRandomSampling = false;            
-        else
-                mOnlyRandomSampling = true;
+        mDistribution = new ViewCellBasedDistribution(*this, NULL);
 
         mGvsStats.Reset();
@@ -90 +89 @@
         // hack: some generic statistical values that can be read
         // by an application using the preprocessor
-        mGenericStats = 0;
-        mGenericStats2 = 0;
+        for (int i = 0; i < 2; ++ i)
+                mGenericStats[i] = 0;
 }
 
@@ -97 +96 @@
 GvsPreprocessor::~GvsPreprocessor()
 {
+        delete mDistribution;
         ClearRayQueue();
 }
@@ -177 +177 @@
         {
                 ++ triObj->mCounter;
-                ++ mGenericStats2;
+                ++ mGenericStats[1];
         }
 }
@@ -221 +221 @@
 
                 // counter < 2 => not accounted for yet
-                        // test of triangle was accounted for yet
-                if (result = AddTriangleObject(obj))
+                // test of triangle was accounted for yet
+                result = AddTriangleObject(obj);
+                
+                if (mUseKdPvs && (1 || result))
                 {
                         // exchange the triangle with the node in the pvs for kd pvs
-                        if (mUseKdPvs)
+                        KdNode *node = mKdTree->GetPvsNode(ray.mTermination);
+
+                        //KdNode *node = mKdTree->GetPvsNodeCheck(ray.mTermination, obj);
+                        //if (!node) cerr << "e: " << obj->GetBox() << " " << ray.mTermination << endl; else 
+                        if (!node->Mailed())
                         {
-                                KdNode *node = mKdTree->GetPvsNode(ray.mTermination);
-
-                                if (!node->Mailed())
-                                {
-                                        // add to pvs
-                                        node->Mail();
-                                        KdIntersectable *kdInt = mKdTree->GetOrCreateKdIntersectable(node);
-                                        mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
-                                
-                                        if (SHOW_QT_VISUALIZATION) UpdateStatsForVisualization(kdInt);  
-                                }
+                                //cout<<"o";
+                                // add to pvs
+                                node->Mail();
+                                KdIntersectable *kdInt = mKdTree->GetOrCreateKdIntersectable(node);
+                                mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
+
+                                if (SHOW_QT_VISUALIZATION) UpdateStatsForVisualization(kdInt);  
                         }
-
-                        result = true;
-                }
-                else
-                {
-                        result = false;
                 }
         }
@@ -257 +253 @@
                 return false;
 
-//      cout << "t";
         if (0 && GVS_DEBUG)
                 mVssRays.push_back(new VssRay(*vssRay));
@@ -441 +436 @@
         //const int numRandomRays = 0;
         const int numRandomRays = 16 - (int)simpleRays.size();
-        ViewCellBasedDistribution vcStrat(*this, mCurrentViewCell);
-
-        GenerateRays(numRandomRays, vcStrat, simpleRays);
+
+        GenerateRays(numRandomRays, *mDistribution, simpleRays);
 
 
@@ -607 +601 @@
 
 
-int GvsPreprocessor::CastInitialSamples(const int numSamples, 
-                                                                                const int sampleType)
+int GvsPreprocessor::CastInitialSamples(int numSamples)
 {       
         const long startTime = GetTime();
@@ -615 +608 @@
         SimpleRayContainer simpleRays;
         
-        ViewCellBasedDistribution vcStrat(*this, mCurrentViewCell);
-    GenerateRays(numSamples, vcStrat, simpleRays);
+        ViewCellBorderBasedDistribution vcStrat(*this, mCurrentViewCell);
+    GenerateRays(numSamples, *mDistribution, simpleRays);
 
         //cout << "sr: " << simpleRays.size() << endl;
@@ -880 +873 @@
 }
 
-#if 1
+
 void GvsPreprocessor::IntersectWithViewCell()
 {
-        mCurrentViewCell->GetMesh()->ComputeBoundingBox();
-        AxisAlignedBox3 box = mCurrentViewCell->GetMesh()->mBox;
-        
+        AxisAlignedBox3 box = mCurrentViewCell->GetBox();
+
+        int oldTrianglePvs = (int)mTrianglePvs.size();
+        int newKdObj = 0;
+
+        // compute pvs kd nodes that intersect view cell
         ObjectContainer kdobjects;
+
+        // find intersecting objects not in pvs (i.e., only unmailed)
         mKdTree->CollectKdObjects(box, kdobjects);
 
+        ObjectContainer pvsKdObjects;
+
         ObjectContainer::const_iterator oit, oit_end = kdobjects.end();
 
         for (oit = kdobjects.begin(); oit != oit_end; ++ oit)
         {
-        // add to kdnode pvs
-                KdIntersectable *kdInt = static_cast<KdIntersectable *>(*oit);
-                
-                mCurrentViewCell->GetPvs().AddSampleDirtyCheck(kdInt, 1.0f);
-                //if (SHOW_QT_VISUALIZATION) mViewCellsManager->UpdateStatsForViewCell(mCurrentViewCell, kdInt);
-
+        KdIntersectable *kdInt = static_cast<KdIntersectable *>(*oit);
+        
                 myobjects.clear();
-                mKdTree->CollectObjects(kdInt->GetItem(), myobjects);
+                mKdTree->CollectObjectsWithDublicates(kdInt->GetItem(), myobjects);
 
                 // account for kd object pvs
+                bool addkdobj = false;
+
                 ObjectContainer::const_iterator oit, oit_end = myobjects.end();
 
@@ -908 +906 @@
                 {
                         TriangleIntersectable *triObj = static_cast<TriangleIntersectable *>(*oit);
-            
-                        CountObject(triObj);
-            
-                        // the triangle itself intersects
+             
+                        // test if the triangle itself intersects
                         if (box.Intersects(triObj->GetItem()))
-                        {
-                                if ((triObj->mCounter < ACCOUNTED_OBJECT))
-                                {
-                                        triObj->mCounter += ACCOUNTED_OBJECT;
-
-                                        mTrianglePvs.push_back(triObj);
-                                        mGenericStats = (int)mTrianglePvs.size();
-                                }
-                        }                       
-                }
-        }
-        cout << "added " << mTrianglePvs.size() << " triangles (" << mCurrentViewCell->GetPvs().GetSize() << " objects) by intersection" << endl;
-
-}
-
-#else
-
-void GvsPreprocessor::IntersectWithViewCell()
-{
-        //Intersectable::NewMail();
-        mCurrentViewCell->GetMesh()->ComputeBoundingBox();
-        AxisAlignedBox3 box = mCurrentViewCell->GetMesh()->mBox;
-
-        // compute pvs kd nodes that intersect view cell
-        ObjectContainer kdobjects;
-        mKdTree->CollectKdObjects(box, kdobjects);
-
-        ObjectContainer pvsKdObjects;
-
-        ObjectContainer::const_iterator oit, oit_end = kdobjects.end();
-
-        for (oit = kdobjects.begin(); oit != oit_end; ++ oit)
-        {
-        KdIntersectable *kdInt = static_cast<KdIntersectable *>(*oit);
-        
-                myobjects.clear();
-                mKdTree->CollectObjects(kdInt->GetItem(), myobjects);
-
-                // account for kd object pvs
-                bool addkdobj = false;
-
-                ObjectContainer::const_iterator oit, oit_end = myobjects.end();
-
-                for (oit = myobjects.begin(); oit != oit_end; ++ oit)
-                {
-                        TriangleIntersectable *triObj = static_cast<TriangleIntersectable *>(*oit);
-                        // the triangle itself intersects => add object
-                        if (box.Intersects(triObj->GetItem()))
-                        {
-                                if ((triObj->mCounter < ACCOUNTED_OBJECT))
-                                {
-                                        triObj->mCounter += ACCOUNTED_OBJECT;
-
-                                        mTrianglePvs.push_back(triObj);
-                                        mGenericStats = (int)mTrianglePvs.size();
-
-                                        addkdobj = true;
-                                }
-                        }
+                                addkdobj = AddTriangleObject(triObj);
                 }
                 
-                // add node to object pvs
-                if (addkdobj)
-                        pvsKdObjects.push_back(kdInt);
-        }
-
-        // new mail because objects were mailed for kd tree search
-        KdNode::NewMail();
-
-        // now actually ADD new objects to object pvs
-        oit_end = pvsKdObjects.end();
-
-        for (oit = pvsKdObjects.begin(); oit != oit_end; ++ oit)
-        {
-        KdIntersectable *kdInt = static_cast<KdIntersectable *>(*oit);
-        
-                kdInt->Mail();
-
-                mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
-                if (SHOW_QT_VISUALIZATION) UpdateStatsForVisualization(kdInt);  
-        }
-
-        cout << "added " << mTrianglePvs.size() << " triangles (" << (int)pvsKdObjects.size() << " objects) by intersection" << endl;
-}
-#endif
+                // add node to kd pvs
+                if (1 && addkdobj)
+                {
+                        ++ newKdObj;
+                        mCurrentViewCell->GetPvs().AddSampleDirty(kdInt, 1.0f);
+                        //mCurrentViewCell->GetPvs().AddSampleDirtyCheck(kdInt, 1.0f);
+                        if (SHOW_QT_VISUALIZATION) UpdateStatsForVisualization(kdInt);
+                }
+        }
+
+        cout << "added " << (int)mTrianglePvs.size() - oldTrianglePvs << " triangles (" << newKdObj << " objects) by intersection" << endl;
+}
+
 
 void GvsPreprocessor::PerViewCellComputation()
@@ -1009 +936 @@
                         (*oit)->mCounter = NOT_ACCOUNTED_OBJECT;
 
+                mDistribution->SetViewCell(mCurrentViewCell);
         ComputeViewCell();
         }
@@ -1114 +1042 @@
         {
                 mRayCaster->InitPass();
+
                 // Ray queue empty => 
                 // cast a number of uniform samples to fill ray queue
-                int newSamples = CastInitialSamples(mInitialSamples, mSamplingType);
+                int newSamples = CastInitialSamples(mInitialSamples);
 
                 if (!mOnlyRandomSampling)
@@ -1286 +1215 @@
 void GvsPreprocessor::ComputeViewCell()
 {
+        mCurrentViewCell->GetMesh()->ComputeBoundingBox();
+
         KdNode::NewMail();
 
@@ -1293 +1224 @@
                 << "computing view cell " << mProcessedViewCells 
                 << " (id: " << mCurrentViewCell->GetId() << ")" << endl;
-
-        // compute the pvs of the current view cell
-        // compute object that directly intersect view cell
-        //IntersectWithViewCell();
+        cout << "bb: " << mCurrentViewCell->GetBox() << endl;
 
         mGvsStats.mPerViewCellSamples = 0;
@@ -1303 +1231 @@
         int passSamples = 0;
 
-        mGenericStats = 0;
-        mGenericStats2 = 0;
+        for (int i = 0; i < 0; ++ i)
+                mGenericStats[i] = 0;
 
         while (1)
         {
-                int oldPvsSize = 0;//mCurrentViewCell->GetPvs().GetSize();
+                int oldPvsSize = mCurrentViewCell->GetPvs().GetSize();
 
                 mRayCaster->InitPass();
@@ -1314 +1242 @@
                 // Ray queue empty => 
                 // cast a number of uniform samples to fill ray queue
-                int newSamples = CastInitialSamples(mInitialSamples, mSamplingType);
+                int newSamples = CastInitialSamples(mInitialSamples);
 
                 if (!mOnlyRandomSampling)
@@ -1330 +1258 @@
                         if (GVS_DEBUG) VisualizeViewCell(mTrianglePvs);
 
+                        //const bool convertPerPass = true;
                         const bool convertPerPass = false;
 
@@ -1364 +1293 @@
         }
         
-        // finally add objects that directly intersect the view cell
-        //IntersectWithViewCell();
+        // at last compute objects that directly intersect view cell
+        IntersectWithViewCell();
 
                 
@@ -1407 +1336 @@
                 mGvsStats.mPvsCost = 0; // todo objectPvs.EvalPvsCost();
         }
-        else
-        {
+        else if (0)
+        {
+                //KdNode::NewMail();
+
+                // compute pvs kd nodes that intersect view cell
+                ObjectContainer mykdobjects;
+
+                // extract kd pvs
+                ObjectContainer::const_iterator it, it_end = mTrianglePvs.end();
+
+                for (it = mTrianglePvs.begin(); it != it_end; ++ it)
+                {
+                        Intersectable *obj = *it;
+                        // find intersecting objects not yet in pvs (i.e., only unmailed)
+                        mKdTree->CollectKdObjects(obj->GetBox(), mykdobjects);
+                }
+
+                // add pvs
+                it_end = mykdobjects.end();
+
+                for (it = mykdobjects.begin(); it != it_end; ++ it)
+                {
+                        mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
+                }
+
+                cout << "added " << (int)mykdobjects.size() << " new objects " << endl;
+
                 mGvsStats.mPerViewCellPvs = mCurrentViewCell->GetPvs().GetSize();
                 mGvsStats.mPvsCost = mCurrentViewCell->GetPvs().EvalPvsCost();
@@ -1471 +1425 @@
 
                 mTrianglePvs.push_back(triObj);
-                mGenericStats = (int)mTrianglePvs.size();
+                mGenericStats[0] = (int)mTrianglePvs.size();
                 return true;
         }
@@ -1478 +1432 @@
 }
 
-}
+
+
+}

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

@@ -13 +13 @@
 class TriangleIntersectable;
 class KdIntersectable;
-
+class ViewCellBasedDistribution;
 
 /** View space partition statistics.
@@ -128 +128 @@
         /** Generates the rays starting the adaptive visibility sampling process.
         */
-        int CastInitialSamples(const int numSamples, const int sampleType);
+        int CastInitialSamples(int numSamples);
 
         /** Uses the information gained from the ray for doing adaptive border sampling.
@@ -256 +256 @@
 
         RayQueue mRayQueue; 
-        int mSamplingType;
+        ViewCellBasedDistribution *mDistribution;
 
         //AxisAlignedBox3 mViewSpaceBox;

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

@@ -1077 +1077 @@
       KdInterior *interior = (KdInterior *)node;
           
-      if ( box.Max()[interior->mAxis] > interior->mPosition )
+      if ( box.Max()[interior->mAxis] >= interior->mPosition )
         nodeStack.push(interior->mFront);
       
-      if (box.Min()[interior->mAxis] < interior->mPosition)
+      if (box.Min()[interior->mAxis] <= interior->mPosition)
         nodeStack.push(interior->mBack);
     }
@@ -1155 +1155 @@
 
 
-void KdTree::CollectObjectsWithDublicates(KdNode *n, ObjectContainer &objects)
+void KdTree::CollectObjectsWithDublicates(KdNode *n, ObjectContainer &objects) const
 {
         stack<KdNode *> nodeStack;
@@ -1778 +1778 @@
 }
 
+
+KdNode *
+KdTree::GetPvsNodeCheck(const Vector3 &point, Intersectable *obj) const
+{
+  KdNode *node = mRoot;
+  
+  while (node->mPvsTermination == 0 ) {
+    KdInterior *inter = (KdInterior *)node;
+    if (point[inter->mAxis] < inter->mPosition)
+      node = inter->mBack;
+    else
+      node = inter->mFront;
+  }
+  
+  ObjectContainer objects;
+  CollectObjectsWithDublicates(node, objects);
+
+  ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+  bool found = false;
+  for (oit = objects.begin(); oit != oit_end; ++ oit)
+  {
+          if ((*oit)->GetId() == obj->GetId())
+                  found = true;
+  }
+
+  if (!found) return NULL;
+
+  return node;
+}
+
 KdNode *
 KdTree::GetNode(const Vector3 &point,

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

@@ -386 +386 @@
   GetPvsNode(const Vector3 &point) const;
   
+ KdNode *
+  GetPvsNodeCheck(const Vector3 &point, Intersectable *obj) const;
 
   void
@@ -406 +408 @@
   /** Collects objects with dublicates (no mailing going on)
   */
-  void CollectObjectsWithDublicates(KdNode *n, ObjectContainer &objects);
+  void CollectObjectsWithDublicates(KdNode *n, ObjectContainer &objects) const;
   void CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects);
 

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

@@ -241 +241 @@
 
         virtual int CastRay(Ray &ray);
-        virtual int CastSimpleRay(const SimpleRay &ray) { return 0;}
-        virtual int CastSimpleRay(const SimpleRay &ray, int IndexRay)
-        { return 0; }
+        virtual int CastSimpleRay(const SimpleRay &ray) { return 0;}
+        virtual int CastSimpleRay(const SimpleRay &ray, int IndexRay)
+        { return 0; }
 
         virtual bool IsConvex() const { return mMesh->mIsConvex; }

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

@@ -296 +296 @@
                                         for (tit = triangles.begin(); tit != tit_end; ++ tit)
                                         {
-                                          // test if the triangle is valid (i.e., not degenerated)
-                                          if (!TriangleValid(*tit))
-                                                  continue;
-
-                                          TriangleIntersectable *obj = new TriangleIntersectable(*tit); 
-                                          root->mGeometry.push_back(obj);
+                                                // test if the triangle is valid (i.e., not degenerated)
+                                                // matt: removed this option so tris can be mapped to intel
+                                                if (0 && !TriangleValid(*tit))
+                                                        continue;
+                                                
+                                                TriangleIntersectable *obj = new TriangleIntersectable(*tit);
+                                                root->mGeometry.push_back(obj);
                                         }
                                 }
@@ -311 +312 @@
         }
 
-        //cout << "\n**** " << root->mGeometry.size() << " " << " lines: " << line << endl;
+        cout << "\n*********\n***** " << root->mGeometry.size() << " " << " lines: " << line << endl;
         if (loadMeshes)
         {

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

@@ -1016 +1016 @@
         case SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION:
                 return new ReverseObjectBasedDistribution(*this);
-        case SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION:
-                return new ViewCellBorderBasedDistribution(*this);
-        case SamplingStrategy::VIEWSPACE_BORDER_BASED_DISTRIBUTION:
-                return new ViewSpaceBorderBasedDistribution(*this);
+        //case SamplingStrategy::VIEWCELL_BORDER_BASED_DISTRIBUTION:
+        //      return new ViewCellBorderBasedDistribution(*this);
         case SamplingStrategy::REVERSE_VIEWSPACE_BORDER_BASED_DISTRIBUTION:
                 return new ReverseViewSpaceBorderBasedDistribution(*this);

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

@@ -273 +273 @@
         RayCaster *mRayCaster;
 
-        int mGenericStats;
-        int mGenericStats2;
+        int mGenericStats[2];
 
         void ScheduleUpdateDynamicObjects();

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

@@ -296 +296 @@
         Vector3 origin, direction; 
 
-        ViewCellContainer &viewCells = mPreprocessor.mViewCellsManager->GetViewCells();
+        //ViewCellContainer &viewCells = mPreprocessor.mViewCellsManager->GetViewCells();
 
         Vector3 point;
         Vector3 normal, normal2;
         
-        const int vcIdx = (int)RandomValue(0, (float)viewCells.size() - 0.5f);
+        //const int vcIdx = (int)RandomValue(0, (float)viewCells.size() - 0.5f);
         const int objIdx = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
 
         Intersectable *object = mPreprocessor.mObjects[objIdx];
-        ViewCell *viewCell = viewCells[vcIdx];
+        ViewCell *viewCell = mViewCell;//viewCells[vcIdx];
 
         object->GetRandomSurfacePoint(point, normal);
@@ -843 +843 @@
         Vector3 origin, direction; 
 
-        ViewCellContainer &viewCells = 
-                mPreprocessor.mViewCellsManager->GetViewCells();
-
         Vector3 point;
         Vector3 normal;
                 
-        //Vector normalObj;
-        // float r[1];
-        // sHalton.GetNext(1, r);
-        // const int objIdx = (int)(r[0] * (float)mPreprocessor.mObjects.size() - 1.0f);
-        // Intersectable *object = mPreprocessor.mObjects[objIdx];
-        // object->GetRandomSurfacePoint(point, normal);
-        // cout << "obj: " << objIdx << endl;
-
         float r[2];
+        //for (int i=0; i < 2; i++)
+        // r[i] = RandomValue(0, 1);
+
         sHalton.GetNext(2, r);
 
@@ -869 +861 @@
 
         // get point on view cell surface
-        mViewCell->GetRandomSurfacePoint(origin, normal);
+        if (0)
+        {
+                //mViewCell->GetRandomEdgePoint(origin, normal);
+                mViewCell->GetRandomSurfacePoint(origin, normal);
+
+                // move a little bit back to avoid piercing through walls
+                // that bound the view cell
+                if (0) origin -= 0.01f * normal;
+        }
+        else
+                origin = mViewCell->GetBox().GetUniformRandomSurfacePoint();
 
         //direction = point - origin;
-
-        // move a little bit back to avoid piercing through walls
-        // that bound the view cell
-        origin -= 0.01f * normal;
 
         // $$ jb the pdf is yet not correct for all sampling methods!

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

@@ -194 +194 @@
  public:
          ViewSpaceBorderBasedDistribution(Preprocessor &preprocessor):
-           SamplingStrategy(preprocessor){
+           SamplingStrategy(preprocessor)
+           {
            mType = VIEWSPACE_BORDER_BASED_DISTRIBUTION;
          }
@@ -220 +221 @@
 {
  public:
-  ViewCellBorderBasedDistribution(Preprocessor &preprocessor):
-        SamplingStrategy(preprocessor) {
-        mType = VIEWCELL_BORDER_BASED_DISTRIBUTION;
-
-  }
+         ViewCellBorderBasedDistribution(Preprocessor &preprocessor, ViewCell *viewCell)
+                 : SamplingStrategy(preprocessor), mViewCell(viewCell)
+         {
+                 mType = VIEWCELL_BORDER_BASED_DISTRIBUTION;
+         }
 
 private:
   virtual bool GenerateSample(SimpleRay &ray);
+
+  ViewCell *mViewCell;
 };
 
@@ -268 +271 @@
         }
 
-private:
-
-  virtual bool GenerateSample(SimpleRay &ray);
+        void SetViewCell(ViewCell *vc) { mViewCell = vc; }
+
+private:
+
+        virtual bool GenerateSample(SimpleRay &ray);
 
         ViewCell *mViewCell;