From 2d16fbd7e235bf2cc96d451469d8d39cae1917c3 Mon Sep 17 00:00:00 2001
From: ladevieq <ladevie.quentin@gmail.com>
Date: Thu, 8 Sep 2022 23:04:06 +0200
Subject: First render using new texture uploading system

---
 include/material.hpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'include/material.hpp')

diff --git a/include/material.hpp b/include/material.hpp
index 5ac08f1..71dd4ca 100644
--- a/include/material.hpp
+++ b/include/material.hpp
@@ -6,12 +6,6 @@
 
 class Texture;
 
-struct gpu_texture {
-    uint32_t image_id;
-    uint32_t sampler_id;
-    uint32_t padding[2];
-};
-
 struct material {
     color base_color;
     Texture* base_color_texture;
@@ -19,3 +13,13 @@ struct material {
     float metalness = 1.f;
     float roughness = 1.f;
 };
+
+struct gpu_material {
+    color base_color;
+    uint32_t albedo_texture_id = 0;
+    uint32_t albedo_texture_sampler_id = 0;
+    uint32_t metallic_roughness_texture_id = 0;
+    uint32_t metallic_roughness_texture_sampler_id = 0;
+    float metalness = 1.f;
+    float roughness = 1.f;
+};
-- 
cgit v1.3