Changeset 955

Timestamp:

Mar 30, 2008, 12:12:18 AM (17 years ago)

Author:

landauf

Message:

• added input buffer: this class captures key-input (at the moment it's using OIS directly, later it will use the InputHandler) and writes it into a string - other classes can listen to changes and can read and modify the string.
• fixed some bugs in CommandExecutor
• fixed a small bug (or changed a questionable feature) in Functor

Location:

code/branches/core2/src/orxonox

Files:

• Orxonox.cc (modified) (3 diffs)
• core/CMakeLists.txt (modified) (1 diff)
• core/CommandExecutor.cc (modified) (19 diffs)
• core/CommandExecutor.h (modified) (3 diffs)
• core/Functor.h (modified) (3 diffs)
• core/InputBuffer.cc (added)
• core/InputBuffer.h (added)
• core/OutputHandler.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (1 diff)

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

@@ -86 +86 @@
 #include "objects/test3.h"
 
+#include "core/CommandExecutor.h"
+#include "core/InputBuffer.h"
+
 #include "Orxonox.h"
 
 namespace orxonox
 {
+    class Testlistener : public InputBufferListener
+    {
+        public:
+            Testlistener(InputBuffer* ib) : ib_(ib) {}
+            void listen() const
+            {
+                std::cout << "> -->" << this->ib_->get() << "<--" << std::endl;
+            }
+            void execute() const
+            {
+std::cout << "### EXECUTE!" << std::endl;
+                CommandExecutor::execute(this->ib_->get());
+                this->ib_->clear();
+            }
+            void hintandcomplete() const
+            {
+std::cout << "### HINT!" << std::endl;
+                std::cout << CommandExecutor::hint(this->ib_->get()) << std::endl;
+                this->ib_->set(CommandExecutor::complete(this->ib_->get()));
+            }
+            void clear() const
+            {
+std::cout << "### CLEAR!" << std::endl;
+                this->ib_->clear();
+            }
+            void removeLast() const
+            {
+std::cout << "### REMOVELAST!" << std::endl;
+                this->ib_->removeLast();
+            }
+
+        private:
+            InputBuffer* ib_;
+    };
+
    // put this in a seperate Class or solve the problem in another fashion
   class OrxListener : public Ogre::FrameListener
@@ -1146 +1184 @@
         std::cout << "2\n";
 */
+        InputBuffer* ib = new InputBuffer(this->getKeyboard());
+        Testlistener* testlistener = new Testlistener(ib);
+        ib->registerListener(testlistener, &Testlistener::listen, true);
+        ib->registerListener(testlistener, &Testlistener::execute, '\r', false);
+        ib->registerListener(testlistener, &Testlistener::hintandcomplete, '\t', true);
+        ib->registerListener(testlistener, &Testlistener::clear, '§', true);
+        ib->registerListener(testlistener, &Testlistener::removeLast, '\b', true);
+
     startRenderLoop();
   }
@@ -1364 +1410 @@
     try
     {
-      keyboard_ = static_cast<OIS::Keyboard*>(inputManager_->createInputObject(OIS::OISKeyboard, false));
+      keyboard_ = static_cast<OIS::Keyboard*>(inputManager_->createInputObject(OIS::OISKeyboard, true));
       mouse_ = static_cast<OIS::Mouse*>(inputManager_->createInputObject(OIS::OISMouse, true));
     }

code/branches/core2/src/orxonox/core/CMakeLists.txt

@@ -20 +20 @@
   NamespaceNode.cc
   CommandExecutor.cc
+  InputBuffer.cc
 )
 

code/branches/core2/src/orxonox/core/CommandExecutor.cc

@@ -49 +49 @@
     // CommandEvaluation //
     ///////////////////////
