Skip to content

Commit 1b627e3

Browse files
committed
Update Hanabi
1 parent 6cc5e38 commit 1b627e3

File tree

4 files changed

+92
-23
lines changed

4 files changed

+92
-23
lines changed

Cargo.lock

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

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ 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 = { version = "0.10", default-features = false, features = ["3d"] } # Not on 0.11 yet because of Hanabi bugs ("Failed to find update pipeline")
52+
bevy_hanabi = { version = "0.11", default-features = false, features = ["3d"] } # 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"
5555
bevy-tnua-xpbd3d = "0.4"
@@ -89,3 +89,4 @@ egui_dock = { git = "https://github.com/bash/egui_dock.git", branch = "backport-
8989
# These patches mainly remove strum and are included in bevy_yarnspinner 0.3.0-rc
9090
bevy_yarnspinner = { git = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust.git", rev = "c6ab0c9e8c3a5a98f741aaae6adef1cfc272db30" }
9191
bevy_yarnspinner_example_dialogue_view = { git = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust.git", rev = "c6ab0c9e8c3a5a98f741aaae6adef1cfc272db30" }
92+
bevy_hanabi = { git = "https://github.com/djeedai/bevy_hanabi/", rev = "b9a98bdf51be07f8127d2f16b68f1eb86259242f" }

assets/scenes/registry.json

+82-14
Original file line numberDiff line numberDiff line change
@@ -4020,11 +4020,6 @@
40204020
"type": {
40214021
"$ref": "#/$defs/bevy_asset::handle::Handle<bevy_hanabi::asset::EffectAsset>"
40224022
}
4023-
},
4024-
"spawner": {
4025-
"type": {
4026-
"$ref": "#/$defs/core::option::Option<bevy_hanabi::spawn::Spawner>"
4027-
}
40284023
}
40294024
},
40304025
"required": [
@@ -4045,9 +4040,9 @@
40454040
"$ref": "#/$defs/bevy_hanabi::asset::AlphaMode"
40464041
}
40474042
},
4048-
"capacity": {
4043+
"capacities": {
40494044
"type": {
4050-
"$ref": "#/$defs/u32"
4045+
"$ref": "#/$defs/alloc::vec::Vec<u32>"
40514046
}
40524047
},
40534048
"module": {
@@ -4065,11 +4060,6 @@
40654060
"$ref": "#/$defs/alloc::string::String"
40664061
}
40674062
},
4068-
"properties": {
4069-
"type": {
4070-
"$ref": "#/$defs/alloc::vec::Vec<bevy_hanabi::properties::Property>"
4071-
}
4072-
},
40734063
"simulation_condition": {
40744064
"type": {
40754065
"$ref": "#/$defs/bevy_hanabi::asset::SimulationCondition"
@@ -4093,12 +4083,11 @@
40934083
},
40944084
"required": [
40954085
"name",
4096-
"capacity",
4086+
"capacities",
40974087
"spawner",
40984088
"z_layer_2d",
40994089
"simulation_space",
41004090
"simulation_condition",
4101-
"properties",
41024091
"motion_integration",
41034092
"module",
41044093
"alpha_mode"
@@ -9289,6 +9278,85 @@
92899278
"type": "object",
92909279
"typeInfo": "Struct"
92919280
},
9281+
"bevy_time::time::Time<bevy_hanabi::time::EffectSimulation>": {
9282+
"additionalProperties": false,
9283+
"isComponent": false,
9284+
"isResource": true,
9285+
"properties": {
9286+
"context": {
9287+
"type": {
9288+
"$ref": "#/$defs/bevy_hanabi::time::EffectSimulation"
9289+
}
9290+
},
9291+
"delta": {
9292+
"type": {
9293+
"$ref": "#/$defs/bevy_utils::Duration"
9294+
}
9295+
},
9296+
"delta_seconds": {
9297+
"type": {
9298+
"$ref": "#/$defs/f32"
9299+
}
9300+
},
9301+
"delta_seconds_f64": {
9302+
"type": {
9303+
"$ref": "#/$defs/f64"
9304+
}
9305+
},
9306+
"elapsed": {
9307+
"type": {
9308+
"$ref": "#/$defs/bevy_utils::Duration"
9309+
}
9310+
},
9311+
"elapsed_seconds": {
9312+
"type": {
9313+
"$ref": "#/$defs/f32"
9314+
}
9315+
},
9316+
"elapsed_seconds_f64": {
9317+
"type": {
9318+
"$ref": "#/$defs/f64"
9319+
}
9320+
},
9321+
"elapsed_seconds_wrapped": {
9322+
"type": {
9323+
"$ref": "#/$defs/f32"
9324+
}
9325+
},
9326+
"elapsed_seconds_wrapped_f64": {
9327+
"type": {
9328+
"$ref": "#/$defs/f64"
9329+
}
9330+
},
9331+
"elapsed_wrapped": {
9332+
"type": {
9333+
"$ref": "#/$defs/bevy_utils::Duration"
9334+
}
9335+
},
9336+
"wrap_period": {
9337+
"type": {
9338+
"$ref": "#/$defs/bevy_utils::Duration"
9339+
}
9340+
}
9341+
},
9342+
"required": [
9343+
"context",
9344+
"wrap_period",
9345+
"delta",
9346+
"delta_seconds",
9347+
"delta_seconds_f64",
9348+
"elapsed",
9349+
"elapsed_seconds",
9350+
"elapsed_seconds_f64",
9351+
"elapsed_wrapped",
9352+
"elapsed_seconds_wrapped",
9353+
"elapsed_seconds_wrapped_f64"
9354+
],
9355+
"short_name": "Time<EffectSimulation>",
9356+
"title": "bevy_time::time::Time<bevy_hanabi::time::EffectSimulation>",
9357+
"type": "object",
9358+
"typeInfo": "Struct"
9359+
},
92929360
"bevy_time::time::Time<bevy_time::fixed::Fixed>": {
92939361
"additionalProperties": false,
92949362
"isComponent": false,

src/particles/creation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn create_sprinting_effect(effects: &mut Assets<EffectAsset>) -> Handle<EffectAs
4848

4949
effects.add(
5050
EffectAsset::new(
51-
100,
51+
vec![100],
5252
Spawner::rate(10.0.into()).with_starts_active(false),
5353
module,
5454
)

0 commit comments

Comments
 (0)