Changeset 519 for trunk

Timestamp:

01/11/06 23:37:19 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• ViewCellsManager.cpp (modified) (11 diffs)
• ViewCellsManager.h (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -321 +321 @@
 
 
+AxisAlignedBox3 ViewCellsManager::GetViewSpaceBox() const
+{
+        return mSceneBox;
+}
+
+
 void ViewCellsManager::ResetViewCells()
 {
@@ -344 +350 @@
   Ray hray(ray);
   float tmin = 0, tmax = 1.0;
-Debug << "here3" << endl;
+
   //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
-  if (!GetSceneBbox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
+  if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
         return;
 
@@ -594 +600 @@
         // compute view cell area as subsititute for probability
 #if 0
-        return GetArea(viewCell) / GetSceneBbox().SurfaceArea();
+        return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
 #else
         return GetArea(viewCell) / GetAccVcArea();
@@ -604 +610 @@
 {
         return viewCell->GetPvs().GetSize() * objRendercost;
-}
-
-
-AxisAlignedBox3 BspViewCellsManager::GetSceneBbox() const
-{
-        return mBspTree->GetBoundingBox();
 }
 
@@ -1110 +1110 @@
         // compute view cell area / volume as subsititute for probability
 #if 0
-        return GetArea(viewCell) / GetSceneBbox().SurfaceArea();
+        return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
 #endif
 #if 1
@@ -1116 +1116 @@
 #endif
 #if 0
-        return GetVolume(viewCell) / GetSceneBbox().GetVolume();
+        return GetVolume(viewCell) / GetViewSpaceBox().GetVolume();
 #endif
 }
@@ -1127 +1127 @@
 
 
-AxisAlignedBox3 KdViewCellsManager::GetSceneBbox() const
-{
-        return mKdTree->GetBox();
-}
-
 void KdViewCellsManager::CollectViewCells()
 {
         //mKdTree->CollectViewCells(mViewCells); TODO
 }
+
 
 int KdViewCellsManager::Construct(const ObjectContainer &objects,
@@ -1408 +1404 @@
         // volume or area substitutes for view point probability
 #if 0
-        return GetArea(viewCell) / GetSceneBbox().SurfaceArea();
+        return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
 #else
         return GetArea(viewCell) / GetAccVcArea();
@@ -1495 +1491 @@
 
         return 0;
-}
-
-
-AxisAlignedBox3 VspKdViewCellsManager::GetSceneBbox() const
-{
-        return mVspKdTree->GetBBox(mVspKdTree->GetRoot());
 }
 
@@ -1767 +1757 @@
 {
 #if 0
-        return GetArea(viewCell) / GetSceneBbox().SurfaceArea();
+        return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
 #else
         return GetArea(viewCell) / GetAccVcArea();
@@ -1784 +1774 @@
 {
         return viewCell->GetPvs().GetSize() * objRendercost;
-}
-
-
-AxisAlignedBox3 VspBspViewCellsManager::GetSceneBbox() const
-{
-        return mVspBspTree->GetBoundingBox();
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -214 +214 @@
         virtual float GetVolume(ViewCell *viewCell) const;
 
-        virtual AxisAlignedBox3 GetSceneBbox() const = 0;
-
         /** Sets the current renderer mainly for view cells statistics.
         */
@@ -232 +230 @@
         */
         void SetViewSpaceBox(const AxisAlignedBox3 &box);
+
+        AxisAlignedBox3 GetViewSpaceBox() const;
 
         /** Creates mesh for this view cell.
@@ -365 +365 @@
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
 
-        AxisAlignedBox3 GetSceneBbox() const;
-
         /** Get a viewcell containing the specified point */
         ViewCell *GetViewCell(const Vector3 &point);
@@ -442 +440 @@
         float GetProbability(ViewCell *viewCell);
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
-  
-        AxisAlignedBox3 GetSceneBbox() const;
 
         void CreateMesh(ViewCell *vc);
@@ -501 +497 @@
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
 
-        AxisAlignedBox3 GetSceneBbox() const;
-
         void CreateMesh(ViewCell *vc);
 
@@ -556 +550 @@
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
         
-        AxisAlignedBox3 GetSceneBbox() const;
-        
         ViewCell *GetViewCell(const Vector3 &point);