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

Timestamp:

08/20/07 12:51:12 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/generate_viewcells.env (modified) (1 diff)
• src/Environment.cpp (modified) (1 diff)
• src/FlexibleHeap.h (modified) (5 diffs)
• src/HierarchyManager.cpp (modified) (1 diff)
• src/LogManager.h (modified) (2 diffs)
• src/OspTree.cpp (modified) (1 diff)
• src/OspTree.h (modified) (2 diffs)
• src/Preprocessor.cpp (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (3 diffs)
• src/ResourceManager.cpp (deleted)
• src/ResourceManager.h (modified) (4 diffs)
• src/Triangle3.cpp (modified) (1 diff)
• src/ViewCell.cpp (modified) (7 diffs)
• src/ViewCellsManager.cpp (modified) (20 diffs)
• src/ViewCellsManager.h (modified) (6 diffs)
• src/ViewCellsParser.cpp (modified) (5 diffs)
• src/VspTree.cpp (modified) (7 diffs)
• src/VssPreprocessor.cpp (modified) (10 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env

@@ -219 +219 @@
                 ###################################################
 
-                # minimal steps of same type: for interleaved, this is only valid for the first few splits
+                # minimal steps of same domain (view /object): for interleaved mode
                 minStepsOfSameType 100
                 maxStepsOfSameType 900

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

@@ -2393 +2393 @@
                                 "vsp_term_max_view_cells=",
                                 "10000");
-
         
         RegisterOption("VspTree.Termination.missTolerance",

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

@@ -34 +34 @@
 
 
-/** This class implements a flexible heap for
-use as a priority queue.
-
-Unlike the stl priority_queue, the class allows access to all 
-elements. It implements efficient insertion routines and remove routines
-of arbitrary elements.
+/** This class implements a flexible heap for use as a priority queue.
+        Unlike the stl priority_queue, the class allows access to all 
+        elements. It implements efficient insertion routines and remove routines
+        of arbitrary elements.
 */
 template<typename T>
@@ -48 +46 @@
         FlexibleHeap(const unsigned int n): mBuffer(n) { }
 
-        void Push(T t) { Push(t, t->GetPriority()); }
+        void Push(T t);
         void Push(T t, const float priority);
-        bool Update(T t) { return Update(t, t->GetPriority()); }
+        bool Update(T t);
         bool Update(T t, const float priority);
 
-        unsigned int Size() const { return (unsigned int)mBuffer.size(); }
-        bool Empty() const {return mBuffer.empty(); }
-        T Item(const unsigned int i) { return mBuffer[i]; }
-        const T Item(const unsigned int i) const { return mBuffer[i]; }
+        inline unsigned int Size() const;
+        inline bool Empty() const;
+        inline T Item(const unsigned int i);
+        inline const T Item(const unsigned int i) const;
         T Pop();
-        T Top() const { return (mBuffer.empty() ? (T)NULL : mBuffer.front()); }
+        inline T Top() const;
         /** Erases the element from the heap.
         */
@@ -79 +77 @@
 
 
-/*****************************************************************************/
-/*                         MyHeap implementation                             *
-/*****************************************************************************/
+
+
+/******************************************************************/
+/*                 FexibleHeap implementation                     */
+/******************************************************************/
+
+
+template <typename T>
+void FlexibleHeap<T>::Push(T t) 
+{ 
+        Push(t, t->GetPriority()); 
+}
+
+
+template <typename T>
+bool FlexibleHeap<T>::Update(T t) 
+{ 
+        return Update(t, t->GetPriority()); 
+}
+
+
+template <typename T>
+inline unsigned int FlexibleHeap<T>::Size() const 
+{ 
+        return (unsigned int)mBuffer.size(); 
+}
+
+
+template <typename T>
+inline bool FlexibleHeap<T>::Empty() const 
+{
+        return mBuffer.empty(); 
+}
+
+
+template <typename T>
+inline T FlexibleHeap<T>::Item(const unsigned int i) 
+{ 
+        return mBuffer[i]; 
+}
+
+
+template <typename T>
+inline const T FlexibleHeap<T>::Item(const unsigned int i) const 
+{ 
+        return mBuffer[i]; 
+}
+
+
+template <typename T>
+inline T FlexibleHeap<T>::Top() const 
+{ 
+        return (mBuffer.empty() ? (T)NULL : mBuffer.front()); 
+}
+
 
 template <typename T>
@@ -120 +170 @@
         }
 }
