Changeset 1220 for GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp

Timestamp:

08/18/06 17:25:57 (18 years ago)

Author:

szydlowski

Message:

 

File:

• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp (modified) (8 diffs)

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp

@@ -30 +30 @@
                                 .addOpt("l","logfile", ARGUMENT_REQUIRED)
                                 .addOpt("d","demomode", ARGUMENT_NONE)
+                                .addOpt("","buildmode", ARGUMENT_REQUIRED)
                                 .addOpt("","maxdepth", ARGUMENT_REQUIRED)
                                 .addOpt("","kt", ARGUMENT_REQUIRED)
@@ -49 +50 @@
                         std::stringstream s;
 
+                        if (cmdparser.getOpt("buildmode", tmp))
+                        {
+                                int bm = KdTree::KDBM_NOTSET;
+                                for (int i = 0; i < KdTree::KDBM_SIZE; i ++)
+                                {
+                                        if (tmp == KdTreeAppListener::BUILDMETHOD[i])
+                                                bm = i;
+                                }
+                                if (bm != KdTree::KDBM_NOTSET)
+                                {
+                                        options.mBuildMethod = bm;
+                                }
+                                else
+                                {
+                                        MessageBox(NULL, ("Invalid argument for option --buildmode: " + tmp).c_str(), "Error", MB_OK | MB_ICONERROR );
+                                        return -1;
+                                }
+                        }
+
                         if (cmdparser.getOpt("maxdepth", tmp))
                         {
@@ -72 +92 @@
                         if (cmdparser.getOpt("r",tmp))
                         {
-                                if (tmp == "INT" || tmp == "VFC" || tmp == "SWC" || tmp == "CHC")
-                                {
-                                        options.mRenderMethod = tmp;
+                                int rm = KdTree::KDRM_NOTSET;
+                                for (int i = 0; i < KdTree::KDRM_SIZE; i ++)
+                                {
+                                        if (tmp == KdTreeAppListener::RENDERMETHOD[i])
+                                                rm = i;
+                                }
+                                if (rm != KdTree::KDRM_NOTSET)
+                                {
+                                        options.mRenderMethod = rm;
                                 }
                                 else
                                 {
-                                        MessageBox(NULL, ("Invalid argument for option --rendermethod: " + tmp).c_str(), "Error", MB_OK | MB_ICONERROR );
+                                        MessageBox(NULL, ("Invalid argument for option --rendermode: " + tmp).c_str(), "Error", MB_OK | MB_ICONERROR );
                                         return -1;
                                 }
@@ -85 +111 @@
                         if (cmdparser.getOpt("s",tmp))
                         {
-                                if (tmp == "KDT" || tmp == "OCT" || tmp == "OCM" || tmp == "GEN")
-                                {
-                                        options.mSceneManager = tmp;
+                                int sm = KdTreeAppListener::SM_NOTSET;
+                                for (int i = 0; i < KdTreeAppListener::SM_SIZE; i ++)
+                                {
+                                        if (tmp == KdTreeAppListener::SCENEMANAGER[i])
+                                                sm = i;
+                                }
+                                if (sm != KdTreeAppListener::SM_NOTSET)
+                                {
+                                        options.mSceneManager = sm;
                                 }
                                 else
@@ -149 +181 @@
         cfDeath.load("testKdTree.cfg");
 
-        mSelectedSceneManager = cfDeath.getSetting("scenemanager");
         mSceneFiles = cfDeath.getSetting("scene");
 
@@ -194 +225 @@
                 mOptions.mDemoOutfileName = cfDeath.getSetting("demooutfile");
 
-        // set default demo output name to avoid SNAFUs
-        //if (mOptions.mDemoOutfileName.empty())
-        //      mOptions.mDemoOutfileName = "demo.bin";
-
         if (mOptions.mDemoLogfileName.empty())
                 mOptions.mDemoLogfileName = cfDeath.getSetting("demologfile");
-
-        // set default demo logfile name to avoid SNAFUs
-        //if (mOptions.mDemoLogfileName.empty())
-        //      mOptions.mDemoLogfileName = "demo.csv";
-
-        // override scene manager set in config file
-        if (!mOptions.mSceneManager.empty())
-        {
-                if (mOptions.mSceneManager == "KDT")
-                        mSelectedSceneManager = "KdTreeSceneManager";
-                else if (mOptions.mSceneManager == "OCT")
-                        mSelectedSceneManager = "OctreeSceneManager";
-                else if (mOptions.mSceneManager == "OCM")
-                        mSelectedSceneManager = "OcclusionCullingSceneManager";
-                else if (mOptions.mSceneManager == "GEN")
-                        mSelectedSceneManager = "DefaultSceneManager";
-        }
-        // the other way round for log
-        else
-        {
-                if (mSelectedSceneManager == "KdTreeSceneManager")
-                        mOptions.mSceneManager = "KDT";
-                else if (mSelectedSceneManager == "OctreeSceneManager")
-                        mOptions.mSceneManager = "OCT";
-                else if (mSelectedSceneManager == "OcclusionCullingSceneManager")
-                        mOptions.mSceneManager = "OCM";
-                else if (mSelectedSceneManager == "DefaultSceneManager")
-                        mOptions.mSceneManager = "GEN";
-        }
 
         ExampleApplication::setupResources();
@@ -416 +414 @@
 {
         // Get the SceneManager
-        mSceneMgr = mRoot->createSceneManager(mSelectedSceneManager,"MySceneManager");
-        // set params
-        mSceneMgr->setOption("KdTreeMaxDepth", &mOptions.mMaxDepth);
-        mSceneMgr->setOption("KT", &mOptions.mKT);
-        mSceneMgr->setOption("KI", &mOptions.mKI);
-        mSceneMgr->setOption("RenderMethod", &mOptions.mRenderMethod);
-        mSceneMgr->setOption("EnhancedVisibility", &mOptions.mEnhancedVisibility);
+        mSceneMgr = mRoot->createSceneManager(
+                KdTreeAppListener::SCENEMANAGERNAME[mOptions.mSceneManager],
+                "MySceneManager");
+        // set params depending on scene manager
+        if (mOptions.mSceneManager == KdTreeAppListener::SM_KDT)
+        {
+                mSceneMgr->setOption("BuildMethod", &mOptions.mBuildMethod);
+                mSceneMgr->setOption("KdTreeMaxDepth", &mOptions.mMaxDepth);
+                mSceneMgr->setOption("KT", &mOptions.mKT);
+                mSceneMgr->setOption("KI", &mOptions.mKI);
+                mSceneMgr->setOption("RenderMethod", &mOptions.mRenderMethod);
+                mSceneMgr->setOption("EnhancedVisibility", &mOptions.mEnhancedVisibility);
+        }
+        // set algorithm when scene manager is OCM - numbering is different though
+        if (mOptions.mSceneManager == KdTreeAppListener::SM_OCM)
+        {
+                int alg = CONV_KDT_TO_OCM_ALG(mOptions.mRenderMethod);
+                mSceneMgr->setOption("Algorithm", &alg);
+        }
 }
 
@@ -452 +462 @@
         mTopCam->setDirection(0,0,-1);
         mTopCam->pitch(Radian(-Math::HALF_PI));
-        //mTopCam->setCullingFrustum(mCamera);
+        mTopCam->setCullingFrustum(mCamera);
         mTopCam->setNearClipDistance(1);