Skip to content

Commit 2f8cb58

Browse files
janhohenheimjanhohenheim
authored
Merge pull request #310 from janhohenheim/update-deps
2 parents 95fc169 + 3dc6469 commit 2f8cb58

File tree

11 files changed

+748
-560
lines changed

11 files changed

+748
-560
lines changed

‎Cargo.lock

+608-515
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ anyhow = "1"
4242
bevy_kira_audio = "0.19"
4343
bevy_asset_loader = { version = "0.20", features = ["progress_tracking", "standard_dynamic_assets"] }
4444
bevy_common_assets = { version = "0.10", features = ["ron", "toml"] }
45-
bevy_egui = "0.25"
45+
bevy_egui = "0.25" # version governed by bevy_editor_pls and leafwing-input-manager
4646
oxidized_navigation = { version = "0.10", features = ["xpbd"] }
4747
iyes_progress = "0.11"
4848
leafwing-input-manager = { version = "0.13", features = ["egui"] }
4949
bevy_dolly = "0.0.3"
5050
bevy_mod_sysfail = "7"
5151
bevy_editor_pls = { version = "0.8.1", optional = true }
52-
bevy_hanabi = "0.10"
52+
bevy_hanabi = "0.10" # Not on 0.11 yet because of Hanabi bugs ("Failed to find update pipeline")
5353
bevy_yarnspinner = "0.2"
5454
bevy_yarnspinner_example_dialogue_view = "0.2.1"
55-
bevy-tnua-xpbd3d = "0.2"
55+
bevy-tnua-xpbd3d = "0.4"
5656
bevy_xpbd_3d = { version = "0.4", features = ["simd"] }
57-
bevy-tnua = "0.15"
57+
bevy-tnua = "0.18"
5858
bevy_atmosphere = "0.9"
5959
warbler_grass = "0.6"
6060
bevy_gltf_blueprints = "0.10"

‎assets/scenes/World.glb

-12.5 MB
Binary file not shown.

‎assets/scenes/level.blend

-10.8 MB
Binary file not shown.

‎assets/scenes/library/Fox.glb

-373 KB
Binary file not shown.

‎assets/scenes/library/House.glb

12.3 MB
Binary file not shown.

‎assets/scenes/library/Orb.glb

8 Bytes
Binary file not shown.

‎assets/scenes/registry.json

