Changeset 12287

Timestamp:

Apr 11, 2019, 1:16:08 PM (6 years ago)

Author:

tkuonen

Message:

MouseAPI: improve getting mouse pos

Location:

code/branches/MouseAPI_FS19/src/modules/MouseAPI

Files:

• mouseapi.cc (modified) (3 diffs)
• mouseapi.h (modified) (1 diff)
• mouseapiexample.cc (modified) (3 diffs)

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

@@ -52 +52 @@
     cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();//todo: trycatch
     Ogre::Viewport *vp = GraphicsManager::getInstance().getViewport();
-    Ogre::Ray ray = cam->getCameraToViewportRay(mousePos.x/((float)vp->getActualWidth()),mousePos.y/((float)vp->getActualHeight()));
+    int mouseposX = InputManager::getInstance().getMousePosition().first;
+    int mouseposY = InputManager::getInstance().getMousePosition().second;
+    Ogre::Ray ray = cam->getCameraToViewportRay(mouseposX/((float)vp->getActualWidth()),mouseposY/((float)vp->getActualHeight()));
     for(auto event: clickEvents)
     {
@@ -65 +67 @@
 void MouseAPI::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
 {
-    mousePos = abs;
+    //mousePos = abs;
 }
 
@@ -72 +74 @@
     cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();
     Ogre::Viewport *vp = GraphicsManager::getInstance().getViewport();
-    Ogre::Ray ray = cam->getCameraToViewportRay(mousePos.x/((float)vp->getActualWidth()),mousePos.y/((float)vp->getActualHeight()));
+    int mouseposX = InputManager::getInstance().getMousePosition().first;
+    int mouseposY = InputManager::getInstance().getMousePosition().second;
+    Ogre::Ray ray = cam->getCameraToViewportRay(mouseposX/((float)vp->getActualWidth()),mouseposY/((float)vp->getActualHeight()));
     for(auto event:scrollEvents)
     {
         if(!event.considerPosition || ray.intersects(Ogre::Sphere(event.position,event.radius)).first)
-            event.onScrolledFunction(abs,rel,mousePos);
+            event.onScrolledFunction(abs,rel,IntVector2(mouseposX,mouseposY));
     }
 }

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

@@ -56 +56 @@
     std::list<scrollElement> scrollEvents;
     Ogre::Camera *cam ;
-    IntVector2 mousePos;
+    //IntVector2 mousePos;
     InputState* state;
     bool active = false;

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

@@ -1 +1 @@
 #include "mouseapiexample.h"
+#include "gametypes/Gametype.h"
 
 namespace orxonox
@@ -9 +10 @@
 {
     RegisterObject(MouseAPIExample);
+    //this->getGametype()->getPlayers().begin()->first->getControllableEntity()...
+
 
 }
@@ -16 +19 @@
     if(MouseAPI::isActive())
         MouseAPI::getInstance().deactivate();
+
 }