From 88ce3ed506277c881d9ef2a898ec9862f2a7b243 Mon Sep 17 00:00:00 2001 From: HampusM Date: Sun, 12 May 2024 13:01:33 +0200 Subject: fix(engine): make default material colors black --- engine/src/renderer/mod.rs | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'engine/src/renderer') diff --git a/engine/src/renderer/mod.rs b/engine/src/renderer/mod.rs index fbb86f7..e2a567a 100644 --- a/engine/src/renderer/mod.rs +++ b/engine/src/renderer/mod.rs @@ -385,30 +385,18 @@ fn apply_light( gl_shader_program.set_uniform_vec_3fv( cstr!("material.ambient"), - &material - .ambient() - .cloned() - .unwrap_or(Color { red: 1.0, green: 1.0, blue: 1.0 }) - .into(), + &material.ambient().clone().into(), ); gl_shader_program.set_uniform_vec_3fv( cstr!("material.diffuse"), - &material - .diffuse() - .cloned() - .unwrap_or(Color { red: 1.0, green: 1.0, blue: 1.0 }) - .into(), + &material.diffuse().clone().into(), ); #[allow(clippy::cast_possible_wrap)] gl_shader_program.set_uniform_vec_3fv( cstr!("material.specular"), - &material - .specular() - .cloned() - .unwrap_or(Color { red: 1.0, green: 1.0, blue: 1.0 }) - .into(), + &material.specular().clone().into(), ); #[allow(clippy::cast_possible_wrap)] -- cgit v1.2.3-18-g5258