+
 
 template <typename T>
@@ -200 +251 @@
         mBuffer.pop_back();
 
-        DownHeap(0);
+        if (!mBuffer.empty())
+                DownHeap(0);
+
         dead->NotInHeap();
 

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

@@ -549 +549 @@
         
         PrepareViewSpaceSubdivision(viewSpaceQueue, sampleRays, objects);
-
+        /// q: why clear the dirty list here?
         dirtyList.clear();
         // view space subdivision started

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

@@ -16 +16 @@
         there is always only one log manager.
 */
-class LogManager {
-
+class LogManager 
+{
 public:
 
@@ -34 +34 @@
         LogManager();
 
-  ~LogManager() {}
-  
+        ~LogManager() {}
+
         void LogMessage(const std::string &str);
 
 protected:
-
         std::ofstream mOutStream;
 
 private:
-
         static LogManager *sLogManager;
-        
 };
 

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

@@ -1591 +1591 @@
         }
 
-        // andidates holding this view cells are thrown into dirty list
+        // candidates that contain this view cells are thrown into dirty list
         ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
 

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

@@ -255 +255 @@
                 {
                         mDirty = false;
-                        // todo: avoid computing split plane
                         sOspTree->EvalSubdivisionCandidate(*this);      
                 }
@@ -272 +271 @@
                 }
 
