cyborg
/
cyborg
2
2
Fork 0
Code Issues 19 Pull Requests 1 Projects Releases Wiki Activity

Organize viking room model

This commit is contained in:
marceline-cramer 2022-02-12 01:30:23 -07:00
parent f3fff03aff
commit b108e7f80f
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/viking_room.png → src/assets/viking_room/albedo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 940 KiB

After

Width:  |  Height:  |  Size: 940 KiB

0
src/viking_room.obj → src/assets/viking_room/model.obj
View File

4
src/main.rs
View File

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