Changeset 469 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

Timestamp:

12/16/05 18:52:33 (19 years ago)

Author:

mattausch

Message:

updated view cells, view cell manager. changed rendersimulator

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -7 +7 @@
 #include "Statistics.h"
 //namespace GtpVisibilityPreprocessor {
-  
+
+struct Triangle3;
+
 class BspInterior;
 class BspPvs;
-struct Triangle3;
 class BspLeaf;
 class VspKdTree;
 class VspKdLeaf;
-
+class KdLeaf;
 
 /**
@@ -28 +29 @@
         ViewCell(Mesh *mesh);
 
-
+        /** Default destructor.
+        */
         virtual ~ViewCell() {}
         /** Returns Pvs. 
         */
-        const ViewCellPvs &GetPvs() const;
-        ViewCellPvs &GetPvs();
+        const ObjectPvs &GetPvs() const;
+        ObjectPvs &GetPvs();
 
         int Type() const;
@@ -41 +43 @@
         void AddPassingRay(const Ray &ray, const int contributions);    
 
+        /** Returns volume of the view cell.
+        */
+        virtual float GetVolume() const;
+
+        /** Sets volume of the view cell.
+        */
+        void SetVolume(float size);
 
         /// Ray set description of the rays passing through this node.  
@@ -51 +60 @@
 
         /// the potentially visible objects
-        ViewCellPvs mPvs;
+        ObjectPvs mPvs;
+
+        float mVolume;
 };
 
-class BspViewCell: public ViewCell
+/**
+        View cell belonging to a hierarchy.
+*/
+template<typename T>
+class HierarchyViewCell: public ViewCell
+{
+public:
+        HierarchyViewCell<T>(): mLeaves(0) {}
+        HierarchyViewCell<T>(Mesh *mesh): 
+                ViewCell(mesh), mLeaves(0) {}
+
+        /// Leaves of the hierarchy which are part of this view cell.
+        std::vector<T> mLeaves;
+};
+
+typedef HierarchyViewCell<BspLeaf *> BspViewCell;
+typedef HierarchyViewCell<KdLeaf *> KdViewCell;
+typedef HierarchyViewCell<VspKdLeaf *> VspKdViewCell;
+
+/*class BspViewCell: public ViewCell
 {
 public:
         BspViewCell(): mBspLeaves(0) {}
         BspViewCell(Mesh *mesh): 
-        ViewCell(mesh), mBspLeaves(0) {}
+                ViewCell(mesh), mBspLeaves(0) {}
 
-        /// Leaves which hold this view cell.
-        vector<BspLeaf *> mBspLeaves;
+        /// Leaves of the hierarchy which are part of this view cell.
+        std::vector<BspLeaf *> mBspLeaves;
 };
-
-class VspKdViewCell: public ViewCell
+*/
+/*class VspKdViewCell: public ViewCell
 {
 public:
-        VspKdViewCell(): mVspKdLeaves(0) {}
+        VspKdViewCell(): mLeaves(0) {}
         VspKdViewCell(Mesh *mesh): 
-        ViewCell(mesh), mVspKdLeaves(0) {}
+                ViewCell(mesh), mLeaves(0) {}
 
-        float GetSize() {return mSize;}
-        void SetSize(float size) {mSize = size;}
-
-        /// Leaves which hold this view cell.
-        vector<VspKdLeaf *> mVspKdLeaves;
-
-protected:
-        float mSize;
+        /// Leaves of the hierarchy which are part of this view cell.
+        std::vector<VspKdLeaf *> mLeaves;
 };
-
+*/
 class ViewCellsStatistics: public StatisticsBase
 {