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

Timestamp:

12/20/05 20:33:42 (19 years ago)

Author:

mattausch

Message:

worked on new features,
removed Random Bug (took only 32000 values),
removed bug when choosing new candidates (totally wrong)
introduced new candidate plane method
implemented priority queue for vsp bsp

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -175 +175 @@
 
         int constructionSamples = 0;
+        
+        if (strcmp(viewCellsStr, "kdTree") == 0)
+        {
+                mViewCellsManager = new KdViewCellsManager(mKdTree);
+        }
+        else if (strcmp(viewCellsStr, "bspTree") == 0)
+        {
+                mBspTree = new BspTree();
+
+                Debug << "view cell type: Bsp" << endl;
+
+                environment->GetIntValue("BspTree.Construction.samples", constructionSamples);
+                mViewCellsManager = new BspViewCellsManager(mBspTree, constructionSamples);
+        }
+        else if (strcmp(viewCellsStr, "vspBspTree") == 0)
+        {
+                mVspBspTree = new VspBspTree();
+
+                Debug << "view cell type: VspBsp" << endl;
+
+                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
+                mBspTree = new BspTree();
+
+                Debug << "view cell type: Bsp" << endl;
+                environment->GetIntValue("BspTree.Construction.samples", constructionSamples);
+                mViewCellsManager = new BspViewCellsManager(mBspTree, constructionSamples);
+        }
+        else
+        {
+                cerr<<"Wrong view cells type" << viewCellsStr << endl;
+                exit(1);
+        }
 
         float objRenderCost = 0, vcOverhead = 0, moveSpeed = 0;
@@ -182 +226 @@
         environment->GetFloatValue("Simulation.moveSpeed", moveSpeed);
 
-        mRenderSimulator = new RenderSimulator(objRenderCost, vcOverhead, moveSpeed);
-        
-        if (strcmp(viewCellsStr, "kdTree") == 0)
-        {
-                mViewCellsManager = new KdViewCellsManager(mKdTree);
-        }
-        else if (strcmp(viewCellsStr, "bspTree") == 0)
-        {
-                mBspTree = new BspTree();
-
-                Debug << "view cell type: Bsp" << endl;
-
-                environment->GetIntValue("BspTree.Construction.samples", constructionSamples);
-                mViewCellsManager = new BspViewCellsManager(mBspTree, constructionSamples);
-        }
-        else if (strcmp(viewCellsStr, "vspBspTree") == 0)
-        {
-                mVspBspTree = new VspBspTree();
-
-                Debug << "view cell type: VspBsp" << endl;
-
-                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
-                mBspTree = new BspTree();
-
-                Debug << "view cell type: Bsp" << endl;
-                environment->GetIntValue("BspTree.Construction.samples", constructionSamples);
-                mViewCellsManager = new BspViewCellsManager(mBspTree, constructionSamples);
-        }
-        else
-        {
-                cerr<<"Wrong view cells type" << viewCellsStr << endl;
-                exit(1);
-        }
-
+        mRenderSimulator = 
+                new RenderSimulator(mViewCellsManager, objRenderCost, vcOverhead, moveSpeed);
+        
         int postProcessSamples = 0;
         int visSamples = 0;