From 8279a357f6f35d58a4c81d84c3c44a7da687b170 Mon Sep 17 00:00:00 2001
From: ladevieq <ladevie.quentin@gmail.com>
Date: Thu, 4 Aug 2022 23:35:13 +0200
Subject: Fix most warnings

---
 include/scene.hpp | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'include/scene.hpp')

diff --git a/include/scene.hpp b/include/scene.hpp
index c0b0344..257b8c9 100644
--- a/include/scene.hpp
+++ b/include/scene.hpp
@@ -1,11 +1,10 @@
 #ifndef __SCENE_HPP_
 #define __SCENE_HPP_
 
+#include <cstdint>
+
 #include "camera.hpp"
-#include "bvh.hpp"
-#include "material.hpp"
 
-class vkrenderer;
 class Buffer;
 class scene {
     struct metadata {
@@ -23,24 +22,16 @@ class scene {
         uint32_t debug_bvh  = (uint32_t)false;
         int32_t downscale_factor = 1;
 
-        metadata(camera cam, uint32_t width, uint32_t height)
-            : cam(std::move(cam)), width(width), height(height) {}
+        metadata(const camera &cam, uint32_t width, uint32_t height);
     };
 
     // void random_scene();
 
 public:
-    scene(camera cam, uint32_t width, uint32_t height, vkrenderer &renderer);
+    scene(const camera& cam, uint32_t width, uint32_t height);
 
     metadata meta;
 
-    // Geometry & BVH
-    std::vector<uint32_t>   indices;
-    std::vector<float>      positions;
-    std::vector<float>      normals;
-    std::vector<float>      uvs;
-    std::vector<material>   materials;
-
     Buffer*                 scene_buffer;
     Buffer*                 indices_buffer;
     Buffer*                 positions_buffer;
@@ -48,8 +39,6 @@ public:
     Buffer*                 uvs_buffer;
     Buffer*                 bvh_buffer;
     Buffer*                 materials_buffer;
-
-    std::vector<packed_bvh_node> packed_nodes;
 };
 
 #endif // !__SCENE_HPP_
-- 
cgit v1.3