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 
Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
	Escape-the-Dawn/GameWorld.cpp
This commit is contained in:
Adam
2014-03-14 01:53:22 +01:00
parent 72c06231ad 143cb48a1f
commit 7fdb035294
37 changed files with 529 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Camera.h
+4 -11
View File
@@ -1,13 +1,7 @@
#ifndef Camera_h__
#define Camera_h__
#define GLM_FORCE_RADIANS
#include <glm/glm.hpp>
#include <glm/gtc/constants.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtx/rotate_vector.hpp>
#include <glm/gtc/quaternion.hpp>
#include <glm/gtx/quaternion.hpp>
#include "GLM.h"
class Camera
{
@@ -38,13 +32,13 @@ public:
void ViewMatrix(glm::mat4 val) { m_ViewMatrix = val; }
float FOV() const { return m_FOV; }
void FOV(float val) { m_FOV = val; }
void FOV(float val);
float NearClip() const { return m_NearClip; }
void NearClip(float val) { m_NearClip = val; }
void NearClip(float val);
float FarClip() const { return m_FarClip; }
void FarClip(float val) { m_FarClip = val; }
void FarClip(float val);
private:
void UpdateProjectionMatrix();
@@ -54,7 +48,6 @@ private:
float m_AspectRatio;
float m_NearClip;
float m_FarClip;
glm::vec3 m_Position;
glm::quat m_Orientation;