aboutsummaryrefslogtreecommitdiffstats
path: root/include/camera.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/camera.hpp')
-rw-r--r--include/camera.hpp24
1 files changed, 10 insertions, 14 deletions
diff --git a/include/camera.hpp b/include/camera.hpp
index 858833b..43ed755 100644
--- a/include/camera.hpp
+++ b/include/camera.hpp
@@ -1,35 +1,31 @@
#ifndef __CAMERA_HPP_
#define __CAMERA_HPP_
-#include "ray.hpp"
+#include "vec3.hpp"
class camera {
public:
camera(
point3 position,
point3 target,
- double v_fov,
- double aspect_ratio,
- double aperture,
- double focus_dist
+ float v_fov,
+ float aspect_ratio,
+ float aperture,
+ float focus_dist
);
- ray get_ray(double u, double v) const;
-
point3 position;
- float lens_radius;
- float viewport_width;
- float viewport_height;
+ vec3 right;
+ vec3 up;
vec3 horizontal;
vec3 vertical;
- vec3 forward;
- vec3 right;
- vec3 up;
+ vec3 first_pixel;
- point3 bottom_left_pixel;
+ float lens_radius;
+ float padding[3];
};
#endif // !__CAMERA_HPP_