Changeset 310 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

10/05/05 18:36:16 (19 years ago)

Author:

mattausch

Message:

updated input file behaviour. started to use pvs templates. removed raycast bugs

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -17 +17 @@
 int BspTree::sMaxCandidates = 10;
 int BspTree::sSplitPlaneStrategy = NEXT_POLYGON; 
-int BspTree::sConstructionMethod = VIEW_CELLS;
+int BspTree::sConstructionMethod = FROM_INPUT_VIEW_CELLS;
 int BspTree::sTermMaxPolysForAxisAligned = 50;
 
@@ -263 +263 @@
 mStoreSplitPolys(false)
 {
+        mypvs<BspNode *> testpvs; testpvs.Find(mRoot);
         Randomize(); // initialise random generator for heuristics
 }
@@ -1059 +1060 @@
 void BspTree::ParseEnvironment()
 {
+        //-- parse bsp cell tree construction method
+        char constructionMethodStr[60];
+        
+        environment->GetStringValue("BspTree.constructionMethod", constructionMethodStr);
+
+        sConstructionMethod = FROM_INPUT_VIEW_CELLS;
+        
+        if (strcmp(constructionMethodStr, "fromViewCells") == 0)
+                sConstructionMethod = FROM_INPUT_VIEW_CELLS;
+        else if (strcmp(constructionMethodStr, "fromSceneGeometry") == 0)
+                sConstructionMethod = FROM_SCENE_GEOMETRY;
+        else if (strcmp(constructionMethodStr, "fromRays") == 0)
+                sConstructionMethod = FROM_RAYS;
+        else 
+        {
+                cerr << "Wrong construction method " << constructionMethodStr << endl;
+                exit(1);
+    }
+
+        Debug << "Construction method: " << constructionMethodStr << endl;
+
         environment->GetIntValue("BspTree.Termination.maxDepth", sTermMaxDepth);
         environment->GetIntValue("BspTree.Termination.maxPolygons", sTermMaxPolygons);
@@ -1092 +1114 @@
 
         Debug << endl;
-
-        //-- parse BSP tree construction method
-        char constructionMethodStr[60];
-        
-        environment->GetStringValue("BspTree.constructionMethod", constructionMethodStr);
-
-        sConstructionMethod = BspTree::VIEW_CELLS;
-        
-        if (strcmp(constructionMethodStr, "viewCells") == 0)
-                sConstructionMethod = BspTree::VIEW_CELLS;
-        else if (strcmp(constructionMethodStr, "sceneGeometry") == 0)
-                sConstructionMethod = BspTree::SCENE_GEOMETRY;
-        else if (strcmp(constructionMethodStr, "rays") == 0)
-                sConstructionMethod = BspTree::RAYS;
-        else 
-        {
-                cerr << "Wrong bsp construction method " << constructionMethodStr << endl;
-                exit(1);
-    }
-
-        Debug << "Construction method: " << constructionMethodStr << endl;
 }