benkyd/inferno-hart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preview renderer feature parity, we're getting close to a merge now

Browse Source
This commit is contained in:
Benjamin Kyd
2023-11-29 13:08:10 +00:00
parent 7f9ef80b66
commit 5306fdcbb3
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/graphics/buffer.cpp
View File

@@ -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;

18
src/inferno.cpp
View File

@@ -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);

3
src/scene/mesh.cpp
View File

@@ -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(