Merge remote-tracking branch 'origin/main' into pbr-ssr

Author: aevyrie

Cargo.toml

@@ -217,6 +217,7 @@ common_api = [
   "bevy_image",
   "bevy_mesh",
   "bevy_shader",
+  "bevy_material",
   "bevy_text",
   "hdr",
   "png",
@@ -374,6 +375,9 @@ bevy_light = ["bevy_internal/bevy_light"]
 # Provides shaders usable through asset handles.
 bevy_shader = ["bevy_internal/bevy_shader"]
 
+# Provides materials.
+bevy_material = ["bevy_internal/bevy_material"]
+
 # Adds support for gizmos
 bevy_gizmos = ["bevy_internal/bevy_gizmos"]
 
@@ -1250,6 +1254,19 @@ description = "Showcases different blend modes"
 category = "3D Rendering"
 wasm = true
 
+[[example]]
+name = "contact_shadows"
+path = "examples/3d/contact_shadows.rs"
+# Causes an ICE on docs.rs
+doc-scrape-examples = false
+required-features = ["bluenoise_texture"]
+
+[package.metadata.example.contact_shadows]
+name = "Contact Shadows"
+description = "Showcases how contact shadows add shadow detail"
+category = "3D Rendering"
+wasm = true
+
 [[example]]
 name = "lighting"
 path = "examples/3d/lighting.rs"
@@ -4499,7 +4516,7 @@ doc-scrape-examples = false
 name = "glTF extension AnimationGraph"
 description = "Uses glTF data to build an AnimationGraph via extension processing"
 category = "glTF"
-wasm = true
+wasm = false
 
 [[example]]
 name = "gltf_extension_mesh_2d"
@@ -4511,7 +4528,7 @@ doc-scrape-examples = false
 name = "glTF extension processing to build Mesh2ds from glTF data"
 description = "Uses glTF extension data to convert incoming Mesh3d/MeshMaterial3d assets to 2d"
 category = "glTF"
-wasm = true
+wasm = false
 
 [[example]]
 name = "query_gltf_primitives"

benches/benches/bevy_reflect/list.rs

@@ -1,7 +1,7 @@
 use core::{hint::black_box, iter, time::Duration};
 
 use benches::bench;
-use bevy_reflect::{DynamicList, List};
+use bevy_reflect::list::{DynamicList, List};
 use criterion::{
     criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,
     Criterion, PlotConfiguration, Throughput,

benches/benches/bevy_reflect/map.rs

@@ -2,7 +2,7 @@ use core::{fmt::Write, hint::black_box, iter, time::Duration};
 
 use benches::bench;
 use bevy_platform::collections::HashMap;
-use bevy_reflect::{DynamicMap, Map};
+use bevy_reflect::map::{DynamicMap, Map};
 use criterion::{
     criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,
     Criterion, PlotConfiguration, Throughput,

benches/benches/bevy_reflect/struct.rs

@@ -1,7 +1,10 @@
 use core::{hint::black_box, time::Duration};
 
 use benches::bench;
-use bevy_reflect::{DynamicStruct, GetField, PartialReflect, Reflect, Struct};
+use bevy_reflect::{
+    structs::{DynamicStruct, GetField, Struct},
+    PartialReflect, Reflect,
+};
 use criterion::{
     criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,
     Criterion, PlotConfiguration, Throughput,

crates/bevy_animation/src/lib.rs

@@ -1522,7 +1522,7 @@ impl<'a> Iterator for TriggeredEventsIter<'a> {
 #[cfg(test)]
 mod tests {
     use crate as bevy_animation;
-    use bevy_reflect::{DynamicMap, Map};
+    use bevy_reflect::map::{DynamicMap, Map};
 
     use super::*;
 

crates/bevy_asset/src/io/wasm.rs

@@ -3,7 +3,10 @@ use crate::io::{
 };
 use alloc::{borrow::ToOwned, boxed::Box, format};
 use js_sys::{Uint8Array, JSON};
-use std::path::{Path, PathBuf};
+use std::{
+    borrow::Cow,
+    path::{Path, PathBuf},
+};
 use tracing::error;
 use wasm_bindgen::{prelude::wasm_bindgen, JsCast, JsValue};
 use wasm_bindgen_futures::JsFuture;
@@ -27,15 +30,27 @@ extern "C" {
 /// Reader implementation for loading assets via HTTP in Wasm.
 pub struct HttpWasmAssetReader {
     root_path: PathBuf,
+    request_mapper: Option<Box<dyn Fn(&str) -> Cow<str> + Send + Sync + 'static>>,
 }
 
 impl HttpWasmAssetReader {
     /// Creates a new `WasmAssetReader`. The path provided will be used to build URLs to query for assets.
     pub fn new<P: AsRef<Path>>(path: P) -> Self {
         Self {
             root_path: path.as_ref().to_owned(),
+            request_mapper: None,
         }
     }
+
+    /// Sets a mapper function to modify the request URL for each asset fetch. This can be used to
+    /// add query parameters or modify the path in any way.
+    pub fn with_request_mapper<F>(mut self, mapper: F) -> Self
+    where
+        F: Fn(&str) -> Cow<str> + Send + Sync + 'static,
+    {
+        self.request_mapper = Some(Box::new(mapper));
+        self
+    }
 }
 
 fn js_value_to_err(context: &str) -> impl FnOnce(JsValue) -> std::io::Error + '_ {
@@ -57,14 +72,20 @@ impl HttpWasmAssetReader {
         &self,
         path: PathBuf,
     ) -> Result<impl Reader + use<>, AssetReaderError> {
+        let path = path.to_str().unwrap();
+        let fetch_path = self
+            .request_mapper
+            .as_ref()
+            .map_or_else(|| Cow::Borrowed(path), |mapper| mapper(path));
+
         // The JS global scope includes a self-reference via a specializing name, which can be used to determine the type of global context available.
         let global: Global = js_sys::global().unchecked_into();
         let promise = if !global.window().is_undefined() {
             let window: web_sys::Window = global.unchecked_into();
-            window.fetch_with_str(path.to_str().unwrap())
+            window.fetch_with_str(&fetch_path)
         } else if !global.worker().is_undefined() {
             let worker: web_sys::WorkerGlobalScope = global.unchecked_into();
-            worker.fetch_with_str(path.to_str().unwrap())
+            worker.fetch_with_str(&fetch_path)
         } else {
             let error = std::io::Error::other("Unsupported JavaScript global context");
             return Err(AssetReaderError::Io(error.into()));
@@ -85,7 +106,7 @@ impl HttpWasmAssetReader {
             // Some web servers, including itch.io's CDN, return 403 when a requested file isn't present.
             // TODO: remove handling of 403 as not found when it's easier to configure
             // see https://github.com/bevyengine/bevy/pull/19268#pullrequestreview-2882410105
-            403 | 404 => Err(AssetReaderError::NotFound(path)),
+            403 | 404 => Err(AssetReaderError::NotFound((*fetch_path).into())),
             status => Err(AssetReaderError::HttpError(status)),
         }
     }

crates/bevy_core_pipeline/Cargo.toml

@@ -40,9 +40,6 @@ bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev", default-fea
 bitflags = "2.3"
 radsort = "0.1"
 nonmax = "0.5"
-serde = { version = "1", default-features = false, features = ["derive"] }
-smallvec = { version = "1", default-features = false }
-thiserror = { version = "2", default-features = false }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [lints]

crates/bevy_core_pipeline/src/mip_generation/experimental/depth.rs

@@ -22,21 +22,19 @@ use bevy_ecs::{
 use bevy_math::{uvec2, UVec2, Vec4Swizzles as _};
 use bevy_render::{
     batching::gpu_preprocessing::GpuPreprocessingSupport,
-    render_resource::BindGroupLayoutDescriptor,
-};
-use bevy_render::{
     experimental::occlusion_culling::{
         OcclusionCulling, OcclusionCullingSubview, OcclusionCullingSubviewEntities,
     },
     render_graph::{Node, NodeRunError, RenderGraphContext},
     render_resource::{
         binding_types::{sampler, texture_2d, texture_2d_multisampled, texture_storage_2d},
-        BindGroup, BindGroupEntries, BindGroupLayout, BindGroupLayoutEntries,
-        CachedComputePipelineId, ComputePassDescriptor, ComputePipeline, ComputePipelineDescriptor,
-        Extent3d, IntoBinding, PipelineCache, PushConstantRange, Sampler, SamplerBindingType,
-        SamplerDescriptor, ShaderStages, SpecializedComputePipeline, SpecializedComputePipelines,
-        StorageTextureAccess, TextureAspect, TextureDescriptor, TextureDimension, TextureFormat,
-        TextureSampleType, TextureUsages, TextureView, TextureViewDescriptor, TextureViewDimension,
+        BindGroup, BindGroupEntries, BindGroupLayout, BindGroupLayoutDescriptor,
+        BindGroupLayoutEntries, CachedComputePipelineId, ComputePassDescriptor, ComputePipeline,
+        ComputePipelineDescriptor, Extent3d, IntoBinding, PipelineCache, PushConstantRange,
+        Sampler, SamplerBindingType, SamplerDescriptor, ShaderStages, SpecializedComputePipeline,
+        SpecializedComputePipelines, StorageTextureAccess, TextureAspect, TextureDescriptor,
+        TextureDimension, TextureFormat, TextureSampleType, TextureUsages, TextureView,
+        TextureViewDescriptor, TextureViewDimension,
     },
     renderer::{RenderContext, RenderDevice},
     texture::TextureCache,

crates/bevy_core_pipeline/src/mip_generation/mod.rs

@@ -36,25 +36,21 @@ use bevy_render::{
     diagnostic::RecordDiagnostics as _,
     render_asset::RenderAssets,
     render_resource::{
-        binding_types::uniform_buffer, BindGroupLayoutDescriptor, FilterMode, ShaderType,
-        TextureFormatFeatureFlags, UniformBuffer,
+        binding_types::{sampler, texture_2d, texture_storage_2d, uniform_buffer},
+        BindGroup, BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
+        CachedComputePipelineId, ComputePassDescriptor, ComputePipelineDescriptor, Extent3d,
+        FilterMode, PipelineCache, Sampler, SamplerBindingType, SamplerDescriptor, ShaderStages,
+        ShaderType, SpecializedComputePipelines, StorageTextureAccess, TextureAspect,
+        TextureDescriptor, TextureDimension, TextureFormat, TextureFormatFeatureFlags,
+        TextureUsages, TextureView, TextureViewDescriptor, TextureViewDimension, UniformBuffer,
     },
-    renderer::{RenderAdapter, RenderQueue},
+    renderer::{RenderAdapter, RenderContext, RenderDevice, RenderQueue},
     settings::WgpuFeatures,
     texture::GpuImage,
     RenderStartup,
 };
 use bevy_render::{
     render_graph::{Node, NodeRunError, RenderGraphContext, RenderGraphExt},
-    render_resource::{
-        binding_types::{sampler, texture_2d, texture_storage_2d},
-        BindGroup, BindGroupEntries, BindGroupLayoutEntries, CachedComputePipelineId,
-        ComputePassDescriptor, ComputePipelineDescriptor, Extent3d, PipelineCache, Sampler,
-        SamplerBindingType, SamplerDescriptor, ShaderStages, SpecializedComputePipelines,
-        StorageTextureAccess, TextureAspect, TextureDescriptor, TextureDimension, TextureFormat,
-        TextureUsages, TextureView, TextureViewDescriptor, TextureViewDimension,
-    },
-    renderer::{RenderContext, RenderDevice},
     Render, RenderApp, RenderSystems,
 };
 use bevy_shader::{Shader, ShaderDefVal};

crates/bevy_core_pipeline/src/skybox/mod.rs

@@ -124,11 +124,11 @@ impl ExtractComponent for Skybox {
                 brightness: skybox.brightness * exposure,
                 transform: Transform::from_rotation(skybox.rotation.inverse()).to_matrix(),
                 #[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
-                _wasm_padding_8b: 0,
+                _webgl2_padding_8b: 0,
                 #[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
-                _wasm_padding_12b: 0,
+                _webgl2_padding_12b: 0,
                 #[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
-                _wasm_padding_16b: 0,
+                _webgl2_padding_16b: 0,
             },
         ))
     }
@@ -140,11 +140,11 @@ pub struct SkyboxUniforms {
     brightness: f32,
     transform: Mat4,
     #[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
-    _wasm_padding_8b: u32,
+    _webgl2_padding_8b: u32,
     #[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
-    _wasm_padding_12b: u32,
+    _webgl2_padding_12b: u32,
     #[cfg(all(feature = "webgl", target_arch = "wasm32", not(feature = "webgpu")))]
-    _wasm_padding_16b: u32,
+    _webgl2_padding_16b: u32,
 }
 
 #[derive(Resource)]