Changeset 1220 for GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include

Timestamp:

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

Author:

szydlowski

Message:

 

Location:

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

Files:

• TestKdTree.h (modified) (2 diffs)
• TestKdTreeAppListener.h (modified) (4 diffs)

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

@@ -57 +57 @@
         // scene options
         String  mSceneFiles;
-        String  mSelectedSceneManager;
         Real    mRotationRadius;
         int             mModelSpacing;
@@ -67 +66 @@
 
         KdTreeAppListener::Options mOptions;
-
 
         virtual void setupResources(void);

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

@@ -36 +36 @@
 #define __KdTreeAppListener_H__
 
-#include "Ogre.h"
-#include "OgreKeyEvent.h"
-#include "OgreEventListeners.h"
-#include "OgreStringConverter.h"
-#include "OgreException.h"
-
+#include <Ogre.h>
+#include <OgreKeyEvent.h>
+#include <OgreEventListeners.h>
+#include <OgreStringConverter.h>
+#include <OgreException.h>
+
+#include <OgreKdTree.h>
+
+#define CONV_OCM_TO_KDT_ALG(i) (i == 0 ? 3 : i)
+#define CONV_KDT_TO_OCM_ALG(i) (i % 3)
 #define VIZ_VIEWPORT_Z_ORDER 10
 
@@ -72 +76 @@
         };
 
+        enum SceneMgr
+        {
+                SM_KDT,
+                SM_OCM,
+                SM_OCT,
+                SM_GEN,
+                SM_SIZE,
+                SM_NOTSET
+        };
+
         enum ShowTree
         {
@@ -90 +104 @@
         {
                 Options():
-                mDemoMode(false),
-                mEnhancedVisibility(false),
                 mRotateSpeed(36.0f),
                 mMoveSpeed(100.0f),
                 mRotationPeriod(30.0f),
-                mMaxDepth(12),
                 mKT(2.0f),
                 mKI(1.0f),
-                mRenderMethod("CHC")
+                mMaxDepth(12),
+                mSceneManager(SM_KDT),
+                mRenderMethod(KdTree::KDRM_GTP_CHC),
+                mBuildMethod(KdTree::KDBM_PRIORITYQUEUE),
+                mDemoMode(false),
+                mEnhancedVisibility(false)
                 {
 
                 }
 
-                String mSceneManager;
                 String mDemoInfileName;
                 String mDemoOutfileName;
                 String mDemoLogfileName;
-                bool mDemoMode;
-                bool mEnhancedVisibility;
+                String mComment;
                 Degree mRotateSpeed;
                 Real mMoveSpeed;
                 Real mRotationPeriod;
-                int mMaxDepth;
                 Real mKT;
                 Real mKI;
-                String mRenderMethod;
-                String mComment;
+                int mMaxDepth;
+                int mSceneManager;
+                int mRenderMethod;
+                int mBuildMethod;
+                bool mDemoMode;
+                bool mEnhancedVisibility;
         };
 
@@ -164 +181 @@
         void keyReleased(KeyEvent* e) {};
 
+        const static Real       DEMO_WAIT;
         const static String NA;
-        const static Real DEMO_WAIT;
+        const static String RENDERMETHOD[];
+        const static String RENDERMETHODCAPTION[];
+        const static String BUILDMETHOD[];
+        const static String BUILDMETHODCAPTION[];
+        const static String SCENEMANAGER[];
+        const static String SCENEMANAGERNAME[];
 protected:
         // basic