Changeset 12309

Timestamp:

Apr 18, 2019, 4:02:06 PM (6 years ago)

Author:

tkuonen

Message:

Add first version of mousecursor

Location:

code/branches/MouseAPI_FS19

Files:

• data/levels/MouseAPIExample.oxw (modified) (1 diff)
• src/modules/MouseAPI/CMakeLists.txt (modified) (1 diff)
• src/modules/MouseAPI/mouseapi.cc (modified) (8 diffs)
• src/modules/MouseAPI/mouseapi.h (modified) (2 diffs)
• src/modules/MouseAPI/mousecursor.cc (deleted)
• src/modules/MouseAPI/mousecursor.h (deleted)
• src/modules/MouseAPI/mousegametype.cc (modified) (2 diffs)
• src/modules/MouseAPI/mousegametype.h (modified) (2 diffs)

code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw

@@ -42 +42 @@
     </attached> 
 </MouseAPIExample>
- 
+<!--<MouseCursor></MouseCursor>-->
+
+<OverlayGroup name = "cursor" scale = "1, 1">
+<GUIOverlay guiname="MouseAPICursor" visible=true position  = "1, 1"
+     pickpoint = "0.0, 0.0"></GUIOverlay>
+</OverlayGroup>
+
   </Scene>
 </Level>

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

@@ -3 +3 @@
   mouseapiexample.cc
   mousegametype.cc
-  mousecursor.cc
 )
 

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

@@ -21 +21 @@
             state->setMouseExclusive(false);//does this work
             state->setMouseHandler(this);
+            state->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
+            InputManager::getInstance().enterState("guiMouseOnly");
             InputManager::getInstance().enterState("MouseAPI");
-        }
+            InputManager::getInstance().setMouseExclusive("game",false);
+            //InputManager::getInstance().setMouseExclusive("guiMouseOnly",false);
+            //InputManager::getInstance().getState("game")->
+        }
+        //GUIManager::getInstance().showGUI("MouseAPICursor", true);//Display a mouse cursor by displaying a empty menu
     }
 
@@ -31 +37 @@
     if(active)
     {
+        GUIManager::getInstance().showGUI("MouseAPICursor", true);
         active = false;
         if(InputManager::exists())
@@ -37 +44 @@
             state->setMouseHandler(nullptr);
             InputManager::getInstance().destroyState("MouseAPI");
+            InputManager::getInstance().enterState("game");
         }
         clickEvents.clear();
@@ -59 +67 @@
         for(auto wantedButton:event.buttons)
         {
-            if(wantedButton == button && ray.intersects(Ogre::Sphere(event.position,event.radius)).first)
+            Ogre::Sphere sphere(event.position,event.radius);
+            if(wantedButton == button && ray.intersects(sphere).first && cam->isVisible(sphere))
                 event.onClickedFunction(button);
         }
@@ -68 +77 @@
 {
     //mousePos = abs;
+    InputManager::getInstance().leaveState("game");//hack: todo: crate 2nd input state with prioritz 98 for cegui(cursor)
+    GUIManager::getInstance().showGUI("MouseAPICursor", true);//hack todo: only if gui not shown & evt better if not in mouse mooved
 }
 
@@ -79 +90 @@
     for(auto event:scrollEvents)
     {
-        if(!event.considerPosition || ray.intersects(Ogre::Sphere(event.position,event.radius)).first)
+        if(!event.considerPosition || (ray.intersects(Ogre::Sphere(event.position,event.radius)).first && cam->isVisible(Ogre::Sphere(event.position,event.radius))))
             event.onScrolledFunction(abs,rel,IntVector2(mouseposX,mouseposY));
     }
@@ -183 +194 @@
          }
      }
+     return 0;
 }
 
@@ -194 +206 @@
          }
      }
-}
-
-}
+     return 0;
+}
+
+//returns relative Position of the Mouse
+Vector2 MouseAPI::getMousePosition()
+{
+    Ogre::Viewport *vp = GraphicsManager::getInstance().getViewport();
+    return Vector2(InputManager::getInstance().getMousePosition().first/((float)vp->getActualWidth()),InputManager::getInstance().getMousePosition().second/((float)vp->getActualHeight()));
+}
+
+}

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

@@ -16 +16 @@
 #include "CameraManager.h"
 #include <functional>
+#include "core/GUIManager.h"
+#include "core/input/KeyBinderManager.h"
 
 namespace orxonox
@@ -87 +89 @@
     float getRadiusScroll(ScrollableElementID id);
 
+    Vector2 getMousePosition();
+
     void activate();
     static bool isActive(){return singletonPtr_s != nullptr && getInstance().active;}

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

@@ -9 +9 @@
 
 }
+
 void MouseGametype::start(){
 
@@ -19 +20 @@
     // Reset the variable.
     this->bForceSpawn_ = temp;
-
-    InputManager::getInstance().setMouseExclusive("game",false);//set show mouse, see guimanager
 }
 

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

@@ -5 +5 @@
 #include "infos/PlayerInfo.h"
 #include <core/input/InputState.h>
-#include <CEGUI/MouseCursor.h> //todo: guimanager: fallunterscheidng cegui version
+#include "core/GUIManager.h"
 
 namespace orxonox
@@ -19 +19 @@
 private:
     PlayerInfo* player_ ;
+    CEGUI::MouseCursor *cursor;
 };