diff --git a/src/viking_room.png b/src/assets/viking_room/albedo.png similarity index 100% rename from src/viking_room.png rename to src/assets/viking_room/albedo.png diff --git a/src/viking_room.obj b/src/assets/viking_room/model.obj similarity index 100% rename from src/viking_room.obj rename to src/assets/viking_room/model.obj diff --git a/src/main.rs b/src/main.rs index f2d087a..1ad0587 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,7 +22,7 @@ use scene::*; fn load_model(ren: &mut Renderer) -> (MeshHandle, MaterialHandle) { use tobj::*; - let model_data = include_bytes!("viking_room.obj").to_vec(); + let model_data = include_bytes!("assets/viking_room/model.obj").to_vec(); let model_data = &mut model_data.as_slice(); let load_options = LoadOptions { @@ -60,7 +60,7 @@ fn load_model(ren: &mut Renderer) -> (MeshHandle, MaterialHandle) { let mesh_data = MeshData { vertices, indices }; let mesh_handle = ren.mesh_pool.allocate(&ren.device, &mesh_data); - let albedo_data = include_bytes!("viking_room.png"); + let albedo_data = include_bytes!("assets/viking_room/albedo.png"); let albedo = image::load_from_memory(albedo_data).unwrap(); use image::GenericImageView;