Changeset 471 for trunk

Timestamp:

12/19/05 13:07:21 (19 years ago)

Author:

mattausch

Message:

fixed rendersimulator

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• KdTree.cpp (modified) (1 diff)
• ViewCell.h (modified) (10 diffs)
• ViewCellsManager.cpp (modified) (4 diffs)
• ViewCellsManager.h (modified) (5 diffs)
• VspKdTree.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

@@ -884 +884 @@
       KdLeaf *leaf = (KdLeaf *)node;
           // kdtree used as view cell container => create view cell
-          leaf->mViewCell = new KdViewCell();
-      vc.push_back(leaf->mViewCell);
+          KdViewCell *viewCell = new KdViewCell();
+          leaf->mViewCell = viewCell;
+          // push back pointer to this leaf
+          viewCell->mLeaves.push_back(leaf);
+      vc.push_back(viewCell);
     } else {
       KdInterior *interior = (KdInterior *)node;

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -24 +24 @@
 public:
         ViewCell();
-        
+
         /** Constructor taking a mesh representing the shape of the viewcell.
         */
@@ -32 +32 @@
         */
         virtual ~ViewCell() {}
-        /** Returns Pvs. 
+        /** Returns Pvs.
         */
         const ObjectPvs &GetPvs() const;
@@ -38 +38 @@
 
         int Type() const;
-        
+
         /** Adds a passing ray to the passing ray container.
         */
-        void AddPassingRay(const Ray &ray, const int contributions);    
+        void AddPassingRay(const Ray &ray, const int contributions);
 
         /** Returns volume of the view cell.
@@ -51 +51 @@
         void SetVolume(float size);
 
-        /// Ray set description of the rays passing through this node.  
+        /// Ray set description of the rays passing through this node.
         PassingRaySet mPassingRays;
 
@@ -73 +73 @@
 public:
         HierarchyViewCell<T>(): mLeaves(0) {}
-        HierarchyViewCell<T>(Mesh *mesh): 
+        HierarchyViewCell<T>(Mesh *mesh):
                 ViewCell(mesh), mLeaves(0) {}
 
@@ -87 +87 @@
 /** Statistics for a view cell partition.
 */
+
 class ViewCellsStatistics: public StatisticsBase
 {
@@ -96 +97 @@
         /// size of the PVS
         int pvs;
-  
+
         /// largest PVS of all view cells
         int maxPvs;
@@ -109 +110 @@
         int leaves;
 
-        /// largest number of leaves covered by one view cell  
+        /// largest number of leaves covered by one view cell
         int maxLeaves;
 
     // Constructor
-        ViewCellsStatistics() 
+        ViewCellsStatistics()
         {
                 Reset();
@@ -120 +121 @@
         double AvgLeaves() const {return (double)leaves / (double)viewCells;};
         double AvgPvs() const {return (double)pvs / (double)viewCells;};
-  
-        void Reset() 
+
+        void Reset()
         {
-                viewCells = 0;  
-                pvs = 0;  
+                viewCells = 0;
+                pvs = 0;
                 maxPvs = 0;
 
@@ -135 +136 @@
         void Print(ostream &app) const;
 
-        friend ostream &operator<<(ostream &s, const ViewCellsStatistics &stat) 
+        friend ostream &operator<<(ostream &s, const ViewCellsStatistics &stat)
         {
                 stat.Print(s);
                 return s;
-        }  
+        }
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -396 +396 @@
 
 
-float BspViewCellsManager::GetProbability(ViewCell *viewCell) const
-{
-        PolygonContainer geom;
-
-        // compute view cell area
-        mBspTree->ConstructGeometry(dynamic_cast<BspViewCell *>(viewCell), geom);
-        
-        const float area = Polygon3::GetArea(geom);
-        const float viewspaceArea = GetTotalArea();// mBspTree->GetBoundingBox().SurfaceArea();
-
-        CLEAR_CONTAINER(geom);
-
-        return area / viewspaceArea;
+float BspViewCellsManager::GetProbability(ViewCell *viewCell)
+{
+        // compute view cell area as subsititute for probability
+        return GetArea(viewCell) / mBspTree->GetBoundingBox().SurfaceArea();
+        //return GetArea(viewCell) / GetTotalArea();
 }
 
@@ -898 +890 @@
 }
 
-float KdViewCellsManager::GetProbability(ViewCell *viewCell) const
-{
-        KdViewCell *vc = dynamic_cast<KdViewCell *>(viewCell);
-
-        AxisAlignedBox3 box = mKdTree->GetBox(vc->mLeaves[0]);
-
-        return box.SurfaceArea();
+float KdViewCellsManager::GetProbability(ViewCell *viewCell)
+{
+        // compute view cell area as subsititute for probability
+        AxisAlignedBox3 box = mKdTree->GetBox(mKdTree->GetRoot());
+
+        return GetArea(viewCell) / box.SurfaceArea();
+        //return GetArea(viewCell) / GetTotalArea();
 }
 
@@ -1161 +1153 @@
 }
 
-float VspKdViewCellsManager::GetProbability(ViewCell *viewCell) const
-{
-/*      AxisAlignedBox3 box = mKdTree->GetBox(*it);
-                        
+float VspKdViewCellsManager::GetProbability(ViewCell *viewCell)
+{
         // volume or area substitutes for view point probability
-        if (0)
-                return box.GetVolume(); 
-        else
-                return box.SurfaceArea();
-*/
-        return dynamic_cast<VspKdViewCell *>(viewCell)->GetVolume();
+        AxisAlignedBox3 box = mVspKdTree->GetBBox(mVspKdTree->GetRoot());
+
+        return GetArea(viewCell) / box.SurfaceArea();
+        //return GetArea(viewCell) / GetTotalArea();
 }
 
@@ -1389 +1377 @@
 }
 
-float VspBspViewCellsManager::GetProbability(ViewCell *viewCell) const
-{
-        PolygonContainer geom;
-
-        // compute view cell area
-        mVspBspTree->ConstructGeometry(dynamic_cast<BspViewCell *>(viewCell), geom);
-        
-        const float area = Polygon3::GetArea(geom);
-        const float accArea = mVspBspTree->GetBoundingBox().SurfaceArea();
-
-        CLEAR_CONTAINER(geom);
-
-        return area / accArea;
+float VspBspViewCellsManager::GetProbability(ViewCell *viewCell)
+{
+        return GetArea(viewCell) / mVspBspTree->GetBoundingBox().SurfaceArea();
+        //return GetArea(viewCell) / GetTotalArea();
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -172 +172 @@
   /** Returns probability that view point lies in one view cell.
   */
-  virtual float GetProbability(ViewCell *viewCell) const = 0;
+  virtual float GetProbability(ViewCell *viewCell) = 0;
 
   /** Returns render cost of a single view cell given the render cost of an object.
@@ -261 +261 @@
                                                 ViewCellContainer &viewcells);
         
-        float GetProbability(ViewCell *viewCell) const;
+        float GetProbability(ViewCell *viewCell);
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
 
@@ -327 +327 @@
         virtual void PrintStatistics(ostream &s) const;
 
-        float GetProbability(ViewCell *viewCell) const;
+        float GetProbability(ViewCell *viewCell);
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
 
@@ -377 +377 @@
                                                 ViewCellContainer &viewcells);
 
-        float GetProbability(ViewCell *viewCell) const;
+        float GetProbability(ViewCell *viewCell);
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
 
@@ -421 +421 @@
                                                 ViewCellContainer &viewcells);
 
-        float GetProbability(ViewCell *viewCell) const;
+        float GetProbability(ViewCell *viewCell);
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
 

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

@@ -2163 +2163 @@
 
         //Debug << mMinViewCells << " " << mMaxCostRatio << endl;
+
         // use priority queue to merge leaves
         while (!mergeQueue.empty() &&