Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

Merge pull request #227 from JayFoxRox/fix-debug

Browse Source 
Fix debug-camera
This commit is contained in:
Daniel Evans 2016-09-01 22:08:50 +01:00 committed by GitHub
commit 341e0ca6bd
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rwgame/states/DebugState.cpp
View File

@ -304,8 +304,7 @@ Menu*DebugState::createWeaponMenu()
DebugState::DebugState(RWGame* game, const glm::vec3& vp, const glm::quat& vd)
: State(game)
, _freeLook( false )
, _sonicMode( false )
, _invertedY(game->getConfig().getInputInvertY())
{
this->enterMenu(createDebugMenu());
@ -357,7 +356,7 @@ void DebugState::tick(float dt)
_debugCam.rotation = glm::angleAxis(_debugLook.x, glm::vec3(0.f, 0.f, 1.f))
* glm::angleAxis(_debugLook.y, glm::vec3(0.f, 1.f, 0.f));
_debugCam.position += _debugCam.rotation * _movement * dt * (_sonicMode ? 1000.f : 100.f);
_debugCam.position += _debugCam.rotation * _movement * dt * (_sonicMode ? 500.f : 50.f);
}
}
@ -383,7 +382,6 @@ void DebugState::handleEvent(const SDL_Event& event)
switch(event.type) {
case SDL_KEYDOWN:
switch(event.key.keysym.sym) {
default: break;
case SDLK_ESCAPE:
StateManager::get().exit();
break;
@ -409,10 +407,7 @@ void DebugState::handleEvent(const SDL_Event& event)
case SDLK_p:
printCameraDetails();
break;
}
switch (event.key.keysym.mod) {
case KMOD_LSHIFT:
case SDLK_LSHIFT:
_sonicMode = true;
break;
default: break;
@ -430,10 +425,7 @@ void DebugState::handleEvent(const SDL_Event& event)
case SDLK_d:
_movement.y = 0.f;
break;
}
switch (event.key.keysym.mod) {
case KMOD_LSHIFT:
case SDLK_LSHIFT:
_sonicMode = false;
break;
default: break;

4
rwgame/states/DebugState.hpp
View File

@ -8,8 +8,8 @@ class DebugState : public State
ViewCamera _debugCam;
glm::vec3 _movement;
glm::vec2 _debugLook;
bool _freeLook;
bool _sonicMode;
bool _freeLook = false;
bool _sonicMode = false;
bool _invertedY;
Menu* createDebugMenu();