Changeset 12334 for code

Timestamp:

May 2, 2019, 4:06:01 PM (6 years ago)

Author:

tkuonen

Message:

Continue With MouseAPI Cursor

Location:

code/branches/MouseAPI_FS19

Files:

• data/gui/layouts/MouseAPICursor.layout (modified) (1 diff)
• data/levels/MouseAPIExample.oxw (modified) (1 diff)
• src/modules/MouseAPI/CMakeLists.txt (modified) (1 diff)
• src/modules/MouseAPI/mouseapi.cc (modified) (1 diff)
• src/modules/MouseAPI/mouseapicursor.cc (added)
• src/modules/MouseAPI/mouseapicursor.h (added)

code/branches/MouseAPI_FS19/data/gui/layouts/MouseAPICursor.layout

@@ -1 +1 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="InGameMenu_RootWindow" type="DefaultWindow">
+    <Window name="MouseAPICursor" type="DefaultWindow">
     </Window>
 </GUILayout>

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

@@ -48 +48 @@
     </attached> 
 </MouseAPIExample>
+
  
   </Scene>

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

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

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

@@ -77 +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
-}
+}
+
+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)