From cd0ccc94ad42d151a793c66c19c2ef45e337ed91 Mon Sep 17 00:00:00 2001 From: Danny McGee Date: Wed, 11 Oct 2023 11:33:17 -0400 Subject: [PATCH] Use design system colors in gizmos --- studio/src/design_system.rs | 15 +++++++++++++++ studio/src/interaction/gizmos.rs | 14 ++++++++------ studio/src/lib.rs | 1 + 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 studio/src/design_system.rs diff --git a/studio/src/design_system.rs b/studio/src/design_system.rs new file mode 100644 index 0000000..0f95db4 --- /dev/null +++ b/studio/src/design_system.rs @@ -0,0 +1,15 @@ +use bevy::prelude::Color as BevyColor; + +pub struct Color; + +impl Color { + // original: rgb(220, 53, 69) + // brighter: rgb(255, 48, 68) + pub const RED: BevyColor = BevyColor::rgb(1.000000, 0.188235, 0.266666); + // original: rgb( 25, 135, 84) + // brighter: rgb( 0, 187, 100) + pub const GREEN: BevyColor = BevyColor::rgb(0.000000, 0.733333, 0.392157); + // original: rgb( 13, 110, 253) + // brighter: rgb( 47, 131, 255) + pub const BLUE: BevyColor = BevyColor::rgb(0.184314, 0.513724, 1.000000); +} diff --git a/studio/src/interaction/gizmos.rs b/studio/src/interaction/gizmos.rs index 59eb31d..031884e 100644 --- a/studio/src/interaction/gizmos.rs +++ b/studio/src/interaction/gizmos.rs @@ -1,5 +1,7 @@ use bevy::{prelude::*, window::PrimaryWindow}; +use crate::design_system; + use super::{InteractionMode, InteractionTransform, Selected, TransformSpace}; pub(super) fn draw( @@ -53,9 +55,9 @@ fn draw_translate_gizmo(xform: &Transform, gizmos: &mut Gizmos, space: Transform gizmos.line(origin, end, color); }; - draw_axis(basis.local_x(), Color::RED); - draw_axis(basis.local_y(), Color::GREEN); - draw_axis(basis.local_z(), Color::BLUE); + draw_axis(basis.local_x(), design_system::Color::RED); + draw_axis(basis.local_y(), design_system::Color::GREEN); + draw_axis(basis.local_z(), design_system::Color::BLUE); } #[inline] @@ -66,7 +68,7 @@ fn draw_rotate_gizmo(xform: &Transform, gizmos: &mut Gizmos, space: TransformSpa TransformSpace::World => &Transform::IDENTITY, }; - gizmos.circle(origin, basis.local_x(), radius, Color::RED); - gizmos.circle(origin, basis.local_y(), radius, Color::GREEN); - gizmos.circle(origin, basis.local_z(), radius, Color::BLUE); + gizmos.circle(origin, basis.local_x(), radius, design_system::Color::RED); + gizmos.circle(origin, basis.local_y(), radius, design_system::Color::GREEN); + gizmos.circle(origin, basis.local_z(), radius, design_system::Color::BLUE); } diff --git a/studio/src/lib.rs b/studio/src/lib.rs index 5445f44..46541f2 100644 --- a/studio/src/lib.rs +++ b/studio/src/lib.rs @@ -15,6 +15,7 @@ use ui::UiLayerPlugin; use viewport::ViewportSize; use wasm_bindgen::prelude::*; +mod design_system; mod input; mod interaction; mod orbit_cam;