From 71fd9e8b83a4ebba758a95b873ba522d4c1a6977 Mon Sep 17 00:00:00 2001
From: Anselme <anselme.francois@gmail.com>
Date: Sat, 8 Apr 2017 12:27:01 +0200
Subject: [PATCH] added shortcut for mouse cursor visibility, added elements in
 test gui

---
 src/defaultkeysmap.h | 5 +++--
 src/engine.cpp       | 6 ++++++
 src/test/main.cpp    | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/defaultkeysmap.h b/src/defaultkeysmap.h
index fc7abbc..bf8724c 100644
--- a/src/defaultkeysmap.h
+++ b/src/defaultkeysmap.h
@@ -8,7 +8,7 @@ class DefaultKeysMap : public IKeysMap
 public:
     enum{MAIN_ACTION, SECONDARY_ACTION, TERTIARY_ACTION, MOVE_FORWARD, MOVE_BACKWARD, STRAFE_LEFT, STRAFE_RIGHT, JUMP,
          TOGGLE_NOCLIP, TOGGLE_PHYSICS_DEBUG, TOGGLE_CONSOLE,
-         MOVE_CURSOR_LEFT, MOVE_CURSOR_RIGHT, PLOP_TEST, LEFT_CLICK,
+         MOVE_CURSOR_LEFT, MOVE_CURSOR_RIGHT, TOGGLE_MOUSE_CURSOR, LEFT_CLICK,
          EXIT_GAME,LAST_DEFAULT_ACTION};
 
     DefaultKeysMap(){
@@ -25,7 +25,7 @@ public:
         keys.push_back( {{TOGGLE_CONSOLE,input::KEYBOARD},      sf::Keyboard::F3,    IKeysMap::PRESSED} );
         keys.push_back( {{MOVE_CURSOR_LEFT,input::KEYBOARD},    sf::Keyboard::Left,  IKeysMap::PRESSED} );
         keys.push_back( {{MOVE_CURSOR_RIGHT,input::KEYBOARD},   sf::Keyboard::Right, IKeysMap::PRESSED} );
-//        keys.push_back( {{PLOP_TEST,input::KEYBOARD},           sf::Keyboard::F7,    IKeysMap::PRESSED} );
+        keys.push_back( {{TOGGLE_MOUSE_CURSOR,input::KEYBOARD}, sf::Keyboard::M,     IKeysMap::PRESSED} );
         keys.push_back( {{EXIT_GAME,input::KEYBOARD},           sf::Keyboard::Escape,IKeysMap::PRESSED} );
         keys.push_back( {{LEFT_CLICK,input::MOUSE},             sf::Mouse::Left,     IKeysMap::PRESSED} );
     }
@@ -43,6 +43,7 @@ public:
             {JUMP,input::KEYBOARD},
             {TOGGLE_NOCLIP,input::KEYBOARD},
             {TOGGLE_PHYSICS_DEBUG,input::KEYBOARD},
+            {TOGGLE_MOUSE_CURSOR,input::KEYBOARD},
             {TOGGLE_CONSOLE,input::KEYBOARD},
             {EXIT_GAME,input::KEYBOARD}
             };
diff --git a/src/engine.cpp b/src/engine.cpp
index 389fff9..05c6e0b 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -103,8 +103,14 @@ void Engine::update()
                 else
                     disablePhysicsDebug();
             }
+            bool isMouseVisible = m_mouseVisible;
+            if(ImGui::Checkbox("Mouse cursor ( shortcut : [M] )", &isMouseVisible))
+                toggleMouseVisibility();
             if(ImGui::Button("EXIT GAME"))
                 stop();
+            float gravity = - m_world->getGravity().y();
+            if(ImGui::SliderFloat("Gravity", &gravity, 0.f, 100.f))
+                m_world->setGravity(btVector3(0, -gravity, 0));
             ImGui::End();
         }
 	}
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 05598f2..f75ff2a 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -315,6 +315,7 @@ int main(){
     engine.setTogglePhysicsDebugAction(DefaultKeysMap::TOGGLE_PHYSICS_DEBUG);
     engine.setToggleShellAction(DefaultKeysMap::TOGGLE_CONSOLE);
     engine.setExitGameAction(DefaultKeysMap::EXIT_GAME);
+    engine.setShowMouseAction(DefaultKeysMap::TOGGLE_MOUSE_CURSOR);
 
     //c'est un goup SparrowShell
     SparrowShell* shell = engine.getShell();