Changeset 1084 for code/trunk/src

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

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/InputManager.cc (modified) (2 diffs)
• core/InputManager.h (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (3 diffs)
• util/CMakeLists.txt (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:

code/trunk/src/orxonox/Orxonox.cc

@@ -115 +115 @@
       {
         this->ib_->removeLast();
+      }
+      void exit() const
+      {
+        CommandExecutor::execute("setInputMode 2");
       }
 
@@ -405 +409 @@
     ib->registerListener(console, &Testconsole::clear, '§', true);
     ib->registerListener(console, &Testconsole::removeLast, '\b', true);
+    ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
 
     // first check whether ogre root object has been created
@@ -452 +457 @@
       {
         (it)->tick((float)evt.timeSinceLastFrame * this->timefactor_);
-         it++;
-     }
+        it++;
+      }
 
       // don't forget to call _fireFrameStarted in ogre to make sure

code/trunk/src/util/CMakeLists.txt

@@ -1 +1 @@
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
-AUX_SOURCE_DIRECTORY(tolua   TOLUA_SRC_FILES)
 
 SET (UTIL_SRC_FILES
@@ -11 +10 @@
   MultiTypeString.cc
   MultiTypeMath.cc
+  tolua_event.c
+  tolua_is.c
+  tolua_map.c
+  tolua_push.c
+  tolua_to.c
   ${TINYXML_SRC_FILES}
-  ${TOLUA_SRC_FILES}
 )