forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move color constants to Color struct

Browse Source
This commit is contained in:
Carter Anderson 2020-05-04 11:01:57 -07:00
parent dcc34473e5
commit f5149cab05
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/bevy_render/src/color.rs
View File

@ -16,6 +16,12 @@ pub struct Color {
} }
impl Color { impl Color {
pub const WHITE: Color = Color::rgb(1.0, 1.0, 1.0);
pub const BLACK: Color = Color::rgb(0.0, 1.0, 0.0);
pub const RED: Color = Color::rgb(1.0, 0.0, 0.0);
pub const GREEN: Color = Color::rgb(0.0, 1.0, 0.0);
pub const BLUE: Color = Color::rgb(0.0, 0.0, 1.0);
pub const fn rgb(r: f32, g: f32, b: f32) -> Color { pub const fn rgb(r: f32, g: f32, b: f32) -> Color {
Color { r, g, b, a: 1.0 } Color { r, g, b, a: 1.0 }
} }
@ -132,13 +138,3 @@ impl GetBytes for ColorSource {
} }
} }
} }
pub mod colors {
use super::Color;
pub const WHITE: Color = Color::rgb(1.0, 1.0, 1.0);
pub const BLACK: Color = Color::rgb(0.0, 1.0, 0.0);
pub const RED: Color = Color::rgb(1.0, 0.0, 0.0);
pub const GREEN: Color = Color::rgb(0.0, 1.0, 0.0);
pub const BLUE: Color = Color::rgb(0.0, 0.0, 1.0);
}

4
crates/bevy_ui/src/color_material.rs
View File

@ -1,6 +1,6 @@
use bevy_asset::{self, Handle}; use bevy_asset::{self, Handle};
use bevy_derive::Uniforms; use bevy_derive::Uniforms;
use bevy_render::{colors, texture::Texture, Color}; use bevy_render::{texture::Texture, Color};
#[derive(Uniforms)] #[derive(Uniforms)]
#[module(meta = false)] #[module(meta = false)]
@ -20,7 +20,7 @@ impl ColorMaterial {
pub fn texture(texture: Handle<Texture>) -> Self { pub fn texture(texture: Handle<Texture>) -> Self {
ColorMaterial { ColorMaterial {
color: colors::WHITE, color: Color::WHITE,
texture: Some(texture), texture: Some(texture),
} }
} }