From 6e67d314151520603728af059948dfc4ee36718f Mon Sep 17 00:00:00 2001 From: Piotr Siuszko Date: Mon, 19 Feb 2024 12:26:16 +0100 Subject: [PATCH] SimpleTextInput- use offical repo with my fix --- bevy_forge/Cargo.lock | 12 ++++++------ bevy_forge/Cargo.toml | 2 +- bevy_forge/src/states/init.rs | 2 +- bevy_forge/src/states/login_screen.rs | 16 +++------------- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/bevy_forge/Cargo.lock b/bevy_forge/Cargo.lock index cfcad3d..903565a 100644 --- a/bevy_forge/Cargo.lock +++ b/bevy_forge/Cargo.lock @@ -1103,8 +1103,8 @@ dependencies = [ [[package]] name = "bevy_simple_text_input" -version = "0.3.2" -source = "git+https://github.com/Leinnan/bevy_simple_text_input#5d406fb308e8c454eefee120b246226210ffde7e" +version = "0.3.1" +source = "git+https://github.com/rparrett/bevy_simple_text_input?rev=79663893770a090c6b85f8f41d9a6bba4166fe8e#79663893770a090c6b85f8f41d9a6bba4166fe8e" dependencies = [ "bevy", ] @@ -3452,9 +3452,9 @@ dependencies = [ [[package]] name = "profiling" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" [[package]] name = "quote" @@ -4540,9 +4540,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/bevy_forge/Cargo.toml b/bevy_forge/Cargo.toml index d922223..110a9fa 100644 --- a/bevy_forge/Cargo.toml +++ b/bevy_forge/Cargo.toml @@ -29,7 +29,7 @@ serde_json = "1.0" futures-lite = "2.2.0" bevy_pkv = "0.9.1" bevy_button_released_plugin = "0.3.1" -bevy_simple_text_input = {git="https://github.com/Leinnan/bevy_simple_text_input"} +bevy_simple_text_input = {git="https://github.com/rparrett/bevy_simple_text_input", rev="79663893770a090c6b85f8f41d9a6bba4166fe8e"} bevy_args = "1.2.0" clap = { version = "4.4", features = ["derive"] } diff --git a/bevy_forge/src/states/init.rs b/bevy_forge/src/states/init.rs index 0be31bd..49e5dab 100644 --- a/bevy_forge/src/states/init.rs +++ b/bevy_forge/src/states/init.rs @@ -71,7 +71,7 @@ fn setup( }, ) .with_text_alignment(TextAlignment::Center), - ) + ).insert(Name::new("GameLogo")) .insert(GameLogoText); }); } diff --git a/bevy_forge/src/states/login_screen.rs b/bevy_forge/src/states/login_screen.rs index 1255231..0d24685 100644 --- a/bevy_forge/src/states/login_screen.rs +++ b/bevy_forge/src/states/login_screen.rs @@ -1,6 +1,6 @@ use bevy::prelude::*; use bevy_button_released_plugin::ButtonReleasedEvent; -use bevy_simple_text_input::TextStorage; +use bevy_simple_text_input::TextInput; use crate::{ beam::context::{BeamContext, CreateAnononymousUserEvent}, @@ -36,12 +36,12 @@ fn handle_buttons( mut reader: EventReader, mut ev: EventWriter, q: Query<&LoginScreenButton>, - text: Query<&TextStorage, Changed>, + text: Query<&TextInput, Changed>, mut beam: ResMut, ) { if let Ok(text) = text.get_single() { if !text.0.is_empty() { - beam.name = Some((**text).clone()); + beam.name = Some(text.0.clone()); } } for event in reader.read() { @@ -117,15 +117,5 @@ fn setup( .with_text_alignment(TextAlignment::Center), ); }); - // parent.spawn(ImageBundle { - // image: UiImage::new(asset_server.load("gfx/gameIconTransparent.png")), - // ..default() - // }); - // parent - // .spawn( - // TextBundle::from_section("Hi! Request will start soon.", text_style.clone()) - // .with_text_alignment(TextAlignment::Center), - // ) - // .insert(RequestText); }); }