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

Timestamp:

Mar 28, 2019, 1:33:50 PM (5 years ago)

Author:

tkuonen

Message:

Comlete initial version of MouseAPI
remove compile errors

File:

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

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

@@ -2 +2 @@
 #define MOUSEAPI_H
 
+
+#include "OrxonoxPrereqs.h"
+#include "util/OgreForwardRefs.h"
+#include "graphics/Camera.h"
 #include <util/Math.h>
 #include <list>
@@ -8 +12 @@
 #include <core/GraphicsManager.h>
 #include <core/input/InputState.h>
+#include <OgreCamera.h>
+#include <OgreViewport.h>
 
 namespace orxonox
@@ -21 +27 @@
         Vector3 position;
         float radius;
-        list<MouseButtonCode::ByEnum> buttons;
+        std::list<MouseButtonCode::ByEnum> buttons;
         void (*onClickedFunction)(MouseButtonCode::ByEnum button);
-        clickableElement(const Vector3& position,float radius,const list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)()):position(position),
+        clickableElement(const Vector3& position,float radius,const std::list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)(MouseButtonCode::ByEnum button)):position(position),
             radius(radius), buttons(buttons), onClickedFunction(onClickedFunction){}
     };
@@ -33 +39 @@
         float radius;
         void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos);
-        scrollEvents(void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos)):considerPosition(false),
+        scrollElement(void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos)):considerPosition(false),
             onScrolledFunction(onScrolledFunction){}
-        scrollEvents(Vector3& position, float radius, void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos)):considerPosition(true),
+        scrollElement(const Vector3& position, float radius, void (*onScrolledFunction)(int abs,int rel,const IntVector2& mousePos)):considerPosition(true),
             position(position), radius(radius), onScrolledFunction(onScrolledFunction){}
     };
@@ -42 +48 @@
     std::list<clickableElement> clickEvents;
     std::list<scrollElement> scrollEvents;
-    Ogre::Camera cam;
+    Ogre::Camera *cam ;
     IntVector2 mousePos;
     InputState* state;
@@ -57 +63 @@
     virtual void mouseScrolled (int abs, int rel) override;
 
-    void addClickableObject(const Vector3& position,float radius,const list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)(MouseButtonCode::ByEnum button));
+    void addClickableObject(const Vector3& position,float radius,const std::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));