[Orxonox-commit 7770] r12362 - code/branches/MouseAPI_FS19/src/modules/MouseAPI

[mkarpf at orxonox.net]

Author: mkarpf
Date: 2019-05-09 15:53:01 +0200 (Thu, 09 May 2019)
New Revision: 12362

Modified:
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h
Log:
cleanup (minor)


Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-05-09 13:50:09 UTC (rev 12361)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-05-09 13:53:01 UTC (rev 12362)
@@ -1,5 +1,5 @@
 #include "mouseapi.h"
-#include "core/singleton/ScopedSingletonIncludes.h"
+
 namespace orxonox{
 
 ManageScopedSingleton(MouseAPI, ScopeID::GRAPHICS, false);

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h	2019-05-09 13:50:09 UTC (rev 12361)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h	2019-05-09 13:53:01 UTC (rev 12362)
@@ -1,7 +1,6 @@
 #ifndef MOUSEAPI_H
 #define MOUSEAPI_H
 
-
 #include "OrxonoxPrereqs.h"
 #include "util/OgreForwardRefs.h"
 #include "graphics/Camera.h"
@@ -18,6 +17,7 @@
 #include "core/GUIManager.h"
 #include "core/input/KeyBinderManager.h"
 #include "tools/interfaces/Tickable.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 
 /* this class implements a basic mouse-api
  * supported are mouse-clicks (left, right, mousewheel, ...) and scrolling
@@ -44,6 +44,7 @@
 class MouseAPI : public InputHandler, public Singleton<MouseAPI>,public Tickable
 {
 friend class Singleton<MouseAPI>;
+
 private:
 
     // Elements that can be clicked on are stored as clickableElement
@@ -88,8 +89,6 @@
     // pointer to the game-camera
     Ogre::Camera *cam ;
 
-    //IntVector2 mousePos;
-
     // pointer to our input-state
     InputState* state;
 
@@ -96,8 +95,6 @@
     // true => MouseAPI has been activated, false => MouseAPI has not been activated
     bool active = false;
 
-
-
 public:
 
     MouseAPI();