[Orxonox-commit 7741] r12334 - in code/branches/MouseAPI_FS19: data/gui/layouts data/levels src/modules/MouseAPI

[tkuonen at orxonox.net]

Author: tkuonen
Date: 2019-05-02 16:06:01 +0200 (Thu, 02 May 2019)
New Revision: 12334

Added:
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h
Modified:
   code/branches/MouseAPI_FS19/data/gui/layouts/MouseAPICursor.layout
   code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
Log:
Continue With MouseAPI Cursor


Modified: code/branches/MouseAPI_FS19/data/gui/layouts/MouseAPICursor.layout
===================================================================
--- code/branches/MouseAPI_FS19/data/gui/layouts/MouseAPICursor.layout	2019-05-02 14:02:17 UTC (rev 12333)
+++ code/branches/MouseAPI_FS19/data/gui/layouts/MouseAPICursor.layout	2019-05-02 14:06:01 UTC (rev 12334)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="InGameMenu_RootWindow" type="DefaultWindow">
+    <Window name="MouseAPICursor" type="DefaultWindow">
     </Window>
 </GUILayout>

Modified: code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw
===================================================================
--- code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw	2019-05-02 14:02:17 UTC (rev 12333)
+++ code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw	2019-05-02 14:06:01 UTC (rev 12334)
@@ -47,6 +47,7 @@
 	<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,100" /> 
     </attached> 
 </MouseAPIExample>
+
  
   </Scene>
 </Level>

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt	2019-05-02 14:02:17 UTC (rev 12333)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt	2019-05-02 14:06:01 UTC (rev 12334)
@@ -2,6 +2,7 @@
   mouseapi.cc
   mouseapiexample.cc
   mousegametype.cc
+  mouseapicursor.cc
 )
 
 

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-05-02 14:02:17 UTC (rev 12333)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-05-02 14:06:01 UTC (rev 12334)
@@ -76,10 +76,19 @@
 void MouseAPI::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
 {
     //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
 }
 
+void MouseAPI::tick(float dt)
+{
+    if(active)
+    {
+        InputManager::getInstance().leaveState("game");//hack: todo: crate 2nd input state with prioritz 98 for cegui(cursor)
+        GUIManager::getInstance().showGUI("MouseAPICursor", false);//hack todo: only if gui not shown & evt better if not in mouse mooved
+    }
+
+}
+
+
 void MouseAPI::mouseScrolled(int abs, int rel)
 {
     cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();

Added: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc	                        (rev 0)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.cc	2019-05-02 14:06:01 UTC (rev 12334)
@@ -0,0 +1,12 @@
+#include "mouseapicursor.h"
+
+namespace orxonox{
+
+RegisterClass(MouseAPICursor);
+
+MouseAPICursor::MouseAPICursor(Context* context):OrxonoxOverlay(context)
+{
+//TODO: copy from radar overlay
+}
+
+}

Added: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h	                        (rev 0)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapicursor.h	2019-05-02 14:06:01 UTC (rev 12334)
@@ -0,0 +1,12 @@
+#ifndef MOUSEAPICURSOR_H
+#define MOUSEAPICURSOR_H
+#include <overlays/OrxonoxOverlay.h>
+
+
+class MouseAPICursor: public OrxonoxOverlay
+{
+public:
+    MouseAPICursor(Context* context);
+};
+
+#endif // MOUSEAPICURSOR_H