+    CommandEvaluation::CommandEvaluation()
+    {
+        this->processedCommand_ = "";
+        this->additionalParameter_ = "";
+
+        this->functionclass_ = 0;
+        this->configvalueclass_ = 0;
+        this->shortcut_ = 0;
+        this->function_ = 0;
+        this->configvalue_ = 0;
+        this->key_ = 0;
+
+        this->errorMessage_ = "";
+        this->state_ = CS_Uninitialized;
+    }
+
     KeybindMode CommandEvaluation::getKeybindMode()
     {
@@ -156 +172 @@
     bool CommandExecutor::execute(const std::string& command)
     {
-        if (CommandExecutor::getEvaluation().processedCommand_ != command)
+        if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
             CommandExecutor::parse(command);
 
@@ -169 +185 @@
         switch (evaluation.state_)
         {
+            case CS_Uninitialized:
+                break;
             case CS_Empty:
                 break;
@@ -227 +245 @@
     std::string CommandExecutor::complete(const std::string& command)
     {
-        if (CommandExecutor::getEvaluation().processedCommand_ != command)
+        if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
             CommandExecutor::parse(command);
 
@@ -246 +264 @@
         switch (evaluation.state_)
         {
+            case CS_Uninitialized:
+                break;
             case CS_Empty:
-                return (tokens.subSet(0, tokens.size() - 1).join() + " " + CommandExecutor::getCommonBegin(temp));
+                return (CommandExecutor::getCommonBegin(temp));
                 break;
             case CS_FunctionClass_Or_Shortcut_Or_Keyword:
@@ -258 +278 @@
                 break;
             case CS_Function:
-                return (tokens.subSet(0, tokens.size() - 1).join() + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleFunctions_));
+                if (tokens.size() >= 1)
+                    return tokens[0] + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleFunctions_);
                 break;
             case CS_Function_Params:
@@ -267 +288 @@
                 break;
             case CS_ConfigValueClass:
-                return (tokens.subSet(0, tokens.size() - 1).join() + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleConfigValueClasses_));
+                if (tokens.size() >= 1)
+                    return tokens[0] + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleConfigValueClasses_);
                 break;
             case CS_ConfigValue:
-                return (tokens.subSet(0, tokens.size() - 1).join() + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleConfigValues_));
+                if (tokens.size() >= 2)
+                    return tokens[0] + " " + tokens[1] + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleConfigValues_);
                 break;
             case CS_ConfigValueType:
@@ -279 +302 @@
                 break;
             case CS_KeybindKey:
-                return (tokens.subSet(0, tokens.size() - 1).join() + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleKeys_));
+                if (tokens.size() >= 1)
+                    return tokens[0] + " " + CommandExecutor::getCommonBegin(evaluation.listOfPossibleKeys_);
                 break;
             case CS_KeybindCommand:
