Started scene reader. Added libjson-spirit dependency.

This commit is contained in:
Miguel Angel Astor Romero
2017-01-18 17:26:09 -04:00
parent 965b04ca39
commit 5edccd4d30
10 changed files with 351 additions and 32 deletions

View File

@@ -20,14 +20,10 @@ public:
vec3 m_look;
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(vec3 _e = vec3(0.0f), vec3 _l = vec3(0.0f, 0.0f, -1.0f), vec3 _u = vec3(0.0f, 1.0f, 0.0f)):
m_eye(_e),
m_look(_l),
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_inv_view_matrix(inverse(lookAt(_e, _l, normalize(_u))))
{ }
@@ -36,14 +32,9 @@ public:
void pitch(float angle);
void yaw(float angle);
void roll(float angle);
vec2 sample_pixel(int i, int j) const;
void view_to_world(Ray & r) const;
private:
int m_h;
int m_w;
float m_fov;
float m_a_ratio;
mat4 m_inv_view_matrix;
};