[Orxonox-commit 7755] r12348 - code/branches/MouseAPI_FS19/src/modules/MouseAPI

[tkuonen at orxonox.net]

Author: tkuonen
Date: 2019-05-09 12:32:44 +0200 (Thu, 09 May 2019)
New Revision: 12348

Modified:
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h
Log:
Fix Build


Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h	2019-05-09 09:39:39 UTC (rev 12347)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h	2019-05-09 10:32:44 UTC (rev 12348)
@@ -17,6 +17,7 @@
 #include <functional>
 #include "core/GUIManager.h"
 #include "core/input/KeyBinderManager.h"
+#include "tools/interfaces/Tickable.h"
 
 /* This class implements a basic mouse-api
  * supported are mouse-clicks (left, right, mousewheel, ...) and scrolling
@@ -37,7 +38,7 @@
 typedef uint ClickableObjectID;
 typedef uint ScrollableElementID;
 
-class MouseAPI : public InputHandler, public Singleton<MouseAPI>
+class MouseAPI : public InputHandler, public Singleton<MouseAPI>,public Tickable
 {
 friend class Singleton<MouseAPI>;
 private:
@@ -99,6 +100,8 @@
     MouseAPI();
     ~MouseAPI();
 
+    virtual void tick(float dt) override;
+
     /* everytime a mousebutton is pressed, this function is called and checks if the cursor is over an element that can be clicked on
      * if yes, the function associated with this element will be called with the corresponding button as argument
      */

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc	2019-05-09 09:39:39 UTC (rev 12347)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc	2019-05-09 10:32:44 UTC (rev 12348)
@@ -6,6 +6,7 @@
 
 MouseAPICursor::MouseAPICursor(Context* context):OrxonoxOverlay(context)
 {
+    RegisterObject(MouseAPICursor);
 //TODO: copy from radar overlay
 }
 

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h	2019-05-09 09:39:39 UTC (rev 12347)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h	2019-05-09 10:32:44 UTC (rev 12348)
@@ -1,7 +1,9 @@
 #ifndef MOUSEAPICURSOR_H
 #define MOUSEAPICURSOR_H
 #include <overlays/OrxonoxOverlay.h>
+#include "core/CoreIncludes.h"
 
+namespace orxonox{
 
 class MouseAPICursor: public OrxonoxOverlay
 {
@@ -9,4 +11,6 @@
     MouseAPICursor(Context* context);
 };
 
+}
+
 #endif // MOUSEAPICURSOR_H