Changeset 1112 for code/branches/input

Timestamp:

Apr 19, 2008, 10:31:52 PM (17 years ago)

Author:

rgrieder

Message:

added calculate command
In the console, you can now type something like "calculate sin(cos(3+4) - 8)*7" or even "calculate 7>8" and you'll get the result as a double.
The parser was something I've written 3 years ago when I first used C++ (the parser is mainly C).

Location:

code/branches/input

Files:

• src/core/InputHandler.cc (modified) (4 diffs)
• src/core/InputHandler.h (modified) (3 diffs)
• src/core/InputManager.cc (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (6 diffs)
• src/util/String.cc (modified) (1 diff)
• visual_studio/loader_properties.vsprops (deleted)
• visual_studio/vc8/core.vcproj (modified) (1 diff)
• visual_studio/vc8/util.vcproj (modified) (2 diffs)

code/branches/input/src/core/InputHandler.cc

@@ -38 +38 @@
 #include "InputEvent.h"
 #include "InputManager.h"
+#include "core/CommandExecutor.h"
 
 namespace orxonox
@@ -68 +69 @@
     {
       // simply write the key number (i) in the string
-      this->bindingsKeyPressed_[i] = getConvertedValue<int, std::string>(i);
-      this->bindingsKeyReleased_[i] = getConvertedValue<int, std::string>(i);
-    }
+      this->bindingsKeyPress_[i] = "";
+      this->bindingsKeyRelease_[i] = "";
+    }
+    this->bindingsKeyPress_[OIS::KC_NUMPADENTER] = "setInputMode " + getConvertedValue<int, std::string>(IM_KEYBOARD);
+    this->bindingsKeyPress_[OIS::KC_ESCAPE] = "exit";
     return true;
   }
