mirror of
https://github.com/bevyengine/bevy
synced 2024-11-26 06:30:19 +00:00
a795de30b4
# Motivation When spawning entities into a scene, it is very common to create assets like meshes and materials and to add them via asset handles. A common setup might look like this: ```rust fn setup( mut commands: Commands, mut meshes: ResMut<Assets<Mesh>>, mut materials: ResMut<Assets<StandardMaterial>>, ) { commands.spawn(PbrBundle { mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), material: materials.add(StandardMaterial::from(Color::RED)), ..default() }); } ``` Let's take a closer look at the part that adds the assets using `add`. ```rust mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), material: materials.add(StandardMaterial::from(Color::RED)), ``` Here, "mesh" and "material" are both repeated three times. It's very explicit, but I find it to be a bit verbose. In addition to being more code to read and write, the extra characters can sometimes also lead to the code being formatted to span multiple lines even though the core task, adding e.g. a primitive mesh, is extremely simple. A way to address this is by using `.into()`: ```rust mesh: meshes.add(shape::Cube { size: 1.0 }.into()), material: materials.add(Color::RED.into()), ``` This is fine, but from the names and the type of `meshes`, we already know what the type should be. It's very clear that `Cube` should be turned into a `Mesh` because of the context it's used in. `.into()` is just seven characters, but it's so common that it quickly adds up and gets annoying. It would be nice if you could skip all of the conversion and let Bevy handle it for you: ```rust mesh: meshes.add(shape::Cube { size: 1.0 }), material: materials.add(Color::RED), ``` # Objective Make adding assets more ergonomic by making `Assets::add` take an `impl Into<A>` instead of `A`. ## Solution `Assets::add` now takes an `impl Into<A>` instead of `A`, so e.g. this works: ```rust commands.spawn(PbrBundle { mesh: meshes.add(shape::Cube { size: 1.0 }), material: materials.add(Color::RED), ..default() }); ``` I also changed all examples to use this API, which increases consistency as well because `Mesh::from` and `into` were being used arbitrarily even in the same file. This also gets rid of some lines of code because formatting is nicer. --- ## Changelog - `Assets::add` now takes an `impl Into<A>` instead of `A` - Examples don't use `T::from(K)` or `K.into()` when adding assets ## Migration Guide Some `into` calls that worked previously might now be broken because of the new trait bounds. You need to either remove `into` or perform the conversion explicitly with `from`: ```rust // Doesn't compile let mesh_handle = meshes.add(shape::Cube { size: 1.0 }.into()), // These compile let mesh_handle = meshes.add(shape::Cube { size: 1.0 }), let mesh_handle = meshes.add(Mesh::from(shape::Cube { size: 1.0 })), ``` ## Concerns I believe the primary concerns might be: 1. Is this too implicit? 2. Does this increase codegen bloat? Previously, the two APIs were using `into` or `from`, and now it's "nothing" or `from`. You could argue that `into` is slightly more explicit than "nothing" in cases like the earlier examples where a `Color` gets converted to e.g. a `StandardMaterial`, but I personally don't think `into` adds much value even in this case, and you could still see the actual type from the asset type. As for codegen bloat, I doubt it adds that much, but I'm not very familiar with the details of codegen. I personally value the user-facing code reduction and ergonomics improvements that these changes would provide, but it might be worth checking the other effects in more detail. Another slight concern is migration pain; apps might have a ton of `into` calls that would need to be removed, and it did take me a while to do so for Bevy itself (maybe around 20-40 minutes). However, I think the fact that there *are* so many `into` calls just highlights that the API could be made nicer, and I'd gladly migrate my own projects for it.
178 lines
5.8 KiB
Rust
178 lines
5.8 KiB
Rust
//! A shader that binds several textures onto one
|
|
//! `binding_array<texture<f32>>` shader binding slot and sample non-uniformly.
|
|
|
|
use bevy::{
|
|
prelude::*,
|
|
reflect::TypePath,
|
|
render::{
|
|
render_asset::RenderAssets, render_resource::*, renderer::RenderDevice,
|
|
texture::FallbackImage, RenderApp,
|
|
},
|
|
};
|
|
use std::{num::NonZeroU32, process::exit};
|
|
|
|
fn main() {
|
|
let mut app = App::new();
|
|
app.add_plugins((
|
|
DefaultPlugins.set(ImagePlugin::default_nearest()),
|
|
GpuFeatureSupportChecker,
|
|
MaterialPlugin::<BindlessMaterial>::default(),
|
|
))
|
|
.add_systems(Startup, setup)
|
|
.run();
|
|
}
|
|
|
|
const MAX_TEXTURE_COUNT: usize = 16;
|
|
const TILE_ID: [usize; 16] = [
|
|
19, 23, 4, 33, 12, 69, 30, 48, 10, 65, 40, 47, 57, 41, 44, 46,
|
|
];
|
|
|
|
struct GpuFeatureSupportChecker;
|
|
|
|
impl Plugin for GpuFeatureSupportChecker {
|
|
fn build(&self, _app: &mut App) {}
|
|
|
|
fn finish(&self, app: &mut App) {
|
|
let Ok(render_app) = app.get_sub_app_mut(RenderApp) else {
|
|
return;
|
|
};
|
|
|
|
let render_device = render_app.world.resource::<RenderDevice>();
|
|
|
|
// Check if the device support the required feature. If not, exit the example.
|
|
// In a real application, you should setup a fallback for the missing feature
|
|
if !render_device
|
|
.features()
|
|
.contains(WgpuFeatures::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING)
|
|
{
|
|
error!(
|
|
"Render device doesn't support feature \
|
|
SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING, \
|
|
which is required for texture binding arrays"
|
|
);
|
|
exit(1);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<BindlessMaterial>>,
|
|
asset_server: Res<AssetServer>,
|
|
) {
|
|
commands.spawn(Camera3dBundle {
|
|
transform: Transform::from_xyz(2.0, 2.0, 2.0).looking_at(Vec3::new(0.0, 0.0, 0.0), Vec3::Y),
|
|
..default()
|
|
});
|
|
|
|
// load 16 textures
|
|
let textures: Vec<_> = TILE_ID
|
|
.iter()
|
|
.map(|id| asset_server.load(format!("textures/rpg/tiles/generic-rpg-tile{id:0>2}.png")))
|
|
.collect();
|
|
|
|
// a cube with multiple textures
|
|
commands.spawn(MaterialMeshBundle {
|
|
mesh: meshes.add(shape::Cube { size: 1.0 }),
|
|
material: materials.add(BindlessMaterial { textures }),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
#[derive(Asset, TypePath, Debug, Clone)]
|
|
struct BindlessMaterial {
|
|
textures: Vec<Handle<Image>>,
|
|
}
|
|
|
|
impl AsBindGroup for BindlessMaterial {
|
|
type Data = ();
|
|
|
|
fn as_bind_group(
|
|
&self,
|
|
layout: &BindGroupLayout,
|
|
render_device: &RenderDevice,
|
|
image_assets: &RenderAssets<Image>,
|
|
fallback_image: &FallbackImage,
|
|
) -> Result<PreparedBindGroup<Self::Data>, AsBindGroupError> {
|
|
// retrieve the render resources from handles
|
|
let mut images = vec![];
|
|
for handle in self.textures.iter().take(MAX_TEXTURE_COUNT) {
|
|
match image_assets.get(handle) {
|
|
Some(image) => images.push(image),
|
|
None => return Err(AsBindGroupError::RetryNextUpdate),
|
|
}
|
|
}
|
|
|
|
let fallback_image = &fallback_image.d2;
|
|
|
|
let textures = vec![&fallback_image.texture_view; MAX_TEXTURE_COUNT];
|
|
|
|
// convert bevy's resource types to WGPU's references
|
|
let mut textures: Vec<_> = textures.into_iter().map(|texture| &**texture).collect();
|
|
|
|
// fill in up to the first `MAX_TEXTURE_COUNT` textures and samplers to the arrays
|
|
for (id, image) in images.into_iter().enumerate() {
|
|
textures[id] = &*image.texture_view;
|
|
}
|
|
|
|
let bind_group = render_device.create_bind_group(
|
|
"bindless_material_bind_group",
|
|
layout,
|
|
&BindGroupEntries::sequential((&textures[..], &fallback_image.sampler)),
|
|
);
|
|
|
|
Ok(PreparedBindGroup {
|
|
bindings: vec![],
|
|
bind_group,
|
|
data: (),
|
|
})
|
|
}
|
|
|
|
fn unprepared_bind_group(
|
|
&self,
|
|
_: &BindGroupLayout,
|
|
_: &RenderDevice,
|
|
_: &RenderAssets<Image>,
|
|
_: &FallbackImage,
|
|
) -> Result<UnpreparedBindGroup<Self::Data>, AsBindGroupError> {
|
|
// we implement as_bind_group directly because
|
|
panic!("bindless texture arrays can't be owned")
|
|
// or rather, they can be owned, but then you can't make a `&'a [&'a TextureView]` from a vec of them in get_binding().
|
|
}
|
|
|
|
fn bind_group_layout_entries(_: &RenderDevice) -> Vec<BindGroupLayoutEntry>
|
|
where
|
|
Self: Sized,
|
|
{
|
|
vec![
|
|
// @group(2) @binding(0) var textures: binding_array<texture_2d<f32>>;
|
|
BindGroupLayoutEntry {
|
|
binding: 0,
|
|
visibility: ShaderStages::FRAGMENT,
|
|
ty: BindingType::Texture {
|
|
sample_type: TextureSampleType::Float { filterable: true },
|
|
view_dimension: TextureViewDimension::D2,
|
|
multisampled: false,
|
|
},
|
|
count: NonZeroU32::new(MAX_TEXTURE_COUNT as u32),
|
|
},
|
|
// @group(2) @binding(1) var nearest_sampler: sampler;
|
|
BindGroupLayoutEntry {
|
|
binding: 1,
|
|
visibility: ShaderStages::FRAGMENT,
|
|
ty: BindingType::Sampler(SamplerBindingType::Filtering),
|
|
count: None,
|
|
// Note: as textures, multiple samplers can also be bound onto one binding slot.
|
|
// One may need to pay attention to the limit of sampler binding amount on some platforms.
|
|
// count: NonZeroU32::new(MAX_TEXTURE_COUNT as u32),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
impl Material for BindlessMaterial {
|
|
fn fragment_shader() -> ShaderRef {
|
|
"shaders/texture_binding_array.wgsl".into()
|
|
}
|
|
}
|