-                void CollectDirtyCandidates(SubdivisionCandidateContainer &dirtyList,
-                                                                        const bool onlyUnmailed)
+                void CollectDirtyCandidates(SubdivisionCandidateContainer &dirtyList, const bool onlyUnmailed)
                 {
                         sOspTree->CollectDirtyCandidates(this, dirtyList, onlyUnmailed);

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

@@ -509 +509 @@
         if (result) 
         { 
-
                 mSceneGraph->AssignObjectIds();
  

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

@@ -462 +462 @@
                         if (mUseSpatialFilter) 
                         {
-                                // 9.11. 2006 -> experiment with new spatial filter
-#if 0
-                                mViewCellsManager->ApplySpatialFilter(mKdTree,
-                                        mSpatialFilterSize*
-                                        Magnitude(mViewCellsManager->GetViewSpaceBox().Size()),
-                                        mPvsCache.mPvs);
-#else
-                                //cout<<"updating filter" << endl;
                                 // mSpatialFilter size is in range 0.001 - 0.1
                                 mViewCellsManager->ApplyFilter2(viewcell,
-                                        mUseFilter,
-                                        100 * mSpatialFilterSize,
-                                        mPvsCache.mPvs,
-                                        &mPvsCache.filteredBoxes
-                                        );
-#endif
-                        } 
+                                                                    mUseFilter,
+                                                                                                100 * mSpatialFilterSize,
+                                                                                                mPvsCache.mPvs,
+                                                                                                &mPvsCache.filteredBoxes);
+                        }
                         else
                         {
@@ -496 +486 @@
                 if (mUseSpatialFilter && mRenderBoxes) 
                 {
-                        for (int i=0; i < mPvsCache.filteredBoxes.size(); i++)
+                        for (int i=0; i < mPvsCache.filteredBoxes.size(); ++ i)
+                        {
                                 RenderBox(mPvsCache.filteredBoxes[i]);
+                        }
                 } 
                 else 
@@ -507 +499 @@
                         else
                         {
+                                mPvsSize = mPvsCache.mPvs.GetSize();
+
                                 ObjectPvsIterator it = mPvsCache.mPvs.GetIterator();
 
-                                mPvsSize = mPvsCache.mPvs.GetSize();
-                                for (; it.HasMoreEntries(); ) 
+                                while (it.HasMoreEntries())
                                 {
                                         Intersectable *object = it.Next(pvsData);

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

@@ -8 +8 @@
 #include "Mesh.h"
 #include "Material.h"
+
+
 
 namespace GtpVisibilityPreprocessor {
@@ -124 +126 @@
         ResourceManager<T>()
         {}
-
         /** Release resources.
         */
@@ -137 +138 @@
                 }
         }
-  
         /** Copy constructor.
         */
@@ -143 +143 @@
     {
     }
-
-         /** Helper function returning unique id for resource.
-         */
+        /** Helper function returning unique id for resource.
+        */
         static unsigned int CreateUniqueId()
         {

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

@@ -37 +37 @@
                                    Vector3 &normal) const
 {
-#if 0
-        VertexContainer vertices;
-        vertices.push_back(mVertices[0]);
-        vertices.push_back(mVertices[1]);
-        vertices.push_back(mVertices[2]);
-
-        Polygon3 poly(vertices);
-
-        int dummy = poly.CastRay(ray, t, nearestT);
-        normal = poly.GetNormal();
-        
-        //      cout << "polyversion code: " << dummy << " t: " << t << " nearestT: " << nearestT << endl;
-        return dummy;
-#endif
-        
         //////////////
         // specialised triangle ray casting version

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

@@ -2589 +2589 @@
 
 ///////////////////
-// Binary export
+//-- Binary export
 
 void ViewCellsTree::ExportBinInterior(OUT_STREAM &stream, ViewCellInterior *interior)
 {
-#if TODO
         int interiorid = TYPE_INTERIOR;
         stream.write(reinterpret_cast<char *>(&interiorid), sizeof(int));
-
-        int axis = interior->GetAxis();
-        float pos = interior->GetPosition();
-
-        stream.write(reinterpret_cast<char *>(&axis), sizeof(int));
-        stream.write(reinterpret_cast<char *>(&pos), sizeof(float));
-#endif
 }
 
@@ -2608 +2600 @@
 void ViewCellsTree::ExportBinLeaf(OUT_STREAM &stream, ViewCell *leaf)
 {
-#if TODO
         int type = TYPE_LEAF;
 
-        int id = -1;
-        if (viewCell != mOutOfBoundsCell)
-                id = viewCell->GetId();
+        int id = leaf->GetId();
 
         stream.write(reinterpret_cast<char *>(&type), sizeof(int));
         stream.write(reinterpret_cast<char *>(&id), sizeof(int));
 
-        int pvsSize = viewCell->GetPvs().GetSize();
+        int pvsSize = leaf->GetPvs().GetSize();
         stream.write(reinterpret_cast<char *>(&pvsSize), sizeof(int));
 
-        ObjectPvsIterator pit = viewCell->GetPvs().GetIterator();
-
-        // write PVS of view cell
+        ObjectPvsIterator pit = leaf->GetPvs().GetIterator();
+
+        // write pvs
         while (pit.HasMoreEntries())
         {
@@ -2630 +2619 @@
                 stream.write(reinterpret_cast<char *>(&id), sizeof(int));
         }
-#endif
 }
 
@@ -2636 +2624 @@
 bool ViewCellsTree::ExportBinary(OUT_STREAM &stream)
 {
-#if TODO
+
         // export binary version of mesh
         queue<ViewCell *> tStack;
@@ -2652 +2640 @@
                 else
                 {
-                        VspInterior *interior = static_cast<ViewCellInterior *>(node);
-
+                        ViewCellInterior *interior = static_cast<ViewCellInterior *>(node);
+
+                        // export current interior
                         ExportBinInterior(stream, interior);
                         
-                        tStack.push(interior->GetFront());
-                        tStack.push(interior->GetBack());
-                }
-        }
-#endif
+                        // push children
+                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        {
+                                tStack.push(*it);
+                        }
+                }
+        }
+
         return true;
 }
@@ -2666 +2660 @@
 
 //////////////////
-// import binary
+//-- import binary
 
 ViewCellInterior *ViewCellsTree::ImportBinInterior(IN_STREAM  &stream, ViewCellInterior *parent)
