Changeset 445 for trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

Timestamp:

12/02/05 20:38:01 (19 years ago)

Author:

mattausch

Message:

Added VspBspTree? functionality:
This is a view space partitioning specialised BSPtree.
There are no polygon splits, but we split the sample rays.
The candidates for the next split plane are evaluated only
by checking the sampled visibility information.
The polygons are employed merely as candidates for the next split planes.

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp (modified) (6 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -7 +7 @@
 #include "Environment.h"
 #include "ViewCellsManager.h"
+#include "ViewCellBsp.h"
+#include "VspBspTree.h"
+#include "VspKdTree.h"
 
 Preprocessor::Preprocessor():
@@ -12 +15 @@
 mBspTree(NULL),
 mVspKdTree(NULL),
+mVspBspTree(NULL),
 mViewCellsManager(NULL)
 {
@@ -22 +26 @@
         DEL_PTR(mKdTree);
         DEL_PTR(mVspKdTree);
+        DEL_PTR(mVspBspTree);
         DEL_PTR(mViewCellsManager);
 }
@@ -167 +172 @@
         environment->GetStringValue("ViewCells.type", viewCellsStr);
 
+        int constructionSamples = 0;
+
         if (strcmp(viewCellsStr, "kdTree") == 0)
         {
@@ -173 +180 @@
         if (strcmp(viewCellsStr, "bspTree") == 0)
         {
-                int bspConstructionSamples = 0;
-
                 mBspTree = new BspTree();
 
-                environment->GetIntValue("BspTree.Construction.samples", bspConstructionSamples);
-                mViewCellsManager = new BspViewCellsManager(mBspTree, bspConstructionSamples);
-        }
-        else if (strcmp(viewCellsStr, "vspTree") == 0)
-        {
-                int vspKdConstructionSamples = 0;
-                
-                environment->GetIntValue("VspKdTree.Construction.samples", vspKdConstructionSamples);
-        mViewCellsManager = new VspKdViewCellsManager(mVspKdTree, vspKdConstructionSamples);
+                environment->GetIntValue("BspTree.Construction.samples", constructionSamples);
+                mViewCellsManager = new BspViewCellsManager(mBspTree, constructionSamples);
+        }
+        if (strcmp(viewCellsStr, "vspBspTree") == 0)
+        {
+                mVspBspTree = new VspBspTree();
+
+                environment->GetIntValue("VspBspTree.Construction.samples", constructionSamples);
+                mViewCellsManager = new VspBspViewCellsManager(mVspBspTree, constructionSamples);
+        }
+        else if (strcmp(viewCellsStr, "vspKdTree") == 0)
+        {
+                mVspKdTree = new VspKdTree();           
+        
+                environment->GetIntValue("VspKdTree.Construction.samples", constructionSamples);
+        mViewCellsManager = new VspKdViewCellsManager(mVspKdTree, constructionSamples);
         }
         else if (strcmp(viewCellsStr, "sceneDependent") == 0)
         {
                 //TODO
-                int bspConstructionSamples = 0;
-
-                environment->GetIntValue("BspTree.Construction.samples", bspConstructionSamples);
-                mViewCellsManager = new BspViewCellsManager(mBspTree, bspConstructionSamples);
+                mBspTree = new BspTree();
+
+                environment->GetIntValue("BspTree.Construction.samples", constructionSamples);
+                mViewCellsManager = new BspViewCellsManager(mBspTree, constructionSamples);
         }
         else
@@ -205 +217 @@
 
         environment->GetIntValue("ViewCells.PostProcessing.samples", postProcessSamples);
-        environment->GetIntValue("BspTree.Visualization.samples", visSamples);
+        environment->GetIntValue("ViewCells.Visualization.samples", visSamples);
 
         mViewCellsManager->SetPostProcessSamples(postProcessSamples);