Changeset 4408 in orxonox.OLD for orxonox

Timestamp:

May 31, 2005, 12:11:57 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: integrating the event handler into orxonox mainclass

Location:

orxonox/trunk/src

Files:

• command_node.cc (modified) (1 diff)
• orxonox.cc (modified) (4 diffs)
• orxonox.h (modified) (4 diffs)

orxonox/trunk/src/command_node.cc

@@ -285 +285 @@
         default:
           Orxonox *orx = Orxonox::getInstance();
-          orx->eventHandler(&event);
+          orx->graphicsHandler(&event);
           break;
         }

orxonox/trunk/src/orxonox.cc

@@ -40 +40 @@
 #include "benchmark.h"
 #include "event_handler.h"
+#include "event.h"
 
 #include <string.h>
@@ -166 +167 @@
   localinput = new CommandNode(configfilename);
 
-  EventHandler::getInstance()->test();
+  this->eventHandler = EventHandler::getInstance();
+  this->eventHandler->init();
   
   return 0;
@@ -286 +288 @@
    \param event: an event not handled by the CommandNode 
 */
-void Orxonox::eventHandler(SDL_Event* event)
+void Orxonox::graphicsHandler(SDL_Event* event)
 {
   // Handle special events such as reshape, quit, focus changes
@@ -316 +318 @@
   return false;
 }
+
+
+void Orxonox::process(const Event &event)
+{}
 
 /**

orxonox/trunk/src/orxonox.h

@@ -9 +9 @@
 #include "comincl.h"
 #include "glincl.h"
+#include "event_listener.h"
+
 
 class CommandNode;
@@ -17 +19 @@
 class ResourceManager;
 class ObjectManager;
+class EventHandler;
+class Event;
 
 //! Orxonox core singleton class
 /**
 */
-class Orxonox {
+class Orxonox : public EventListener {
 
  private:
@@ -34 +38 @@
   ResourceManager* resourceManager; //!< The ResourceManager
   ObjectManager* objectManager; //!< the object manager of the game
+  EventHandler* eventHandler;
   
   bool bQuitOrxonox;          //!< If Orxonox should Quit
@@ -59 +64 @@
   void quitGame();
 
-  void eventHandler (SDL_Event* event);
+  void graphicsHandler (SDL_Event* event);
   bool systemCommand (Command* cmd);
+  void process(const Event  &event);
 
   int init (int argc, char** argv);