Skip to content

Commit

Permalink
Update color and naming for consistency (#10367)
Browse files Browse the repository at this point in the history
The `ClearColor` PR was merged before I was quite finished. This fixes a
few errors, and addresses Cart's feedback about the pixel perfect
example by updating the sprite colors to match the existing bevy bird
branding colors.


![image](https://github.com/bevyengine/bevy/assets/2632925/33722c45-ed66-4d3a-af11-f4197611a13c)
  • Loading branch information
aevyrie authored Nov 4, 2023
1 parent cd59422 commit 1d8d78e
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 7 deletions.
File renamed without changes
File renamed without changes
Binary file modified assets/pixel/bevy_pixel_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/2d/bloom_2d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn setup(

// Sprite
commands.spawn(SpriteBundle {
texture: asset_server.load("branding/bevy_bird_light.png"),
texture: asset_server.load("branding/bevy_bird_dark.png"),
sprite: Sprite {
color: Color::rgb(5.0, 5.0, 5.0), // 4. Put something bright in a dark environment to see the effect
custom_size: Some(Vec2::splat(160.0)),
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/pixel_perfect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default());
commands.spawn((
SpriteBundle {
texture: asset_server.load("pixel/bevy_pixel_light.png"),
texture: asset_server.load("pixel/bevy_pixel_dark.png"),
transform: Transform::from_xyz(100., 0., 0.),
..default()
},
Expand Down
2 changes: 1 addition & 1 deletion examples/2d/sprite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn main() {
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default());
commands.spawn(SpriteBundle {
texture: asset_server.load("branding/bevy_bird_light.png"),
texture: asset_server.load("branding/bevy_bird_dark.png"),
..default()
});
}
2 changes: 1 addition & 1 deletion examples/2d/sprite_flipping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn main() {
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default());
commands.spawn(SpriteBundle {
texture: asset_server.load("branding/bevy_bird_light.png"),
texture: asset_server.load("branding/bevy_bird_dark.png"),
sprite: Sprite {
// Flip the logo to the left
flip_x: true,
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/anti_aliasing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ fn setup(
// Plane
commands.spawn(PbrBundle {
mesh: meshes.add(shape::Plane::from_size(50.0).into()),
material: materials.add(Color::GRAY.into()),
material: materials.add(Color::rgb(0.1, 0.2, 0.1).into()),
..default()
});

Expand Down
2 changes: 1 addition & 1 deletion examples/3d/deferred_rendering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ fn setup(
..default()
});

let mut forward_mat: StandardMaterial = Color::GRAY.into();
let mut forward_mat: StandardMaterial = Color::rgb(0.1, 0.2, 0.1).into();
forward_mat.opaque_render_method = OpaqueRendererMethod::Forward;
let forward_mat_h = materials.add(forward_mat);

Expand Down
2 changes: 1 addition & 1 deletion examples/3d/tonemapping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fn setup_basic_scene(
commands.spawn((
PbrBundle {
mesh: meshes.add(shape::Plane::from_size(50.0).into()),
material: materials.add(Color::GRAY.into()),
material: materials.add(Color::rgb(0.1, 0.2, 0.1).into()),
..default()
},
SceneNumber(1),
Expand Down

0 comments on commit 1d8d78e

Please sign in to comment.