[WIP] Supermath101's work on the player and controls

Cargo.toml

@@ -23,4 +23,5 @@ bevy = { version = "0.6" }
 bevy_ecs_tilemap = "0.5"
 bevy_egui = "0.11"
 bevy_rapier2d = "0.12"
-anyhow = "1.0"
+anyhow = "1.0"
+leafwing-input-manager = "0.2"

assets/asset-licenses.csv

@@ -1 +1,2 @@
 Asset Name,License,Author,Link
+images/player.png,Unknown,clipartstation.com,https://clipartstation.com/human-figure-clipart-4/

src/main.rs

@@ -7,6 +7,7 @@ use bevy::window::WindowMode;
 use bevy_egui::EguiPlugin;
 
 mod menus;
+mod player;
 mod singleplayer;
 mod utils;
 
@@ -39,4 +40,3 @@ fn main() {
         .add_state(GameState::MainMenu)
         .run();
 }
-

src/menus/common.rs

@@ -1,12 +1,16 @@
+//! Some UI utility functions and structs.
+
 use bevy::prelude::*;
 
+/// Marks a UI element as disabled.
 #[derive(Component)]
 pub struct Disabled;
 
 pub const NORMAL_COLOR: UiColor = UiColor(Color::rgb(0.15, 0.15, 0.15));
 pub const HOVERED_COLOR: UiColor = UiColor(Color::rgb(0.25, 0.25, 0.25));
 pub const PRESSED_COLOR: UiColor = UiColor(Color::rgb(0.35, 0.75, 0.35));
 
+/// Creates the [`Style`]s that we add to most buttons.
 pub fn button_style() -> Style {
     Style {
         size: Size::new(Val::Px(150.0), Val::Px(35.0)),
@@ -17,6 +21,7 @@ pub fn button_style() -> Style {
     }
 }
 
+/// Creates the [`Style`]s that we add to most text.
 pub fn text_style() -> Style {
     Style {
         align_self: AlignSelf::Center,
@@ -26,6 +31,7 @@ pub fn text_style() -> Style {
     }
 }
 
+/// Creates the [`TextStyle`]s that we add to most text.
 pub fn text_textstyle(asset_server: &AssetServer) -> TextStyle {
     TextStyle {
         font: asset_server.load("fonts/FiraSans-Bold.ttf"),
@@ -42,6 +48,7 @@ pub fn text_textstyle_disabled(asset_server: &AssetServer) -> TextStyle {
     }
 }
 
+/// Creates the [`TextAlignment`]s that we add to most buttons.
 pub fn button_text_alignment() -> TextAlignment {
     TextAlignment {
         horizontal: HorizontalAlign::Center,

src/player/mod.rs

@@ -0,0 +1,41 @@
+use bevy::prelude::*;
+use leafwing_input_manager::prelude::*;
+
+pub fn setup_player(mut commands: Commands, asset_server: Res<AssetServer>) {
+    commands
+        .spawn_bundle(SpriteBundle {
+            texture: asset_server.load("images/player.png"),
+            transform: Transform::from_xyz(0., 0., 0.),
+            sprite: Sprite {
+                custom_size: Some(Vec2::new(32.0, 64.0)),
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+        .insert(Player)
+        .insert_bundle(InputManagerBundle::<Action> {
+            // Stores "which virtual action buttons are currently pressed"
+            action_state: ActionState::default(),
+            // Stores how those actions relate to inputs from your player
+            input_map: InputMap::new([
+                (Action::MoveLeft, KeyCode::A),
+                (Action::MoveRight, KeyCode::D),
+            ]),
+        });
+}
+
+pub fn cleanup_player(mut commands: Commands, query: Query<Entity, With<Player>>) {
+    commands.entity(query.single()).despawn();
+}
+
+/// The player.
+#[derive(Debug, Component, Clone, Copy)]
+pub struct Player;
+
+/// The possible keyboard button actions a player can do.
+#[allow(missing_docs)]
+#[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug)]
+pub enum Action {
+    MoveLeft,
+    MoveRight,
+}

src/singleplayer/mod.rs

@@ -1,6 +1,7 @@
 use bevy::prelude::*;
 use bevy_ecs_tilemap::prelude::*;
 
+use crate::player;
 use crate::GameState;
 
 pub struct SinglePlayerScene;
@@ -10,7 +11,12 @@ impl Plugin for SinglePlayerScene {
         app.add_plugin(TilemapPlugin)
             .add_system(crate::utils::set_texture_filters_to_nearest)
             .add_system_set(
-                SystemSet::on_enter(GameState::Playing).with_system(singleplayer_setup),
+                SystemSet::on_enter(GameState::Playing)
+                    .with_system(singleplayer_setup.label("2d_map_setup"))
+                    .with_system(player::setup_player.after("2d_map_setup")),
+            )
+            .add_system_set(
+                SystemSet::on_exit(GameState::Playing).with_system(player::cleanup_player),
             );
     }
 }