@@ -2725 +2719 @@
 
 
-/** Data used for tree traversal
-*/
-struct MyTraversalData
-{  
-public:
-
-        MyTraversalData(ViewCell *node, const int depth, const AxisAlignedBox3 &box):
-        mNode(node), mDepth(depth), mBox(box)
-        {}
-
-
-        //////////////////////
-
-        /// the current node
-        ViewCell *mNode;
-        /// current depth
-        int mDepth;
-        /// the bounding box
-        AxisAlignedBox3 mBox;
-};
-
-
 bool ViewCellsTree::ImportBinary(IN_STREAM &stream, const ObjectContainer &pvsObjects)
 {

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

@@ -34 +34 @@
 #define PVS_ADD_DIRTY 1
 
+
+
 namespace GtpVisibilityPreprocessor {
 
@@ -46 +48 @@
 const static bool CLAMP_TO_BOX = true;
 
+
+
+inline static bool ilt(Intersectable *obj1, Intersectable *obj2)
+{
+        return obj1->mId < obj2->mId;
+}
 
 
@@ -994 +1002 @@
         EvaluateViewCellsStats();
 
-        if (1) CompressViewCells();
+        // compress the final solution
+        if (0) CompressViewCells();
 
         // write view cells to disc
@@ -1021 +1030 @@
                                                                                                  
 {
+        if (!Debug.is_open()) Debug.open("debug.log");
+
         // give just an empty container as parameter:
         // this loading function is used in the engine, thus it
         // does not need to load the entities the preprocessor works on
         ObjectContainer preprocessorObjects;
-
-        if (!Debug.is_open()) Debug.open("debug.log");
 
         return LoadViewCells(filename, 
@@ -1033 +1042 @@
                                                  finalizeViewCells,
                                                  bconverter);
+}
+
+
+void ViewCellsManager::LoadIndexedBoundingBoxes(IN_STREAM &stream, IndexedBoundingBoxContainer &iboxes)
+{
+        Vector3 bmin;
+        Vector3 bmax;
+        int id;
+
+        stream.read(reinterpret_cast<char *>(&bmin), sizeof(Vector3));
+        stream.read(reinterpret_cast<char *>(&bmax), sizeof(Vector3));
+        stream.read(reinterpret_cast<char *>(&id), sizeof(int));
+
+        AxisAlignedBox3 box(bmin, bmax);
+
+        iboxes.push_back(IndexedBoundingBox(id, box));
+        //Debug << "bbox: " << box << endl;
+}
+
+
+ViewCellsManager *ViewCellsManager::LoadViewCellsBin(const string &filename, 
+                                                                                                         ObjectContainer &pvsObjects,
+                                                                                                         ObjectContainer &preprocessorObjects,
+                                                                                                         bool finalizeViewCells,
+                                                                                                         BoundingBoxConverter *bconverter)
+{
+        IN_STREAM stream(filename.c_str());
+        
+        IndexedBoundingBoxContainer iboxes;
+        LoadIndexedBoundingBoxes(stream, iboxes);
+
+        if (bconverter)
+        {
+                // all bounding boxes gathered in this step => 
+                // associate object ids with bounding boxes
+                bconverter->IdentifyObjects(iboxes, pvsObjects);
+        }
+
+        // sort objects by id
+        sort(pvsObjects.begin(), pvsObjects.end(), ilt);
+
+        ViewCellsTree *vcTree = new ViewCellsTree();
+        VspTree *vspTree = new VspTree();
+
+        HierarchyManager *hm = new HierarchyManager(0);
+
+        vspTree->ImportBinary(stream, pvsObjects);
+        
+        VspOspViewCellsManager *vcm = new VspOspViewCellsManager(vcTree, hm);
+
+        return vcm;
 }
 
@@ -1061 +1121 @@
         }
         
-        if (0) //hack: should work with reset function, but something is wrong ..
+        if (0) //hack: reset function should work, but something is wrong ..
         {
                 vm->ResetViewCells();
@@ -1104 +1164 @@
                                                                                          const ObjectContainer &objects)
 {
+        // no view cells constructed yet
         if (!ViewCellsConstructed() || !ViewCellsTreeConstructed())
-        {
                 return false;
-        }
 
         cout << "exporting view cells to xml ... ";
@@ -2424 +2483 @@
 
 
-
-                  if (evaluateFilter) {
+                  if (evaluateFilter) 
+                  {
                           ObjectPvs filteredPvs;
 
-                          PvsFilterStatistics fstat = ApplyFilter2(viewcell,
-                                  false,
-                                  mFilterWidth,
-                                  filteredPvs);
-
-                          float filteredCost = filteredPvs.EvalPvsCost();
+                          PvsFilterStatistics fstat = ApplyFilter2(viewcell, false, mFilterWidth, filteredPvs);
+
+                          const float filteredCost = filteredPvs.EvalPvsCost();
 
                           stat.avgFilteredPvs += filteredCost;
@@ -3070 +3126 @@
                         MeshInstance *mi = static_cast<MeshInstance *>(*it);
                         const AxisAlignedBox3 box = mi->GetBox();
+                        
                         Vector3 bmin = box.Min();
                         Vector3 bmax = box.Max();
+                        
                         int id = mi->GetId();
 
@@ -3444 +3502 @@
 
         // Minimal number of samples so that filtering takes place
-#define MIN_SAMPLES  50
+        const float MIN_SAMPLES = 50;
 
         if (samples > MIN_SAMPLES) 
@@ -3537 +3595 @@
         }
 
-        Debug << " nPvs size = " << pvs.GetSize() << endl;
+        //Debug << " nPvs size = " << pvs.GetSize() << endl;
 
         if (!mUseKdPvs)
@@ -5887 +5945 @@
 
 
-Intersectable *
-VspOspViewCellsManager::GetIntersectable(const VssRay &ray, const bool isTermination) const
+Intersectable *VspOspViewCellsManager::GetIntersectable(const VssRay &ray, 
+                                                                                                                const bool isTermination) const
 {
         if (mUseKdPvs)
@@ -6387 +6445 @@
                         const bool exportBounds = false;
 
-                        if (1)
                         mHierarchyManager->ExportObjectSpaceHierarchy(exporter, 
                                                                       objects, 
@@ -6575 +6632 @@
                                                                                          const ObjectContainer &objects)
 {
+        // no view cells were computed
         if (!ViewCellsConstructed() || !ViewCellsTreeConstructed())
                 return false;
+
+        cout << "exporting binary" << endl;
+        string fname("test.vc");
+        return ExportBinaryViewCells(fname, exportPvs, objects);
 
         const long starttime = GetTime();
@@ -6612 +6674 @@
 
                                 stream << "<BoundingBox" << " id=\"" << id << "\""
-                                   << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                   << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                       << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
                         }
+
                         stream << "</BoundingBoxes>" << endl;
                 }
@@ -6661 +6724 @@
                                                                                                    const ObjectContainer &objects)
 {
+        // no view cells constructed yet
         if (!ViewCellsConstructed() || !ViewCellsTreeConstructed())
                 return false;
@@ -6678 +6742 @@
     ///////////////
         //-- export bounding boxes
-        //-- we need the boxes to identify objects in the target engine
-
+
+        // we use bounding box intersection to identify pvs objects in the target engine
         vector<KdIntersectable *>::const_iterator kit, kit_end = mPreprocessor->mKdTree->mKdIntersectables.end();
 
@@ -6689 +6753 @@
                 const AxisAlignedBox3 &box = obj->GetBox();
 
-                // set kd node id
+                // setting the kd node id important to identify the kd node as pvs entry
                 obj->SetId(id);
+
                 Vector3 bmin = box.Min();
                 Vector3 bmax = box.Max();
@@ -6703 +6768 @@
         //-- export the view cells and the pvs
 
-
         int numViewCells = mCurrentViewCellsStats.viewCells;
         stream.write(reinterpret_cast<char *>(&numViewCells), sizeof(int));
@@ -6712 +6776 @@
         stream.write(reinterpret_cast<char *>(&vmin), sizeof(Vector3));
         stream.write(reinterpret_cast<char *>(&vmax), sizeof(Vector3));
+
+        // todo
+        mViewCellsTree->ExportBinary(stream);
 
 

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

@@ -520 +520 @@
                                                                                    BoundingBoxConverter *bconverter = NULL);
 
+        /** Convenience function assuming that there are no preprocessor objects.
+        */
         static ViewCellsManager *LoadViewCells(const string &filename, 
                                                                                    ObjectContainer &pvsObjects,
@@ -525 +527 @@
                                                                                    BoundingBoxConverter *bconverter = NULL);
 
+        ViewCellsManager *LoadViewCellsBin(const string &filename, 
+                                           ObjectContainer &pvsObjects,
+                                                                           ObjectContainer &preprocessorObjects,
+                                                                           bool finalizeViewCells,
+                                                                           BoundingBoxConverter *bconverter);
+
+
         ///////////////////////
-        // visiblity filter options
+        //-- visiblity filter options
 
         // TODO: write own visibiltiy filter class
@@ -636 +645 @@
                                                 const vector<int> &strategies,
                                                 VssRayContainer &vssRays) const;
-
+        /** cast samples for the purpose of evaluating the view cells solution
+        */
         int CastEvaluationSamples(const int samplesPerPass, 
                                                           VssRayContainer &passSamples);// const;
@@ -660 +670 @@
         */
         void EvaluateViewCellsStats();
+        /** This helper function loads the bounding boxes for a binary solution.
+        */
+        void LoadIndexedBoundingBoxes(IN_STREAM &stream, IndexedBoundingBoxContainer &iboxes);
 
 
@@ -1135 +1148 @@
 {
         friend class ViewCellsParseHandlers;
+        friend class ViewCellsManager;
 
 public:
 
+        /** This version takes a view cells tree and a hierarchy
+                as input.
+        */
         VspOspViewCellsManager(ViewCellsTree *vcTree, 
                                                    const string &hierarchyType);
@@ -1196 +1213 @@
                                                            const string &prefix,
                                                            VssRayContainer *visRays = NULL);
-        
-        ;
         /** See parent class.
         */

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

@@ -60 +60 @@
 //      can be set via the -v= command.
 // ---------------------------------------------------------------------------
-static bool     doNamespaces       = false;
-static bool     doSchema           = false;
-static bool     schemaFullChecking = false;
-static SAXParser::ValSchemes    valScheme       = SAXParser::Val_Auto;
+static bool doNamespaces = false;
+static bool doSchema = false;
+static bool schemaFullChecking = false;
+static SAXParser::ValSchemes valScheme = SAXParser::Val_Auto;
 
 // hack for loading bvh nodes
@@ -313 +313 @@
         else
         {
+                // sort objects by id
                 sort(mPvsObjects.begin(), mPvsObjects.end(), ilt);
         }
@@ -318 +319 @@
         Debug << "\nconverted bounding boxes to objects in "
                   << TimeDiff(startTime, GetTime()) * 1e-6 << " secs" << endl;
+
         mBoxTimer.Exit();
 }
