Changeset 1010

Timestamp:

06/12/06 01:40:25 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.cpp (modified) (2 diffs)
• ViewCell.h (modified) (2 diffs)
• VspOspTree.cpp (modified) (9 diffs)
• VspOspTree.h (modified) (2 diffs)

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

@@ +1 @@
+#include <time.h>
+#include <iomanip>
+#include <stack>
+
+
 #include "ViewCell.h"
 #include "Mesh.h"
@@ -8 +13 @@
 #include "ViewCellsManager.h"
 #include "Exporter.h"
-
-#include <time.h>
-#include <iomanip>
-#include <stack>
-
 
 

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

@@ -8 +8 @@
 #include "Material.h"
 #include "gzstream.h"
-#include "VspOspTree.h"
+
 
 namespace GtpVisibilityPreprocessor {
@@ -374 +374 @@
 
 
-//typedef HierarchyLeafViewCell<VspLeaf *> VspViewCell;
+typedef HierarchyLeafViewCell<VspLeaf *> VspViewCell;
 typedef HierarchyLeafViewCell<BspLeaf *> BspViewCell;
 typedef HierarchyLeafViewCell<KdLeaf *> KdViewCell;

GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp

@@ -3 +3 @@
 #include <iomanip>
 
+#include "ViewCell.h"
 #include "Plane3.h"
 #include "VspOspTree.h"
 #include "Mesh.h"
 #include "common.h"
-#include "ViewCell.h"
 #include "Environment.h"
 #include "Polygon3.h"
@@ -14 +14 @@
 #include "Exporter.h"
 #include "Plane3.h"
-#include "ViewCellBsp.h"
 #include "ViewCellsManager.h"
 #include "Beam.h"
@@ -401 +400 @@
                  (sizeof(VspOspTree) + 
                   mVspStats.Leaves() * sizeof(VspLeaf) + 
-                  mCreatedViewCells * sizeof(BspViewCell) +
+                  mCreatedViewCells * sizeof(VspViewCell) +
                   mVspStats.pvs * sizeof(ObjectPvsData) +
                   mVspStats.Interior() * sizeof(VspInterior) +
@@ -604 +603 @@
         {
                 VspLeaf *leaf = dynamic_cast<VspLeaf *>(newNode);
-                BspViewCell *viewCell = new BspViewCell();
+                VspViewCell *viewCell = new VspViewCell();
 
         leaf->SetViewCell(viewCell);
@@ -1147 +1146 @@
         }
 
-
-        BspNodeGeometry geomFront;
-        BspNodeGeometry geomBack;
-        
+#if TODO
         pFront = geomFront.GetVolume();
         pBack = pOverall - pFront;
-
+#endif
                 
 
@@ -2056 +2052 @@
 ViewCell *VspOspTree::GetViewCell(const Vector3 &point, const bool active)
 {
-#if TODO
         if (mRoot == NULL)
                 return NULL;
@@ -2078 +2073 @@
                 {       
                         VspInterior *interior = dynamic_cast<VspInterior *>(node);
-        
+#if TODO        
                         // random decision
                         if (interior->GetPlane().Side(point) < 0)
@@ -2084 +2079 @@
                         else
                                 nodeStack.push(interior->GetFront());
+#endif
                 }
         }
@@ -2091 +2087 @@
         else
                 return viewcell;
-#endif
 }
 

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

@@ -2 +2 @@
 #define _VspOspTree_H__
 
+#include <stack>
+
 #include "Mesh.h"
 #include "Containers.h"
-#include "Polygon3.h"
-#include <stack>
 #include "Statistics.h"
 #include "VssRay.h"
@@ -15 +15 @@
 
 class ViewCellLeaf;
-class VspViewCell;
+//class VspViewCell;
 class Plane3;
 class AxisAlignedBox3;