@@ -296 +320 @@
     std::string CommandExecutor::hint(const std::string& command)
     {
-        if (CommandExecutor::getEvaluation().processedCommand_ != command)
+        if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
             CommandExecutor::parse(command);
 
@@ -308 +332 @@
         switch (evaluation.state_)
         {
+            case CS_Uninitialized:
+                break;
             case CS_Empty:
                 return (CommandExecutor::dump(evaluation.listOfPossibleShortcuts_) + "\n" + CommandExecutor::dump(evaluation.listOfPossibleFunctionClasses_));
@@ -358 +384 @@
                 break;
             case CS_Error:
-                return "Error";
+                return CommandExecutor::getEvaluation().errorMessage_;
                 break;
         }
@@ -381 +407 @@
         switch (CommandExecutor::getEvaluation().state_)
         {
+            case CS_Uninitialized:
+                // Impossible
+                break;
             case CS_Empty:
                 if (CommandExecutor::argumentsGiven() == 0)
@@ -635 +664 @@
                         {
                             CommandExecutor::getEvaluation().configvalue_ = CommandExecutor::getContainerOfPossibleConfigValue(CommandExecutor::getToken(2), CommandExecutor::getEvaluation().configvalueclass_);
-                            if (CommandExecutor::getEvaluation().configvalueclass_ != 0)
+                            if (CommandExecutor::getEvaluation().configvalue_ != 0)
                             {
                                 // There is a perfect match: Add a whitespace and continue parsing
@@ -791 +820 @@
             if ((*it).second->hasConsoleCommands())
             {
-                if ((*it).first.find(getLowercase(fragment)) == 0)
+                if ((*it).first.find(getLowercase(fragment)) == 0 || fragment == "")
                 {
                     CommandExecutor::getEvaluation().listOfPossibleFunctionClasses_.push_back(&(*it).first);
@@ -805 +834 @@
         for (std::map<std::string, ExecutorStatic*>::const_iterator it = CommandExecutor::getLowercaseConsoleCommandShortcutMapBegin(); it != CommandExecutor::getLowercaseConsoleCommandShortcutMapEnd(); ++it)
         {
-            if ((*it).first.find(getLowercase(fragment)) == 0)
+            if ((*it).first.find(getLowercase(fragment)) == 0 || fragment == "")
             {
                 CommandExecutor::getEvaluation().listOfPossibleShortcuts_.push_back(&(*it).first);
@@ -818 +847 @@
         for (std::map<std::string, ExecutorStatic*>::const_iterator it = identifier->getLowercaseConsoleCommandMapBegin(); it != identifier->getLowercaseConsoleCommandMapEnd(); ++it)
         {
-            if ((*it).first.find(getLowercase(fragment)) == 0)
+            if ((*it).first.find(getLowercase(fragment)) == 0 || fragment == "")
             {
                 CommandExecutor::getEvaluation().listOfPossibleFunctions_.push_back(&(*it).first);
@@ -833 +862 @@
             if ((*it).second->hasConfigValues())
             {
-                if ((*it).first.find(getLowercase(fragment)) == 0)
+                if ((*it).first.find(getLowercase(fragment)) == 0 || fragment == "")
                 {
                     CommandExecutor::getEvaluation().listOfPossibleConfigValueClasses_.push_back(&(*it).first);
@@ -847 +876 @@
         for (std::map<std::string, ConfigValueContainer*>::const_iterator it = identifier->getLowercaseConfigValueMapBegin(); it != identifier->getLowercaseConfigValueMapEnd(); ++it)
         {
-            if ((*it).first.find(getLowercase(fragment)) == 0)
+            if ((*it).first.find(getLowercase(fragment)) == 0 || fragment == "")
             {
                 CommandExecutor::getEvaluation().listOfPossibleConfigValues_.push_back(&(*it).first);
@@ -908 +937 @@
         std::map<std::string, ConfigValueContainer*>::const_iterator it = identifier->getLowercaseConfigValueMap().find(getLowercase(name));
         if (it != identifier->getLowercaseConfigValueMapEnd())
+        {
             return (*it).second;
+        }
 
         return 0;

code/branches/core2/src/orxonox/core/CommandExecutor.h

@@ -34 +34 @@
 
 #include "util/SubString.h"
+#include "util/MultiTypeMath.h"
 #include "CorePrereqs.h"
 
@@ -42 +43 @@
     enum CommandState
     {
+        CS_Uninitialized,
         CS_Empty,
         CS_FunctionClass_Or_Shortcut_Or_Keyword,
@@ -67 +69 @@
     {
         public:
+            CommandEvaluation();
+
             KeybindMode getKeybindMode();
             void setAdditionalParameter(const std::string& param);

code/branches/core2/src/orxonox/core/Functor.h

@@ -52 +52 @@
 #define CreateTypeToStringTemplate(type) \
     template <> \
-    inline std::string typeToString<type>() { return #type; }
+    inline std::string typeToString<type>() { return #type; } \
+    template <> \
+    inline std::string typeToString<type&>() { return #type; } \
+    template <> \
+    inline std::string typeToString<const type>() { return #type; } \
+    template <> \
+    inline std::string typeToString<const type&>() { return #type; }
 
     CreateTypeToStringTemplate(int);
@@ -66 +72 @@
     CreateTypeToStringTemplate(long double);
     CreateTypeToStringTemplate(bool);
-    CreateTypeToStringTemplate(std::string);
-    CreateTypeToStringTemplate(orxonox::Vector2);
-    CreateTypeToStringTemplate(orxonox::Vector3);
-    CreateTypeToStringTemplate(orxonox::Quaternion);
-    CreateTypeToStringTemplate(orxonox::ColourValue);
-    CreateTypeToStringTemplate(orxonox::Radian);
-    CreateTypeToStringTemplate(orxonox::Degree);
-
+    CreateTypeToStringTemplate(Vector2);
+    CreateTypeToStringTemplate(Vector3);
+    CreateTypeToStringTemplate(Quaternion);
+    CreateTypeToStringTemplate(ColourValue);
+    CreateTypeToStringTemplate(Radian);
+    CreateTypeToStringTemplate(Degree);
+
+    template <> \
+    inline std::string typeToString<std::string>() { return "string"; } \
+    template <> \
+    inline std::string typeToString<std::string&>() { return "string"; } \
+    template <> \
+    inline std::string typeToString<const std::string>() { return "string"; } \
+    template <> \
+    inline std::string typeToString<const std::string&>() { return "string"; }
 
     class _CoreExport Functor
@@ -88 +101 @@
             inline MultiTypeMath getReturnvalue() const { return this->returnedValue_; }
 
-            std::string getTypenameParam(unsigned int param) const { return (param > 0 && param <= 5) ? this->typeParam_[param-1] : ""; }
+            std::string getTypenameParam(unsigned int param) const { return (param >= 0 && param < 5) ? this->typeParam_[param] : ""; }
             std::string getTypenameReturnvalue() const { return this->typeReturnvalue_; }
 

code/branches/core2/src/orxonox/core/OutputHandler.h

@@ -61 +61 @@
             /** @brief Puts some text on the outstream. @param text The text */
             static inline void log(const std::string& text)
-                { OutputHandler::getOutStream().setOutputLevel(0); OutputHandler::getOutStream().output(text); }
+                { OutputHandler::getOutStream().setOutputLevel(0); OutputHandler::getOutStream().output(text + "\n"); }
 
             /** @brief Returns a reference to the logfile. @return The logfile */

code/branches/core2/src/orxonox/objects/SpaceShip.cc

@@ -52 +52 @@
 {
     ConsoleCommand(SpaceShip, setMaxSpeedTest, AccessLevel::Debug, false);
+    ConsoleCommandGeneric(test1, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxSpeed", AccessLevel::Debug), false);
+    ConsoleCommandGeneric(test2, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxBlubber", AccessLevel::Debug), false);
+    ConsoleCommandGeneric(test3, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setRofl", AccessLevel::Debug), false);
 
     CreateFactory(SpaceShip);