diff --git a/examples/dynamic_shape.rs b/examples/dynamic_shape.rs index a10fd27..d1c11df 100644 --- a/examples/dynamic_shape.rs +++ b/examples/dynamic_shape.rs @@ -1,6 +1,6 @@ use std::f64::consts::PI; -use bevy::prelude::*; +use bevy::{color::palettes, prelude::*}; use bevy_prototype_lyon::prelude::*; fn main() { @@ -63,8 +63,8 @@ fn setup_system(mut commands: Commands) { path: GeometryBuilder::build_as(&shape), ..default() }, - Fill::color(Color::CYAN), - Stroke::new(Color::BLACK, 10.0), + Fill::color(Color::Srgba(palettes::css::DARK_CYAN)), + Stroke::new(Color::Srgba(palettes::css::BLACK), 10.0), ExampleShape, )); } diff --git a/examples/path.rs b/examples/path.rs index 0b97c03..1e23ff4 100644 --- a/examples/path.rs +++ b/examples/path.rs @@ -1,4 +1,4 @@ -use bevy::prelude::*; +use bevy::{color::palettes, prelude::*}; use bevy_prototype_lyon::prelude::*; fn main() { @@ -36,7 +36,7 @@ fn setup_system(mut commands: Commands) { }, ..default() }, - Stroke::new(Color::BLACK, 10.0), - Fill::color(Color::RED), + Stroke::new(Color::Srgba(palettes::css::BLACK), 10.0), + Fill::color(Color::Srgba(palettes::css::RED)), )); } diff --git a/examples/readme.rs b/examples/readme.rs index dda0f71..4cb8029 100644 --- a/examples/readme.rs +++ b/examples/readme.rs @@ -1,7 +1,7 @@ //! This is the example that goes to the README.md file. The README.md should be //! updated before every release. -use bevy::prelude::*; +use bevy::{color::palettes, prelude::*}; use bevy_prototype_lyon::prelude::*; fn main() { @@ -26,7 +26,7 @@ fn setup_system(mut commands: Commands) { path: GeometryBuilder::build_as(&shape), ..default() }, - Fill::color(Color::CYAN), - Stroke::new(Color::BLACK, 10.0), + Fill::color(Color::Srgba(palettes::css::DARK_CYAN)), + Stroke::new(Color::Srgba(palettes::css::BLACK), 10.0), )); } diff --git a/examples/rounded_polygon.rs b/examples/rounded_polygon.rs index 3fc9d2c..36cde16 100644 --- a/examples/rounded_polygon.rs +++ b/examples/rounded_polygon.rs @@ -1,4 +1,4 @@ -use bevy::prelude::*; +use bevy::{color::palettes, prelude::*}; use bevy_prototype_lyon::prelude::*; fn main() { @@ -34,6 +34,6 @@ fn setup_system(mut commands: Commands) { path: GeometryBuilder::build_as(&shape), ..default() }, - Fill::color(Color::CYAN), + Fill::color(Color::Srgba(palettes::css::DARK_CYAN)), )); } diff --git a/src/draw.rs b/src/draw.rs index d6d6c13..511a483 100644 --- a/src/draw.rs +++ b/src/draw.rs @@ -1,6 +1,6 @@ //! Types for defining shape color and options. -use bevy::{ecs::component::Component, render::color::Color}; +use bevy::{color::Color, ecs::component::Component}; use lyon_tessellation::{FillOptions, StrokeOptions}; /// Defines the fill options for the lyon tessellator and color of the generated diff --git a/src/geometry.rs b/src/geometry.rs index 28930e1..14a3e9f 100644 --- a/src/geometry.rs +++ b/src/geometry.rs @@ -66,6 +66,7 @@ impl GeometryBuilder { /// ``` /// # use bevy::prelude::*; /// # use bevy_prototype_lyon::prelude::*; + /// # use bevy::color::palettes; /// # /// fn my_system(mut commands: Commands) { /// let line = shapes::Line(Vec2::ZERO, Vec2::new(10.0, 0.0)); @@ -80,8 +81,8 @@ impl GeometryBuilder { /// path: builder.build(), /// ..default() /// }, - /// Fill::color(Color::ORANGE_RED), - /// Stroke::new(Color::ORANGE_RED, 10.0), + /// Fill::color(Color::Srgba(palettes::css::ORANGE_RED)), + /// Stroke::new(Color::Srgba(palettes::css::ORANGE_RED), 10.0), /// )); /// } /// # bevy::ecs::system::assert_is_system(my_system); @@ -107,6 +108,7 @@ impl GeometryBuilder { /// ``` /// # use bevy::prelude::*; /// # use bevy_prototype_lyon::prelude::*; + /// # use bevy::color::palettes; /// # /// fn my_system(mut commands: Commands) { /// let line = shapes::Line(Vec2::ZERO, Vec2::new(10.0, 0.0)); @@ -115,7 +117,7 @@ impl GeometryBuilder { /// path: GeometryBuilder::build_as(&line), /// ..default() /// }, - /// Fill::color(Color::ORANGE_RED), + /// Fill::color(Color::Srgba(palettes::css::ORANGE_RED)), /// )); /// } /// # bevy::ecs::system::assert_is_system(my_system); diff --git a/src/plugin.rs b/src/plugin.rs index badf210..79103dc 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -12,6 +12,7 @@ //! `ShapeBundle`. use bevy::{ + color::palettes, prelude::*, render::{mesh::Indices, render_asset::RenderAssetUsages, render_resource::PrimitiveTopology}, sprite::Mesh2dHandle, @@ -85,7 +86,7 @@ fn mesh_shapes_system( fill( &mut fill_tess, &path.0, - &Fill::color(Color::FUCHSIA), + &Fill::color(Color::Srgba(palettes::css::FUCHSIA)), &mut buffers, ); } diff --git a/src/vertex.rs b/src/vertex.rs index 4c9e178..d7909c7 100644 --- a/src/vertex.rs +++ b/src/vertex.rs @@ -1,4 +1,4 @@ -use bevy::render::color::Color; +use bevy::color::{Color, LinearRgba}; use lyon_tessellation::{ self as tess, FillVertex, FillVertexConstructor, StrokeVertex, StrokeVertexConstructor, }; @@ -27,7 +27,7 @@ impl FillVertexConstructor for VertexConstructor { fn new_vertex(&mut self, vertex: FillVertex) -> Vertex { Vertex { position: [vertex.position().x, vertex.position().y], - color: self.color.as_linear_rgba_f32(), + color: LinearRgba::to_f32_array(&LinearRgba::from(self.color)), } } } @@ -37,7 +37,7 @@ impl StrokeVertexConstructor for VertexConstructor { fn new_vertex(&mut self, vertex: StrokeVertex) -> Vertex { Vertex { position: [vertex.position().x, vertex.position().y], - color: self.color.as_linear_rgba_f32(), + color: LinearRgba::to_f32_array(&LinearRgba::from(self.color)), } } }