Skip to content

Commit 5779ba2

Browse files
greeble-devgreeble-dev
committed
Updated examples.
1 parent 14a2a36 commit 5779ba2

File tree

10 files changed

+45
-30
lines changed

10 files changed

+45
-30
lines changed

‎examples/2d/mesh2d_repeated_texture.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@ fn setup(
3434
asset_server.load("textures/fantasy_ui_borders/panel-border-010.png");
3535
let image_with_repeated_sampler = asset_server.load_with_settings(
3636
"textures/fantasy_ui_borders/panel-border-010-repeated.png",
37-
|s: &mut _| {
38-
*s = ImageLoaderSettings {
39-
sampler: ImageSampler::Descriptor(ImageSamplerDescriptor {
40-
// rewriting mode to repeat image,
41-
address_mode_u: ImageAddressMode::Repeat,
42-
address_mode_v: ImageAddressMode::Repeat,
43-
..default()
44-
}),
37+
ImageLoaderSettings {
38+
sampler: ImageSampler::Descriptor(ImageSamplerDescriptor {
39+
// rewriting mode to repeat image,
40+
address_mode_u: ImageAddressMode::Repeat,
41+
address_mode_v: ImageAddressMode::Repeat,
4542
..default()
46-
}
43+
}),
44+
..default()
4745
},
4846
);
4947

‎examples/3d/deferred_rendering.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,10 @@ fn setup_parallax(
226226
"textures/parallax_example/cube_normal.png",
227227
// The normal map texture is in linear color space. Lighting won't look correct
228228
// if `is_srgb` is `true`, which is the default.
229-
|settings: &mut ImageLoaderSettings| settings.is_srgb = false,
229+
ImageLoaderSettings {
230+
is_srgb: false,
231+
..Default::default()
232+
},
230233
);
231234

232235
let mut cube = Mesh::from(Cuboid::new(0.15, 0.15, 0.15));

‎examples/3d/parallax_mapping.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,10 @@ fn setup(
208208
"textures/parallax_example/cube_normal.png",
209209
// The normal map texture is in linear color space. Lighting won't look correct
210210
// if `is_srgb` is `true`, which is the default.
211-
|settings: &mut ImageLoaderSettings| settings.is_srgb = false,
211+
ImageLoaderSettings {
212+
is_srgb: false,
213+
..Default::default()
214+
},
212215
);
213216

214217
// Camera

‎examples/3d/scrolling_fog.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ fn setup(
9494
// Load a repeating 3d noise texture. Make sure to set ImageAddressMode to Repeat
9595
// so that the texture wraps around as the density texture offset is moved along.
9696
// Also set ImageFilterMode to Linear so that the fog isn't pixelated.
97-
let noise_texture = assets.load_with_settings("volumes/fog_noise.ktx2", |settings: &mut _| {
98-
*settings = ImageLoaderSettings {
97+
let noise_texture = assets.load_with_settings(
98+
"volumes/fog_noise.ktx2",
99+
ImageLoaderSettings {
99100
sampler: ImageSampler::Descriptor(ImageSamplerDescriptor {
100101
address_mode_u: ImageAddressMode::Repeat,
101102
address_mode_v: ImageAddressMode::Repeat,
@@ -106,8 +107,8 @@ fn setup(
106107
..default()
107108
}),
108109
..default()
109-
}
110-
});
110+
},
111+
);
111112

112113
// Spawn a FogVolume and use the repeating noise texture as its density texture.
113114
commands.spawn((

‎examples/asset/alter_mesh.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ fn setup(
8383
// only `RENDER_WORLD`. This is more memory efficient, as we don't need to keep the mesh in
8484
// RAM. For this example however, this would not work, as we need to inspect and modify the
8585
// mesh at runtime.
86-
|settings: &mut GltfLoaderSettings| settings.load_meshes = RenderAssetUsages::all(),
86+
GltfLoaderSettings {
87+
load_meshes: RenderAssetUsages::all(),
88+
..Default::default()
89+
},
8790
);
8891

8992
// Here, we rely on the default loader settings to achieve a similar result to the above.

‎examples/asset/alter_sprite.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
6666
// only `RENDER_WORLD`. This is more memory efficient, as we don't need to keep the image in
6767
// RAM. For this example however, this would not work, as we need to inspect and modify the
6868
// image at runtime.
69-
|settings: &mut ImageLoaderSettings| settings.asset_usage = RenderAssetUsages::all(),
69+
ImageLoaderSettings {
70+
asset_usage: RenderAssetUsages::all(),
71+
..Default::default()
72+
},
7073
);
7174

7275
commands.spawn((

‎examples/asset/asset_decompression.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ struct GzAssetLoader;
2323
/// Possible errors that can be produced by [`GzAssetLoader`]
2424
#[non_exhaustive]
2525
#[derive(Debug, Error)]
26+
#[expect(
27+
clippy::large_enum_variant,
28+
reason = "XXX TODO: Why did this start happening?"
29+
)]
2630
enum GzAssetLoaderError {
2731
/// An [IO](std::io) Error
2832
#[error("Could not load asset: {0}")]

‎examples/asset/asset_settings.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
6464
Sprite {
6565
image: asset_server.load_with_settings(
6666
"bevy_pixel_dark_with_settings.png",
67-
|settings: &mut ImageLoaderSettings| {
68-
settings.sampler = ImageSampler::nearest();
67+
ImageLoaderSettings {
68+
sampler: ImageSampler::nearest(),
69+
..Default::default()
6970
},
7071
),
7172
custom_size: Some(Vec2 { x: 160.0, y: 120.0 }),

‎examples/asset/repeated_texture.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,14 @@ fn setup(
3939
MeshMaterial3d(materials.add(StandardMaterial {
4040
base_color_texture: Some(asset_server.load_with_settings(
4141
"textures/fantasy_ui_borders/panel-border-010-repeated.png",
42-
|s: &mut _| {
43-
*s = ImageLoaderSettings {
44-
sampler: ImageSampler::Descriptor(ImageSamplerDescriptor {
45-
// rewriting mode to repeat image,
46-
address_mode_u: ImageAddressMode::Repeat,
47-
address_mode_v: ImageAddressMode::Repeat,
48-
..default()
49-
}),
42+
ImageLoaderSettings {
43+
sampler: ImageSampler::Descriptor(ImageSamplerDescriptor {
44+
// rewriting mode to repeat image,
45+
address_mode_u: ImageAddressMode::Repeat,
46+
address_mode_v: ImageAddressMode::Repeat,
5047
..default()
51-
}
48+
}),
49+
..default()
5250
},
5351
)),
5452

‎examples/ui/ui_texture_slice_flip_and_tile.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ fn main() {
2020
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
2121
let image = asset_server.load_with_settings(
2222
"textures/fantasy_ui_borders/numbered_slices.png",
23-
|settings: &mut ImageLoaderSettings| {
23+
ImageLoaderSettings {
2424
// Need to use nearest filtering to avoid bleeding between the slices with tiling
25-
settings.sampler = ImageSampler::nearest();
25+
sampler: ImageSampler::nearest(),
26+
..Default::default()
2627
},
2728
);
2829

0 commit comments

Comments
 (0)