diff --git a/assets/branding/bevy_bird_light.png b/assets/branding/bevy_bird_light.png new file mode 100644 index 0000000000..ed81a69903 Binary files /dev/null and b/assets/branding/bevy_bird_light.png differ diff --git a/assets/branding/bevy_bird_light.svg b/assets/branding/bevy_bird_light.svg new file mode 100644 index 0000000000..5346a49b16 --- /dev/null +++ b/assets/branding/bevy_bird_light.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crates/bevy_core_pipeline/src/clear_color.rs b/crates/bevy_core_pipeline/src/clear_color.rs index 0461b6c2c7..9d1ce4c5dc 100644 --- a/crates/bevy_core_pipeline/src/clear_color.rs +++ b/crates/bevy_core_pipeline/src/clear_color.rs @@ -27,8 +27,9 @@ pub enum ClearColorConfig { #[reflect(Resource)] pub struct ClearColor(pub Color); +/// Match the dark gray bevy website code block color by default. impl Default for ClearColor { fn default() -> Self { - Self(Color::rgb(0.4, 0.4, 0.4)) + Self(Color::rgb_u8(43, 44, 47)) } } diff --git a/example_showcase_config.ron b/example_showcase_config.ron new file mode 100644 index 0000000000..4503c3738b --- /dev/null +++ b/example_showcase_config.ron @@ -0,0 +1 @@ +(exit_after: Some(250)) \ No newline at end of file diff --git a/examples/2d/bloom_2d.rs b/examples/2d/bloom_2d.rs index 108cc94c57..16f48b3667 100644 --- a/examples/2d/bloom_2d.rs +++ b/examples/2d/bloom_2d.rs @@ -11,7 +11,6 @@ use bevy::{ fn main() { App::new() - .insert_resource(ClearColor(Color::DARK_GRAY)) .add_plugins(DefaultPlugins) .add_systems(Startup, setup) .add_systems(Update, update_bloom_settings) @@ -38,7 +37,7 @@ fn setup( // Sprite commands.spawn(SpriteBundle { - texture: asset_server.load("branding/icon.png"), + texture: asset_server.load("branding/bevy_bird_light.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)), diff --git a/examples/2d/sprite.rs b/examples/2d/sprite.rs index d26478be58..79e3d010eb 100644 --- a/examples/2d/sprite.rs +++ b/examples/2d/sprite.rs @@ -12,7 +12,7 @@ fn main() { fn setup(mut commands: Commands, asset_server: Res) { commands.spawn(Camera2dBundle::default()); commands.spawn(SpriteBundle { - texture: asset_server.load("branding/icon.png"), + texture: asset_server.load("branding/bevy_bird_light.png"), ..default() }); } diff --git a/examples/2d/sprite_flipping.rs b/examples/2d/sprite_flipping.rs index 4be1908819..c7619859c9 100644 --- a/examples/2d/sprite_flipping.rs +++ b/examples/2d/sprite_flipping.rs @@ -12,7 +12,7 @@ fn main() { fn setup(mut commands: Commands, asset_server: Res) { commands.spawn(Camera2dBundle::default()); commands.spawn(SpriteBundle { - texture: asset_server.load("branding/icon.png"), + texture: asset_server.load("branding/bevy_bird_light.png"), sprite: Sprite { // Flip the logo to the left flip_x: true, diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs index 9fbbca077c..ca142616fd 100644 --- a/examples/3d/3d_scene.rs +++ b/examples/3d/3d_scene.rs @@ -15,16 +15,17 @@ fn setup( mut meshes: ResMut>, mut materials: ResMut>, ) { - // plane + // circular base commands.spawn(PbrBundle { - mesh: meshes.add(shape::Plane::from_size(5.0).into()), - material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()), + mesh: meshes.add(shape::Circle::new(4.0).into()), + material: materials.add(Color::WHITE.into()), + transform: Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)), ..default() }); // cube commands.spawn(PbrBundle { mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), - material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()), + material: materials.add(Color::rgb_u8(124, 144, 255).into()), transform: Transform::from_xyz(0.0, 0.5, 0.0), ..default() }); @@ -40,7 +41,7 @@ fn setup( }); // camera commands.spawn(Camera3dBundle { - transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y), + transform: Transform::from_xyz(-2.5, 4.5, 9.0).looking_at(Vec3::ZERO, Vec3::Y), ..default() }); } diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs index c92c67cd65..6e71640f74 100644 --- a/examples/3d/anti_aliasing.rs +++ b/examples/3d/anti_aliasing.rs @@ -263,8 +263,8 @@ fn setup( ) { // Plane commands.spawn(PbrBundle { - mesh: meshes.add(shape::Plane::from_size(5.0).into()), - material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()), + mesh: meshes.add(shape::Plane::from_size(50.0).into()), + material: materials.add(Color::GRAY.into()), ..default() }); @@ -325,6 +325,18 @@ fn setup( enabled: false, ..default() }, + EnvironmentMapLight { + diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"), + specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"), + }, + FogSettings { + color: Color::rgba_u8(43, 44, 47, 255), + falloff: FogFalloff::Linear { + start: 1.0, + end: 4.0, + }, + ..default() + }, )); // example instructions diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs index b29fc9adab..913ec0aeba 100644 --- a/examples/3d/atmospheric_fog.rs +++ b/examples/3d/atmospheric_fog.rs @@ -99,7 +99,6 @@ fn setup_instructions(mut commands: Commands) { "Press Spacebar to Toggle Atmospheric Fog.\nPress S to Toggle Directional Light Fog Influence.", TextStyle { font_size: 20.0, - color: Color::WHITE, ..default() }, ) diff --git a/examples/3d/blend_modes.rs b/examples/3d/blend_modes.rs index 1b6b43059d..a240584729 100644 --- a/examples/3d/blend_modes.rs +++ b/examples/3d/blend_modes.rs @@ -188,7 +188,7 @@ fn setup( let text_style = TextStyle { font: asset_server.load("fonts/FiraMono-Medium.ttf"), font_size: 18.0, - color: Color::BLACK, + ..default() }; let label_text_style = TextStyle { diff --git a/examples/3d/bloom_3d.rs b/examples/3d/bloom_3d.rs index 4b68878fcd..396ac0cd1d 100644 --- a/examples/3d/bloom_3d.rs +++ b/examples/3d/bloom_3d.rs @@ -14,7 +14,6 @@ use std::{ fn main() { App::new() - .insert_resource(ClearColor(Color::DARK_GRAY)) .add_plugins(DefaultPlugins) .add_systems(Startup, setup_scene) .add_systems(Update, (update_bloom_settings, bounce_spheres)) diff --git a/examples/3d/deferred_rendering.rs b/examples/3d/deferred_rendering.rs index 492d98bd5a..1bf1978851 100644 --- a/examples/3d/deferred_rendering.rs +++ b/examples/3d/deferred_rendering.rs @@ -52,7 +52,7 @@ fn setup( ..default() }, FogSettings { - color: Color::rgba(0.25, 0.25, 0.25, 1.0), + color: Color::rgba_u8(43, 44, 47, 255), falloff: FogFalloff::Linear { start: 1.0, end: 8.0, @@ -93,11 +93,11 @@ fn setup( }); commands.spawn(SceneBundle { scene: helmet_scene, - transform: Transform::from_xyz(-3.0, 0.0, -3.0), + transform: Transform::from_xyz(-4.0, 0.0, -3.0), ..default() }); - let mut forward_mat: StandardMaterial = Color::rgb(0.1, 0.2, 0.1).into(); + let mut forward_mat: StandardMaterial = Color::GRAY.into(); forward_mat.opaque_render_method = OpaqueRendererMethod::Forward; let forward_mat_h = materials.add(forward_mat); @@ -216,7 +216,6 @@ fn setup( "", TextStyle { font_size: 18.0, - color: Color::WHITE, ..default() }, ) diff --git a/examples/3d/load_gltf.rs b/examples/3d/load_gltf.rs index ccf7f7b5dc..f6a412608b 100644 --- a/examples/3d/load_gltf.rs +++ b/examples/3d/load_gltf.rs @@ -8,10 +8,6 @@ use std::f32::consts::*; fn main() { App::new() - .insert_resource(AmbientLight { - color: Color::WHITE, - brightness: 1.0 / 5.0f32, - }) .insert_resource(DirectionalLightShadowMap { size: 4096 }) .add_plugins(DefaultPlugins) .add_systems(Startup, setup) diff --git a/examples/3d/pbr.rs b/examples/3d/pbr.rs index 305d073a95..348fc7d9d5 100644 --- a/examples/3d/pbr.rs +++ b/examples/3d/pbr.rs @@ -74,7 +74,6 @@ fn setup( "Perceptual Roughness", TextStyle { font_size: 36.0, - color: Color::WHITE, ..default() }, ) @@ -91,7 +90,6 @@ fn setup( "Metallic", TextStyle { font_size: 36.0, - color: Color::WHITE, ..default() }, ), diff --git a/examples/3d/spherical_area_lights.rs b/examples/3d/spherical_area_lights.rs index f8b5d6b93f..99dfc14d09 100644 --- a/examples/3d/spherical_area_lights.rs +++ b/examples/3d/spherical_area_lights.rs @@ -4,7 +4,6 @@ use bevy::prelude::*; fn main() { App::new() - .insert_resource(ClearColor(Color::BLACK)) .add_plugins(DefaultPlugins) .add_systems(Startup, setup) .run(); diff --git a/examples/3d/spotlight.rs b/examples/3d/spotlight.rs index 6c9083622d..6813ad4bab 100644 --- a/examples/3d/spotlight.rs +++ b/examples/3d/spotlight.rs @@ -9,10 +9,15 @@ use rand::{rngs::StdRng, Rng, SeedableRng}; fn main() { App::new() + .insert_resource(AmbientLight { + brightness: 0.02, + ..default() + }) .add_plugins(( DefaultPlugins, FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin::default(), + bevy_internal::core_pipeline::experimental::taa::TemporalAntiAliasPlugin, )) .add_systems(Startup, setup) .add_systems(Update, (light_sway, movement)) @@ -31,21 +36,14 @@ fn setup( // ground plane commands.spawn(PbrBundle { mesh: meshes.add(shape::Plane::from_size(100.0).into()), - material: materials.add(StandardMaterial { - base_color: Color::GREEN, - perceptual_roughness: 1.0, - ..default() - }), + material: materials.add(Color::WHITE.into()), ..default() }); // cubes let mut rng = StdRng::seed_from_u64(19878367467713); let cube_mesh = meshes.add(Mesh::from(shape::Cube { size: 0.5 })); - let blue = materials.add(StandardMaterial { - base_color: Color::BLUE, - ..default() - }); + let blue = materials.add(Color::rgb_u8(124, 144, 255).into()); for _ in 0..40 { let x = rng.gen_range(-5.0..5.0); let y = rng.gen_range(0.0..3.0); @@ -61,12 +59,6 @@ fn setup( )); } - // ambient light - commands.insert_resource(AmbientLight { - color: Color::rgb(0.0, 1.0, 1.0), - brightness: 0.14, - }); - let sphere_mesh = meshes.add(Mesh::from(shape::UVSphere { radius: 0.05, ..default() @@ -124,10 +116,14 @@ fn setup( } // camera - commands.spawn(Camera3dBundle { + commands.spawn((Camera3dBundle { + camera: Camera { + hdr: true, + ..default() + }, transform: Transform::from_xyz(-4.0, 5.0, 10.0).looking_at(Vec3::ZERO, Vec3::Y), ..default() - }); + },)); } fn light_sway(time: Res