@@ -693 +695 @@
                 string attrName(StrX(attributes.getName(i)).LocalForm());
                 StrX attrValue(attributes.getValue(i));
+
                 const char *ptr = attrValue.LocalForm();
 
@@ -711 +714 @@
         AxisAlignedBox3 box(bmin, bmax);
         mIBoundingBoxes.push_back(IndexedBoundingBox(id, box));
-        //Debug << "bbox: " << box << endl;
 }
 

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

@@ -792 +792 @@
         
         mPlaneTimer.Exit();
-
         mEvalTimer.Entry();
 
         VspLeaf *leaf = static_cast<VspLeaf *>(splitCandidate.mParentData.mNode);
+
 
         //////////////
@@ -832 +832 @@
 
 #if COUNT_ORIGIN_OBJECTS
-
                 obj = (*ray).mOriginObject;
 
@@ -838 +837 @@
                 {
                         leaf = mBvHierarchy->GetLeaf(obj);
-
                         UpdateContributionsToPvs(leaf, cf, sData); 
                 }
@@ -3227 +3225 @@
 
 void VspTree::AddCandidateToDirtyList(const VssRay &ray, 
-                                                                const bool isTermination,
-                                                                vector<SubdivisionCandidate *> &dirtyList,
-                                                                const bool onlyUnmailed) const
+                                                                          const bool isTermination,
+                                                                          vector<SubdivisionCandidate *> &dirtyList,
+                                                                          const bool onlyUnmailed) const
 
 {
 #if HACK_PERFORMANCE
-
         Intersectable *obj = isTermination ? ray.mTerminationObject : ray.mOriginObject; 
 
@@ -3251 +3248 @@
         }
 #else
