benkyd/Minecraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned some stuff up a little

Browse Source
This commit is contained in:
Ben Kyd
2019-10-09 10:03:31 +01:00
parent 15df28c29a
commit 1fd1829076
7 changed files with 17 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/renderer/camera.cpp
View File

@@ -49,13 +49,11 @@ void Camera::HandleMouse(SDL_Event e) {
MouseMoved(mouseDelta);
}
void Camera::MoveCamera() {
void Camera::MoveCamera(Uint8* state) {
float dx = 0;
float dz = 0;
float dy = 0;
const Uint8* state = SDL_GetKeyboardState(NULL);
// Rotate by camera direction
glm::mat2 rotate {
cos(yaw), -sin(yaw),
@@ -65,46 +63,34 @@ void Camera::MoveCamera() {
glm::vec2 f(0.0, 1.0);
f = f * rotate;
if (state[SDL_SCANCODE_W])
{
if (state[SDL_SCANCODE_W]) {
dz -= f.y;
dx -= f.x;
}
if (state[SDL_SCANCODE_S])
{
if (state[SDL_SCANCODE_S]) {
dz += f.y;
dx += f.x;
}
if (state[SDL_SCANCODE_A])
{
if (state[SDL_SCANCODE_A]) {
dz += f.x;
dx += -f.y;
}
if (state[SDL_SCANCODE_D])
{
if (state[SDL_SCANCODE_D]) {
dz -= f.x;
dx -= -f.y;
}
if (state[SDL_SCANCODE_SPACE])
{
if (state[SDL_SCANCODE_SPACE]) {
dy += 1;
}
if (state[SDL_SCANCODE_LSHIFT])
{
if (state[SDL_SCANCODE_LSHIFT]) {
dy -= 1;
}
// if (state[SDL_SCANCODE_Z])
// if (state[SDL_SCANCODE_LSHIFT])
// get current view matrix
glm::mat4 mat = GetViewMatrix();
glm::vec3 forward(mat[0][2], mat[1][2], mat[2][2]);
glm::vec3 strafe(mat[0][0], mat[1][0], mat[2][0]);
// forward vector must be negative to look forward.
// read :http://in2gpu.com/2015/05/17/view-matrix/
eyeVector.x += dx * CameraSpeed;