Merge branch 'storage-buffer' into clustered-forward-storage-buffers

bevyengine · Mar 2, 2022 · ccf9af8 · ccf9af8
2 parents 305a3d0 + 952819a
commit ccf9af8
Show file tree

Hide file tree

Showing 151 changed files with 1,859 additions and 1,228 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -304,6 +304,10 @@ path = "examples/async_tasks/external_source_external_thread.rs"
 name = "audio"
 path = "examples/audio/audio.rs"
 
+[[example]]
+name = "audio_control"
+path = "examples/audio/audio_control.rs"
+
 # Diagnostics
 [[example]]
 name = "log_diagnostics"
@@ -467,6 +471,10 @@ path = "examples/shader/shader_defs.rs"
 name = "shader_material"
 path = "examples/shader/shader_material.rs"
 
+[[example]]
+name = "shader_material_screenspace_texture"
+path = "examples/shader/shader_material_screenspace_texture.rs"
+
 [[example]]
 name = "shader_material_glsl"
 path = "examples/shader/shader_material_glsl.rs"

diff --git a/assets/branding/banner-text.png b/assets/branding/banner-text.png
diff --git a/assets/branding/banner.png b/assets/branding/banner.png
diff --git a/assets/branding/bevy_bird_simpleicons.svg b/assets/branding/bevy_bird_simpleicons.svg
diff --git a/assets/branding/bevy_logo_dark.png b/assets/branding/bevy_logo_dark.png
diff --git a/assets/branding/bevy_logo_dark.svg b/assets/branding/bevy_logo_dark.svg
diff --git a/assets/branding/bevy_logo_dark_big.png b/assets/branding/bevy_logo_dark_big.png
diff --git a/assets/branding/bevy_logo_light.png b/assets/branding/bevy_logo_light.png