Organize viking room model
This commit is contained in:
parent
f3fff03aff
commit
b108e7f80f
Before Width: | Height: | Size: 940 KiB After Width: | Height: | Size: 940 KiB |
|
@ -22,7 +22,7 @@ use scene::*;
|
||||||
fn load_model(ren: &mut Renderer) -> (MeshHandle, MaterialHandle) {
|
fn load_model(ren: &mut Renderer) -> (MeshHandle, MaterialHandle) {
|
||||||
use tobj::*;
|
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 model_data = &mut model_data.as_slice();
|
||||||
|
|
||||||
let load_options = LoadOptions {
|
let load_options = LoadOptions {
|
||||||
|
@ -60,7 +60,7 @@ fn load_model(ren: &mut Renderer) -> (MeshHandle, MaterialHandle) {
|
||||||
let mesh_data = MeshData { vertices, indices };
|
let mesh_data = MeshData { vertices, indices };
|
||||||
let mesh_handle = ren.mesh_pool.allocate(&ren.device, &mesh_data);
|
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();
|
let albedo = image::load_from_memory(albedo_data).unwrap();
|
||||||
|
|
||||||
use image::GenericImageView;
|
use image::GenericImageView;
|
||||||
|
|
Loading…
Reference in New Issue