Changeset 1563 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

10/03/06 22:03:58 (18 years ago)

Author:

mattausch

Message:

fixed bug with view space box

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (5 diffs)
• GvsPreprocessor.cpp (modified) (4 diffs)
• GvsPreprocessor.h (modified) (1 diff)
• GzBinFileInputStream.h (modified) (1 diff)
• HierarchyManager.cpp (modified) (3 diffs)
• HierarchyManager.h (modified) (1 diff)
• Preprocessor.cpp (modified) (4 diffs)
• Preprocessor.h (modified) (1 diff)
• RssPreprocessor.cpp (modified) (4 diffs)
• RssPreprocessor.h (modified) (1 diff)
• RssTree.cpp (modified) (2 diffs)
• SamplingPreprocessor.cpp (modified) (2 diffs)
• ViewCellBsp.cpp (modified) (7 diffs)
• ViewCellBsp.h (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (25 diffs)
• ViewCellsParser.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (27 diffs)
• VspBspTree.h (modified) (2 diffs)
• VssPreprocessor.cpp (modified) (4 diffs)
• VssPreprocessor.h (modified) (1 diff)

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

@@ -892 +892 @@
         int nObjectsLeft = 0;
         const int nTotalObjects = (int)tData.mNode->mObjects.size();
-        const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
+        const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
 
         SortableEntryContainer::const_iterator backObjectsStart = mSubdivisionCandidates->begin();
@@ -1294 +1294 @@
                 const float area = box.SurfaceArea();
 
-                return (float)objects.size() * area / mHierarchyManager->GetViewSpaceBox().SurfaceArea();
+                return (float)objects.size() * area / mViewCellsManager->GetViewSpaceBox().SurfaceArea();
         }
         else
@@ -1300 +1300 @@
                 //-- render cost heuristics
 
-                const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
+                const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
                 // probability that view point lies in a view cell which sees this node
                 const float p = EvalViewCellsVolume(objects) / viewSpaceVol;    
@@ -1712 +1712 @@
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
-        const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
+        const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
         mTotalCost = (float)objects.size() * prop / viewSpaceVol;
 
@@ -1822 +1822 @@
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
-        const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
+        const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
         mTotalCost = (float)objects.size() * prop / viewSpaceVol;
 

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

@@ -184 +184 @@
                 SimpleRay sray(oldRay.mOrigin, p - oldRay.mOrigin);
         
-                VssRay *newRay = mRayCaster->CastRay(sray, mViewSpaceBox, false);
+                VssRay *newRay = mRayCaster->CastRay(sray, mViewCellsManager->GetViewSpaceBox(), false);
                 //cout << "\np1: " << p1 << "\np : " <<  p << "\np2: " << p2 << endl;
                 if (!newRay) return 0;
