From 8279a357f6f35d58a4c81d84c3c44a7da687b170 Mon Sep 17 00:00:00 2001 From: ladevieq Date: Thu, 4 Aug 2022 23:35:13 +0200 Subject: Fix most warnings --- src/scene.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/scene.cpp') diff --git a/src/scene.cpp b/src/scene.cpp index d32a696..d62e309 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -5,6 +5,8 @@ #include "vk-renderer.hpp" #include "gltf.hpp" +#include "bvh.hpp" +#include "material.hpp" // void scene::random_scene() { // material ground_material = { { 0.5, 0.5, 0.5 } }; @@ -55,8 +57,20 @@ // spheres_count = spheres.size(); // } -scene::scene(camera cam, uint32_t width, uint32_t height, vkrenderer &renderer) - :meta(std::move(cam), width, height){ + +scene::metadata::metadata(const camera &cam, uint32_t width, uint32_t height) + : cam(cam), width(width), height(height) {} + +scene::scene(const camera& cam, uint32_t width, uint32_t height) + :meta(cam, width, height){ + + // Geometry & BVH + std::vector indices; + std::vector positions; + std::vector normals; + std::vector uvs; + std::vector materials; + std::vector packed_nodes; // auto bistro_interior_path = std::filesystem::path("../models/BistroInterior"); // auto bistro_interior_filename = std::string("BistroInterior.gltf"); -- cgit v1.3