Changeset 1002 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

Timestamp:

06/07/06 10:59:55 (18 years ago)

Author:

mattausch

Message:

debug run: fixing memory holes

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h (modified) (13 diffs)

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

@@ -170 +170 @@
         void AddViewCell(ViewCell *viewCell);
 
-        /** Derive view cells from objects. The view ells are created by taking the object
+        /** Derive view cells from scene objects. The view ells are created by taking the object
                 geometry into account.
         */
-        void DeriveViewCells(const ObjectContainer &objects, 
-                                                 ViewCellContainer &viewCells, 
-                                                 const int maxViewCells) const;
+        void DeriveViewCellsFromObjects(const ObjectContainer &objects, 
+                                                                        ViewCellContainer &viewCells, 
+                                                                        const int maxViewCells) const;
 
         /** Sets maximal number of samples used for the 
@@ -206 +206 @@
         int GetPostProcessSamples() const;
 
-        /** Returns true if view cells wer already constructed.
+        /** Returns true if view cells are already constructed.
         */
         virtual bool ViewCellsConstructed() const = 0;
@@ -405 +405 @@
         */
         float EvalRenderCost(Intersectable *obj) const;
-
    
-        
+        /** Sets pvs size of view cell as a scalar. Used when storing pvs only in the leaves
+                of the hierarchy.
+        */
+        inline void SetScalarPvsSize(ViewCell *vc, const int pvsSize) const;
+
+
         /** Returns bounding box of a view cell.
         */
@@ -420 +424 @@
         bool LoadBoundingBoxes(const string filename, IndexedBoundingBoxContainer &boxes) const;
 
-        bool GetExportPvs() const 
-        {
-                return mExportPvs;
-        }
+        /** Returns true if pvs should be exported together with the view cells.
+        */
+        bool GetExportPvs() const;
 
         /** Loads view cells from file. The view cells manager is created with 
                 respect to the loaded view cells.
 
+                @param filename the filename of the view cells
+                @param objects the scene objects
+                @param env an environment file containing more parameters
+                @param finalizeViewCells if the view cells should be post processed, i.e.
+                        a mesh is created representing the geometry
+                @param bconverter a conversion routine working with the similarities of bounding
+                boxes: if there is a certain similarity of overlap between bounding boxes, two tested
+                candidate objects are considered to be the same objects
                 @returns the view cells manager if loading was successful, false otherwise
         */
@@ -522 +533 @@
         virtual void ExportColor(Exporter *exporter, ViewCell *vc) const = 0;
 
-
+        /** Returns volume of the view space.
+        */
         virtual float GetViewSpaceVolume();
         
@@ -553 +565 @@
         virtual void UpdatePvsForEvaluation(ViewCell *root, ObjectPvs &pvs) = 0;
 
-
+        
         ////////////////////////////////////////////////
 
@@ -570 +582 @@
         /// Loaded view cells
         ViewCellContainer mViewCells;
-
+        /// the corresponding view cell tree holding the logical description of view cells
         ViewCellsTree *mViewCellsTree;
-
+        /// if empty view cells should be pruned (i.e., invalidated) from this point on
         bool mPruneEmptyViewCells;
 
+        /// if the pvss in the view cell leaves and the interiors are up to date
         bool mViewCellPvsIsUpdated;
+
         /// maximum number of samples taken for construction of the view cells
         int mConstructionSamples;
@@ -595 +609 @@
         bool mCompressViewCells;
 
+        /// holds the current view cell statistics
         ViewCellsStatistics mCurrentViewCellsStats;
         /// the scene bounding box
@@ -602 +617 @@
         bool mExportViewCells;
 
-        //bool mMarchTree);
+        // if only valid view cells should be considered for processing
         bool mOnlyValidViewCells;
 
         /// if rays should be used to collect merge candidates
         bool mUseRaysForMerge;
-        /// merge the view cells?
+        /// if there should be an additional merge step after the subdivision
         bool mMergeViewCells;
 
@@ -616 +631 @@
         //-- visualization options
         
-        /// color code for view cells
+        /// color code for view cells visualization
         int mColorCode;
         bool mExportGeometry;
@@ -638 +653 @@
         bool mExportPvs;
 
+        /// the pointer to the environment
         Environment *mEnvironment;
 };
-
 
 
@@ -729 +744 @@
         void ExportBspPvs(const ObjectContainer &objects);
 
+        /** test if subdivision is valid in terms of volume / area.
+        */
         void TestSubdivision();
 };
@@ -994 +1011 @@
                                           const VssRayContainer &rays);
 
+        /** test if subdivision is valid in terms of volume / area.
+        */
         void TestSubdivision();
 };
 
 
-class ViewCellsManagerFactory
+/*class ViewCellsManagerFactory
 {
-
 public:
-
         ViewCellsManager *Create(const string mName);
-
-};
+};*/
 
 }