+84
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,44 @@
433433
"type": "object",
434434
"typeInfo": "Enum"
435435
},
436+
"bevy_asset::handle::Handle<bevy_asset_loader::standard_dynamic_asset::StandardDynamicAssetArrayCollection>": {
437+
"isComponent": true,
438+
"isResource": false,
439+
"oneOf": [
440+
{
441+
"items": false,
442+
"prefixItems": [
443+
{
444+
"type": {
445+
"$ref": "#/$defs/std::sync::Arc<bevy_asset::handle::StrongHandle>"
446+
}
447+
}
448+
],
449+
"short_name": "Strong",
450+
"title": "Strong",
451+
"type": "array",
452+
"typeInfo": "Tuple"
453+
},
454+
{
455+
"items": false,
456+
"prefixItems": [
457+
{
458+
"type": {
459+
"$ref": "#/$defs/bevy_asset::id::AssetId<bevy_asset_loader::standard_dynamic_asset::StandardDynamicAssetArrayCollection>"
460+
}
461+
}
462+
],
463+
"short_name": "Weak",
464+
"title": "Weak",
465+
"type": "array",
466+
"typeInfo": "Tuple"
467+
}
468+
],
469+
"short_name": "Handle<StandardDynamicAssetArrayCollection>",
470+
"title": "bevy_asset::handle::Handle<bevy_asset_loader::standard_dynamic_asset::StandardDynamicAssetArrayCollection>",
471+
"type": "object",
472+
"typeInfo": "Enum"
473+
},
436474
"bevy_asset::handle::Handle<bevy_asset_loader::standard_dynamic_asset::StandardDynamicAssetCollection>": {
437475
"isComponent": true,
438476
"isResource": false,
@@ -1681,6 +1719,52 @@
16811719
"type": "object",
16821720
"typeInfo": "Enum"
16831721
},
1722+
"bevy_asset::id::AssetId<bevy_asset_loader::standard_dynamic_asset::StandardDynamicAssetArrayCollection>": {
1723+
"isComponent": false,
1724+
"isResource": false,
1725+
"oneOf": [
1726+
{
1727+
"additionalProperties": false,
1728+
"properties": {
1729+
"index": {
1730+
"title": "index",
1731+
"type": {
1732+
"$ref": "#/$defs/bevy_asset::assets::AssetIndex"
1733+
}
1734+
}
1735+
},
1736+
"required": [
1737+
"index"
1738+
],
1739+
"short_name": "Index",
1740+
"title": "Index",
1741+
"type": "object",
1742+
"typeInfo": "Struct"
1743+
},
1744+
{
1745+
"additionalProperties": false,
1746+
"properties": {
1747+
"uuid": {
1748+
"title": "uuid",
1749+
"type": {
1750+
"$ref": "#/$defs/bevy_utils::Uuid"
1751+
}
1752+
}
1753+
},
1754+
"required": [
1755+
"uuid"
1756+
],
1757+
"short_name": "Uuid",
1758+
"title": "Uuid",
1759+
"type": "object",
1760+
"typeInfo": "Struct"
1761+
}
1762+
],
1763+
"short_name": "AssetId<StandardDynamicAssetArrayCollection>",
1764+
"title": "bevy_asset::id::AssetId<bevy_asset_loader::standard_dynamic_asset::StandardDynamicAssetArrayCollection>",
1765+
"type": "object",
1766+
"typeInfo": "Enum"
1767+
},
16841768
"bevy_asset::id::AssetId<bevy_asset_loader::standard_dynamic_asset::StandardDynamicAssetCollection>": {
16851769
"isComponent": false,
16861770
"isResource": false,

‎src/bevy_config.rs

+27-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,38 @@
11
use anyhow::Context;
2+
use bevy::render::settings::{WgpuFeatures, WgpuSettings};
3+
use bevy::render::RenderPlugin;
24
use bevy::{prelude::*, window::PrimaryWindow, winit::WinitWindows};
35
use bevy_mod_sysfail::prelude::*;
46
use std::io::Cursor;
57
use winit::window::Icon;
68

79
/// Overrides the default Bevy plugins and configures things like the screen settings.
810
pub(super) fn plugin(app: &mut App) {
9-
let default_plugins = DefaultPlugins.set(WindowPlugin {
10-
primary_window: Some(Window {
11-
title: "Foxtrot".to_string(),
12-
..default()
13-
}),
14-
..default()
15-
});
16-
app.insert_resource(Msaa::Sample4)
17-
.insert_resource(ClearColor(Color::rgb(0.4, 0.4, 0.4)))
18-
.add_plugins(default_plugins)
19-
.add_systems(Startup, set_window_icon);
11+
app.add_plugins(
12+
DefaultPlugins
13+
.set(WindowPlugin {
14+
primary_window: Some(Window {
15+
title: "Foxtrot".to_string(),
16+
..default()
17+
}),
18+
..default()
19+
})
20+
.set(RenderPlugin {
21+
render_creation: create_wgpu_settings().into(),
22+
synchronous_pipeline_compilation: false,
23+
}),
24+
)
25+
.insert_resource(Msaa::Sample4)
26+
.insert_resource(ClearColor(Color::rgb(0.4, 0.4, 0.4)))
27+
.add_systems(Startup, set_window_icon);
28+
}
29+
30+
fn create_wgpu_settings() -> WgpuSettings {
31+
let mut wgpu_settings = WgpuSettings::default();
32+
wgpu_settings
33+
.features
34+
.set(WgpuFeatures::VERTEX_WRITABLE_STORAGE, true);
35+
wgpu_settings
2036
}
2137

2238
// Sets the icon on Windows and X11

‎src/movement/character_controller.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mod models;
1414
/// the control components [`Walk`] and [`Jump`]. It also controls a state machine to determine which animations to play.
1515
pub(super) fn plugin(app: &mut App) {
1616
app.add_plugins((components::plugin, animation::plugin, models::plugin))
17-
.add_plugins((TnuaXpbd3dPlugin, TnuaControllerPlugin))
17+
.add_plugins((TnuaXpbd3dPlugin::default(), TnuaControllerPlugin::default()))
1818
.add_systems(
1919
Update,
2020
(apply_jumping, apply_walking)

‎src/particles/creation.rs

+24-29
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
use crate::{level_instantiation::on_spawn::player, particles::SprintingParticle};
2-
use bevy::{pbr::NotShadowReceiver, prelude::*};
2+
use bevy::pbr::NotShadowReceiver;
3+
use bevy::prelude::*;
34
use bevy_hanabi::prelude::*;
45

56
pub(crate) fn create_sprint_particle_bundle(effects: &mut Assets<EffectAsset>) -> impl Bundle {
6-
let sprinting = create_sprinting_effect(effects);
77
(
88
Name::new("Sprinting particle"),
99
SprintingParticle,
10-
ParticleEffectBundle {
11-
effect: sprinting,
12-
..default()
13-
},
10+
ParticleEffectBundle::new(create_sprinting_effect(effects)),
1411
NotShadowReceiver,
1512
)
1613
}
1714

18-
fn create_sprinting_effect(effects: &mut Assets<EffectAsset>) -> ParticleEffect {
15+
fn create_sprinting_effect(effects: &mut Assets<EffectAsset>) -> Handle<EffectAsset> {
1916
let mut color_gradient = Gradient::new();
2017
color_gradient.add_key(0.0, Vec4::new(1.2, 1.0, 1.0, 0.6));
2118
color_gradient.add_key(0.1, Vec4::new(1.2, 1.0, 1.0, 0.4));
@@ -49,27 +46,25 @@ fn create_sprinting_effect(effects: &mut Assets<EffectAsset>) -> ParticleEffect
4946
};
5047
let accel_modifier = AccelModifier::new(module.lit(Vec3::new(0., 1., 0.)));
5148

52-
ParticleEffect::new(
53-
effects.add(
54-
EffectAsset::new(
55-
100,
56-
Spawner::rate(10.0.into()).with_starts_active(false),
57-
module,
58-
)
59-
.with_name("Sprint")
60-
.init(position_circle_modifier)
61-
.init(velocity_sphere_modifier)
62-
.init(lifetime)
63-
.update(linear_drag_modifier)
64-
.render(orient_modifier)
65-
.update(accel_modifier)
66-
.render(ColorOverLifetimeModifier {
67-
gradient: color_gradient,
68-
})
69-
.render(SizeOverLifetimeModifier {
70-
gradient: size_gradient,
71-
screen_space_size: false,
72-
}),
73-
),
49+
effects.add(
50+
EffectAsset::new(
51+
100,
52+
Spawner::rate(10.0.into()).with_starts_active(false),
53+
module,
54+
)
55+
.with_name("Sprint")
56+
.init(position_circle_modifier)
57+
.init(velocity_sphere_modifier)
58+
.init(lifetime)
59+
.update(linear_drag_modifier)
60+
.render(orient_modifier)
61+
.update(accel_modifier)
62+
.render(ColorOverLifetimeModifier {
63+
gradient: color_gradient,
64+
})
65+
.render(SizeOverLifetimeModifier {
66+
gradient: size_gradient,
67+
screen_space_size: false,
68+
}),
7469
)
7570
}

0 commit comments

Comments
 (0)