-
         SubdivisionCandidate *candidate = NULL;
 
@@ -3379 +3375 @@
                         // simple render cost evaluation
                         if (-- leaf->mCounter == 0)
-                                //pvs += (int)leaf->mObjects.size();
                                 pvs += BvHierarchy::EvalAbsCost(leaf->mObjects);
+
                         break;
                 }
@@ -3466 +3462 @@
         return pvsSize;
 #endif
-        
 }
 

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

@@ -254 +254 @@
 {
         //debuggerWidget = new GlDebuggerWidget(renderer);
-        //  renderer->resize(640, 480);
+        //renderer->resize(640, 480);
         //debuggerWidget->resize(640, 480);
 
@@ -265 +265 @@
         exporter->ExportGeometry(objects);
         exporter->SetFilled();
+        
         //Randomize();
-// §§matt
-//      debuggerWidget = new GlDebuggerWidget(renderer);
-
-        /*debuggerWidget->mBeam = beam;
+        //§§matt
+        //debuggerWidget = new GlDebuggerWidget(renderer);
+
+        /*
+        debuggerWidget->mBeam = beam;
         debuggerWidget->mSourceObject = sourceObj;
         debuggerWidget->mSamples = 10000;
@@ -276 +278 @@
         debuggerWidget->show();
         
-        renderer->makeCurrent();*/
+        renderer->makeCurrent();
+        */
 
         for (int i = 0; i < 10; ++ i)
@@ -299 +302 @@
 
                 BeamSampleStatistics stats;
-// §§matt
-/*              renderer->SampleBeamContributions(sourceObj,
+
+                // §§matt
+                /*      
+                renderer->SampleBeamContributions(sourceObj,
                                                                                   beam,
                                                                                   200000,
@@ -310 +315 @@
                 image.save(s, "PNG");
                 Debug << "beam statistics: " << stats << endl << endl;
-*/
+                */
+
                 if (1)
                 {
@@ -321 +327 @@
                 }
 
-                bool exportViewCells = false;
+                const bool exportViewCells = false;
+
                 if (exportViewCells)
                 {
@@ -338 +345 @@
                                 exporter->ExportViewCell(*it);
                         }
-
-                        /*vector<KdNode *>::const_iterator it, it_end = beam.mKdNodes.end();
-                        
-                        for (it = beam.mKdNodes.begin(); it != beam.mKdNodes.end(); ++ it)
-                        {
-                                exporter->ExportBox(mKdTree->GetBox((*it)));
-                        }*/
                 }
         }
-        /*while (1)
-        { debuggerWidget->repaint();
-        };*/
+        
         delete exporter;
 }
@@ -376 +374 @@
         int totalSamples = 0;
 
-        //mSceneGraph->CollectObjects(&mObjects);
-
         if (!mLoadViewCells)
         {
-                //-- generate new view cells from the scratch
-                //-- for construction the manager uses it's own set of samples
+                // generate new view cells from the scratch using coarse sampling
                 ConstructViewCells();
         }
@@ -387 +382 @@
         else 
         {        
-                //-- load view cells from file
-                //-- test successful view cells loading by exporting them again
-                VssRayContainer dummies;
-                mViewCellsManager->Visualize(mObjects, dummies);
+                // load view cells from file
+                // we test success by exporting view cells again
+                VssRayContainer dummyContainer;
+                mViewCellsManager->Visualize(mObjects, dummyContainer);
+                
                 mViewCellsManager->ExportViewCells("test.xml.zip", mViewCellsManager->GetExportPvs(), mObjects);
         }
@@ -401 +397 @@
         {
                 cout << "Loading samples from file ... ";
+                
                 LoadSamples(mVssRays, mObjects);
+                
                 cout << "finished\n" << endl;
                 totalSamples = (int)mVssRays.size();