From e864f404d17c3125e57dd8cde37dc4e740f95fd9 Mon Sep 17 00:00:00 2001 From: Kenneth Loeffler Date: Wed, 23 Aug 2023 20:27:54 -0700 Subject: [PATCH] Use rbx-dom's Color3uint8 <-> Color3 conversions From for DomCoolor3uint8 was not correct here, and these conversions are already implemented by rbx-dom anyway --- src/roblox/datatypes/types/color3.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/roblox/datatypes/types/color3.rs b/src/roblox/datatypes/types/color3.rs index 8026875..8bf5cc7 100644 --- a/src/roblox/datatypes/types/color3.rs +++ b/src/roblox/datatypes/types/color3.rs @@ -287,20 +287,12 @@ impl From for DomColor3 { impl From for Color3 { fn from(v: DomColor3uint8) -> Self { - Self { - r: (v.r as f32) / 255f32, - g: (v.g as f32) / 255f32, - b: (v.b as f32) / 255f32, - } + Color3::from(DomColor3::from(v)) } } impl From for DomColor3uint8 { fn from(v: Color3) -> Self { - Self { - r: v.r.clamp(u8::MIN as f32, u8::MAX as f32) as u8, - g: v.g.clamp(u8::MIN as f32, u8::MAX as f32) as u8, - b: v.b.clamp(u8::MIN as f32, u8::MAX as f32) as u8, - } + DomColor3uint8::from(DomColor3::from(v)) } }