Changeset 12348 for code/branches/MouseAPI_FS19/src/modules

Timestamp:

May 9, 2019, 12:32:44 PM (6 years ago)

Author:

tkuonen

Message:

Fix Build

Location:

code/branches/MouseAPI_FS19/src/modules/MouseAPI

Files:

• mouseapi.h (modified) (3 diffs)
• mouseapicursor.cc (modified) (1 diff)
• mouseapicursor.h (modified) (2 diffs)

code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h

@@ -18 +18 @@
 #include "core/GUIManager.h"
 #include "core/input/KeyBinderManager.h"
+#include "tools/interfaces/Tickable.h"
 
 /* This class implements a basic mouse-api
@@ -38 +39 @@
 typedef uint ScrollableElementID;
 
-class MouseAPI : public InputHandler, public Singleton<MouseAPI>
+class MouseAPI : public InputHandler, public Singleton<MouseAPI>,public Tickable
 {
 friend class Singleton<MouseAPI>;
@@ -100 +101 @@
     ~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

code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc

@@ -7 +7 @@
 MouseAPICursor::MouseAPICursor(Context* context):OrxonoxOverlay(context)
 {
+    RegisterObject(MouseAPICursor);
 //TODO: copy from radar overlay
 }

code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h

@@ -2 +2 @@
 #define MOUSEAPICURSOR_H
 #include <overlays/OrxonoxOverlay.h>
+#include "core/CoreIncludes.h"
 
+namespace orxonox{
 
 class MouseAPICursor: public OrxonoxOverlay
@@ -10 +12 @@
 };
 
+}
+
 #endif // MOUSEAPICURSOR_H