bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiler warnings.

Browse Source
This commit is contained in:
Bert Peters
2018-03-29 14:21:27 +02:00
parent c495a60c4d
commit 1ffbfda2d9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fmri/RenderingState.cpp
View File

@@ -9,8 +9,6 @@
using namespace fmri; using namespace fmri;
static RenderingState &state = RenderingState::instance();
static float getFPS() static float getFPS()
{ {
static int frames = 0; static int frames = 0;
@@ -34,8 +32,8 @@ void RenderingState::move(unsigned char key)
float speed = 0.5f; float speed = 0.5f;
std::array<float, 3> dir; std::array<float, 3> dir;
const auto yaw = deg2rad(state.angle[0]); const auto yaw = deg2rad(angle[0]);
const auto pitch = deg2rad(state.angle[1]); const auto pitch = deg2rad(angle[1]);
if (key == 'w' || key == 's') { if (key == 'w' || key == 's') {
dir[0] = std::sin(yaw) * std::cos(pitch); dir[0] = std::sin(yaw) * std::cos(pitch);
@@ -55,7 +53,7 @@ void RenderingState::move(unsigned char key)
speed *= 2; speed *= 2;
} }
for (auto i = 0; i < dir.size(); ++i) { for (auto i = 0u; i < dir.size(); ++i) {
pos[i] += speed * dir[i]; pos[i] += speed * dir[i];
} }
} }
@@ -81,7 +79,7 @@ void RenderingState::handleKey(unsigned char x)
exit(0); exit(0);
case 'h': case 'h':
state.reset(); RenderingState::instance().reset();
break; break;
default: default: