Changeset 580 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

Timestamp:

02/01/06 19:29:59 (18 years ago)

Author:

mattausch

Message:

implemented variance
started implementing merge history

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h (modified) (12 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -27 +27 @@
 class Beam;
 class Preprocessor;
+class ViewCellsTree;
+class MergeCandidate;
 
 struct BspRay;
@@ -133 +135 @@
                 @returns new view cell based on the merging.
         */
-        ViewCell *MergeViewCells(ViewCell &front, ViewCell &back) const;
+        ViewCellInterior *MergeViewCells(ViewCell &front, ViewCell &back) const;
         
         /** Generates view cell of type specified by this manager
         */
-        virtual ViewCell *GenerateViewCell(Mesh *mesh = NULL) const;
+        virtual ViewCell *GenerateViewCell(Mesh *mesh = NULL) const = 0;
 
         /** Adds a new view cell to the list of predefined view cells.
@@ -206 +208 @@
         virtual float GetRendercost(ViewCell *viewCell, float objRendercost) const = 0;
 
-        /** Returns vector of loaded / generated view cells.
+        /** Returns container of loaded / generated view cells.
         */
         ViewCellContainer &GetViewCells();
@@ -311 +313 @@
         /** Exports view cell geometry.
         */
-        virtual void ExportVcGeometry(Exporter *exporter, ViewCell *vc) const = 0;
+        virtual void ExportViewCellGeometry(Exporter *exporter, ViewCell *vc) const = 0;
 
         virtual void FinalizeViewCells(const bool createMesh);
@@ -325 +327 @@
         /** Evaluates statistics values on view cells.
         */
-        void EvaluateRenderStatistics(float &totalRenderCost, 
-                                                                  float &expectedRenderCost, 
-                                                                  float &variance);
+        void EvaluateRenderStatistics(float &totalRenderCost,
+                                                                  float &expectedRenderCost,
+                                                                  float &deviation,
+                                                                  float &variance,
+                                                                  int &totalPvs,
+                                                                  float &avgRenderCost);
+
+
+        /** Returns hierarchy of the view cells.
+        */
+        ViewCellsTree *GetViewCellsTree();
+
+        virtual void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates) = 0;
+
 
 protected:
@@ -392 +405 @@
         /// Loaded view cells
         ViewCellContainer mViewCells;
+
+        ViewCellsTree *mViewCellsTree;
 
         /// maximum number of samples taken for construction of the view cells
@@ -417 +432 @@
         bool mOnlyValidViewCells;
 
+        /// if rays should be used to collect merge candidates
+        bool mUseRaysForMerge;
+        
+
         //-- visualization options
         
@@ -472 +491 @@
         void CreateMesh(ViewCell *vc);
 
-        void ExportVcGeometry(Exporter *exporter, ViewCell *vc) const;
+        void ExportViewCellGeometry(Exporter *exporter, ViewCell *vc) const;
+        
+        void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates);
 
 protected:
@@ -529 +550 @@
         bool ViewCellsConstructed() const;
 
+        ViewCell *GenerateViewCell(Mesh *mesh) const;
 
         /** Prints out statistics of this approach.
@@ -540 +562 @@
         void CreateMesh(ViewCell *vc);
 
-        void ExportVcGeometry(Exporter *exporter, ViewCell *vc) const;
+        void ExportViewCellGeometry(Exporter *exporter, ViewCell *vc) const;
+
+        void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates);
 
 protected:
 
+        /** Collects view cells from a hierarchy.
+        */
         void CollectViewCells();
+
         KdNode *GetNodeForPvs(KdLeaf *leaf);
 
@@ -598 +625 @@
         void CreateMesh(ViewCell *vc);
 
-        void ExportVcGeometry(Exporter *exporter, ViewCell *vc) const;
+        void ExportViewCellGeometry(Exporter *exporter, ViewCell *vc) const;
+
+        void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates);
 
 protected:
@@ -664 +693 @@
         int CastBeam(Beam &beam);
 
-        void ExportVcGeometry(Exporter *exporter, ViewCell *vc) const;
+        void ExportViewCellGeometry(Exporter *exporter, ViewCell *vc) const;
 
         //float GetVolume(ViewCell *viewCell) const;
 
         void Finalize(ViewCell *viewCell, const bool createMesh);
+
+        void CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates);
 
 protected: