BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source
This commit is contained in:
ViktorLjung
2014-03-14 01:17:53 +01:00
parent c2ad1f9321 55688888e2
commit 143cb48a1f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Camera.cpp
+1 -1
View File
@@ -95,4 +95,4 @@ void Camera::FarClip(float val)
{ {
m_FarClip = val; m_FarClip = val;
UpdateProjectionMatrix(); UpdateProjectionMatrix();
} }
Escape-the-Dawn/Shaders/Fragment.glsl
+1 -1
View File
@@ -23,7 +23,7 @@ in VertexData {
vec3 ShadowCoord; vec3 ShadowCoord;
} Input; } Input;
vec3 scene_ambient = vec3(0.98f, 0.95f, 0.8f); vec3 scene_ambient = vec3(0.98, 0.95, 0.7);
out vec4 fragmentColor; out vec4 fragmentColor;
Escape-the-Dawn/Systems/PlayerSystem.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
glm::vec3 Ship_Forward = glm::vec3(glm::vec4(0, 0, 1, 0)); glm::vec3 Ship_Forward = glm::vec3(glm::vec4(0, 0, 1, 0));
float TurnSpeed = 1.0f; float TurnSpeed = 1.0f;
glm::vec3 Euler = glm::eulerAngles(transform->Orientation); glm::vec3 Euler = glm::degrees(glm::eulerAngles(transform->Orientation));
if(input->KeyState[GLFW_KEY_LEFT]) { if(input->KeyState[GLFW_KEY_LEFT]) {
transform->Position -= Ship_Right * (float)dt * (m_PlayerSpeed + Euler.z); transform->Position -= Ship_Right * (float)dt * (m_PlayerSpeed + Euler.z);