From 2db0d27e7f1744443958717c19b732eed57455f2 Mon Sep 17 00:00:00 2001
From: ladevieq <ladevie.quentin@gmail.com>
Date: Sat, 9 Jan 2021 20:42:24 +0100
Subject: Replace old classes with compute shader structs

---
 include/camera.hpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'include/camera.hpp')

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_
-- 
cgit v1.3