From 65e24308babb2ed4f33fb6f1d7b531df676bd70d Mon Sep 17 00:00:00 2001 From: HampusM Date: Fri, 17 Jul 2026 03:06:04 +0200 Subject: refactor(engine): change Color struct into a enum --- engine/src/material.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/src/material.rs') diff --git a/engine/src/material.rs b/engine/src/material.rs index 42a9884..dd5a460 100644 --- a/engine/src/material.rs +++ b/engine/src/material.rs @@ -1,6 +1,6 @@ use crate::asset::Handle as AssetHandle; use crate::builder; -use crate::color::Color; +use crate::color::{Color, Rgb}; use crate::ecs::Component; use crate::reflection::Reflection; use crate::texture::Texture; @@ -22,7 +22,7 @@ pub struct Material impl Material { - pub const fn builder() -> Builder + pub fn builder() -> Builder { Builder::new() } @@ -52,12 +52,12 @@ pub struct Builder impl Builder { #[must_use] - pub const fn new() -> Self + pub fn new() -> Self { Self { - ambient: Color::WHITE_F32, - diffuse: Color::WHITE_F32, - specular: Color::WHITE_F32, + ambient: Color::Rgb(Rgb::::white()), + diffuse: Color::Rgb(Rgb::::white()), + specular: Color::Rgb(Rgb::::white()), ambient_map: None, diffuse_map: None, specular_map: None, -- cgit v1.2.3-18-g5258