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

Timestamp:

08/22/07 14:27:41 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCellsManager.cpp (modified) (4 diffs)
• ViewCellsManager.h (modified) (4 diffs)
• VspTree.cpp (modified) (6 diffs)
• VspTree.h (modified) (5 diffs)

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

@@ -1021 +1021 @@
         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;
-
-        return LoadViewCells(filename, 
-                                                 pvsObjects,
-                                                 preprocessorObjects,
-                                                 finalizeViewCells,
-                                                 bconverter);
-}
-
+
+        if (strstr(filename.c_str(), ".bn"))
+        {
+                Debug << "binary view cells format detected" << endl;
+
+                return LoadViewCellsBinary(filename, 
+                                               pvsObjects,
+                                                                   finalizeViewCells,
+                                                                   bconverter);
+        }
+        else
+        {
+                Debug << "xml view cells format detected" << endl;
+
+                // 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;
+
+                return LoadViewCells(filename, 
+                                         pvsObjects,
+                                                         preprocessorObjects,
+                                                         finalizeViewCells,
+                                                         bconverter);
+        }
+}
 
 void ViewCellsManager::LoadIndexedBoundingBoxesBinary(IN_STREAM &stream, IndexedBoundingBoxContainer &iboxes)
@@ -7110 +7124 @@
 
 
-
-ViewCellsManager *LoadViewCellsBinary(const string &filename, 
-                                                                          ObjectContainer &pvsObjects,
-                                                                          bool finalizeViewCells,
-                                                                          BoundingBoxConverter *bconverter)                                                                                              
-{
-        if (!Debug.is_open()) Debug.open("debug.log");
-
+ViewCellsManager *ViewCellsManager::LoadViewCellsBinary(const string &filename, 
+                                                                                                                ObjectContainer &pvsObjects,
+                                                                                                                bool finalizeViewCells,
+                                                                                                                BoundingBoxConverter *bconverter)                                                                                                
+{
         IN_STREAM stream(filename.c_str());
 
@@ -7142 +7153 @@
         }
 
-        // sort objects by id
-        //sort(pvsObjects.begin(), pvsObjects.end(), ilt);
-
 
         ObjectContainer pvsLookup;
@@ -7188 +7196 @@
 
         Debug << "loading the view space partition tree" << endl;
-        VspTree *vspTree = new VspTree();
-
-        vspTree->mBoundingBox = viewSpaceBox;
+        VspTree *vspTree = new VspTree(viewSpaceBox);
 
         if (!vspTree->ImportBinary(stream))

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

@@ -715 +715 @@
         */
         virtual void ExportStats(const string &mergeStats);
-
-        friend ViewCellsManager *LoadViewCellsBinary(const string &filename, 
+        /** Loads view cells in binary mode.
+        */
+        static ViewCellsManager *LoadViewCellsBinary(const string &filename, 
                                                                                                  ObjectContainer &pvsObjects,
                                                                                                  bool finalizeViewCells,
@@ -722 +723 @@
         /** This helper function loads the bounding boxes for a binary solution.
         */
-        static void LoadIndexedBoundingBoxesBinary(IN_STREAM &stream, IndexedBoundingBoxContainer &iboxes);
+        static void LoadIndexedBoundingBoxesBinary(IN_STREAM &stream, 
+                                                       IndexedBoundingBoxContainer &iboxes);
 
 
@@ -1270 +1272 @@
         /** Fast view cell loader in binary mode.
         */
-        friend ViewCellsManager *LoadViewCellsBinary(const string &filename, 
-                                                                                                 ObjectContainer &pvsObjects,
-                                                                                                 bool finalizeViewCells,
-                                                                                                 BoundingBoxConverter *bconverter);
+        friend ViewCellsManager *ViewCellsManager::
+                LoadViewCellsBinary(const std::string &filename, 
+                                    ObjectContainer &pvsObjects,
+                                                        bool finalizeViewCells,
+                                                        BoundingBoxConverter *bconverter);
+
 
         /** Print statistics about the view cells compression.
@@ -1282 +1286 @@
         ////////////////////
 
-        /// if we should compress the objects after view cell evaluation: this makes
-        /// only sense for testing purpose
+        /// if we the objects are compressed after evaluation 
+        /// this makes only sense for testing purpose
         bool mCompressObjects;
-        /// pointer to the hierarchy manager responsible for view space / object space subdivision.
+        /// hierarchy manager managing view space / object subdivision.
         HierarchyManager *mHierarchyManager;
 };

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

@@ -387 +387 @@
 mOutOfBoundsCell(NULL),
 mStoreRays(false),
-//mStoreRays(true),
 mTimeStamp(1),
 mHierarchyManager(NULL)
 {
         mLocalSubdivisionCandidates = new vector<SortableEntry>;
-
-        bool randomize = false;
-        Environment::GetSingleton()->GetBoolValue("VspTree.Construction.randomize", randomize);
-        if (randomize)
-                Randomize(); // initialise random generator for heuristics
+        ParseEnvironment();
+}
+
+
+VspTree::VspTree(const AxisAlignedBox3 &bbox):
+mRoot(NULL),
+mOutOfBoundsCell(NULL),
+mStoreRays(false),
+mTimeStamp(1),
+mHierarchyManager(NULL),
+mBoundingBox(bbox)
+{
+        mLocalSubdivisionCandidates = new vector<SortableEntry>;
+        ParseEnvironment();
+}
+
+
+
+void VspTree::ParseEnvironment()
+{
+        // initialise random generator for heuristics
+        bool randomize;
+    Environment::GetSingleton()->GetBoolValue("VspTree.Construction.randomize", randomize);
+        if (randomize) Randomize(); 
 
         char subdivisionStatsLog[100];
         Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
         mSubdivisionStats.open(subdivisionStatsLog);
+
 
         /////////////
@@ -410 +429 @@
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.minProbability", mTermMinProbability);
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxRayContribution", mTermMaxRayContribution);
-        
+
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.missTolerance", mTermMissTolerance);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxViewCells", mMaxViewCells);
@@ -432 +451 @@
 
         Environment::GetSingleton()->GetFloatValue("VspTree.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight);
-        
+
         // if only the driving axis is used for axis aligned split
         Environment::GetSingleton()->GetBoolValue("VspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
@@ -439 +458 @@
 
         //mMemoryConst = (float)(sizeof(VspLeaf) + sizeof(VspViewCell));
-        //mMemoryConst = 50;//(float)(sizeof(VspViewCell));
         //mMemoryConst = (float)(sizeof(VspLeaf) + sizeof(ObjectPvs));
-
-        mMemoryConst = 16;//(float)sizeof(ObjectPvs);
-        
+        //mMemoryConst = (float)sizeof(ObjectPvs);
+
+        // hack
+        mMemoryConst = 16;
+
 
         //////////////
@@ -450 +470 @@
         Debug << "******* VSP options ********" << endl;
 
-    Debug << "max depth: " << mTermMaxDepth << endl;
+        Debug << "max depth: " << mTermMaxDepth << endl;
         Debug << "min PVS: " << mTermMinPvs << endl;
         Debug << "min probabiliy: " << mTermMinProbability << endl;
@@ -458 +478 @@
         Debug << "miss tolerance: " << mTermMissTolerance << endl;
         Debug << "max view cells: " << mMaxViewCells << endl;
+
         Debug << "randomize: " << randomize << endl;
-
         Debug << "min global cost ratio: " << mTermMinGlobalCostRatio << endl;
         Debug << "global cost miss tolerance: " << mTermGlobalCostMissTolerance << endl;

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

@@ -550 +550 @@
         */ 
         VspTree();
+        /** Constructor just setting the bounds of the tree.
+        */ 
+        VspTree(const AxisAlignedBox3 &bbox);
         /** Default destructor.
         */
@@ -706 +709 @@
                 }
         };
-
+        /** Parse the environment settings.
+        */
+        void ParseEnvironment();
         /** faster evaluation of split plane cost for kd axis aligned cells.
         */
@@ -754 +759 @@
         */
         void EvaluateLeafStats(const VspTraversalData &data);
-
         /** Subdivides node using a best split priority queue.
             @param tQueue the best split priority queue
@@ -804 +808 @@
         */
         float EvalPvsCost(const RayInfoContainer &rays) const;
-
+        /** Helper function for split cost evaluation.
+        */
         int EvalPvsEntriesIncr(VspSubdivisionCandidate &splitCandidate,
                                                    const SplitData &sData) const;
@@ -1084 +1089 @@
 
 #endif
-
-
-        friend ViewCellsManager *LoadViewCellsBinary(const std::string &filename, 
-                                                                                     ObjectContainer &pvsObjects,
-                                                                                                 bool finalizeViewCells,
-                                                                                                 BoundingBoxConverter *bconverter);
+        
 
 protected: