Changeset 1177 for GTP/trunk/App/Demos/Vis

Timestamp:

08/02/06 15:22:19 (18 years ago)

Author:

szydlowski

Message:

 

Location:

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

Files:

• include/TestKdTreeAppListener.h (modified) (6 diffs)
• scripts/TestKdTree.vcproj (modified) (1 diff)

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

@@ -215 +215 @@
                 String rm;
                 if (mSceneMgr->getOption("RenderMethod", &rm))
-                        value = " " + rm;
+                {
+                        if (rm == "INT")
+                                value = " Internal Frustum Culling";
+                        else if (rm == "VFC")
+                                value = " View Frustum Culling";
+                        else if (rm == "SWC")
+                                value = " Stop and Wait Culling";
+                        else if (rm == "CHC")
+                                value = " Coherent Hierarchical Culling";
+                        else
+                                value = na;
+                }
                 else
                         value = na;
@@ -278 +289 @@
 
                 // stuff for the kdtree overlay
+                static String sRM = "[SPACE] Algorithm: ";
+                static String sBM = "[X] Build Method: ";
                 static String sMaxDepth = "[1][2] Max Tree Depth: ";
                 static String sHL = "[3][4] Highlight: ";
                 static String sKT = "[5][6] KT: ";
                 static String sKI = "[7][8] KI: ";
-                static String sBM = "[Y] Build Method: ";
-                static String sRM = "[X] Render Method: ";
                 static String sMov = "[Q] Movement: ";
 
@@ -291 +302 @@
 
                 //static String rmOptions[] = { "Recursive", "Stack", "StopAndWait", "CHC" };
-                static String rmOptions[] = { "Recursive", "Stack" };
+                static String rmOptions[] = { "INT", "VFC", "SWC", "CHC" };
+                static String rmOptionCaptions[] =
+                {
+                        "Internal Frustum Culling",
+                        "View Frustum Culling", 
+                        "Stop and Wait Culling",
+                        "Coherent Hierarchical Culling"
+                };
                 static int rmOptionsSize = sizeof(rmOptions) / sizeof (String);
                 static int rmCurrent = 0;
@@ -400 +418 @@
                 }
 
-                if (mInputDevice->isKeyDown(KC_Z) && mTimeUntilNextToggle <= 0)
+                if (mInputDevice->isKeyDown(KC_X) && mTimeUntilNextToggle <= 0)
                 {
                         String bm;
@@ -417 +435 @@
                 }
 
-                if (mInputDevice->isKeyDown(KC_X) && mTimeUntilNextToggle <= 0)
+                if (mInputDevice->isKeyDown(KC_SPACE) && mTimeUntilNextToggle <= 0)
                 {
                         String rm;
@@ -424 +442 @@
                                 rmCurrent = (rmCurrent + 1) % rmOptionsSize;
                                 if (mSceneMgr->setOption("RenderMethod", &rmOptions[rmCurrent]))
-                                        OverlayManager::getSingleton().getOverlayElement("KdTree/RenderMethod")->setCaption(sRM + rmOptions[rmCurrent]);
+                                        OverlayManager::getSingleton().getOverlayElement("KdTree/RenderMethod")->setCaption(sRM + rmOptionCaptions[rmCurrent]);
                         }
                         else

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj

@@ -103 +103 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)""
-                                GenerateDebugInformation="FALSE"
+                                GenerateDebugInformation="TRUE"
                                 SubSystem="2"
                                 OptimizeReferences="2"