OSDN > Find Software > silny-kombat > SCM > hg > silny-kombat > Commit

silny-kombat
Fork

silny-kombat: Commit

Mercurial repo for silny-kombat project

Refactoring - enum for key signals

diff -r 980b29188d4f -r ed3e954454a2 src/controller.rs

--- a/src/controller.rs Wed Feb 09 20:03:39 2022 +0100

+++ b/src/controller.rs Wed Feb 09 20:32:59 2022 +0100

		@@ -19,7 +19,7 @@
19	19	system::Vector2f,
20	20	SfBox
21	21	};
22		-use crate::key_processing::KeyProcessor;
	22	+use crate::key_processing::{KeyProcessor, SignalForSM, KeyEvents};
23	23
24	24	pub struct Controller<'a> {
25	25	characterA : Option<&'a Character<'a>>,

		@@ -208,7 +208,10 @@
208	208
209	209	pub fn process_key_result_for_character(key_processor:&key_processing::KeyProcessor, character: & mut Character, key_result:i32)
210	210	{
211		- if key_result == 1 \|\| key_result == 2 \|\| key_result == 3 {
	211	+ if key_result == KeyEvents::Char_Left as i32
	212	+ \|\| key_result == KeyEvents::Char_Right as i32
	213	+ \|\| key_result == KeyEvents::Char_Key_Release as i32
	214	+ {
212	215	character.trigger(key_processor.process_key(key_result));
213	216	}
214	217	}

diff -r 980b29188d4f -r ed3e954454a2 src/key_processing.rs

--- a/src/key_processing.rs Wed Feb 09 20:03:39 2022 +0100

+++ b/src/key_processing.rs Wed Feb 09 20:32:59 2022 +0100

		@@ -36,16 +39,16 @@
36	39	pub fn process_key(&self, key_result: i32) -> i32 {
37	40	if key_result == KeyEvents::Char_Left as i32
38	41	{
39		- return 2;
	42	+ return SignalForSM::MoveToLeft as i32;
40	43
41	44
42	45	} else if key_result == KeyEvents::Char_Right as i32
43	46	{
44		- return 1;
	47	+ return SignalForSM::MoveToRight as i32;
45	48
46	49	} else if key_result == KeyEvents::Char_Key_Release as i32
47	50	{
48		- return 3;
	51	+ return SignalForSM::KeyRelease as i32;
49	52	}
50	53	return 0
51	54	}

diff -r 980b29188d4f -r ed3e954454a2 src/sprite_rendering.rs

--- a/src/sprite_rendering.rs Wed Feb 09 20:03:39 2022 +0100

+++ b/src/sprite_rendering.rs Wed Feb 09 20:32:59 2022 +0100

		@@ -7,6 +7,10 @@
7	7	SfBox
8	8	};
9	9
	10	+ enum States {
	11	+ Idle
	12	+ }
	13	+
10	14	pub struct CharacterSprite<'a> {
11	15	//sprite : 'a mut Sprite<'a>
12	16	pub sprite : Sprite<'a>,