Changeset 3290 for code/branches/core4/src/orxonox

Timestamp:

Jul 14, 2009, 11:30:05 AM (15 years ago)

Author:

rgrieder

Message:

Moved WindowEventListener to the core to avoid some really ugly hacks in the Mouse.

Location:

code/branches/core4/src/orxonox

Files:

• GraphicsManager.cc (modified) (1 diff)
• gamestates/GSGraphics.h (modified) (1 diff)
• interfaces/InterfaceCompilation.cc (modified) (2 diffs)
• overlays/OrxonoxOverlay.h (modified) (1 diff)
• overlays/console/InGameConsole.h (modified) (1 diff)

code/branches/core4/src/orxonox/GraphicsManager.cc

@@ -63 +63 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
+#include "core/WindowEventListener.h"
 #include "tools/ParticleInterface.h"
-#include "interfaces/WindowEventListener.h"
 
 // HACK!

code/branches/core4/src/orxonox/gamestates/GSGraphics.h

@@ -39 +39 @@
 
 #include "core/GameState.h"
-#include "interfaces/WindowEventListener.h"
+#include "core/WindowEventListener.h"
 
 namespace orxonox

code/branches/core4/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -40 +40 @@
 #include "Tickable.h"
 #include "TimeFactorListener.h"
-#include "WindowEventListener.h"
 
 #include "core/CoreIncludes.h"
@@ -103 +102 @@
 
     //----------------------------
-    // WindowEventListener
-    //----------------------------
-    /**
-        @brief Constructor for the WindowEventListener.
-    */
-    WindowEventListener::WindowEventListener()
-    {
-        RegisterRootObject(WindowEventListener);
-    }
-
-    //----------------------------
     // Rewardable
     //----------------------------

code/branches/core4/src/orxonox/overlays/OrxonoxOverlay.h

@@ -42 +42 @@
 #include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
-#include "interfaces/WindowEventListener.h"
+#include "core/WindowEventListener.h"
 
 namespace orxonox

code/branches/core4/src/orxonox/overlays/console/InGameConsole.h

@@ -36 +36 @@
 #include "util/OgreForwardRefs.h"
 #include "core/Shell.h"
-#include "interfaces/WindowEventListener.h"
+#include "core/WindowEventListener.h"
 
 namespace orxonox