FOV is now a property of camera

robn · Feb 15, 2012 · 928c8fa · 928c8fa
1 parent 2433e6e
commit 928c8fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/Camera.cpp b/src/Camera.cpp
@@ -12,11 +12,11 @@
 #include "render/VertexArray.h"
 #include "render/Material.h"
 
-Camera::Camera(const Body *body, float width, float height, float znear, float zfar) :
+Camera::Camera(const Body *body, float width, float height, float fovY, float znear, float zfar) :
 	m_body(body),
 	m_width(width),
 	m_height(height),
-	m_fovAng(Pi::config.Float("FOV")),
+	m_fovAng(fovY),
 	m_zNear(znear),
 	m_zFar(zfar),
 	m_frustum(m_width, m_height, m_fovAng, znear, zfar),

diff --git a/src/Camera.h b/src/Camera.h
@@ -13,7 +13,7 @@ class Renderer;
 class Camera {
 public:
 	// create camera relative to the given body, for rendering to area width x height
-	Camera(const Body *body, float width, float height, float nearClip, float farClip);
+	Camera(const Body *body, float width, float height, float fovY, float nearClip, float farClip);
 	virtual ~Camera();
 
 	void Update();

diff --git a/src/WorldView.cpp b/src/WorldView.cpp
@@ -181,10 +181,11 @@ void WorldView::InitObject()
 	float zfar;
 	Pi::renderer->GetNearFarRange(znear, zfar);
 
-	m_frontCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), znear, zfar);
-	m_rearCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), znear, zfar);
-	m_externalCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), znear, zfar);
-	m_siderealCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), znear, zfar);
+	const float fovY = Pi::config.Float("FOV");
+	m_frontCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), fovY, znear, zfar);
+	m_rearCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), fovY, znear, zfar);
+	m_externalCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), fovY, znear, zfar);
+	m_siderealCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight(), fovY, znear, zfar);
 
 	m_rearCamera->SetOrientation(matrix4x4d::RotateYMatrix(M_PI));