From 3a9f75bcfeb38bc1dae36eea5f399d4af720bdee Mon Sep 17 00:00:00 2001 From: CoCo_Sol007 Date: Mon, 11 Mar 2024 06:11:48 +0100 Subject: [PATCH] save --- crates/border-wars/assets/temp.png | Bin 0 -> 1014 bytes crates/border-wars/src/map/click_tile.rs | 5 ++-- crates/border-wars/src/ui/tiles_info.rs | 36 ++++++++++++++++++++--- 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 crates/border-wars/assets/temp.png diff --git a/crates/border-wars/assets/temp.png b/crates/border-wars/assets/temp.png new file mode 100644 index 0000000000000000000000000000000000000000..6d174ed3408216b9f4bba281dc624e85e8e8dc44 GIT binary patch literal 1014 zcmeAS@N?(olHy`uVBq!ia0y~yU~y$&U^M1n28ujr^Zf{<*aCb)TuVz!SFBj^>oK=K z0|RrDr;B4q#hka-9kXN{MO+-e{?&gwHJt7I0{5vlFFUrf@Y+{isi|cI>cs^P)W7}t zlApouma>w=0!4>~xX~g-hlh$xB2xH}iWHNH7L$q+K9ZmUh<2DVqmz+4kKZ!esr^0T zwnqC?vFPZho9-lKua24K?UOt0a#82Xw?)zG47Mcpofd5~J5#vx(1o_Ik7u#x8%$39 zx$D_M=`$%ay9yeo`UDH=ZJ3m)b%-@=)7pF2?JCZCZClClJo2QO=tCRro6D5uq^mxD z)cCgf`kItET?Mlyt_c?OGoDncbtu!#X#Lz94izUoo~`6q9(mGA^r4A%mMbhX!) zTF*9@-#BR@`f$(jpk+Tj5A#mjRzX=jzik`VlDF!GM(!!mSdi(qPY{@;R!$6L` zc?#s%=$p^>%}GyvEF+N-!U91ZDNu%o3km~QtP>XhmwMj6p5enom<@2NfDE{8$bw|E z;Z7#igbq1bMkQHBElEbD^MVT|2`YS&Vbp^2FTsT%@>uv)b-$n4&-, ) { let Some(event) = mouse_button_event.read().next() else { - return; + return; }; if !(event.state.is_pressed() && event.button == MouseButton::Left) { diff --git a/crates/border-wars/src/ui/tiles_info.rs b/crates/border-wars/src/ui/tiles_info.rs index 201286e..7a9dcd4 100644 --- a/crates/border-wars/src/ui/tiles_info.rs +++ b/crates/border-wars/src/ui/tiles_info.rs @@ -65,21 +65,38 @@ fn handle_tile_click( transform.translation.y += 10.; } } - } } -fn init_text_zone(mut commands: Commands) { +fn init_text_zone(mut commands: Commands, asset_server: Res) { commands - .spawn(TextBundle { + .spawn(ImageBundle { style: Style { position_type: PositionType::Absolute, + height: Val::Percent(50.), + width: Val::Percent(50.), + bottom: Val::ZERO, + ..Default::default() + }, + image: UiImage { + texture: asset_server.load("temp.png"), ..default() }, ..default() }) - .insert(TileInfoText); + .with_children(|builder| { + builder + .spawn(TextBundle { + style: Style { + height:Val::Percent(100.), + position_type: PositionType::Absolute, + ..default() + }, + ..default() + }) + .insert(TileInfoText); + }); } /// TODO @@ -109,3 +126,14 @@ fn update_tile_info_text( } } } + +// .spawn(TextBundle { +// style: Style { +// position_type: PositionType::Absolute, +// +// ..default() +// }, +// +// ..default() +// }) +// .insert(TileInfoText);