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/vk-renderer.hpp | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

(limited to 'include/vk-renderer.hpp')

diff --git a/include/vk-renderer.hpp b/include/vk-renderer.hpp
index 70fcc7e..37a3494 100644
--- a/include/vk-renderer.hpp
+++ b/include/vk-renderer.hpp
@@ -5,42 +5,14 @@
 #include "thirdparty/vk_mem_alloc.h"
 
 #include "vec3.hpp"
-
-enum MATERIAL_TYPE: uint32_t {
-    LAMBERTIAN  = 0,
-    METAL       = 1,
-    DIELECTRIC  = 2,
-};
-
-struct material {
-    color albedo;
-    float fuzz;
-    float ior;
-    uint32_t type;
-    uint32_t padding;
-};
-
-struct sphere {
-    vec3 position;
-    material mat;
-    float radius;
-    float padding[3];
-};
+#include "camera.hpp"
+#include "sphere.hpp"
 
 struct input_data {
     color sky_color;
     color ground_color;
 
-    struct camera {
-        vec3 position;
-        vec3 up;
-        vec3 right;
-        vec3 forward;
-        float viewport_width;
-        float viewport_height;
-        float lens_radius;
-        float focus_distance;
-    } cam;
+    camera cam;
 
     float random_offset[2000];
     float random_disk[2000];
-- 
cgit v1.3