Changeset 4817 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 7, 2005, 5:12:45 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: orxonox is now baseobject, graphicsengine handles events itself and is therefore eventlistener now

Location:

orxonox/trunk/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• event/event_listener.cc (modified) (4 diffs)
• graphics/graphics_engine.cc (modified) (4 diffs)
• graphics/graphics_engine.h (modified) (3 diffs)

orxonox/trunk/src/lib/event/event_handler.cc

@@ -65 +65 @@
   EventHandler::singletonRef = NULL;
   delete this->keyMapper;
+
+  for(int i = 0; i < ES_NUMBER; ++i)
+  {
+    for(int j = 0; j < SDLK_LAST; ++j)
+    {
+      if( this->listeners[i][j] != NULL)
+      {
+        PRINTF(2)("Someone forgot to unsubscribe an EventListener!\n");
+      }
+    }
+  }
 }
 

orxonox/trunk/src/lib/event/event_listener.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -17 +17 @@
 
 #include "event_listener.h"
+#include "event_handler.h"
 
 using namespace std;
@@ -24 +25 @@
    \brief standard constructor
 */
-EventListener::EventListener () 
+EventListener::EventListener ()
 {
-   this->setClassID(CL_EVENT_LISTENER, "EventListener"); 
+   this->setClassID(CL_EVENT_LISTENER, "EventListener");
 }
 
@@ -34 +35 @@
 
 */
-EventListener::~EventListener () 
-{}
+EventListener::~EventListener ()
+{
+  /* unsubscribes itself from the event listener */
+  EventHandler::getInstance()->unsubscribe(this);
+}

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -18 +18 @@
 #include "graphics_engine.h"
 #include "resource_manager.h"
+#include "event_handler.h"
 
 #include "debug.h"
@@ -46 +47 @@
 
 //  this->listModes();
+
+  // subscribe the resolutionChanged-event
+  EventHandler::getInstance()->subscribe(this, ES_GAME, EV_VIDEO_RESIZE);
+
 }
 
@@ -59 +64 @@
 {
   // delete what has to be deleted here
+  EventHandler::getInstance()->unsubscribe(this);
 }
 
@@ -389 +395 @@
 
 
+/**
+  \brief processes the events for orxonox main class
+  \param the event to handle
+ */
+void GraphicsEngine::process(const Event &event)
+{
+  switch (event.type)
+  {
+    case EV_VIDEO_RESIZE:
+      this->resolutionChanged(event.resize);
+      break;
+  }
+
+}
+

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -5 +5 @@
 
     handles graphical SDL-initialisation, textures, resolutions, and so on
-*/
+ */
 
 #ifndef _GRAPHICS_ENGINE_H
 #define _GRAPHICS_ENGINE_H
 
-#include "base_object.h"
+#include "event_listener.h"
 
 #include "sdlincl.h"
@@ -23 +23 @@
    handles graphical SDL-initialisation, textures, resolutions, and so on
  */
-class GraphicsEngine : public BaseObject
+class GraphicsEngine : public EventListener
 {
   public:
@@ -64 +64 @@
     static void swapBuffers() { SDL_GL_SwapBuffers(); };
 
+    void process(const Event  &event);
 
   private: