From 81bba9fb007333c54006be9172e090c38c45d110 Mon Sep 17 00:00:00 2001 From: HampusM Date: Sun, 5 May 2024 21:29:49 +0200 Subject: chore: move textures to inside of Material --- src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 2b2afac..8efbf6b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,7 @@ use engine::lighting::LightSource; use engine::material::Builder as MaterialBuilder; use engine::renderer::Extension as RendererExtension; use engine::shader::Program as ShaderProgram; -use engine::texture::{List as TextureList, Texture}; +use engine::texture::Texture; use engine::transform::Transform; use engine::vector::{Vec2, Vec3}; use engine::vertex::Builder as VertexBuilder; @@ -47,8 +47,8 @@ fn main() -> Result<(), Box> engine.spawn(( create_cube_mesh(cube_vertex_builder_cb), - TextureList::from_iter([texture]), MaterialBuilder::new() + .textures([texture]) .ambient_map(texture_id) .diffuse_map(texture_id) .specular_map(texture_id) @@ -68,8 +68,8 @@ fn main() -> Result<(), Box> ..Default::default() }, create_cube_mesh(cube_vertex_builder_cb), - TextureList::from_iter([light_source_texture]), MaterialBuilder::new() + .textures([light_source_texture]) .ambient_map(light_source_texture_id) .diffuse_map(light_source_texture_id) .specular_map(light_source_texture_id) -- cgit v1.2.3-18-g5258