[Orxonox-commit 7686] r12279 - code/branches/MouseAPI_FS19/src/modules/MouseAPI

[tkuonen at orxonox.net]

Author: tkuonen
Date: 2019-04-04 16:21:48 +0200 (Thu, 04 Apr 2019)
New Revision: 12279

Modified:
   code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
Log:


Modified: code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc
===================================================================
--- code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-04-04 14:17:26 UTC (rev 12278)
+++ code/branches/MouseAPI_FS19/src/modules/MouseAPI/mouseapi.cc	2019-04-04 14:21:48 UTC (rev 12279)
@@ -11,14 +11,17 @@
 
 void MouseAPI::activate()
 {
-    active = true;
-     if(InputManager::exists())
-     {
-        //cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();
-        state = InputManager::getInstance().createInputState("MouseAPI",true,true,99);
-        state->setMouseExclusive(false);//does this work
-        state->setMouseHandler(this);
-        InputManager::getInstance().enterState("MouseAPI");
+    if(!active)
+    {
+        active = true;
+        if(InputManager::exists())
+        {
+            //cam = CameraManager::getInstance().getActiveCamera()->getOgreCamera();
+            state = InputManager::getInstance().createInputState("MouseAPI",true,true,99);
+            state->setMouseExclusive(false);//does this work
+            state->setMouseHandler(this);
+            InputManager::getInstance().enterState("MouseAPI");
+        }
     }
 
 }
@@ -25,15 +28,18 @@
 
 void MouseAPI::deactivate()
 {
-    active = false;
-    if(InputManager::exists())
+    if(active)
     {
-        InputManager::getInstance().leaveState("MouseAPI");
-        state->setMouseHandler(nullptr);
-        InputManager::getInstance().destroyState("MouseAPI");
+        active = false;
+        if(InputManager::exists())
+        {
+            InputManager::getInstance().leaveState("MouseAPI");
+            state->setMouseHandler(nullptr);
+            InputManager::getInstance().destroyState("MouseAPI");
+        }
+        clickEvents.clear();
+        scrollEvents.clear();
     }
-    clickEvents.clear();
-    scrollEvents.clear();
 }
 
 MouseAPI::~MouseAPI()