@@ -293 +293 @@
                                                                                  const VssRay &oldRay)
 {
-        cout << "r";
         ++ mReverseSamples;
 
@@ -393 +392 @@
         const long startTime = GetTime();
 
-        mViewSpaceBox = mKdTree->GetBox();
         Randomize(0);
         
@@ -406 +404 @@
 
         if (!mLoadViewCells)
-        {       /// construct the view cells from the scratch
-                ConstructViewCells(mViewSpaceBox);
-                cout << "view cells loaded" << endl;
+        {       
+                /// construct the view cells from the scratch
+                ConstructViewCells();
+                cout << "finished view cell construction" << endl;
         }
         else if (1)
-        {        cout << "here2255566" << endl; 
+        {       
                 //-- load view cells from file
                 //-- test successful view cells loading by exporting them again
                 VssRayContainer dummies;
                 mViewCellsManager->Visualize(mObjects, dummies);
-                mViewCellsManager->ExportViewCells("test.xml.zip", mViewCellsManager->GetExportPvs(), mObjects);
+                mViewCellsManager->ExportViewCells("test.xml.gz", mViewCellsManager->GetExportPvs(), mObjects);
         }
 

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

@@ -128 +128 @@
         int mSamplingType;
 
-        AxisAlignedBox3 mViewSpaceBox;
+        //AxisAlignedBox3 mViewSpaceBox;
         float mEps;
         float mThreshold;

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

@@ -134 +134 @@
 inline bool GzBinFileInputStream::getIsOpen() const
 {
-        return bool (mStream.is_open());//(fSource != 0);
+        return mStream.is_open() != 0;//(fSource != 0);
 }
 

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

@@ -163 +163 @@
 }
 
-
+/*
 AxisAlignedBox3 HierarchyManager::GetViewSpaceBox() const
 {
         return mVspTree->mBoundingBox;
-}
+}*/
 
 
@@ -312 +312 @@
         cout << "\nfinished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
-#if _DEBUG
+/*#if _DEBUG
         cout << "view space: " << GetViewSpaceBox() << endl;
         cout << "object space:  " << GetObjectSpaceBox() << endl;
-#endif
+#endif*/
 
         mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
@@ -709 +709 @@
         cout << "\nfinished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
-#if _DEBUG
+/*#if _DEBUG
         cout << "view space: " << GetViewSpaceBox() << endl;
         cout << "object space:  " << GetObjectSpaceBox() << endl;
-#endif
+#endif*/
 
         mHierarchyStats.Stop();

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

@@ -195 +195 @@
         /** Returns view space bounding box.
         */
-        AxisAlignedBox3 GetViewSpaceBox() const;
+        //AxisAlignedBox3 GetViewSpaceBox() const;
         /** Returns object space bounding box.
         */

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

@@ -422 +422 @@
         ///////
         //-- parse view cells construction method
+
         Environment::GetSingleton()->GetBoolValue("ViewCells.loadFromFile", mLoadViewCells);
         char buf[100];
@@ -429 +430 @@
                 Environment::GetSingleton()->GetStringValue("ViewCells.filename", buf);
                 cout << "loading view cells from " << buf << endl;
+                
                 mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, true);
+
                 if (!mViewCellsManager)
                         return false;
@@ -440 +443 @@
 
                 // default view space is the extent of the scene
-                mViewCellsManager->SetViewSpaceBox(mSceneGraph->GetBox());
-
+                AxisAlignedBox3 box = mSceneGraph->GetBox();
+                                        
+                if (0)
+                {
+                        // use a small box outside of the scene
+                        box.Scale(Vector3(0.1f,0.5f,0.5f));
+                        box.Translate(Vector3(Magnitude(mSceneGraph->GetBox().Size())*0.5f, 0, 0));
+                }
+
+                mViewCellsManager->SetViewSpaceBox(box);
+         
                 bool loadVcGeometry;
                 Environment::GetSingleton()->GetBoolValue("ViewCells.loadGeometry", loadVcGeometry);
@@ -492 +504 @@
 
   
-bool Preprocessor::ConstructViewCells(const AxisAlignedBox3 &viewSpaceBox)
-{
-        mViewCellsManager->SetViewSpaceBox(viewSpaceBox);
-        
+bool Preprocessor::ConstructViewCells()
+{
         // construct view cells using it's own set of samples
         mViewCellsManager->Construct(this);

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

@@ -92 +92 @@
   /** Construct viewcells from the scratch 
   */
-  bool ConstructViewCells(const AxisAlignedBox3 &viewSpaceBox);
+  bool ConstructViewCells();
 
   /** Returns the specified sample strategy, NULL if no valid strategy.

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

@@ -283 +283 @@
   exporter->SetWireframe();
 
-  if (1 || mViewSpaceBox) {
+  if (1) {
         exporter->SetForcedMaterial(RgbColor(1,0,1));
         exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
@@ -321 +321 @@
   exporter->SetWireframe();
 
-  if (1 || mViewSpaceBox) {
+  if (1) {
         exporter->SetForcedMaterial(RgbColor(1,0,1));
         exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
@@ -361 +361 @@
   exporter->SetWireframe();
   exporter->ExportKdTree(*mKdTree);
-        
-  if (mViewSpaceBox) {
-        exporter->SetForcedMaterial(RgbColor(1,0,0));
-        exporter->ExportBox(*mViewSpaceBox);
-        exporter->ResetForcedMaterial();
-  }
         
   exporter->SetForcedMaterial(RgbColor(0,0,1));
@@ -510 +504 @@
   int totalSamples = 0;
 
-  mViewSpaceBox = NULL;
-
   // if not already loaded, construct view cells from file
   if (!mLoadViewCells)
   {
-        if (1) 
-          mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
-        else {
-          AxisAlignedBox3 box = mKdTree->GetBox();
-          
-          if (1) {
-                // use a small box outside of the scene
-                box.Scale(Vector3(0.1f,0.5f,0.5f));
-                box.Translate(Vector3(Magnitude(mKdTree->GetBox().Size())*0.5f, 0, 0));
-          } else {
-                float s = box.Size(0);
-                box.Scale(0.1f);
-                box.SetMin(0, box.Min(0) + s);
-                box.SetMax(0, box.Max(0) + s);
-          }
-         
-          mViewCellsManager->SetViewSpaceBox(box);
-        }
-        
-        // construct view cells using it's own set of samples
-        mViewCellsManager->Construct(this);
-        
-        //-- several visualizations and statistics
-        Debug << "view cells construction finished: " << endl;
-        mViewCellsManager->PrintStatistics(Debug);
-  }
-  
+          // construct view cells using it's own set of samples
+          mViewCellsManager->Construct(this);
+
+          //-- several visualizations and statistics
+          Debug << "view cells construction finished: " << endl;
+          mViewCellsManager->PrintStatistics(Debug);
+  }
+
   
   int rssPass = 0;

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

@@ -38 +38 @@
   bool mDirectionalSampling;
   
-  AxisAlignedBox3 *mViewSpaceBox;
+  //AxisAlignedBox3 *mViewSpaceBox;
 
   ofstream mStats;

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

@@ -348 +348 @@
   } else {
         mRoots.resize(1);
-        RssTreeLeaf *leaf = new RssTreeLeaf(NULL, rays.size());
+        RssTreeLeaf *leaf = new RssTreeLeaf(NULL, (int)rays.size());
         leaf->bbox.Initialize();
         leaf->dirBBox.Initialize();
@@ -1897 +1897 @@
   }
 
-  return rays.size();
+  return (int)rays.size();
 }
 

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

@@ -118 +118 @@
 
   Randomize(0);
-  
-  long startTime = GetTime();
-  
+  const long startTime = GetTime();
   int totalSamples = 0;
 
@@ -126 +124 @@
   if (!mLoadViewCells)
   {
-          ConstructViewCells(mKdTree->GetBox());
-  }
-  
-
-  
+          ConstructViewCells();
+  }
+    
   int samples = 0;
   int i=0;

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

@@ -171 +171 @@
 mTimeStamp(1),
 mViewCellsTree(NULL),
-mOutOfBoundsCellPartOfTree(false)
+mOutOfBoundsCellPartOfTree(false),
+mOutOfBoundsCell(NULL)
 {
         Randomize(); // initialise random generator for heuristics
@@ -956 +957 @@
         {
                 tData = tStack.top();
-
             tStack.pop();
 
@@ -1010 +1010 @@
                 if (!mUsePredefinedViewCells)
                 {       // generate new view cell for each leaf
-                        viewCell = new BspViewCell();
+                        viewCell = new BspViewCell();cout << "g";
                 }
                 else
-                {
+                {       
                         // add predefined view cell to leaf
                         viewCell = dynamic_cast<BspViewCell *>(tData.mViewCell);
-
                         // from now on out of bounds cell can be handled as any other cell,
                         // responsibility for deleting has been shifted
-                        if (viewCell == mOutOfBoundsCell)
+                        if (IsOutOfBounds(viewCell))
                         {
                                 mOutOfBoundsCellPartOfTree = true;
                         }
+                
                 }
 
@@ -1035 +1035 @@
                 else
                         viewCell->SetVolume(probability);
-
                 
                 ///////////
@@ -1049 +1048 @@
                 }
 
-                if (1)EvaluateLeafStats(tData);
-                
-
+                if (1) EvaluateLeafStats(tData);
+                
                 ////////
                 //-- clean up
@@ -2399 +2397 @@
         {
                 // per definition out of bounds cell has zero volume
-                if ((*it) == mOutOfBoundsCell)
+                if (IsOutOfBounds(*it))
                         continue;
 
@@ -3325 +3323 @@
 ViewCell *BspTree::GetViewCell(const Vector3 &point)
 {
-  if (mRoot == NULL)
-        return NULL;
-  
-
-  stack<BspNode *> nodeStack;
-  nodeStack.push(mRoot);
-  
-  ViewCellLeaf *viewcell = NULL;
-  
-  while (!nodeStack.empty())  {
-        BspNode *node = nodeStack.top();
-        nodeStack.pop();
-        
-        if (node->IsLeaf()) {
-          viewcell = dynamic_cast<BspLeaf *>(node)->mViewCell;
-          break;
-        } else {
-          
-          BspInterior *interior = dynamic_cast<BspInterior *>(node);
-                
-          // random decision
-          if (interior->GetPlane().Side(point) < 0)
-                nodeStack.push(interior->GetBack());
-          else
-                nodeStack.push(interior->GetFront());
-        }
-  }
-  
-  return viewcell;
+        if (mRoot == NULL)
+                return NULL;
+
+        stack<BspNode *> nodeStack;
+        nodeStack.push(mRoot);
+
+        ViewCellLeaf *viewcell = NULL;
+
+        while (!nodeStack.empty())  {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+
+                if (node->IsLeaf()) 
+                {
+                        viewcell = dynamic_cast<BspLeaf *>(node)->mViewCell;
+                        break;
+                } 
+                else 
+                {
+
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+
+                        // random decision
+                        if (interior->GetPlane().Side(point) < 0)
+                        {
+                                nodeStack.push(interior->GetBack());
+                        }
+                        else
+                        {
+                                nodeStack.push(interior->GetFront());
+                        }
+                }
+        }
+
+        return viewcell;
 }
 

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

@@ -625 +625 @@
         int     _CastRay(Ray &ray);
 
+        /** Casts line segment between origin and termination and returns
+                view cells which are touched by the line.
+        */
         int     CastLineSegment(const Vector3 &origin,
                                                 const Vector3 &termination,
@@ -630 +633 @@
                                                 );
 
+        /** Returns view cell this point is located in.
+        */
         ViewCell *GetViewCell(const Vector3 &point);
   
@@ -665 +670 @@
         */
         BspLeaf *GetRandomLeaf(const bool onlyUnmailed = false);
-
 
         /** Returns epsilon of this tree.

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

@@ -233 +233 @@
   Mesh *m = vc->GetMesh();
   
-  if (m) {
-        m->ComputeBoundingBox();
-        return m->mBox;
+  if (m) 
+  {
+          m->ComputeBoundingBox();
+          return m->mBox;
   }
 
   AxisAlignedBox3 box;
-  
   box.Initialize();
   
@@ -289 +289 @@
         {
                 VssRayContainer::const_iterator it, it_end = rays.end();
-
                 for (it = rays.begin(); it != it_end; ++ it)
                 {
@@ -298 +297 @@
         {
                 VssRayContainer::const_iterator it, it_end = rays.end();
-
                 for (it = rays.begin(); it != it_end; ++ it)
                 {
-                        //(*it)->Unref();
                         if (!(*it)->IsActive())
                                 delete (*it);
@@ -322 +319 @@
         mPreprocessor = preprocessor;
         
-        
+
         ///////////////////////////////////////////////////////
         //-- Initial sampling for the construction of the view cell hierarchy. 
@@ -361 +358 @@
         {
                 //-- export initial view cell partition
-                Debug << "\nView cells after initial sampling:\n" 
-                          << mCurrentViewCellsStats << endl;
+                Debug << "\nView cells after initial sampling:\n" << mCurrentViewCellsStats << endl;
 
                 const string filename("viewcells.wrl");
@@ -428 +424 @@
 
         
-#if 0
-        ///////////////
-        //-- Get stats after the additional sampling step
-        //-- and before the bottom-up merge step
-
-        EvaluateViewCellsStats();
-        Debug << "\noriginal view cell partition before post process:\n" 
-                  << mCurrentViewCellsStats << endl;
-
-        mRenderer->RenderScene();
-        SimulationStatistics ss;
-        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
-
-    Debug << ss << endl;
-#endif
-
+        if (0)
+        {
+                ///////////////
+                //-- Get stats after the additional sampling step
+                //-- and before the bottom-up merge step
+
+                EvaluateViewCellsStats();
+                Debug << "\noriginal view cell partition before post process:\n" 
+                          << mCurrentViewCellsStats << endl;
+        
+                mRenderer->RenderScene();
+                SimulationStatistics ss;
+                dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
+
+                Debug << ss << endl;
+        }
 
         ////////////////////
@@ -612 +608 @@
 {
         ViewCellsParser parser;
-
         ViewCellsManager *vm = NULL;
 
         if (parser.ParseViewCellsFile(filename, &vm, objects, bconverter))
         {
-                long startTime = GetTime();
+                const long startTime = GetTime();
 
                 vm->ResetViewCells();
@@ -671 +666 @@
                 for (oit = objects.begin(); oit != oit_end; ++ oit)
                 {
-                        MeshInstance *mi = dynamic_cast<MeshInstance *>(*oit);
-                        const AxisAlignedBox3 box = mi->GetBox();
+                        const AxisAlignedBox3 box = (*oit)->GetBox();
 
                         ////////////
                         //-- the bounding boxes
-                        stream << "<BoundingBox" << " id=\"" << mi->GetId() << "\""
+                        stream << "<BoundingBox" << " id=\"" << (*oit)->GetId() << "\""
                                    << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
                                    << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
@@ -1262 +1256 @@
                                                                                          const bool extrudeBaseTriangles)
 {
-        bool success;
-
         /// we use predefined view cells from now on
         mUsePredefinedViewCells = true;
@@ -1271 +1263 @@
         {
                 Environment::GetSingleton()->GetFloatValue("ViewCells.height", parser.mViewCellHeight);
-                success = parser.ParseFile(filename, *this);
+                const bool success = parser.ParseFile(filename, *this);
+
+                if (!success)
+                        return false;
         }
         else
@@ -1277 +1272 @@
                 // hack: use standard mesh loading
                 // create temporary scene graph for loading the view cells geometry
+                // note: delete the meshes as they are created two times for transformed mesh instances.
                 SceneGraphNode *root = new SceneGraphNode();
-                success = parser.ParseFile(filename, root, true);
-                                
-                if (success)
-                {
-                        ObjectContainer::const_iterator oit, oit_end = root->mGeometry.end();
-                        for (oit = root->mGeometry.begin(); oit != oit_end; ++ oit)
+                const bool success = parser.ParseFile(filename, root, true);
+                
+                if (!success)
+                {
+                        DEL_PTR(root);
+                        return false;
+                }
+
+                ObjectContainer::const_iterator oit, oit_end = root->mGeometry.end();
+                
+                for (oit = root->mGeometry.begin(); oit != oit_end; ++ oit)
+                {
+                        Mesh *mesh;
+                        if ((*oit)->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
                         {
-                                if ((*oit)->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
-                                {
-                                        TransformedMeshInstance *mit = dynamic_cast<TransformedMeshInstance *>(*oit);
-                                        Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
-                                        mit->GetTransformedMesh(*mesh);
-                                        mesh->ComputeBoundingBox();
-                                        mViewCells.push_back(GenerateViewCell(mesh));
-                                }
-                                else if ((*oit)->Type() == Intersectable::MESH_INSTANCE)
-                                {
-                                        MeshInstance *mit = dynamic_cast<MeshInstance *>(*oit);
-                                        mViewCells.push_back(GenerateViewCell(mit->GetMesh()));
-                                }                       
+                                TransformedMeshInstance *mit = dynamic_cast<TransformedMeshInstance *>(*oit);
+                                mesh = MeshManager::GetSingleton()->CreateResource();
+                                mit->GetTransformedMesh(*mesh);
                         }
-                }
+                        else if ((*oit)->Type() == Intersectable::MESH_INSTANCE)
+                        {
+                                MeshInstance *mit = dynamic_cast<MeshInstance *>(*oit);
+                                mesh = mit->GetMesh();
+                        }
+                        mesh->ComputeBoundingBox();
+                        mViewCells.push_back(GenerateViewCell(mesh));
+                }
+
                 DEL_PTR(root);
         }
 
-        if (success)
-        {
-                // set view space box to bounding box of the view cells
-                AxisAlignedBox3 bbox;
-                bbox.Initialize();
-                ViewCellContainer::iterator it = mViewCells.begin(), it_end = mViewCells.end();
-                for (; it != it_end; ++ it) 
-                {
-                        bbox.Include(GetViewCellBox(*it));
-                }
-                SetViewSpaceBox(bbox);
-        
-                cout << "generated " << (int)mViewCells.size() << " view cells using the geometry from file " << filename << endl;
-        }
-
-        return success;
+        // set view space box to bounding box of the view cells
+        AxisAlignedBox3 bbox;
+        bbox.Initialize();
+        ViewCellContainer::iterator it = mViewCells.begin(), it_end = mViewCells.end();
+
+        for (; it != it_end; ++ it) 
+        {
+                bbox.Include((*it)->GetMesh()->mBox);
+        }
+
+        SetViewSpaceBox(bbox);
+        cout << "view space box: " << bbox << endl;
+        cout << "generated " << (int)mViewCells.size() << " view cells using the geometry " << filename << endl;
+
+        return true;
 }
 
@@ -2539 +2540 @@
         VssRayContainer savedRays;
 
+        // choose a a number of rays based on the ratio of cast rays / requested rays
         const int limit = min(mInitialSamples, (int)rays.size());
-
         VssRayContainer::const_iterator it, it_end = rays.end();
 
         const float prop = (float)limit / ((float)rays.size() + Limits::Small);
-
         for (it = rays.begin(); it != it_end; ++ it)
         {
@@ -2785 +2785 @@
                 return;
         
-        int savedColorCode = mColorCode;
+        const int savedColorCode = mColorCode;
         
         if (1) // export final view cells
@@ -2989 +2989 @@
                                                                                                  const AxisAlignedBox3 *sceneBox,
                                                                                                  const AxisAlignedPlane *clipPlane
-                                                                                                 ) const
-{
-        // out of bounds cell
-        //if (vc->GetId() == OUT_OF_BOUNDS_ID) return;
-
-        // export mesh if available
-        if (vc->GetMesh())
-        {
-                exporter->ExportMesh(vc->GetMesh());
-                return;
-        }
-
-        // otherwise construct from leaves
+                                                                                                        ) const
+{
         if (clipPlane)
         {
@@ -3018 +3007 @@
                         mBspTree->ConstructGeometry(*it, geom);
 
-                        const float eps = 0.00000001f;
+                        const float eps = 0.0001f;
                         const int cf = geom.Side(plane, eps);
 
@@ -3032 +3021 @@
                                                                    mViewSpaceBox, 
                                                                    eps);
-        
+
                                 if (back.Valid())
-                                {       
+                                {
                                         exporter->ExportPolygons(back.GetPolys());
                                 }                       
@@ -3042 +3031 @@
         else
         {
-                BspNodeGeometry geom;
-                mBspTree->ConstructGeometry(vc, geom);
-                exporter->ExportPolygons(geom.GetPolys());
+                // export mesh if available
+                // TODO: some bug here?
+                if (1 && vc->GetMesh())
+                {
+                        exporter->ExportMesh(vc->GetMesh());
+                }
+                else
+                {
+                        BspNodeGeometry geom;
+                        mBspTree->ConstructGeometry(vc, geom);
+                        exporter->ExportPolygons(geom.GetPolys());
+                }
         }
 }
@@ -3158 +3156 @@
                 for (oit = objects.begin(); oit != oit_end; ++ oit)
                 {
-                        MeshInstance *mi = dynamic_cast<MeshInstance *>(*oit);
-                        const AxisAlignedBox3 box = mi->GetBox();
+                        const AxisAlignedBox3 box = (*oit)->GetBox();
                         
-                        stream << "<BoundingBox" << " id=\"" << mi->GetId() << "\""
+                        stream << "<BoundingBox" << " id=\"" << (*oit)->GetId() << "\""
                                    << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
                                    << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
@@ -4123 +4120 @@
                 {
                         cout << "exporting view cells after post process ... ";
-
                         if (0)
-                        {
-                                // export view space box
+                        {       // export view space box
                                 exporter->SetWireframe();
                                 exporter->ExportBox(mViewSpaceBox);
@@ -4133 +4128 @@
 
                         Material m; 
-
                         m.mDiffuseColor.r = 0.0f;
                         m.mDiffuseColor.g = 0.5f;
@@ -4140 +4134 @@
             exporter->SetForcedMaterial(m);
 
-                        if (0 && mExportGeometry)
+                        if (1 && mExportGeometry)
                         {
                                 exporter->ExportGeometry(objects);
                         }
 
-                        // export rays
                         if (0 && mExportRays)
                         {
                                 exporter->ExportRays(visRays, RgbColor(1, 0, 0));
                         }
-
                         ExportViewCellsForViz(exporter, NULL, GetClipPlane());
 
@@ -4500 +4492 @@
                                                                                                         ) const
 {
-        // out of bounds cell
-        //if (vc->GetId() == OUT_OF_BOUNDS_ID)  return;
         if (clipPlane)
         {
@@ -4513 +4503 @@
                 {
                         BspNodeGeometry geom;
-
                         BspNodeGeometry front;
                         BspNodeGeometry back;
@@ -4545 +4534 @@
                 // export mesh if available
                 // TODO: some bug here?
-                if (0 && vc->GetMesh())
+                if (1 && vc->GetMesh())
                 {
                         exporter->ExportMesh(vc->GetMesh());
@@ -5070 +5059 @@
 
                         // matt: hack for clamping scene
-                        AxisAlignedBox3 bbox = mHierarchyManager->GetViewSpaceBox();
+                        AxisAlignedBox3 bbox = mViewSpaceBox;
                         bbox.Scale(Vector3(0.5, 1, 0.5));
                         if (CLAMP_TO_BOX)

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

@@ -850 +850 @@
 
                 // set view space box
-                mVspBspTree->mBox = mViewSpaceBox;
+                mVspBspTree->mBoundingBox = mViewSpaceBox;
 
                 ViewCellsMap::iterator vit, vit_end = mViewCells.end();

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

@@ -277 +277 @@
                 if (mesh) 
                 {       // // copy the mesh into polygons and add to BSP tree aabb
-                        mBox.Include(viewCells[i]->GetBox()); 
+                        mBoundingBox.Include(viewCells[i]->GetBox()); 
                         polysSize += AddMeshToPolygons(mesh,
                                                                                    polys,
@@ -326 +326 @@
         if (mesh) // copy the mesh data to polygons
                 {
-                        mBox.Include(object->GetBox()); // add to BSP tree aabb
+                        mBoundingBox.Include(object->GetBox()); // add to BSP tree aabb
                         AddMeshToPolygons(mesh, polys, NULL);
 
@@ -344 +344 @@
         if (forcedBoundingBox)
         {
-                mBox = *forcedBoundingBox;
+                mBoundingBox = *forcedBoundingBox;
         }
         else // compute vsp tree bounding box
         {
-                mBox.Initialize();
+                mBoundingBox.Initialize();
 
                 VssRayContainer::const_iterator rit, rit_end = sampleRays.end();
@@ -358 +358 @@
 
                         // compute bounding box of view space
-                        mBox.Include(ray->GetTermination());
-                        mBox.Include(ray->GetOrigin());
+                        mBoundingBox.Include(ray->GetTermination());
+                        mBoundingBox.Include(ray->GetOrigin());
                 }
         }
@@ -393 +393 @@
                         Intersectable *obj = ray->mTerminationObject;
 
-                        if ((mBox.IsInside(ray->mTermination) || !forcedBoundingBox) &&
+                        if ((mBoundingBox.IsInside(ray->mTermination) || !forcedBoundingBox) &&
                                 obj && !obj->Mailed())
                         {
@@ -419 +419 @@
                                 //-- compute bounding box
                                 if (!forcedBoundingBox)
-                                        mBox.Include(ray->mTermination);
-                        }
-
-                        if ((mBox.IsInside(ray->mOrigin) || !forcedBoundingBox) &&
+                                        mBoundingBox.Include(ray->mTermination);
+                        }
+
+                        if ((mBoundingBox.IsInside(ray->mOrigin) || !forcedBoundingBox) &&
                                 ray->mOriginObject && 
                                 !ray->mOriginObject->Mailed())
@@ -460 +460 @@
 
                 // TODO: not very efficient to implictly cast between rays types
-                if (mBox.GetRaySegment(hray, minT, maxT))
+                if (mBoundingBox.GetRaySegment(hray, minT, maxT))
                 {
                         float len = ray->Length();
@@ -473 +473 @@
         // normalize
         if (mUseAreaForPvs)
-                mTermMinProbability *= mBox.SurfaceArea(); 
+                mTermMinProbability *= mBoundingBox.SurfaceArea(); 
         else 
-                mTermMinProbability *= mBox.GetVolume();
+                mTermMinProbability *= mBoundingBox.GetVolume();
 
 
@@ -547 +547 @@
 
 
-        mTotalCost = tData.mPvs * tData.mProbability / mBox.GetVolume();
+        mTotalCost = tData.mPvs * tData.mProbability / mBoundingBox.GetVolume();
         mTotalPvsSize = tData.mPvs;
         
@@ -652 +652 @@
         tQueue.push(splitCandidate);
 
-        mTotalCost = tData.mPvs * tData.mProbability / mBox.GetVolume();
+        mTotalCost = tData.mPvs * tData.mProbability / mBoundingBox.GetVolume();
         mTotalPvsSize = tData.mPvs;
         
@@ -948 +948 @@
                         
                         float costDecr = 
-                                (cFront + cBack - cData) / mBox.GetVolume();
+                                (cFront + cBack - cData) / mBoundingBox.GetVolume();
 
                         mTotalCost += costDecr;
@@ -1109 +1109 @@
         
         const float costDecr = 
-                (cFront + cBack - cData) / mBox.GetVolume();
+                (cFront + cBack - cData) / mBoundingBox.GetVolume();
 
         mTotalCost += costDecr;
@@ -1162 +1162 @@
                                                                            *backData.mGeometry,
                                                                            splitPlane,
-                                                                           mBox,
+                                                                           mBoundingBox,
                                                                            //0.0f);
                                                                            mEpsilon);
@@ -2003 +2003 @@
                                                                   geomBack,
                                                                   candidatePlane,
-                                                                  mBox,
+                                                                  mBoundingBox,
                                                                   //0.0f);
                                                                   mEpsilon);
@@ -2041 +2041 @@
         const float newRenderCost = penaltyFront * pFront + penaltyBack * pBack;
 
-        const float renderCostDecrease = (oldRenderCost - newRenderCost) / mBox.GetVolume();
+        const float renderCostDecrease = (oldRenderCost - newRenderCost) / mBoundingBox.GetVolume();
         
         // take render cost of node into account to avoid being stuck in a local minimum
-        normalizedOldRenderCost = oldRenderCost / mBox.GetVolume();
+        normalizedOldRenderCost = oldRenderCost / mBoundingBox.GetVolume();
         
         return renderCostDecrease;
@@ -2108 +2108 @@
                                                                                                                   geomBack,
                                                                                                                   candidatePlane,
-                                                                                                                  mBox,
+                                                                                                                  mBoundingBox,
                                                                                                                   //0.0f);
                                                                                                                   mEpsilon);
@@ -2236 +2236 @@
                                                                         *secondGeom,
                                                                         interior->GetPlane(),
-                                                                        mBox,
+                                                                        mBoundingBox,
                                                                         //0.0000001f);
                                                                         mEpsilon);
@@ -2427 +2427 @@
 AxisAlignedBox3 VspBspTree::GetBoundingBox() const
 {
-        return mBox;
+        return mBoundingBox;
 }
 
@@ -2500 +2500 @@
         float maxt, mint;
 
-        if (!mBox.GetRaySegment(ray, mint, maxt))
+        if (!mBoundingBox.GetRaySegment(ray, mint, maxt))
                 return 0;
 
@@ -2761 +2761 @@
         PolygonContainer boxPolys;
         
-        mBox.ExtractPolys(boxPolys);
+        mBoundingBox.ExtractPolys(boxPolys);
         vector<Plane3> boxPlanes;
 
@@ -2930 +2930 @@
 
                 for (int j = 0; j < 4; ++ j)
-                        vertices.push_back(mBox.GetFace(i).mVertices[j]);
+                {
+                        vertices.push_back(mBoundingBox.GetFace(i).mVertices[j]);
+                }
 
                 Polygon3 *poly = new Polygon3(vertices);
@@ -2967 +2969 @@
 
                                         if (backPoly->Valid(mEpsilon))
+                                        {
                                                 candidatePolys[i] = backPoly;
+                                        }
                                         else
+                                        {
                                                 DEL_PTR(backPoly);
+                                        }
 
                                         // outside, don't need this
                                         DEL_PTR(frontPoly);
                                         break;
+
                                 // polygon outside of halfspace
                                 case Polygon3::FRONT_SIDE:
                                         DEL_PTR(candidatePolys[i]);
                                         break;
+
                                 // just take polygon as it is
                                 case Polygon3::BACK_SIDE:
@@ -2989 +2997 @@
                 {
                         geom.Add(candidatePolys[i], candidatePlanes[i]);
-                        //      geom.mPolys.push_back(candidates[i]);
-                }
-        }
+                }
+        }
+}
+
+
+bool VspBspTree::IsOutOfBounds(ViewCell *vc) const
+{
+        return vc->GetId() == OUT_OF_BOUNDS_ID;
+}
+
+
+void VspBspTree::SetViewCellsTree(ViewCellsTree *viewCellsTree)
+{
+        mViewCellsTree = viewCellsTree;
 }
 
@@ -3009 +3028 @@
         for (it = leaves.begin(); it != it_end; ++ it)
         {
-                if ((*it) == mOutOfBoundsCell)
+                if (IsOutOfBounds(*it))
                         continue;
                 
@@ -3120 +3139 @@
                                                                 *bGeom,
                                                                 interior->GetPlane(),
-                                                                mBox,
+                                                                mBoundingBox,
                                                                 //0.0000001f);
                                                                 eps);
@@ -3214 +3233 @@
                                                                 *bGeom,
                                                                 interior->GetPlane(),
-                                                                mBox,
+                                                                mBoundingBox,
                                                                 //0.0000001f);
                                                                 eps);
@@ -3709 +3728 @@
                                                                         *secondGeom,
                                                                         interior->GetPlane(),
-                                                                        mBox,
+                                                                        mBoundingBox,
                                                                         //0.0000001f);
                                                                         mEpsilon);

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

@@ -356 +356 @@
         int ComputeBoxIntersections(const AxisAlignedBox3 &box, ViewCellContainer &viewCells) const;
 
-        /// pointer to the hierarchy of view cells
-        ViewCellsTree *mViewCellsTree;
-
+        /** Pointer to the view cells tree.
+        */
+        void SetViewCellsTree(ViewCellsTree *vct);
+        
+        /** Returns true if this view cell prepresents
+                invalid view space.
+        */
+        bool IsOutOfBounds(ViewCell *vc) const;
+
+        
 
 protected:
@@ -736 +743 @@
 
         /// box around the whole view domain
-        AxisAlignedBox3 mBox;
-
-        
+        AxisAlignedBox3 mBoundingBox;
+
+        /// pointer to the hierarchy of view cells
+        ViewCellsTree *mViewCellsTree;
+
+
         //-- termination critera
 

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

@@ -40 +40 @@
   
   useViewspacePlane = mUseViewSpaceBox; //hack
-
-  mViewSpaceBox.Initialize();
   
   Debug << "*********** vss preprocessor options **************" << endl;
@@ -158 +156 @@
 
   exporter->SetForcedMaterial(RgbColor(1,0,1));
-  exporter->ExportBox(mViewSpaceBox);
+  exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
   exporter->ResetForcedMaterial();
 
@@ -201 +199 @@
 
   exporter->SetForcedMaterial(RgbColor(1,0,0));
-  exporter->ExportBox(mViewSpaceBox);
+  exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
   exporter->ResetForcedMaterial();
 
@@ -373 +371 @@
         Debug << "type: vss" << endl;
 
-  long startTime = GetTime();
-
-  int totalSamples = 0;
-
-
-  AxisAlignedBox3 box(mKdTree->GetBox());
-  
-  if (!useViewspacePlane) {
-        float size = 0.05f;
-        float s = 0.5f - size;
-        float olds = Magnitude(box.Size());
-        box.Enlarge(box.Size()*Vector3(-s));
-        Vector3 translation = Vector3(-olds*0.1f, 0, 0);
-        box.SetMin(box.Min() + translation);
-        box.SetMax(box.Max() + translation);
-  } else {
-
-        // sample city like heights
-        box.SetMin(1, box.Min(1) + box.Size(1)*0.2f);
-        box.SetMax(1, box.Min(1) + box.Size(1)*0.3f);
-  }
-
-  if (use2dSampling)
-        box.SetMax(1, box.Min(1));
-
-  cout << "use view space box=" << mUseViewSpaceBox << endl;
-
-  
-  if (mUseViewSpaceBox)
-  {
-          if (!mEnlargeViewSpace)
-          {
-                  mViewSpaceBox = AxisAlignedBox3(box);
-          }
-          else
-          {
-                  mViewSpaceBox = AxisAlignedBox3(mKdTree->GetBox());
-
-                  if (0) 
-                  {
-                          // HACK: enlarge in y directon
-                          Vector3 size = mViewSpaceBox.Size();
-                        
-                          size[1] *= 1.25;
-                          Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
-                          //Vector3 enlarge(size[0] * 4.0f, 0.0f, 0.0f);
-
-                          mViewSpaceBox.Enlarge(enlarge);
-                          mViewSpaceBox.SetMax(mViewSpaceBox.Max() + enlarge);
-                  } 
-                  else 
-                  {
-                          AxisAlignedBox3 tbox(mViewSpaceBox);
-
-                          Vector3 size = mViewSpaceBox.Size();
-                          tbox.SetMax(0, mViewSpaceBox.Max(0) + size[0] * 0.5f);
-                          tbox.SetMin(0, mViewSpaceBox.Min(0) + size[0]);
-                          mViewSpaceBox = tbox;
-                  }             
-          }
-  }
-  else
-  {
-          mViewSpaceBox = AxisAlignedBox3(mKdTree->GetBox());
-  }
-  
-  mSceneGraph->CollectObjects(&mObjects);
-
-  if (!mLoadViewCells)
-  {
-          //-- generate new view cells from the scratch
-          //-- for construction the manager uses it's own set of samples
-          ConstructViewCells(mViewSpaceBox);
-  }
+        const long startTime = GetTime();
+        int totalSamples = 0;
+
+        if (mUseViewSpaceBox)
+        {
+                AxisAlignedBox3 viewSpaceBox;
+                viewSpaceBox.Initialize();
+
+                viewSpaceBox = AxisAlignedBox3(mKdTree->GetBox());
+                AxisAlignedBox3 tbox(mViewCellsManager->GetViewSpaceBox());
+
+                const Vector3 size = tbox.Size();
+                viewSpaceBox.SetMax(0, tbox.Max(0) + size[0] * 0.5f);
+                viewSpaceBox.SetMin(0, tbox.Min(0) + size[0]);
+                 
+                // change the view space of the view cells manager
+                mViewCellsManager->SetViewSpaceBox(viewSpaceBox);
+        }
+
+
+        mSceneGraph->CollectObjects(&mObjects);
+
+        if (!mLoadViewCells)
+        {
+                //-- generate new view cells from the scratch
+                //-- for construction the manager uses it's own set of samples
+                ConstructViewCells();
+        }
 #if 0
-  else 
-  {      
-          //-- load view cells from file
-          //-- test successful view cells loading by exporting them again
-      VssRayContainer dummies;
-          mViewCellsManager->Visualize(mObjects, dummies);
-          mViewCellsManager->ExportViewCells("test.xml.zip", mViewCellsManager->GetExportPvs(), mObjects);
-  }
+        else 
+        {        
+                //-- load view cells from file
+                //-- test successful view cells loading by exporting them again
+                VssRayContainer dummies;
+                mViewCellsManager->Visualize(mObjects, dummies);
+                mViewCellsManager->ExportViewCells("test.xml.zip", mViewCellsManager->GetExportPvs(), mObjects);
+        }
 #endif
 
-  VssTree *vssTree = NULL; 
-  const long initialTime = GetTime();
-
-  if (mLoadInitialSamples)
-  {
-          cout << "Loading samples from file ... ";
-          LoadSamples(mVssRays, mObjects);
-          cout << "finished\n" << endl;
-          totalSamples = (int)mVssRays.size();
-  }
-  else
-  {
-        while (totalSamples < mInitialSamples) {
-                int passContributingSamples = 0;
-                int passSampleContributions = 0;
-                int passSamples = 0;
-
-                int index = 0;
-
-                int sampleContributions;
-
-                int s = Min(mSamplesPerPass, mInitialSamples);
-                for (int k=0; k < s; k++) 
+        VssTree *vssTree = NULL; 
+        const long initialTime = GetTime();
+
+        if (mLoadInitialSamples)
+        {
+                cout << "Loading samples from file ... ";
+                LoadSamples(mVssRays, mObjects);
+                cout << "finished\n" << endl;
+                totalSamples = (int)mVssRays.size();
+        }
+        else
+        {
+                while (totalSamples < mInitialSamples) {
+                        int passContributingSamples = 0;
+                        int passSampleContributions = 0;
+                        int passSamples = 0;
+
+                        int index = 0;
+
+                        int sampleContributions;
+
+                        int s = Min(mSamplesPerPass, mInitialSamples);
+                        for (int k=0; k < s; k++) 
+                        {
+                                Vector3 viewpoint; 
+
+                                mViewCellsManager->GetViewPoint(viewpoint);
+                                const Vector3 direction = GetDirection(viewpoint, &mViewCellsManager->GetViewSpaceBox());
+
+                                const SimpleRay sray(viewpoint, direction);
+                                sampleContributions = mRayCaster->CastRay(sray, mVssRays, mViewCellsManager->GetViewSpaceBox(), true);
+
+                                if (sampleContributions) {
+                                        passContributingSamples ++;
+                                        passSampleContributions += sampleContributions;
+                                }
+                                passSamples++;
+                                totalSamples++;
+                        }
+
+                        mPass++;
+                        int pvsSize = 0;
+                        float avgRayContrib = (passContributingSamples > 0) ?
+                                passSampleContributions/(float)passContributingSamples : 0;
+
+                        cout << "#Pass " << mPass << " : t = " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
+                        cout << "#TotalSamples=" << totalSamples/1000
+                                << "#SampleContributions=" << passSampleContributions << " ("
+                                << 100*passContributingSamples/(float)passSamples<<"%)" << " avgPVS="
+                                << pvsSize/(float)mObjects.size() << endl
+                                << "avg ray contrib=" << avgRayContrib << endl;
+
+                        mStats <<
+                                "#Pass\n" <<mPass<<endl<<
+                                "#Time\n" << TimeDiff(startTime, GetTime())*1e-3 << endl<<
+                                "#TotalSamples\n" << totalSamples<< endl<<
+                                "#SampleContributions\n" << passSampleContributions << endl <<
+                                "#PContributingSamples\n"<<100*passContributingSamples/(float)passSamples<<endl <<
+                                "#AvgPVS\n"<< pvsSize/(float)mObjects.size() << endl <<
+                                "#AvgRayContrib\n" << avgRayContrib << endl;
+                }
+
+                cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
+
+
+
+        }
+
+
+        cout << "#totalRayStackSize=" << (int)mVssRays.size() << endl << flush;
+        Debug << (int)mVssRays.size() << " rays generated in " 
+                << TimeDiff(initialTime, GetTime()) * 1e-3 << " seconds" << endl;
+
+        if (mStoreInitialSamples)
+        {
+                cout << "Writing " << (int)mVssRays.size() << " samples to file ... ";
+                ExportSamples(mVssRays);
+                cout << "finished\n" << endl;
+
+                /*VssRayContainer dummyRays;
+                LoadSamples(dummyRays, mObjects);
+                Debug << "rays " << (int)mVssRays.size() << " " << dummyRays.size() << endl;
+
+                for (int i = 0; i < (int)mVssRays.size(); ++ i)
                 {
-                        Vector3 viewpoint; 
-                
-                        mViewCellsManager->GetViewPoint(viewpoint);
-                        const Vector3 direction = GetDirection(viewpoint, &mViewSpaceBox);
-
-                        const SimpleRay sray(viewpoint, direction);
-                        sampleContributions = mRayCaster->CastRay(sray, mVssRays, mViewSpaceBox, true);
-
-                        if (sampleContributions) {
-                                passContributingSamples ++;
-                                passSampleContributions += sampleContributions;
+                Debug << mVssRays[i]->GetOrigin() << " " << mVssRays[i]->GetTermination() << " " << mVssRays[i]->mOriginObject << " " << mVssRays[i]->mTerminationObject << endl;
+                Debug << dummyRays[i]->GetOrigin() << " " << dummyRays[i]->GetTermination() << " " << dummyRays[i]->mOriginObject << " " << dummyRays[i]->mTerminationObject << endl << endl;
+                }*/
+        }
+
+
+        //int numExportRays = 2000;
+        int numExportRays = 0;
+
+        if (numExportRays) {
+                char filename[64];
+                sprintf(filename, "vss-rays-initial.x3d");
+                ExportRays(filename, mVssRays, numExportRays);
+        }
+
+        vssTree = new VssTree;
+        // viewcells = Construct(mVssRays);
+
+        vssTree->Construct(mVssRays, NULL);
+        cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
+
+        if (0) ExportRays("kdtree.x3d", mVssRays, 10);
+
+        if (0)
+        {
+                ExportVssTree("vss-tree-100.x3d", vssTree, Vector3(1,0,0));
+                ExportVssTree("vss-tree-001.x3d", vssTree, Vector3(0,0,1));
+                ExportVssTree("vss-tree-101.x3d", vssTree, Vector3(1,0,1));
+                ExportVssTree("vss-tree-101m.x3d", vssTree, Vector3(-1,0,-1));
+                ExportVssTreeLeaves(vssTree, 10);
+        }
+
+        // viewcells->UpdatePVS(newVssRays);
+        // get viewcells as kd tree boxes
+        vector<AxisAlignedBox3> kdViewcells;
+        if (0) {
+                vector<KdLeaf *> leaves;
+                mKdTree->CollectLeaves(leaves);
+                vector<KdLeaf *>::const_iterator it;
+                int targetLeaves = 50;
+                float prob = targetLeaves/(float)leaves.size();
+                for (it = leaves.begin(); it != leaves.end(); ++it)
+                        if (RandomValue(0.0f,1.0f) < prob)
+                                kdViewcells.push_back(mKdTree->GetBox(*it));
+
+                float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
+                cout<<"Initial average PVS size = "<<avgPvs<<endl;
+        }
+
+
+        int samples = 0;
+        int pass = 0;
+
+
+        // cast view cell samples
+        while (samples < mVssSamples) 
+        {
+
+                int num = mVssSamplesPerPass;
+                SimpleRayContainer rays;
+                VssRayContainer vssRays;
+
+                if (!mUseImportanceSampling) {
+                        for (int j=0; j < num; j++) {
+                                Vector3 viewpoint; 
+                                mViewCellsManager->GetViewPoint(viewpoint);
+                                Vector3 direction = GetDirection(viewpoint, NULL);
+                                rays.push_back(SimpleRay(viewpoint, direction));
                         }
-                        passSamples++;
-                        totalSamples++;
+                } else {
+                        num = GenerateImportanceRays(vssTree, num, rays);
                 }
 
-                mPass++;
-                int pvsSize = 0;
-                float avgRayContrib = (passContributingSamples > 0) ?
-                        passSampleContributions/(float)passContributingSamples : 0;
-
-                cout << "#Pass " << mPass << " : t = " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
-                cout << "#TotalSamples=" << totalSamples/1000
-                        << "#SampleContributions=" << passSampleContributions << " ("
-                        << 100*passContributingSamples/(float)passSamples<<"%)" << " avgPVS="
-                        << pvsSize/(float)mObjects.size() << endl
-                        << "avg ray contrib=" << avgRayContrib << endl;
-
-                mStats <<
-                        "#Pass\n" <<mPass<<endl<<
-                        "#Time\n" << TimeDiff(startTime, GetTime())*1e-3 << endl<<
-                        "#TotalSamples\n" << totalSamples<< endl<<
-                        "#SampleContributions\n" << passSampleContributions << endl <<
-                        "#PContributingSamples\n"<<100*passContributingSamples/(float)passSamples<<endl <<
-                        "#AvgPVS\n"<< pvsSize/(float)mObjects.size() << endl <<
-                        "#AvgRayContrib\n" << avgRayContrib << endl;
-          }
- 
-          cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
-
-
-          
-  }
- 
-
-  cout << "#totalRayStackSize=" << (int)mVssRays.size() << endl << flush;
-  Debug << (int)mVssRays.size() << " rays generated in " 
-            << TimeDiff(initialTime, GetTime()) * 1e-3 << " seconds" << endl;
-
-  if (mStoreInitialSamples)
-  {
-          cout << "Writing " << (int)mVssRays.size() << " samples to file ... ";
-          ExportSamples(mVssRays);
-          cout << "finished\n" << endl;
-
-          /*VssRayContainer dummyRays;
-          LoadSamples(dummyRays, mObjects);
-          Debug << "rays " << (int)mVssRays.size() << " " << dummyRays.size() << endl;
-
-          for (int i = 0; i < (int)mVssRays.size(); ++ i)
-          {
-                  Debug << mVssRays[i]->GetOrigin() << " " << mVssRays[i]->GetTermination() << " " << mVssRays[i]->mOriginObject << " " << mVssRays[i]->mTerminationObject << endl;
-                  Debug << dummyRays[i]->GetOrigin() << " " << dummyRays[i]->GetTermination() << " " << dummyRays[i]->mOriginObject << " " << dummyRays[i]->mTerminationObject << endl << endl;
-          }*/
-  }
-
-  
-  //int numExportRays = 2000;
-  int numExportRays = 0;
-
-  if (numExportRays) {
-        char filename[64];
-        sprintf(filename, "vss-rays-initial.x3d");
-        ExportRays(filename, mVssRays, numExportRays);
-  }
-
-  vssTree = new VssTree;
-  // viewcells = Construct(mVssRays);
-
-  vssTree->Construct(mVssRays, NULL);
-  cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
-
-  if (0) ExportRays("kdtree.x3d", mVssRays, 10);
-
-  if (0)
-  {
-          ExportVssTree("vss-tree-100.x3d", vssTree, Vector3(1,0,0));
-          ExportVssTree("vss-tree-001.x3d", vssTree, Vector3(0,0,1));
-          ExportVssTree("vss-tree-101.x3d", vssTree, Vector3(1,0,1));
-          ExportVssTree("vss-tree-101m.x3d", vssTree, Vector3(-1,0,-1));
-          ExportVssTreeLeaves(vssTree, 10);
-  }
-
-  // viewcells->UpdatePVS(newVssRays);
-  // get viewcells as kd tree boxes
-  vector<AxisAlignedBox3> kdViewcells;
-  if (0) {
-        vector<KdLeaf *> leaves;
-        mKdTree->CollectLeaves(leaves);
-        vector<KdLeaf *>::const_iterator it;
-        int targetLeaves = 50;
-        float prob = targetLeaves/(float)leaves.size();
-        for (it = leaves.begin(); it != leaves.end(); ++it)
-          if (RandomValue(0.0f,1.0f) < prob)
-                kdViewcells.push_back(mKdTree->GetBox(*it));
-
-        float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
-        cout<<"Initial average PVS size = "<<avgPvs<<endl;
-  }
-
-
-  int samples = 0;
-  int pass = 0;
-
-  
-  // cast view cell samples
-  while (samples < mVssSamples) 
-  {
-        
-        int num = mVssSamplesPerPass;
-        SimpleRayContainer rays;
-        VssRayContainer vssRays;
-
-        if (!mUseImportanceSampling) {
-          for (int j=0; j < num; j++) {
-                Vector3 viewpoint; 
-                mViewCellsManager->GetViewPoint(viewpoint);
-                Vector3 direction = GetDirection(viewpoint, NULL);
-                rays.push_back(SimpleRay(viewpoint, direction));
-          }
-        } else {
-          num = GenerateImportanceRays(vssTree, num, rays);
-        }
-
-        CastRays(rays, vssRays, true);
-        vssTree->AddRays(vssRays);
-
-        if (0) {
-          int subdivided = vssTree->UpdateSubdivision();
-          cout<<"subdivided leafs = "<<subdivided<<endl;
-        }
-
-        float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
-        cout<<"Average PVS size = "<<avgPvs<<endl;
-
-        /// compute view cell contribution of rays
-        mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
-        
-        if (numExportRays) {
-          char filename[64];
-          if (mUseImportanceSampling)
-                sprintf(filename, "vss-rays-i%04d.x3d", pass);
-          else
-                sprintf(filename, "vss-rays-%04d.x3d", pass);
-
-          ExportRays(filename, vssRays, numExportRays);
-        }
-
-        samples+=num;
-        float pvs = vssTree->GetAvgPvsSize();
-        cout<<"*****************************\n";
-        cout<<samples<<" avgPVS ="<<pvs<<endl;
-        cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
-        cout<<"*****************************\n";
-//      if (samples >= mVssSamples) break;
-        pass ++;
-  }
-
-  if (mTestBeamSampling && mUseGlRenderer)
-  {     
-          TestBeamCasting(vssTree, mViewCellsManager, mObjects);
-  }
-
-  if (0)  Debug << vssTree->stat << endl;
-
-  if (0)
-  {
-          VssRayContainer viewCellRays;
-          // compute rays used for view cells construction
-          const int numRays = mViewCellsManager->GetVisualizationSamples();
-          vssTree->CollectRays(viewCellRays, numRays);
-  }
-
-
-  ////////////////////
-  //-- render simulation after construction
-
-  mRenderSimulator->RenderScene();
-  SimulationStatistics ss;
-  mRenderSimulator->GetStatistics(ss);
-  Debug << "\nFinal view cells partition render time\n" << ss << endl;
-  cout << "\nFinal view cells partition render time\n" << ss << endl;
-
-  delete vssTree;
-  
-  return true;
-}
-
-}
+                CastRays(rays, vssRays, true);
+                vssTree->AddRays(vssRays);
+
+                if (0) {
+                        int subdivided = vssTree->UpdateSubdivision();
+                        cout<<"subdivided leafs = "<<subdivided<<endl;
+                }
+
+                float avgPvs = GetAvgPvsSize(vssTree, kdViewcells);
+                cout<<"Average PVS size = "<<avgPvs<<endl;
+
+                /// compute view cell contribution of rays
+                mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
+
+                if (numExportRays) {
+                        char filename[64];
+                        if (mUseImportanceSampling)
+                                sprintf(filename, "vss-rays-i%04d.x3d", pass);
+                        else
+                                sprintf(filename, "vss-rays-%04d.x3d", pass);
+
+                        ExportRays(filename, vssRays, numExportRays);
+                }
+
+                samples+=num;
+                float pvs = vssTree->GetAvgPvsSize();
+                cout<<"*****************************\n";
+                cout<<samples<<" avgPVS ="<<pvs<<endl;
+                cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
+                cout<<"*****************************\n";
+                //      if (samples >= mVssSamples) break;
+                pass ++;
+        }
+
+        if (mTestBeamSampling && mUseGlRenderer)
+        {       
+                TestBeamCasting(vssTree, mViewCellsManager, mObjects);
+        }
+
+        if (0)  Debug << vssTree->stat << endl;
+
+        if (0)
+        {
+                VssRayContainer viewCellRays;
+                // compute rays used for view cells construction
+                const int numRays = mViewCellsManager->GetVisualizationSamples();
+                vssTree->CollectRays(viewCellRays, numRays);
+        }
+
+
+        ////////////////////
+        //-- render simulation after construction
+
+        mRenderSimulator->RenderScene();
+        SimulationStatistics ss;
+        mRenderSimulator->GetStatistics(ss);
+        Debug << "\nFinal view cells partition render time\n" << ss << endl;
+        cout << "\nFinal view cells partition render time\n" << ss << endl;
+
+        delete vssTree;
+
+        return true;
+}
+
+}

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

@@ -26 +26 @@
   bool mUseImportanceSampling;
   bool mEnlargeViewSpace;
-  AxisAlignedBox3 mViewSpaceBox;
+  //AxisAlignedBox3 mViewSpaceBox;
 
   ofstream mStats;