From dd63f4a1b40b799054798298fe0170fdcf770162 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Thu, 10 Mar 2016 13:51:18 +0100
Subject: [PATCH] Fixed FOV being used to calculate projection matrix being
 degrees when it should be radians, AGAIN. FOV angles are now correct!

---
 resources/Schema/Components/Camera.xml   | 2 +-
 src/Engine/Editor/EditorRenderSystem.cpp | 2 +-
 src/Engine/Rendering/RenderSystem.cpp    | 2 +-
 src/Engine/Rendering/Renderer.cpp        | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/Schema/Components/Camera.xml b/resources/Schema/Components/Camera.xml
index b9c28d53..00edcc00 100644
--- a/resources/Schema/Components/Camera.xml
+++ b/resources/Schema/Components/Camera.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
-	<FOV>45</FOV>
+	<FOV>59</FOV> <!-- 90 horizontal FOV at 1080p -->
 	<NearClip>0.01</NearClip>
 	<FarClip>5000</FarClip>
 </Camera>
\ No newline at end of file
diff --git a/src/Engine/Editor/EditorRenderSystem.cpp b/src/Engine/Editor/EditorRenderSystem.cpp
index 97203dea..f31b63cf 100644
--- a/src/Engine/Editor/EditorRenderSystem.cpp
+++ b/src/Engine/Editor/EditorRenderSystem.cpp
@@ -86,7 +86,7 @@ bool EditorRenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];
     ComponentWrapper cCamera = e.CameraEntity["Camera"];
-    m_EditorCamera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
+    m_EditorCamera->SetFOV(glm::radians(static_cast<float>((double)cCamera["FOV"])));
     m_EditorCamera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
     m_EditorCamera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
     m_EditorCamera->SetPosition(cTransform["Position"]);
diff --git a/src/Engine/Rendering/RenderSystem.cpp b/src/Engine/Rendering/RenderSystem.cpp
index d685c443..fee539d4 100644
--- a/src/Engine/Rendering/RenderSystem.cpp
+++ b/src/Engine/Rendering/RenderSystem.cpp
@@ -32,7 +32,7 @@ bool RenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];
     ComponentWrapper cCamera = e.CameraEntity["Camera"];
-    m_Camera->SetFOV((double)cCamera["FOV"]);
+    m_Camera->SetFOV(glm::radians((double)cCamera["FOV"]));
     m_Camera->SetNearClip((double)cCamera["NearClip"]);
     m_Camera->SetFarClip((double)cCamera["FarClip"]);
     m_Camera->SetPosition(cTransform["Position"]);
diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp
index 09c35baa..eecb5a7a 100644
--- a/src/Engine/Rendering/Renderer.cpp
+++ b/src/Engine/Rendering/Renderer.cpp
@@ -122,6 +122,7 @@ void Renderer::InputUpdate(double dt)
 
 void Renderer::setWindowSize(Rectangle size)
 {
+    m_Resolution = size;
     glfwSetWindowSize(m_Window, size.Width, size.Height);
 }