fixed missing res folder in lighting

This commit is contained in:
Ben Hansen 2020-03-18 13:54:02 -06:00
parent bd055ff867
commit a7f08a1562
7 changed files with 1159 additions and 2 deletions

View File

@ -346,7 +346,7 @@ impl State {
], ],
}); });
let (obj_model, cmds) = model::Model::load(&device, &texture_bind_group_layout, "code/beginner/tutorial9-models/src/res/cube.obj").unwrap(); let (obj_model, cmds) = model::Model::load(&device, &texture_bind_group_layout, "code/intermediate/tutorial10-lighting/src/res/cube.obj").unwrap();
queue.submit(&cmds); queue.submit(&cmds);
let vs_src = include_str!("shader.vert"); let vs_src = include_str!("shader.vert");

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

View File

@ -0,0 +1,14 @@
# Blender MTL File: 'cube.blend'
# Material Count: 1
newmtl Material.001
Ns 323.999994
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
map_Bump /home/benjamin/Downloads/tuto-14-normal.png
map_Kd /home/benjamin/Downloads/tuto-14-diffuse.jpg

File diff suppressed because it is too large Load Diff

Binary file not shown.

@ -1 +1 @@
Subproject commit f80cc9d0e4187921c44c87840091db70a637612a Subproject commit bb7e290ca411ae49b3eb2e20b3dcde36af454ae1