From 05b9c0b9cd121b6f4c879846aaeb0459a3054745 Mon Sep 17 00:00:00 2001 From: nativerv Date: Sat, 17 Feb 2024 05:22:04 +0300 Subject: [PATCH] refactor(examples): use `bevy_controls_derive::GameState` --- crate/bevy_controls/example/basic/src/main.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/crate/bevy_controls/example/basic/src/main.rs b/crate/bevy_controls/example/basic/src/main.rs index ed23405..8907b47 100644 --- a/crate/bevy_controls/example/basic/src/main.rs +++ b/crate/bevy_controls/example/basic/src/main.rs @@ -7,14 +7,15 @@ use bevy::{ecs::schedule::States, prelude::*}; use bevy_controls::{ contract::{ - Action, ActionInner, GameState, GameStateInner, InputsContainer, InputsContainerInner, + InputsContainer, InputsContainerInner, }, plugin::ControlsPlugin, resource::{Binding, ButtonCombination, Controls, InputType, InputValue, PlayerInputs}, }; use strum_macros::EnumIter; +use bevy_controls_derive::{Action, GameState}; -#[derive(PartialEq, Eq, Hash, EnumIter, Clone, Copy, Debug, bevy_controls_derive::Action)] +#[derive(PartialEq, Eq, Hash, EnumIter, Clone, Copy, Debug, Action)] enum MyAction { Forward, Back, @@ -23,16 +24,12 @@ enum MyAction { Up, } -#[derive(States, PartialEq, Eq, Clone, Hash, Debug, Default)] +#[derive(States, PartialEq, Eq, Clone, Hash, Debug, Default, GameState)] enum MyGameState { #[default] InGame, } -impl GameState for MyGameState {} - -impl GameStateInner for MyGameState {} - #[derive(Resource, Default, Clone, Debug)] struct MyInputsContainer { // When the game does not provide multiplayer, one field is enough