fix: some examples

examples/2d/2d_viewport_to_world.rs

@@ -26,7 +26,7 @@ fn draw_cursor(
         return;
     };
 
-    gizmos.circle_2d(point, 10., WHITE);
+    gizmos.circle_2d(point, 10., WHITE.into());
 }
 
 fn setup(mut commands: Commands) {

examples/2d/bounding_2d.rs

@@ -103,22 +103,22 @@ fn render_shapes(mut gizmos: Gizmos, query: Query<(&Shape, &Transform)>) {
         let rotation = transform.rotation.to_euler(EulerRot::YXZ).2;
         match shape {
             Shape::Rectangle(r) => {
-                gizmos.primitive_2d(*r, translation, rotation, color);
+                gizmos.primitive_2d(*r, translation, rotation, color.into());
             }
             Shape::Circle(c) => {
-                gizmos.primitive_2d(*c, translation, rotation, color);
+                gizmos.primitive_2d(*c, translation, rotation, color.into());
             }
             Shape::Triangle(t) => {
-                gizmos.primitive_2d(*t, translation, rotation, color);
+                gizmos.primitive_2d(*t, translation, rotation, color.into());
             }
             Shape::Line(l) => {
-                gizmos.primitive_2d(*l, translation, rotation, color);
+                gizmos.primitive_2d(*l, translation, rotation, color.into());
             }
             Shape::Capsule(c) => {
-                gizmos.primitive_2d(*c, translation, rotation, color);
+                gizmos.primitive_2d(*c, translation, rotation, color.into());
             }
             Shape::Polygon(p) => {
-                gizmos.primitive_2d(*p, translation, rotation, color);
+                gizmos.primitive_2d(*p, translation, rotation, color.into());
             }
         }
     }
@@ -180,10 +180,10 @@ fn render_volumes(mut gizmos: Gizmos, query: Query<(&CurrentVolume, &Intersects)
         let color = if **intersects { AQUA } else { ORANGE_RED };
         match volume {
             CurrentVolume::Aabb(a) => {
-                gizmos.rect_2d(a.center(), 0., a.half_size() * 2., color);
+                gizmos.rect_2d(a.center(), 0., a.half_size() * 2., color.into());
             }
             CurrentVolume::Circle(c) => {
-                gizmos.circle_2d(c.center(), c.radius(), color);
+                gizmos.circle_2d(c.center(), c.radius(), color.into());
             }
         }
     }
@@ -286,15 +286,15 @@ fn setup(mut commands: Commands, loader: Res<AssetServer>) {
 
 fn draw_filled_circle(gizmos: &mut Gizmos, position: Vec2, color: Srgba) {
     for r in [1., 2., 3.] {
-        gizmos.circle_2d(position, r, color);
+        gizmos.circle_2d(position, r, color.into());
     }
 }
 
 fn draw_ray(gizmos: &mut Gizmos, ray: &RayCast2d) {
     gizmos.line_2d(
         ray.ray.origin,
         ray.ray.origin + *ray.ray.direction * ray.max,
-        WHITE,
+        WHITE.into(),
     );
     draw_filled_circle(gizmos, ray.ray.origin, FUCHSIA);
 }
@@ -359,7 +359,7 @@ fn aabb_cast_system(
                 aabb_cast.ray.ray.origin + *aabb_cast.ray.ray.direction * toi,
                 0.,
                 aabb_cast.aabb.half_size() * 2.,
-                LIME,
+                LIME.into(),
             );
         }
     }
@@ -387,7 +387,7 @@ fn bounding_circle_cast_system(
             gizmos.circle_2d(
                 circle_cast.ray.ray.origin + *circle_cast.ray.ray.direction * toi,
                 circle_cast.circle.radius(),
-                LIME,
+                LIME.into(),
             );
         }
     }
@@ -406,7 +406,7 @@ fn aabb_intersection_system(
 ) {
     let center = get_intersection_position(&time);
     let aabb = Aabb2d::new(center, Vec2::splat(50.));
-    gizmos.rect_2d(center, 0., aabb.half_size() * 2., YELLOW);
+    gizmos.rect_2d(center, 0., aabb.half_size() * 2., YELLOW.into());
 
     for (volume, mut intersects) in volumes.iter_mut() {
         let hit = match volume {
@@ -425,7 +425,7 @@ fn circle_intersection_system(
 ) {
     let center = get_intersection_position(&time);
     let circle = BoundingCircle::new(center, 50.);
-    gizmos.circle_2d(center, circle.radius(), YELLOW);
+    gizmos.circle_2d(center, circle.radius(), YELLOW.into());
 
     for (volume, mut intersects) in volumes.iter_mut() {
         let hit = match volume {

examples/2d/wireframe_2d.rs

@@ -9,7 +9,7 @@
 //! This is a native only feature.
 
 use bevy::{
-    color::palettes::basic::{GREEN, RED, WHITE},
+    color::palettes::basic::{BLACK, GREEN, RED, WHITE},
     prelude::*,
     render::{
         render_resource::WgpuFeatures,
@@ -67,7 +67,7 @@ fn setup(
                     Vec2::new(50.0, -50.0),
                 ))
                 .into(),
-            material: materials.add(Color::BLACK),
+            material: materials.add(BLACK),
             transform: Transform::from_xyz(-150.0, 0.0, 0.0),
             ..default()
         },
@@ -76,15 +76,15 @@ fn setup(
     // Rectangle: Follows global wireframe setting
     commands.spawn(MaterialMesh2dBundle {
         mesh: meshes.add(Rectangle::new(100.0, 100.0)).into(),
-        material: materials.add(Color::BLACK),
+        material: materials.add(BLACK),
         transform: Transform::from_xyz(0.0, 0.0, 0.0),
         ..default()
     });
     // Circle: Always renders a wireframe
     commands.spawn((
         MaterialMesh2dBundle {
             mesh: meshes.add(Circle::new(50.0)).into(),
-            material: materials.add(Color::BLACK),
+            material: materials.add(BLACK),
             transform: Transform::from_xyz(150.0, 0.0, 0.0),
             ..default()
         },

examples/3d/3d_viewport_to_world.rs

@@ -1,6 +1,6 @@
 //! This example demonstrates how to use the `Camera::viewport_to_world` method.
 
-use bevy::prelude::*;
+use bevy::{color::palettes::basic::WHITE, prelude::*};
 
 fn main() {
     App::new()
@@ -41,7 +41,7 @@ fn draw_cursor(
         point + ground.up() * 0.01,
         Dir3::new_unchecked(ground.up()), // Up vector is already normalized.
         0.2,
-        Color::WHITE,
+        WHITE.into(),
     );
 }
 

examples/3d/irradiance_volumes.rs

@@ -48,8 +48,6 @@ static SWITCH_TO_SPHERE_HELP_TEXT: &str = "Tab: Switch to a plain sphere mesh";
 
 static CLICK_TO_MOVE_HELP_TEXT: &str = "Left click: Move the object";
 
-static GIZMO_COLOR: Color = Color::Srgba(YELLOW);
-
 static VOXEL_TRANSFORM: Mat4 = Mat4::from_cols_array_2d(&[
     [-42.317566, 0.0, 0.0, 0.0],
     [0.0, 0.0, 44.601563, 0.0],
@@ -632,7 +630,7 @@ fn draw_gizmo(
 ) {
     if app_status.voxels_visible {
         for transform in irradiance_volume_query.iter() {
-            gizmos.cuboid(*transform, GIZMO_COLOR);
+            gizmos.cuboid(*transform, YELLOW.into());
         }
     }
 }