Changeset 955 for code/branches/core2/src/orxonox/Orxonox.cc

Timestamp:

Mar 30, 2008, 12:12:18 AM (16 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

File:

• code/branches/core2/src/orxonox/Orxonox.cc (modified) (3 diffs)

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));
     }