Changeset 12275 for code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc

Timestamp:

Apr 4, 2019, 3:59:47 PM (5 years ago)

Author:

tkuonen

Message:

Extend MouseAPI

File:

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

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

@@ -49 +49 @@
     for(auto event: clickEvents)
     {
-        for(auto wantedButton:event.buttons){
+        for(auto wantedButton:event.buttons)
+        {
             if(wantedButton == button && ray.intersects(Ogre::Sphere(event.position,event.radius)).first)
                 event.onClickedFunction(button);
@@ -66 +67 @@
     Ogre::Viewport *vp = GraphicsManager::getInstance().getViewport();
     Ogre::Ray ray = cam->getCameraToViewportRay(mousePos.x/((float)vp->getActualWidth()),mousePos.y/((float)vp->getActualHeight()));
-    for(auto event:scrollEvents){
+    for(auto event:scrollEvents)
+    {
         if(!event.considerPosition || ray.intersects(Ogre::Sphere(event.position,event.radius)).first)
             event.onScrolledFunction(abs,rel,mousePos);
@@ -88 +90 @@
 }
 
-//todo
-void MouseAPI::changePositionOfClickableObject(ClickableObjectID id,const Vector3& position){}
-void MouseAPI::changePositionOfScrollableElement(ScrollableElementID id,const Vector3& position){}
-void MouseAPI::changeRadiusOfClickableObject(ClickableObjectID id,float radius){}
-void MouseAPI::changeRadiusOfScrollableElement(ScrollableElementID id,float radius){}
-void MouseAPI::deleteClickableObject(ClickableObjectID){}
-void MouseAPI::deleteScrollableElement(ScrollableElementID){}
+
+bool MouseAPI::changePositionOfClickableObject(ClickableObjectID id,const Vector3& position)
+{
+    for(auto event:clickEvents)
+    {
+        if(event.id == id)
+        {
+            event.position = position;
+            return true;
+        }
+    }
+    return false;
+}
+bool MouseAPI::changePositionOfScrollableElement(ScrollableElementID id,const Vector3& position)
+{
+    for(auto event:scrollEvents)
+    {
+        if(event.id == id)
+        {
+            event.position = position;
+            return true;
+        }
+    }
+    return false;
+}
+bool MouseAPI::changeRadiusOfClickableObject(ClickableObjectID id,float radius)
+{
+    for(auto event:clickEvents)
+    {
+        if(event.id == id)
+        {
+            event.radius = radius;
+            return true;
+        }
+    }
+    return false;
+}
+bool MouseAPI::changeRadiusOfScrollableElement(ScrollableElementID id,float radius)
+{
+    for(auto event:scrollEvents)
+    {
+        if(event.id == id)
+        {
+            event.radius = radius;
+            return true;
+        }
+    }
+    return false;
+}
+bool MouseAPI::deleteClickableObject(ClickableObjectID id)
+{
+    for(auto eventIt = clickEvents.begin();eventIt != clickEvents.end();eventIt++ )
+    {
+        if(eventIt->id == id)
+        {
+            clickEvents.erase(eventIt);
+            return true;
+        }
+    }
+    return false;
+}
+bool MouseAPI::deleteScrollableElement(ScrollableElementID id)
+{
+    for(auto eventIt = scrollEvents.begin();eventIt != scrollEvents.end();eventIt++ )
+    {
+        if(eventIt->id == id)
+        {
+            scrollEvents.erase(eventIt);
+            return true;
+        }
+    }
+    return false;
+}
 
 }