Changeset 1084 for code/trunk/src/core

Timestamp:

Apr 16, 2008, 9:22:50 PM (17 years ago)

Author:

rgrieder

Message:

• updated VC++ files for tolua
• minor CMLs changes

Location:

code/trunk/src/core

Files:

• CMakeLists.txt (modified) (1 diff)
• InputManager.cc (modified) (2 diffs)
• InputManager.h (modified) (2 diffs)

code/trunk/src/core/CMakeLists.txt

@@ -1 +1 @@
 #get the created files
 AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 
-
-MESSAGE(STATUS "tolua sources: ${TOLUA_BIND_FILES}")
 
 SET( CORE_SRC_FILES

code/trunk/src/core/InputManager.cc

@@ -39 +39 @@
 #include "InputHandler.h"
 #include "InputBuffer.h"
+#include "ConsoleCommand.h"
 
 namespace orxonox
 {
+  ConsoleCommand(InputManager, setInputMode, AccessLevel::Admin, true).setDefaultValue(0, IM_INGAME);
+
   /**
     @brief Constructor only resets the pointer values to 0.
@@ -227 +230 @@
     @remark Only has an affect if the mode actually changes
   */
-  void InputManager::setInputMode(InputMode mode)
-  {
-    this->setMode_ = mode;
+  void InputManager::setInputMode(int mode)
+  {
+    if (mode > 0 && mode < 4)
+      getSingleton().setMode_ = (InputMode)mode;
   }
 

code/trunk/src/core/InputManager.h

@@ -72 +72 @@
     void tick(float dt);
     void setWindowExtents(int width, int height);
-    void setInputMode(InputMode mode);
     InputMode getInputMode();
 
@@ -84 +83 @@
     static InputManager& getSingleton();
     static InputManager* getSingletonPtr() { return &getSingleton(); }
+    static void setInputMode(int mode);
 
   private: