Replace ShapeMaterial

Author: Nilirad

examples/readme_example.rs

@@ -6,13 +6,14 @@ use bevy_prototype_lyon::prelude::*;
 
 fn main() {
     App::build()
+        .insert_resource(Msaa { samples: 8 })
         .add_plugins(DefaultPlugins)
         .add_plugin(ShapePlugin)
         .add_startup_system(setup.system())
         .run();
 }
 
-fn setup(mut commands: Commands, mut materials: ResMut<Assets<ShapeMaterial>>) {
+fn setup(mut commands: Commands) {
     let circle = shapes::Circle {
         radius: 100.0,
         ..shapes::Circle::default()
@@ -22,8 +23,11 @@ fn setup(mut commands: Commands, mut materials: ResMut<Assets<ShapeMaterial>>) {
         .spawn(OrthographicCameraBundle::new_2d())
         .spawn(GeometryBuilder::build_as(
             &circle,
-            materials.add(ShapeMaterial::new(Color::AQUAMARINE)),
-            DrawMode::Fill(FillOptions::default()),
+            ShapeColors::outlined(Color::GOLD, Color::BLACK),
+            DrawMode::Outlined {
+                fill_options: FillOptions::default(),
+                outline_options: StrokeOptions::default().with_line_width(5.0),
+            },
             Transform::default(),
         ));
 }

examples/svg_path_shape_example.rs

@@ -19,7 +19,7 @@ struct BuildingBundle {
     transform: Transform,
     global_transform: GlobalTransform,
 }
-fn startup_system(mut commands: Commands, mut materials: ResMut<Assets<ShapeMaterial>>) {
+fn startup_system(mut commands: Commands) {
     commands.spawn(OrthographicCameraBundle::new_2d());
 
     commands.spawn(BuildingBundle {
@@ -41,7 +41,7 @@ fn startup_system(mut commands: Commands, mut materials: ResMut<Assets<ShapeMate
                 svg_doc_size_in_px:svg_doc_size.to_owned()
             },
 
-            materials.add(ShapeMaterial::new(Color::BLACK)),
+            ShapeColors::new(Color::BLACK),
             DrawMode::Stroke(StrokeOptions::default().with_line_width(4.)),
             Transform::default()
         ))
@@ -52,7 +52,7 @@ fn startup_system(mut commands: Commands, mut materials: ResMut<Assets<ShapeMate
                 svg_doc_size_in_px:svg_doc_size.to_owned()
             },
 
-            materials.add(ShapeMaterial::new(Color::BLACK)),
+            ShapeColors::new(Color::BLACK),
             DrawMode::Stroke(StrokeOptions::default().with_line_width(2.5)),
             Transform::default()
         ))
@@ -77,7 +77,7 @@ fn startup_system(mut commands: Commands, mut materials: ResMut<Assets<ShapeMate
                 svg_doc_size_in_px:svg_doc_size.to_owned()
             },
 
-            materials.add(ShapeMaterial::new(Color::BLACK)),
+            ShapeColors::new(Color::BLACK),
             DrawMode::Stroke(StrokeOptions::default().with_line_width(20.)),
             Transform::default()
         ))
@@ -88,7 +88,7 @@ fn startup_system(mut commands: Commands, mut materials: ResMut<Assets<ShapeMate
                 svg_doc_size_in_px:svg_doc_size.to_owned()
             },
 
-            materials.add(ShapeMaterial::new(Color::BLACK)),
+            ShapeColors::new(Color::BLACK),
             DrawMode::Stroke(StrokeOptions::default().with_line_width(17.5)),
             Transform::default()
         ))

src/entity.rs

@@ -48,7 +48,6 @@ pub struct ShapeBundle {
     pub mode: DrawMode,
     pub mesh: Handle<Mesh>,
     pub colors: ShapeColors,
-    pub material: Handle<ShapeMaterial>,
     pub main_pass: MainPass,
     pub draw: Draw,
     pub visible: Visible,
@@ -76,25 +75,8 @@ impl Default for ShapeBundle {
                 main: Color::WHITE,
                 outline: Color::BLACK,
             },
-            material: Handle::<ShapeMaterial>::default(),
             transform: Transform::default(),
             global_transform: GlobalTransform::default(),
         }
     }
 }
-
-/// Defines the color of the shape
-#[derive(RenderResources, Default, TypeUuid)]
-#[uuid = "370d078f-e13b-48d8-b12a-954ba887afcb"]
-pub struct ShapeMaterial {
-    #[allow(missing_docs)]
-    pub color: Color,
-}
-
-impl ShapeMaterial {
-    /// Creates a `ShapeMaterial` with the specified `Color`.
-    #[must_use]
-    pub const fn new(color: Color) -> Self {
-        Self { color }
-    }
-}

src/geometry.rs

@@ -3,10 +3,7 @@
 use bevy::{asset::Handle, transform::components::Transform};
 use lyon_tessellation::path::{path::Builder, Path};
 
-use crate::{
-    entity::{ShapeBundle, ShapeMaterial},
-    utils::DrawMode,
-};
+use crate::{entity::ShapeBundle, prelude::ShapeColors, utils::DrawMode};
 
 /// Structs that implement this trait can be drawn as a shape. See the
 /// [`shapes`](crate::shapes) module for some examples.
@@ -104,15 +101,10 @@ impl GeometryBuilder {
     /// Generates a [`ShapeBundle`] using the data contained in the path
     /// builder.
     #[must_use]
-    pub fn build(
-        self,
-        material: Handle<ShapeMaterial>,
-        mode: DrawMode,
-        transform: Transform,
-    ) -> ShapeBundle {
+    pub fn build(self, colors: ShapeColors, mode: DrawMode, transform: Transform) -> ShapeBundle {
         ShapeBundle {
             path: self.0.build(),
-            material,
+            colors,
             mode,
             transform,
             ..ShapeBundle::default()
@@ -140,13 +132,13 @@ impl GeometryBuilder {
     /// ```
     pub fn build_as(
         shape: &impl Geometry,
-        material: Handle<ShapeMaterial>,
+        colors: ShapeColors,
         mode: DrawMode,
         transform: Transform,
     ) -> ShapeBundle {
         let mut multishape = Self::new();
         multishape.add(shape);
-        multishape.build(material, mode, transform)
+        multishape.build(colors, mode, transform)
     }
 }
 

src/lib.rs

@@ -43,7 +43,7 @@ pub mod prelude {
     };
 
     pub use crate::{
-        entity::{ShapeColors, ShapeMaterial},
+        entity::ShapeColors,
         geometry::{Geometry, GeometryBuilder},
         path::PathBuilder,
         plugin::ShapePlugin,

src/plugin.rs

@@ -31,10 +31,7 @@ use lyon_tessellation::{
     StrokeTessellator, StrokeVertex, StrokeVertexConstructor,
 };
 
-use crate::{
-    entity::{ShapeColors, ShapeMaterial},
-    utils::DrawMode,
-};
+use crate::{entity::ShapeColors, utils::DrawMode};
 
 /// Stages for this plugin.
 pub mod stage {
@@ -100,8 +97,7 @@ impl Plugin for ShapePlugin {
     fn build(&self, app: &mut AppBuilder) {
         let fill_tess = FillTessellator::new();
         let stroke_tess = StrokeTessellator::new();
-        app.add_asset::<ShapeMaterial>()
-            .insert_resource(fill_tess)
+        app.insert_resource(fill_tess)
             .insert_resource(stroke_tess)
             .add_stage_after(
                 bevy::app::CoreStage::Update,

src/render/mod.rs

@@ -16,8 +16,6 @@ use bevy::{
     },
 };
 
-use crate::prelude::ShapeMaterial;
-
 #[allow(missing_docs, clippy::unreadable_literal)]
 pub const SHAPE_PIPELINE_HANDLE: HandleUntyped =
     HandleUntyped::weak_from_u64(PipelineDescriptor::TYPE_UUID, 3868147544761532180);
@@ -75,26 +73,9 @@ fn build_shape_pipeline(mut shaders: ResMut<Assets<Shader>>) -> PipelineDescript
     }
 }
 
-/// Render nodes for this crate.
-pub mod node {
-    #![allow(missing_docs)]
-
-    pub const SHAPE_MATERIAL: &str = "bevy_prototype_lyon:shape_material";
-}
-
 pub(crate) fn add_shape_pipeline(
     mut pipelines: ResMut<Assets<PipelineDescriptor>>,
-    mut render_graph: ResMut<RenderGraph>,
     shaders: ResMut<Assets<Shader>>,
 ) {
     pipelines.set_untracked(SHAPE_PIPELINE_HANDLE, build_shape_pipeline(shaders));
-
-    render_graph.add_system_node(
-        node::SHAPE_MATERIAL,
-        AssetRenderResourcesNode::<ShapeMaterial>::new(true),
-    );
-
-    render_graph
-        .add_node_edge(node::SHAPE_MATERIAL, base::node::MAIN_PASS)
-        .unwrap();
 }

src/render/shape.frag

@@ -4,10 +4,6 @@ layout(location = 0) in vec4 v_color;
 
 layout(location = 0) out vec4 o_Target;
 
-layout(set = 2, binding = 0) uniform ShapeMaterial_color {
-    vec4 color;
-};
-
 void main() {
     o_Target = v_color;
 }