Changeset 12253 for code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h

Timestamp:

Mar 28, 2019, 3:32:09 PM (5 years ago)

Author:

mkarpf

Message:

Test Level created
ATTENTION: Level is buggy and freezes Screen!

File:

• code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.h (modified) (4 diffs)

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

@@ -14 +14 @@
 #include <OgreCamera.h>
 #include <OgreViewport.h>
+#include "CameraManager.h"
+#include <functional>
 
 namespace orxonox
@@ -28 +30 @@
         float radius;
         std::list<MouseButtonCode::ByEnum> buttons;
-        void (*onClickedFunction)(MouseButtonCode::ByEnum button);
-        clickableElement(const Vector3& position,float radius,const std::list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)(MouseButtonCode::ByEnum button)):position(position),
+        std::function<void(MouseButtonCode::ByEnum button)> onClickedFunction;
+        clickableElement(const Vector3& position,float radius,const std::list<MouseButtonCode::ByEnum>& buttons,std::function<void(MouseButtonCode::ByEnum button)> onClickedFunction):position(position),
             radius(radius), buttons(buttons), onClickedFunction(onClickedFunction){}
     };
@@ -55 +57 @@
 public:
 
-    MouseAPI(Camera& cam);
+    MouseAPI();
     ~MouseAPI();
     virtual void buttonPressed (MouseButtonCode::ByEnum button) override;
@@ -63 +65 @@
     virtual void mouseScrolled (int abs, int rel) override;
 
-    void addClickableObject(const Vector3& position,float radius,const std::list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)(MouseButtonCode::ByEnum button));
+    void addClickableObject(const Vector3& position,float radius,const std::list<MouseButtonCode::ByEnum>& buttons,std::function<void(MouseButtonCode::ByEnum button)>  onClickedFunction);
     void addScrollElement(const Vector3& position,float radius,void (*onScrolledFunction)(int abs,int rel,const IntVector2&  mousePos));
     void addScrollElement(void (*onScrolledFunction)(int abs,int rel,const IntVector2&  mousePos));
 
     void changeCamera(Camera& camera);
+
+    void activate();
+    void deactivate();
 };
 }