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

Timestamp:

Apr 4, 2019, 3:28:50 PM (6 years ago)

Author:

tkuonen

Message:

Begin extending MouseAPI

File:

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

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

@@ -20 +20 @@
 {
 
-class MouseAPI : public InputHandler
+typedef uint ClickableObjectID;
+typedef uint ScrollableElementID;
+
+class MouseAPI : public InputHandler, public Singleton<MouseAPI>
 {
-
+friend class Singleton<MouseAPI>;
 private:
 
     struct clickableElement
     {
+        //static ClickableObjectID lastClID;
+        ClickableObjectID id;
         Vector3 position;
         float radius;
         std::list<MouseButtonCode::ByEnum> buttons;
         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){}
+        clickableElement(ClickableObjectID id,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),id(id){}
     };
 
     struct scrollElement
     {
+        static ScrollableElementID lastScID;
+        ScrollableElementID id;
         bool considerPosition;
         Vector3 position;
         float radius;
-        void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos);
-        scrollElement(void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos)):considerPosition(false),
-            onScrolledFunction(onScrolledFunction){}
-        scrollElement(const Vector3& position, float radius, void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos)):considerPosition(true),
-            position(position), radius(radius), onScrolledFunction(onScrolledFunction){}
+        std::function<void(int abs,int rel,const IntVector2& mousePos)> onScrolledFunction;
+        scrollElement(ScrollableElementID id,std::function<void(int abs,int rel,const IntVector2& mousePos)> onScrolledFunction):considerPosition(false),
+            onScrolledFunction(onScrolledFunction),id(id){}
+        scrollElement(ScrollableElementID id,const Vector3& position, float radius, std::function<void(int abs,int rel,const IntVector2& mousePos)> onScrolledFunction):considerPosition(true),
+            position(position), radius(radius), onScrolledFunction(onScrolledFunction),id(id){}
     };
 
-
+    static MouseAPI* singletonPtr_s;
     std::list<clickableElement> clickEvents;
     std::list<scrollElement> scrollEvents;
@@ -53 +60 @@
     IntVector2 mousePos;
     InputState* state;
+    bool active = false;
+
 
 
@@ -65 +74 @@
     virtual void mouseScrolled (int abs, int rel) override;
 
-    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));
+    ClickableObjectID addClickableObject(const Vector3& position,float radius,const std::list<MouseButtonCode::ByEnum>& buttons,std::function<void(MouseButtonCode::ByEnum button)>  onClickedFunction);
+    ScrollableElementID addScrollElement(const Vector3& position,float radius,std::function<void(int abs,int rel,const IntVector2& mousePos)> onScrolledFunction);
+    ScrollableElementID addScrollElement(std::function<void(int abs,int rel,const IntVector2& mousePos)> onScrolledFunction);
 
-    void changeCamera(Camera& camera);
+    void changePositionOfClickableObject(ClickableObjectID id,const Vector3& position);
+    void changePositionOfScrollableElement(ScrollableElementID id,const Vector3& position);
+    void changeRadiusOfClickableObject(ClickableObjectID id,float radius);
+    void changeRadiusOfScrollableElement(ScrollableElementID id,float radius);
+    void deleteClickableObject(ClickableObjectID);
+    void deleteScrollableElement(ScrollableElementID);
 
     void activate();
+    static bool isActive(){return singletonPtr_s != nullptr && getInstance().active;}
     void deactivate();
 };