Changeset 1551 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h

Timestamp:

10/02/06 19:07:38 (18 years ago)

Author:

mattausch

Message:

updated view cells loading. probably no optimal for performance

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.h (modified) (11 diffs)

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

@@ -107 +107 @@
         /** Default destructor.
         */
-        virtual ~ViewCell() {}
-
+        virtual ~ViewCell();
         /** Returns Pvs.
         */
         const ObjectPvs &GetPvs() const;
-
         /** Returns pvs.
         */
         ObjectPvs &GetPvs();
-
         /** Completely substitutes the pvs.
         */
         void SetPvs(const ObjectPvs &pvs);
-
         /** Type of view cells.
         */
         int Type() const;
-
-        
         /** Adds a passing ray to the passing ray container.
         */
         void AddPassingRay(const Ray &ray, const int contributions);
-
         /** Returns volume of the view cell.
         */
         float GetVolume() const;
-
         /** Returns area of the view cell.
         */
         float GetArea() const;
-
         /** Sets the volume of the view cell.
         */
         void SetVolume(float volume);
-        
         /** Sets the area of the view cell.
         */
         void SetArea(float area);
-
-
         /** if this view cell is the root of a view cell hierarchy
         */
         bool IsRoot() const;
-
         /** Returns parent view cell.
         */
         ViewCellInterior *GetParent() const;
-
         /** Sets parent of this view cell.
         */
         void SetParent(ViewCellInterior *parent);
-
-
         /** Sets the mesh for this view cell.
         */
@@ -231 +215 @@
 
 
-
-        ////////////////
+        //////////
         //-- mailing stuff
-
 
         static void NewMail(const int reserve = 1) 
@@ -346 +328 @@
         }
 
-        /** Returns if this view cell is active.
+        /** Returns active view cell, i.e. this view cell or
+                a parent view cell which is set as active view cell.
         */
         ViewCell *GetActiveViewCell() const 
@@ -355 +338 @@
         void SetActiveViewCell(ViewCell *vc)
         { mActiveViewCell = vc;}
-
         
         /** points to the currently active view cell. This is the
@@ -375 +357 @@
         ViewCellLeaf(mesh) {  }
                 
-
         bool IsLeaf() const
         {
@@ -381 +362 @@
         }
 
-
-        /// Leaf of some hierarchy which is part of this view cell.
-        T mLeaf;
+        /// Leaves of some hierarchy which contains this view cell.
+        vector<T> mLeaves;
 };
 
@@ -507 +487 @@
         void SetRoot(ViewCell *root);
 
-        //float ComputeVolume(ViewCell *vc);
-
         /** Assignes unique ids to view cells.
         */
@@ -521 +499 @@
         int CountKdPvs(const ViewCellLeaf *vc) const;
 
-        void SetViewCellsManager(ViewCellsManager *vcm)
-        {
-                mViewCellsManager = vcm;
-        }
+        /** Sets pointer to view cells manager.
+        */
+        void SetViewCellsManager(ViewCellsManager *vcm);
 
 protected:
@@ -595 +572 @@
         void ResetMergeQueue();
 
-        /** Updates the current top level of view cells.
+        /** Updates the current cut of view cells.
                 @returns number of newly merged view cells
         */
@@ -643 +620 @@
         /// if the view cell tree hold compressed pvs
         int mViewCellsStorage;
-
+        /// pointer to the view cells manager
         ViewCellsManager *mViewCellsManager;
+        /// the root of the view cells hierarchy
         ViewCell *mRoot;
 
         /// if merge visualization should be shown
         bool mExportMergedViewCells;
-
-        
         /// intermediate container of merged view cells.
         ViewCellContainer mMergedViewCells;
-        
-
         /// if merged view cells are refined.
         bool mRefineViewCells;
-
         /// weights between variance and render cost increase (must be between zero and one)
         float mRenderCostWeight;
@@ -666 +639 @@
     float mDeviation;
         float mAvgRenderCost;
+        
         /// the area is used for pvs heuristics
         int mUseAreaForPvs;
-
+        /// number of currently active view cells (=current cut)
         int mNumActiveViewCells;
-
         /// minimal number of view cells
         int mMergeMinViewCells;