WallyHackenslacker/PhotonMF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made some camera attributes private.

Browse Source
This commit is contained in:
Miguel Angel Astor Romero
2017-01-12 17:29:18 -04:00
parent 724a98f8a0
commit 54979c3818
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
camera.hpp
View File

@@ -16,21 +16,17 @@ using glm::inverse;
class Camera { class Camera {
public: public:
int m_h;
int m_w;
float m_fov;
float m_a_ratio;
vec3 m_eye; vec3 m_eye;
vec3 m_look; vec3 m_look;
vec3 m_up; vec3 m_up;
Camera(int h = 480, int w = 640, float fov = 90.0f, vec3 _e = vec3(0.0f), vec3 _l = vec3(0.0f, 0.0f, -1.0f), vec3 _u = vec3(0.0f, 1.0f, 0.0f)): Camera(int h = 480, int w = 640, float fov = 90.0f, vec3 _e = vec3(0.0f), vec3 _l = vec3(0.0f, 0.0f, -1.0f), vec3 _u = vec3(0.0f, 1.0f, 0.0f)):
m_h(h),
m_w(w),
m_fov(fov),
m_eye(_e), m_eye(_e),
m_look(_l), m_look(_l),
m_up(normalize(_u)) m_up(normalize(_u)),
m_h(h),
m_w(w),
m_fov(fov)
{ {
m_a_ratio = static_cast<float>(w) / static_cast<float>(h); m_a_ratio = static_cast<float>(w) / static_cast<float>(h);
m_inv_view_matrix = inverse(lookAt(_e, _l, _u)); m_inv_view_matrix = inverse(lookAt(_e, _l, _u));
@@ -45,6 +41,10 @@ public:
void view_to_world(Ray & r) const; void view_to_world(Ray & r) const;
private: private:
int m_h;
int m_w;
float m_fov;
float m_a_ratio;
mat4 m_inv_view_matrix; mat4 m_inv_view_matrix;
}; };