From 5306fdcbb311ce7409c7bb7f282e29ad9c855ecd Mon Sep 17 00:00:00 2001
From: Benjamin Kyd <benjamin.kyd@intel.com>
Date: Wed, 29 Nov 2023 13:08:10 +0000
Subject: [PATCH] preview renderer feature parity, we're getting close to a
 merge now

---
 src/graphics/buffer.cpp |  1 +
 src/inferno.cpp         | 18 +++++++++---------
 src/scene/mesh.cpp      |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/graphics/buffer.cpp b/src/graphics/buffer.cpp
index dd91fa1..40b9170 100644
--- a/src/graphics/buffer.cpp
+++ b/src/graphics/buffer.cpp
@@ -102,6 +102,7 @@ Buffer* vertex_buffer_create(GraphicsDevice* device, void* data, uint32_t size,
         VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
         VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
 
+    yolo::debug("Staging buffer size: {}", bufferSize);
     buffer->NullableClientData = data;
 
     void* mData;
diff --git a/src/inferno.cpp b/src/inferno.cpp
index a05e4ab..564dab1 100644
--- a/src/inferno.cpp
+++ b/src/inferno.cpp
@@ -124,21 +124,21 @@ InfernoApp* inferno_create()
     // basicMaterial->setGlShader(basicShader);
 
     scene::Mesh* mesh = scene::mesh_create(app->Device);
-    scene::mesh_load_obj(mesh, "res/cornell.obj");
+    scene::mesh_load_obj(mesh, "res/cornell-box.obj");
     scene::mesh_ready(mesh);
     // mesh->setMaterial(basicMaterial);
     scene::SceneObject* object = scene::scene_object_create();
     scene::scene_object_add_mesh(object, mesh);
     scene::scene_add_object(app->Scene, object);
 
-    // scene::Mesh* box = new scene::Mesh;
-    // box->loadOBJ("res/cornell.obj");
-    // box->ready();
-    // box->setMaterial(basicMaterial);
-    // scene::SceneObject* box_object = scene::scene_object_create();
-    // scene::scene_object_add_mesh(box_object, box);
-    // scene::scene_add_object(app->Scene, box_object);
-    //
+    scene::Mesh* lucy = scene::mesh_create(app->Device);
+    scene::mesh_load_obj(lucy, "res/lucy.obj");
+    scene::mesh_ready(lucy);
+    // mesh->setMaterial(basicMaterial);
+    scene::SceneObject* lucyObject = scene::scene_object_create();
+    scene::scene_object_add_mesh(lucyObject, lucy);
+    scene::scene_add_object(app->Scene, lucyObject);
+
     // app->PreviewRenderer = graphics::preview_create();
     // graphics::preview_set_viewport(app->PreviewRenderer, app->Scene->Camera);
     // app->RayRenderer = graphics::rayr_create(app->Scene);
diff --git a/src/scene/mesh.cpp b/src/scene/mesh.cpp
index 0989bf8..32885dc 100644
--- a/src/scene/mesh.cpp
+++ b/src/scene/mesh.cpp
@@ -82,7 +82,8 @@ void mesh_ready(Mesh* mesh)
     void* data = mesh->Verticies.data();
     void* indexData = (void*)mesh->MeshObjLoader->getFaces();
 
-    uint32_t size = mesh->Verticies.size() * sizeof(Vert);
+    uint32_t size = mesh->Verticies.size();
+    // yolo::debug("Mesh size: {}", size);
 
     mesh->VertexBuffer = graphics::vertex_buffer_create(mesh->Device, data, size);
     mesh->IndexBuffer = graphics::index_buffer_create(