Changeset 12253

Timestamp:

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

Author:

mkarpf

Message:

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

Location:

code/branches/MouseAPI_FS19/src/modules/MouseAPI

Files:

• CMakeLists.txt (modified) (1 diff)
• mouseapi.cc (modified) (3 diffs)
• mouseapi.h (modified) (4 diffs)

code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt

@@ -1 +1 @@
 SET_SOURCE_FILES(MOUSEAPI_SRC_FILES
   mouseapi.cc
+  mouseapiexample.cc
 )
 

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

@@ -3 +3 @@
 namespace orxonox{
 
-MouseAPI::MouseAPI(Camera& camera)
+MouseAPI::MouseAPI()
 {
-    cam = camera.getOgreCamera();
-    state = InputManager::getInstance().createInputState("MouseAPI");
-    state->setMouseExclusive(false);//does this work
-    state->setMouseHandler(this);
-    InputManager::getInstance().enterState("MouseAPI");
 
 }
 
-MouseAPI::~MouseAPI(){
-    InputManager::getInstance().leaveState("MouseAPI");
-    state->setMouseHandler(nullptr);
-    InputManager::getInstance().destroyState("MouseAPI");
+void MouseAPI::activate()
+{
+     if(InputManager::exists())
+     {
+        cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();
+        state = InputManager::getInstance().createInputState("MouseAPI");
+        state->setMouseExclusive(false);//does this work
+        state->setMouseHandler(this);
+        InputManager::getInstance().enterState("MouseAPI");
+    }
+
+}
+
+void MouseAPI::deactivate()
+{
+    if(InputManager::exists())
+    {
+        InputManager::getInstance().leaveState("MouseAPI");
+        state->setMouseHandler(nullptr);
+        InputManager::getInstance().destroyState("MouseAPI");
+    }
+}
+
+MouseAPI::~MouseAPI()
+{
+
 }
 
@@ -27 +44 @@
         for(auto wantedButton:event.buttons){
             if(wantedButton == button && ray.intersects(Ogre::Sphere(event.position,event.radius)).first)
-                (*(event.onClickedFunction))(button);
+                event.onClickedFunction(button);
         }
     }
@@ -47 +64 @@
 }
 
-void MouseAPI::addClickableObject(const Vector3& position,float radius,const std::list<MouseButtonCode::ByEnum>& buttons,void (*onClickedFunction)(MouseButtonCode::ByEnum button))
+void MouseAPI::addClickableObject(const Vector3& position, float radius, const std::list<MouseButtonCode::ByEnum>& buttons, std::function<void(MouseButtonCode::ByEnum)> onClickedFunction)
 {
     clickEvents.insert(clickEvents.begin(),{position,radius,buttons,onClickedFunction});

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();
 };
 }