build(bevy): updade to 0.19.5
This commit is contained in:
Generated
+685
-643
File diff suppressed because it is too large
Load Diff
@@ -11,14 +11,14 @@ reflect = ["dep:bevy_reflect"]
|
|||||||
inspector-egui = ["reflect", "dep:bevy-inspector-egui"]
|
inspector-egui = ["reflect", "dep:bevy-inspector-egui"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bevy-inspector-egui = { version = "0.33.1", optional = true, default-features = false }
|
bevy-inspector-egui = { version = "0.37", optional = true, default-features = false }
|
||||||
bevy_app = "0.16.1"
|
bevy_app = "0.19.1"
|
||||||
bevy_derive = "0.16.1"
|
bevy_derive = "0.19.1"
|
||||||
bevy_ecs = "0.16.1"
|
bevy_ecs = "0.19.1"
|
||||||
bevy_input = "0.16.1"
|
bevy_input = { version = "0.19.1", features = ["keyboard", "mouse"] }
|
||||||
bevy_state = "0.16.1"
|
bevy_state = "0.19.1"
|
||||||
bevy_platform = "0.16.1"
|
bevy_platform = "0.19.1"
|
||||||
bevy_reflect = { version = "0.16.1", optional = true }
|
bevy_reflect = { version = "0.19.1", features = ["auto_register_static"], optional = true }
|
||||||
log = "0.4.20"
|
log = "0.4.20"
|
||||||
serde = { version = "1.0.194", optional = true }
|
serde = { version = "1.0.194", optional = true }
|
||||||
strum = "0.26.2"
|
strum = "0.26.2"
|
||||||
|
|||||||
+1276
-749
File diff suppressed because it is too large
Load Diff
@@ -12,16 +12,19 @@ wayland = ["bevy/wayland"]
|
|||||||
windows = ["bevy/bevy_winit"]
|
windows = ["bevy/bevy_winit"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bevy = { version = "0.16.1", default-features = false, features = [
|
bevy = { version = "0.19.1", default-features = false, features = [
|
||||||
|
"std",
|
||||||
|
"default_app",
|
||||||
"bevy_asset",
|
"bevy_asset",
|
||||||
"bevy_text",
|
"bevy_text",
|
||||||
"bevy_state",
|
"bevy_state",
|
||||||
"bevy_ui",
|
"bevy_ui",
|
||||||
|
"bevy_ui_render",
|
||||||
"bevy_window",
|
"bevy_window",
|
||||||
"bevy_winit",
|
"bevy_winit",
|
||||||
#"dynamic_linking",
|
|
||||||
"default_font",
|
"default_font",
|
||||||
]}
|
]}
|
||||||
|
bevy_reflect = { version = "0.19.1", features = ["auto_register_static"] }
|
||||||
bevy_controls = { path = "./../../", features = [
|
bevy_controls = { path = "./../../", features = [
|
||||||
"logical-keyboard",
|
"logical-keyboard",
|
||||||
]}
|
]}
|
||||||
|
|||||||
Regular → Executable
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
[toolchain]
|
[toolchain]
|
||||||
channel = '1.88.0'
|
channel = '1.95.0'
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ fn text_span(text: &str, kind: TextSpanKind) -> (TextSpan, TextFont, TextColor,
|
|||||||
(
|
(
|
||||||
TextSpan::new(text),
|
TextSpan::new(text),
|
||||||
TextFont {
|
TextFont {
|
||||||
font_size: TEXT_SIZE,
|
font_size: FontSize::Px(TEXT_SIZE),
|
||||||
..default()
|
..default()
|
||||||
},
|
},
|
||||||
TextColor(Color::WHITE),
|
TextColor(Color::WHITE),
|
||||||
@@ -188,7 +188,7 @@ fn setup(mut commands: Commands) {
|
|||||||
"Info: Important that WASD use physical key positions and HJKL use logical characters from current layout\nAction: ",
|
"Info: Important that WASD use physical key positions and HJKL use logical characters from current layout\nAction: ",
|
||||||
),
|
),
|
||||||
TextFont {
|
TextFont {
|
||||||
font_size: TEXT_SIZE,
|
font_size: FontSize::Px(TEXT_SIZE),
|
||||||
..default()
|
..default()
|
||||||
},
|
},
|
||||||
TextColor(Color::WHITE),
|
TextColor(Color::WHITE),
|
||||||
|
|||||||
+1276
-749
File diff suppressed because it is too large
Load Diff
@@ -12,15 +12,19 @@ wayland = ["bevy/wayland"]
|
|||||||
windows = ["bevy/bevy_winit"]
|
windows = ["bevy/bevy_winit"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bevy = { version = "0.16.1", default-features = false, features = [
|
bevy = { version = "0.19.1", default-features = false, features = [
|
||||||
|
"std",
|
||||||
|
"default_app",
|
||||||
"bevy_asset",
|
"bevy_asset",
|
||||||
"bevy_text",
|
"bevy_text",
|
||||||
"bevy_state",
|
"bevy_state",
|
||||||
"bevy_ui",
|
"bevy_ui",
|
||||||
|
"bevy_ui_render",
|
||||||
"bevy_window",
|
"bevy_window",
|
||||||
"bevy_winit",
|
"bevy_winit",
|
||||||
"default_font",
|
"default_font",
|
||||||
] }
|
] }
|
||||||
|
bevy_reflect = { version = "0.19.1", features = ["auto_register_static"] }
|
||||||
bevy_controls = { path = "./../../" }
|
bevy_controls = { path = "./../../" }
|
||||||
bevy_controls_derive = { path = "./../../../bevy_controls_derive" }
|
bevy_controls_derive = { path = "./../../../bevy_controls_derive" }
|
||||||
strum = "0.26.2"
|
strum = "0.26.2"
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use bevy::{
|
use bevy::{
|
||||||
|
ecs::message::MessageReader,
|
||||||
input::{keyboard::KeyboardInput, ButtonState},
|
input::{keyboard::KeyboardInput, ButtonState},
|
||||||
prelude::*,
|
prelude::*,
|
||||||
};
|
};
|
||||||
@@ -120,7 +121,7 @@ fn setup(mut commands: Commands) {
|
|||||||
commands.spawn((
|
commands.spawn((
|
||||||
Text::new(""),
|
Text::new(""),
|
||||||
TextFont {
|
TextFont {
|
||||||
font_size: TEXT_SIZE,
|
font_size: FontSize::Px(TEXT_SIZE),
|
||||||
..default()
|
..default()
|
||||||
},
|
},
|
||||||
TextColor(Color::WHITE),
|
TextColor(Color::WHITE),
|
||||||
@@ -133,7 +134,7 @@ fn handle_rebinding(
|
|||||||
mut controls: ResMut<Controls<MovementAction, DemoState>>,
|
mut controls: ResMut<Controls<MovementAction, DemoState>>,
|
||||||
mut ui: ResMut<RebindingUi>,
|
mut ui: ResMut<RebindingUi>,
|
||||||
keys: Res<ButtonInput<KeyCode>>,
|
keys: Res<ButtonInput<KeyCode>>,
|
||||||
mut keyboard_events: EventReader<KeyboardInput>,
|
mut keyboard_events: MessageReader<KeyboardInput>,
|
||||||
) {
|
) {
|
||||||
if ui.capturing {
|
if ui.capturing {
|
||||||
for event in keyboard_events.read() {
|
for event in keyboard_events.read() {
|
||||||
|
|||||||
Regular → Executable
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
use std::hash::Hash;
|
use std::hash::Hash;
|
||||||
|
|
||||||
use bevy_ecs::prelude::Resource;
|
use bevy_ecs::{component::Mutable, prelude::Resource};
|
||||||
#[cfg(feature = "inspector-egui")]
|
#[cfg(feature = "inspector-egui")]
|
||||||
use bevy_inspector_egui::inspector_options::InspectorOptionsType;
|
use bevy_inspector_egui::inspector_options::InspectorOptionsType;
|
||||||
#[cfg(feature = "reflect")]
|
#[cfg(feature = "reflect")]
|
||||||
@@ -45,7 +45,7 @@ macro_rules! define_contracts {
|
|||||||
'static
|
'static
|
||||||
+ std::marker::Sync
|
+ std::marker::Sync
|
||||||
+ std::marker::Send
|
+ std::marker::Send
|
||||||
+ Resource
|
+ Resource<Mutability = Mutable>
|
||||||
+ Default
|
+ Default
|
||||||
+ std::fmt::Debug
|
+ std::fmt::Debug
|
||||||
$($feature_bounds)*
|
$($feature_bounds)*
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use bevy_app::{App, Plugin, PreUpdate};
|
use bevy_app::{App, Plugin, PreUpdate};
|
||||||
use bevy_derive::{Deref, DerefMut};
|
use bevy_derive::{Deref, DerefMut};
|
||||||
use bevy_ecs::event::EventReader;
|
|
||||||
use bevy_ecs::{
|
use bevy_ecs::{
|
||||||
|
message::MessageReader,
|
||||||
prelude::Resource,
|
prelude::Resource,
|
||||||
system::{In, IntoSystem, Res, ResMut},
|
system::{In, IntoSystem, Res, ResMut},
|
||||||
};
|
};
|
||||||
@@ -119,11 +119,11 @@ impl<A: Action, Ic: InputsContainer<A>, Gs: GameState> ControlsPlugin<A, Ic, Gs>
|
|||||||
///
|
///
|
||||||
fn collect_inputs(
|
fn collect_inputs(
|
||||||
keyboard_button: Res<ButtonInput<KeyCode>>,
|
keyboard_button: Res<ButtonInput<KeyCode>>,
|
||||||
#[cfg(feature = "logical-keyboard")] mut keyboard_evr: EventReader<KeyboardInput>,
|
#[cfg(feature = "logical-keyboard")] mut keyboard_evr: MessageReader<KeyboardInput>,
|
||||||
#[cfg(feature = "logical-keyboard")] mut pressed_logical_keys: ResMut<PressedLogicalKeys>,
|
#[cfg(feature = "logical-keyboard")] mut pressed_logical_keys: ResMut<PressedLogicalKeys>,
|
||||||
mouse_buttons: Res<ButtonInput<MouseButton>>,
|
mouse_buttons: Res<ButtonInput<MouseButton>>,
|
||||||
mut scroll_evr: EventReader<MouseWheel>,
|
mut scroll_evr: MessageReader<MouseWheel>,
|
||||||
mut motion_evr: EventReader<MouseMotion>,
|
mut motion_evr: MessageReader<MouseMotion>,
|
||||||
// mut collected_inputs: ResMut<TrigeredInputs>,
|
// mut collected_inputs: ResMut<TrigeredInputs>,
|
||||||
) -> TrigeredInputs {
|
) -> TrigeredInputs {
|
||||||
let mut collected_inputs = TrigeredInputs(HashMap::new());
|
let mut collected_inputs = TrigeredInputs(HashMap::new());
|
||||||
|
|||||||
Regular → Executable
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
[toolchain]
|
[toolchain]
|
||||||
channel = '1.88.0'
|
channel = '1.95.0'
|
||||||
components = ["rustfmt", "clippy", "rust-src"]
|
components = ["rustfmt", "clippy", "rust-src"]
|
||||||
|
|||||||
Reference in New Issue
Block a user