From cf8a83e1e39856af8f1d3d605541f7bc6bb70303 Mon Sep 17 00:00:00 2001
From: Dander7BD <dander.1981@gmail.com>
Date: Thu, 27 Feb 2014 12:55:34 +0100
Subject: [PATCH] Merge fixes

---
 Code/Game/GameLogic/Player.h                   | 2 +-
 Code/OysterGraphics/DllInterfaces/GFXAPI.cpp   | 6 ++----
 Code/OysterGraphics/Render/DefaultRenderer.cpp | 1 -
 Code/OysterGraphics/Render/DefaultRenderer.h   | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Code/Game/GameLogic/Player.h b/Code/Game/GameLogic/Player.h
index 8952c5b0..2f029ae4 100644
--- a/Code/Game/GameLogic/Player.h
+++ b/Code/Game/GameLogic/Player.h
@@ -10,7 +10,7 @@
 #include "DynamicArray.h"
 
 const float MAX_HP = 100.0f;
-const float BASIC_SPEED = 30.0f * 0.2f;
+const float BASIC_SPEED = 10.0f;
 
 namespace GameLogic
 {
diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
index 1a35d408..9bed5560 100644
--- a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
+++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
@@ -20,7 +20,6 @@ namespace Oyster
 			std::vector<Definitions::Pointlight> Lights;
 			float deltaTime;
 			int MostModel;
-			float FoV;
 #ifdef _DEBUG
 			Model::Model* cube;
 			Model::Model* sphere;
@@ -89,7 +88,6 @@ namespace Oyster
 		void API::SetProjection(const Math::Float4x4& projection)
 		{
 			Projection = projection;
-			FoV = 2 * std::atanf(1/projection.m[1][1]);
 		}
 
 		void API::SetView(const Math::Float4x4& view)
@@ -101,11 +99,11 @@ namespace Oyster
 		{
 			if(Lights.size())
 			{
-				Render::DefaultRenderer::NewFrame(View, Projection, &Lights[0], (int)Lights.size(), FoV);
+				Render::DefaultRenderer::NewFrame(View, Projection, &Lights[0], (int)Lights.size());
 			}
 			else
 			{
-				Render::DefaultRenderer::NewFrame(View, Projection, NULL, 0, FoV);
+				Render::DefaultRenderer::NewFrame(View, Projection, NULL, 0);
 			}
 		}
 
diff --git a/Code/OysterGraphics/Render/DefaultRenderer.cpp b/Code/OysterGraphics/Render/DefaultRenderer.cpp
index 2ecbbeeb..1066db54 100644
--- a/Code/OysterGraphics/Render/DefaultRenderer.cpp
+++ b/Code/OysterGraphics/Render/DefaultRenderer.cpp
@@ -56,7 +56,6 @@ namespace Oyster
 
 				Definitions::LightConstants lc;
 				lc.InvProj =  Projection.GetInverse();
-				lc.Pixels = Core::resolution;
 				lc.Lights = numLights;
 				lc.View = View;
 				lc.Proj = Projection;
diff --git a/Code/OysterGraphics/Render/DefaultRenderer.h b/Code/OysterGraphics/Render/DefaultRenderer.h
index 74a1e4ff..1a5cdcc0 100644
--- a/Code/OysterGraphics/Render/DefaultRenderer.h
+++ b/Code/OysterGraphics/Render/DefaultRenderer.h
@@ -13,7 +13,7 @@ namespace Oyster
 			class DefaultRenderer
 			{
 			public:
-				static void NewFrame(Oyster::Math::Float4x4 View, Oyster::Math::Float4x4 Projection, Definitions::Pointlight* Lights, int numLights, float Fov);
+				static void NewFrame(Oyster::Math::Float4x4 View, Oyster::Math::Float4x4 Projection, Definitions::Pointlight* Lights, int numLights);
 				static void RenderScene(Model::Model* models, int count, Math::Matrix View, Math::Matrix Projection, float DeltaTime = 0);
 				static void EndFrame();
 			};