@@ -80 +83 @@
   bool InputHandlerGame::keyPressed(const OIS::KeyEvent &e)
   {
-    if (e.key == OIS::KC_ESCAPE)
-    {
-      InputEvent e = {1, true, 0, 0, 0};
-      InputHandlerGame::callListeners(e);
-    }
-    else if (e.key == OIS::KC_NUMPADENTER)
-    {
-      InputManager::getSingleton().setInputMode(IM_KEYBOARD);
-    }
-    else
-    {
-      // find the appropriate key binding
-      std::string cmdStr = bindingsKeyPressed_[int(e.key)];
-      //COUT(3) << cmdStr << " pressed" << std::endl;
+    // find the appropriate key binding
+    std::string cmdStr = bindingsKeyPress_[int(e.key)];
+    if (cmdStr != "")
+    {
+      CommandExecutor::execute(cmdStr);
+      COUT(3) << "Executing command: " << cmdStr << std::endl;
     }
     return true;
@@ -105 +100 @@
   {
     // find the appropriate key binding
-    std::string cmdStr = bindingsKeyReleased_[int(e.key)];
-    //COUT(3) << cmdStr << " released" << std::endl;
+    std::string cmdStr = bindingsKeyRelease_[int(e.key)];
+    if (cmdStr != "")
+    {
+      CommandExecutor::execute(cmdStr);
+      COUT(3) << "Executing command: " << cmdStr << std::endl;
+    }
     return true;
   }

code/branches/input/src/core/InputHandler.h

@@ -44 +44 @@
 namespace orxonox
 {
+  namespace KeybindSetting
+  {
+    enum KeybindSetting
+    {
+      none,
+      onPress,
+      onRelease,
+      continuous,
+    };
+  }
+
+  class _CoreExport BaseInputHandler
+      : public OIS::KeyListener, public OIS::MouseListener
+  {
+  };
+    
   /**
     @brief Captures mouse and keyboard input while in the actual game mode.
     Manages the key bindings.
   */
-  class _CoreExport InputHandlerGame
-        : public OIS::KeyListener, public OIS::MouseListener
+  class _CoreExport InputHandlerGame : public BaseInputHandler
   {
   public:
@@ -72 +87 @@
     static const int numberOfKeys_s = 256;
     //! Array of input events for every pressed key
-    std::string bindingsKeyPressed_[numberOfKeys_s];
+    std::string bindingsKeyPress_[numberOfKeys_s];
     //! Array of input events for every released key
-    std::string bindingsKeyReleased_[numberOfKeys_s];
+    std::string bindingsKeyRelease_[numberOfKeys_s];
+    //! Array of input events for every holding key
+    std::string bindingsKeyHold_[numberOfKeys_s];
 
     /** denotes the maximum number of different buttons there are in OIS.
@@ -91 +108 @@
     GUI.
   */
-  class _CoreExport InputHandlerGUI
-        : public OIS::KeyListener, public OIS::MouseListener
+  class _CoreExport InputHandlerGUI : public BaseInputHandler
   {
   public:

code/branches/input/src/core/InputManager.cc

@@ -93 +93 @@
       paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
 
-#if defined OIS_LINUX_PLATFORM
-      paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
-#endif
+//#if defined OIS_LINUX_PLATFORM
+//      paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
+//#endif
 
       try

code/branches/input/src/orxonox/Orxonox.cc

@@ -54 +54 @@
 //#include "util/Sleep.h"
 #include "util/ArgReader.h"
+#include "util/FloatParser.h"
 
 // core
@@ -123 +124 @@
       InputBuffer* ib_;
   };
+
+  class Calculator
+  {
+  public:
+    static void calculate(std::string calculation)
+    {
+      char** useless = 0;
+      double result = 0.0;
+      bool success = parse_float((char* const)calculation.c_str(), useless, &result);
+      if (success)
+      {
+        if (result == 42.0)
+          std::cout << "Greetings from the restaurant at the end of the universe." << std::endl;
+        std::cout << "Result is: " << result << std::endl;
+      }
+      else
+        std::cout << "Cannot calculate expression: Parse error" << std::endl;
+    }
+  };
+  ConsoleCommandShortcut(Calculator, calculate, AccessLevel::None);
 
   /**
@@ -410 +431 @@
       return;
     }
+    Ogre::Root& ogreRoot = Ogre::Root::getSingleton();
+
 
     // Contains the times of recently fired events
@@ -429 +452 @@
           {
                   // Pump messages in all registered RenderWindows
+      // This calls the WindowEventListener objects.
       Ogre::WindowEventUtilities::messagePump();
 
@@ -452 +476 @@
       // don't forget to call _fireFrameStarted in ogre to make sure
       // everything goes smoothly
-      Ogre::Root::getSingleton()._fireFrameStarted(evt);
+      ogreRoot._fireFrameStarted(evt);
 
       // server still renders at the moment
       //if (mode_ != SERVER)
-      Ogre::Root::getSingleton()._updateAllRenderTargets(); // only render in non-server mode
+      ogreRoot._updateAllRenderTargets(); // only render in non-server mode
 
       // get current time
@@ -466 +490 @@
 
       // again, just to be sure ogre works fine
-      Ogre::Root::getSingleton()._fireFrameEnded(evt);
+      ogreRoot._fireFrameEnded(evt);
           }
   }

code/branches/input/src/util/String.cc

@@ -274 +274 @@
     if (str.size() == 0)
         return str;
+    else if (str.size() == 1)
+    {
+      //TODO: decide whether we need the commented code
+      /*if (str[0] != '\\')
+        return "";
+      else*/
+      return str;
+    }
 
     std::string output = "";

code/branches/input/visual_studio/vc8/core.vcproj

@@ -258 +258 @@
                                         RelativePath="..\..\src\core\tolua\tolua_bind.cc"
                                         >
-                                        <FileConfiguration
-                                                Name="Debug|Win32"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
                                 </File>
                         </Filter>

code/branches/input/visual_studio/vc8/util.vcproj

@@ -157 +157 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\FloatParser.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\Math.cc"
                                 >
@@ -199 +203 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\FloatParser.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\Math.h"
                                 >