From b0708f165601fad16aa59715dbe32796a6e7081e Mon Sep 17 00:00:00 2001 From: ladevieq Date: Tue, 6 Sep 2022 22:41:00 +0200 Subject: Setup for texture upload system --- include/material.hpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'include/material.hpp') diff --git a/include/material.hpp b/include/material.hpp index efa6141..5ac08f1 100644 --- a/include/material.hpp +++ b/include/material.hpp @@ -1,11 +1,12 @@ -#ifndef __MATERIAL_HPP_ -#define __MATERIAL_HPP_ +#pragma once #include #include "vec3.hpp" -struct texture { +class Texture; + +struct gpu_texture { uint32_t image_id; uint32_t sampler_id; uint32_t padding[2]; @@ -13,10 +14,8 @@ struct texture { struct material { color base_color; - texture base_color_texture; - texture metallic_roughness_texture; + Texture* base_color_texture; + Texture* metallic_roughness_texture; float metalness = 1.f; float roughness = 1.f; }; - -#endif // !__MATERIAL_HPP_ -- cgit v1.3