Changeset 2382

Timestamp:

05/16/07 14:11:36 (17 years ago)

Author:

vizrt_christian_seidl

Message:

Modification: TestKdTree? works with BIH now.

Location:

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE

Files:

• include/TestKdTreeAppListener.h (modified) (2 diffs)
• src/TestKdTree.cpp (modified) (8 diffs)
• src/TestKdTreeAppListener.cpp (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h

@@ -93 +93 @@
                 SM_KTE,
                 SM_BVH,
+                SM_BIH,
                 SM_OCM,
                 SM_OCT,
@@ -134 +135 @@
                 mKI(1.0f),
                 mMaxDepth(10),
-                mSceneManager(SM_KDT),
+                mSceneManager(SM_BVH),  //changed cse 
                 mRenderMethod(KdTree::KDRM_GTP_CHC),
                 mBuildMethod(KdTree::KDBM_RECURSIVE),

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

@@ -209 +209 @@
         mViewCells = cfDeath.getSetting("viewcells");
 
+        
+
         tmp = cfDeath.getSetting("shadows");
         StringUtil::toLowerCase(tmp);
@@ -489 +491 @@
                         {
                                 deaths = mSceneMgr->createEntity(cat(entName, i, j).c_str(),"robot.mesh");
+                                //deaths = mSceneMgr->createEntity(cat(entName, i, j).c_str(),"cube.mesh");
                                 if (mShadowsEnabled)
                                         deaths->setCastShadows(true);
@@ -508 +511 @@
                                 Math::RangeRandom(-planeThreeEights, planeThreeEights));
                         deaths = mSceneMgr->createEntity(cat(entName,666,i),"robot.mesh");
+                        //deaths = mSceneMgr->createEntity(cat(entName,666,i),"cube.mesh");
                         if (mShadowsEnabled)
                                 deaths->setCastShadows(true);
@@ -528 +532 @@
                                 Math::RangeRandom(-planeThreeEights, planeThreeEights));
                         deaths = mSceneMgr->createEntity(cat(entName,666,i),"razor.mesh");
+                        //deaths = mSceneMgr->createEntity(cat(entName,666,i),"cube.mesh");
                         if (mShadowsEnabled)
                                 deaths->setCastShadows(true);
@@ -613 +618 @@
 {
         // Get the SceneManager
+        mOptions.mSceneManager=3; //changed cse
         mSceneMgr = mRoot->createSceneManager(
                 KdTreeAppListener::SCENEMANAGERNAME[mOptions.mSceneManager],
@@ -619 +625 @@
         if (mOptions.mSceneManager == KdTreeAppListener::SM_KDT || 
                 mOptions.mSceneManager == KdTreeAppListener::SM_KTE ||
-                mOptions.mSceneManager == KdTreeAppListener::SM_BVH)
+                mOptions.mSceneManager == KdTreeAppListener::SM_BVH ||
+                mOptions.mSceneManager == KdTreeAppListener::SM_BIH )
         {
                 mSceneMgr->setOption("BuildMethod", &mOptions.mBuildMethod);
                 mSceneMgr->setOption("KdTreeMaxDepth", &mOptions.mMaxDepth);
                 mSceneMgr->setOption("KT", &mOptions.mKT);
+                mOptions.mKI=20;
                 mSceneMgr->setOption("KI", &mOptions.mKI);
                 mSceneMgr->setOption("RenderMethod", &mOptions.mRenderMethod);
                 mSceneMgr->setOption("EnhancedVisibility", &mOptions.mEnhancedVisibility);
+                bool show=true;
+                mSceneMgr->setOption("ShowBiHierarchy", &show);
+                mSceneMgr->setOption("ShowAllBoxes", &show);
+                
         }
         // set algorithm when scene manager is OCM - numbering is different though
@@ -652 +664 @@
     mCamera = mSceneMgr->createCamera("PlayerCam");
         mCamera->setNearClipDistance(1);
+   
+    SceneNode *TempNode=mSceneMgr->getRootSceneNode();//->createChildSceneNode("PlayerCamNode", Vector3(0,0,0));
+        printf("TempNode: %d\n",TempNode);
+
 
         mCamNode = mSceneMgr->getRootSceneNode()->createChildSceneNode("PlayerCamNode", Vector3(0,0,0));
@@ -901 +917 @@
         {
                 SceneNode *node = root->createChildSceneNode("IVSceneNode" + index);
+                
 
                 mIVReader->buildTree(mSceneMgr, node);

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

@@ -19 +19 @@
 const String KdTreeAppListener::BUILDMETHOD[] = { "RE", "PQ" };
 const String KdTreeAppListener::BUILDMETHODCAPTION[] = { "Recursive", "Priority Queue" };
-const String KdTreeAppListener::SCENEMANAGER[] = { "KDT", "KTE", "BVH", "OCM", "OCT", "TER", "GEN" };
+const String KdTreeAppListener::SCENEMANAGER[] = { "KDT", "KTE", "BVH","BIH", "OCM", "OCT", "TER", "GEN" };
 const String KdTreeAppListener::SCENEMANAGERNAME[] =
 {
@@ -25 +25 @@
         "KdTreeTerrainSceneManager",
         "BvHierarchySceneManager",
+        "BiHierarchySceneManager",
         "OcclusionCullingSceneManager",
         "OctreeSceneManager",
@@ -113 +114 @@
 mFreeMove(false),
 mTopCamFollow(true),
-mShowTree(SHOWTREE_OFF),
+mShowTree(SHOWTREE_ALL),
 // view cells
 mViewCellsLoaded(false),
@@ -1239 +1240 @@
                 if (evt.timeSinceLastFrame == 0)
                 {
-                        mMoveScale = 1;
+                        mMoveScale = 0.2;
                         mRotScale = 0.1;
                 }
@@ -1347 +1348 @@
                 {
                         togglePlayback();
+                        saveLog();
                         // exit app when in demo mode
                         if (mOptions.mDemoMode)