Changeset 236 for trunk/VUT

Timestamp:

08/12/05 01:40:14 (19 years ago)

Author:

mattausch

Message:

erased compiler errors

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• include/ViewCellBsp.h (modified) (1 diff)
• src/Containers.h (modified) (2 diffs)
• src/Polygon3.h (modified) (2 diffs)
• src/ViewCellBsp.cpp (modified) (3 diffs)
• src/ViewCellBsp.h (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/include/ViewCellBsp.h

@@ -79 +79 @@
           /// Pointer to the root cell of the viewspace */
           ViewCell *mRootCell;
+
+
   };
   

trunk/VUT/GtpVisibilityPreprocessor/src/Containers.h

@@ -11 +11 @@
 class SceneGraphNode;
 class Intersectable;
-class Polygon3;
 
 
@@ -32 +31 @@
 typedef vector<HierarchyNode *> NodeContainer;
 
-/** Queue storing a soup of polygons used during BSP tree construction
-*/
-typedef queue<Polygon3 *> PolygonQueue;
-
-
 
 typedef vector<SceneGraphNode *> SceneGraphNodeContainer;

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.h

@@ -7 +7 @@
 //#include "common.h"
 #include "Containers.h"
+#include "Mesh.h"
 
-class Mesh;
+class Polygon3;
 class Plane3;
 class Face;
 
+
+/** Queue storing a soup of polygons used during BSP tree construction
+*/
+typedef queue<Polygon3 *> PolygonQueue;
 
 /** Class representing a general planar polygon in 3d.
@@ -19 +24 @@
 public:
         Polygon3();
-//      Polygon3(const VertexContainer &vertices);
+        Polygon3(const VertexContainer &vertices);
 
         /** Copies all the vertices of the face.

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -10 +10 @@
 int BspTree::sTermMaxPolygons = 10;
 int BspTree::sTermMaxDepth = 20;
-
-//namespace GtpVisibilityPreprocessor {
+int BspTree::sSplitPlaneStrategy = NEXT_POLYGON; 
 
 
@@ -412 +411 @@
 {
         // TODO: more sophisticated criteria
-        return polyQueue->front()->GetSupportingPlane();
+        switch (sSplitPlaneStrategy)
+        {
+        case LEAST_SPLITS:
+                break;
+        case NEXT_POLYGON:
+        return polyQueue->front()->GetSupportingPlane();
+                break;
+        default:
+                break;
+        }
 }
 
@@ -464 +472 @@
         environment->GetIntValue("BspTree.Termination.maxDepth", sTermMaxDepth);
         environment->GetIntValue("BspTree.Termination.maxPolygons", sTermMaxPolygons);
+
+        char splitPlaneStrategyStr[60];
+
+        environment->GetStringValue("BspTree.splitPlaneStrategy", splitPlaneStrategyStr);
+        // TODO: Extract nodes
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -286 +286 @@
         int mTermMaxDepth;
 
+        enum {NEXT_POLYGON, LEAST_SPLITS};
+
 public:
         /// Parses the environment and stores the global BSP tree parameters
@@ -294 +296 @@
         /// maximal possible depth
         static int sTermMaxDepth;
+
+        static int sSplitPlaneStrategy;
 };