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

Timestamp:

Mar 21, 2019, 4:06:42 PM (5 years ago)

Author:

tkuonen

Message:

 

File:

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

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

@@ -5 +5 @@
 #include <list>
 #include <core/input/InputHandler.h>
+#include <graphics/Camera.h>
+#include <core/GraphicsManager.h>
+#include <core/input/InputState.h>
 
 namespace orxonox
@@ -18 +21 @@
         Vector3 position;
         float radius;
-        list<ClickEvent> events;
-        void (*onClickedFunction)();
-        clickableElement(const Vector3& position,float radius,const list<ClickEvent>& events,void (*onClickedFunction)()):position(position),
-            radius(radius), events(events), onClickedFunction(onClickedFunction){}
+        list<MouseButtonCode::ByEnum> buttons;
+        void (*onClickedFunction)(MouseButtonCode::ByEnum button);
+        clickableElement(const Vector3& position,float radius,const list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)()):position(position),
+            radius(radius), buttons(buttons), onClickedFunction(onClickedFunction){}
     };
 
@@ -39 +42 @@
     std::list<clickableElement> clickEvents;
     std::list<scrollElement> scrollEvents;
+    Ogre::Camera cam;
+    IntVector2 mousePos;
+    InputState* state;
 
 
 public:
-    enum ClickEvent
-    {
-        rightClick,leftClick,middleCLick
-    };
 
-    MouseAPI();
+    MouseAPI(Camera& cam);
     ~MouseAPI();
-    virtual void buttonPressed (MouseButtonCode::ByEnum button);
-    virtual void buttonReleased(MouseButtonCode::ByEnum button){}
-    virtual void buttonHeld    (MouseButtonCode::ByEnum button){}
-    virtual void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
-    virtual void mouseScrolled (int abs, int rel);
+    virtual void buttonPressed (MouseButtonCode::ByEnum button) override;
+    virtual void buttonReleased(MouseButtonCode::ByEnum button)  override{}
+    virtual void buttonHeld    (MouseButtonCode::ByEnum button) override{}
+    virtual void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+    virtual void mouseScrolled (int abs, int rel) override;
 
-    void addClickableObject(const Vector3& position,float radius,const list<ClickEvent>& events,void (*onClickedFunction)());
+    void addClickableObject(const Vector3& position,float radius,const list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)(MouseButtonCode::ByEnum button));
     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);
 };
 }