EpicSparrow/SparrowEngine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added shortcut for mouse cursor visibility, added elements in test gui

Browse Source
This commit is contained in:
Anselme 2017-04-08 12:27:01 +02:00
parent dd9feb9720
commit 71fd9e8b83
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/defaultkeysmap.h
View File

@ -8,7 +8,7 @@ class DefaultKeysMap : public IKeysMap
public: public:
enum{MAIN_ACTION, SECONDARY_ACTION, TERTIARY_ACTION, MOVE_FORWARD, MOVE_BACKWARD, STRAFE_LEFT, STRAFE_RIGHT, JUMP, enum{MAIN_ACTION, SECONDARY_ACTION, TERTIARY_ACTION, MOVE_FORWARD, MOVE_BACKWARD, STRAFE_LEFT, STRAFE_RIGHT, JUMP,
TOGGLE_NOCLIP, TOGGLE_PHYSICS_DEBUG, TOGGLE_CONSOLE, 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}; EXIT_GAME,LAST_DEFAULT_ACTION};
DefaultKeysMap(){ DefaultKeysMap(){
@ -25,7 +25,7 @@ public:
keys.push_back( {{TOGGLE_CONSOLE,input::KEYBOARD}, sf::Keyboard::F3, IKeysMap::PRESSED} ); 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_LEFT,input::KEYBOARD}, sf::Keyboard::Left, IKeysMap::PRESSED} );
keys.push_back( {{MOVE_CURSOR_RIGHT,input::KEYBOARD}, sf::Keyboard::Right, 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( {{EXIT_GAME,input::KEYBOARD}, sf::Keyboard::Escape,IKeysMap::PRESSED} );
keys.push_back( {{LEFT_CLICK,input::MOUSE}, sf::Mouse::Left, IKeysMap::PRESSED} ); keys.push_back( {{LEFT_CLICK,input::MOUSE}, sf::Mouse::Left, IKeysMap::PRESSED} );
} }
@ -43,6 +43,7 @@ public:
{JUMP,input::KEYBOARD}, {JUMP,input::KEYBOARD},
{TOGGLE_NOCLIP,input::KEYBOARD}, {TOGGLE_NOCLIP,input::KEYBOARD},
{TOGGLE_PHYSICS_DEBUG,input::KEYBOARD}, {TOGGLE_PHYSICS_DEBUG,input::KEYBOARD},
{TOGGLE_MOUSE_CURSOR,input::KEYBOARD},
{TOGGLE_CONSOLE,input::KEYBOARD}, {TOGGLE_CONSOLE,input::KEYBOARD},
{EXIT_GAME,input::KEYBOARD} {EXIT_GAME,input::KEYBOARD}
}; };

6
src/engine.cpp
View File

@ -103,8 +103,14 @@ void Engine::update()
else else
disablePhysicsDebug(); disablePhysicsDebug();
} }
bool isMouseVisible = m_mouseVisible;
if(ImGui::Checkbox("Mouse cursor ( shortcut : [M] )", &isMouseVisible))
toggleMouseVisibility();
if(ImGui::Button("EXIT GAME")) if(ImGui::Button("EXIT GAME"))
stop(); 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(); ImGui::End();
} }
} }

1
src/test/main.cpp
View File

@ -315,6 +315,7 @@ int main(){
engine.setTogglePhysicsDebugAction(DefaultKeysMap::TOGGLE_PHYSICS_DEBUG); engine.setTogglePhysicsDebugAction(DefaultKeysMap::TOGGLE_PHYSICS_DEBUG);
engine.setToggleShellAction(DefaultKeysMap::TOGGLE_CONSOLE); engine.setToggleShellAction(DefaultKeysMap::TOGGLE_CONSOLE);
engine.setExitGameAction(DefaultKeysMap::EXIT_GAME); engine.setExitGameAction(DefaultKeysMap::EXIT_GAME);
engine.setShowMouseAction(DefaultKeysMap::TOGGLE_MOUSE_CURSOR);
//c'est un goup SparrowShell //c'est un goup SparrowShell
SparrowShell* shell = engine.getShell(); SparrowShell* shell = engine.getShell();