[Orxonox-commit 7708] r12301 - code/branches/MouseAPI_FS19/src/modules/MouseAPI

[tkuonen at orxonox.net]

Author: tkuonen
Date: 2019-04-11 16:49:18 +0200 (Thu, 11 Apr 2019)
New Revision: 12301

Added:
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.cc
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.h
Modified:
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.cc
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.h
Log:


Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt	2019-04-11 14:04:57 UTC (rev 12300)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/CMakeLists.txt	2019-04-11 14:49:18 UTC (rev 12301)
@@ -2,6 +2,7 @@
   mouseapi.cc
   mouseapiexample.cc
   mousegametype.cc
+  mousecursor.cc
 )
 
 

Added: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.cc	                        (rev 0)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.cc	2019-04-11 14:49:18 UTC (rev 12301)
@@ -0,0 +1,11 @@
+#include "mousecursor.h"
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+RegisterClass(MouseCursor);
+MouseCursor::MouseCursor(Context* context) : MovableEntity(context)
+{
+    RegisterObject(MouseCursor);
+}
+}

Added: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.h
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.h	                        (rev 0)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousecursor.h	2019-04-11 14:49:18 UTC (rev 12301)
@@ -0,0 +1,16 @@
+#ifndef MOUSECURSOR_H
+#define MOUSECURSOR_H
+#include "worldentities/MovableEntity.h"
+
+namespace orxonox
+{
+
+class MouseCursor:public MovableEntity
+{
+public:
+    MouseCursor(Context* context);
+};
+
+}
+
+#endif // MOUSECURSOR_H

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.cc	2019-04-11 14:04:57 UTC (rev 12300)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.cc	2019-04-11 14:49:18 UTC (rev 12301)
@@ -1,5 +1,4 @@
 #include "mousegametype.h"
-
 namespace orxonox
 {
 RegisterUnloadableClass(MouseGametype);
@@ -20,6 +19,7 @@
     // Reset the variable.
     this->bForceSpawn_ = temp;
 
+    InputManager::getInstance().setMouseExclusive("game",false);//set show mouse, see guimanager
 }
 
 void MouseGametype::spawnPlayersIfRequested()

Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.h
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.h	2019-04-11 14:04:57 UTC (rev 12300)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mousegametype.h	2019-04-11 14:49:18 UTC (rev 12301)
@@ -3,6 +3,8 @@
 #include "gametypes/Gametype.h"
 #include "core/CoreIncludes.h"
 #include "infos/PlayerInfo.h"
+#include <core/input/InputState.h>
+#include <CEGUI/MouseCursor.h> //todo: guimanager: fallunterscheidng cegui version
 
 namespace orxonox
 {