set inputs as scancodes instead of u32
parent
0028bd31c3
commit
71add6cfc6
|
@ -20,24 +20,24 @@ pub struct InputConfigs {}
|
|||
#[derive(Deserialize, Serialize)]
|
||||
pub struct KeyboardConfig {
|
||||
// directionals
|
||||
Up: u32,
|
||||
Down: u32,
|
||||
Right: u32,
|
||||
Left: u32,
|
||||
Up: ScanCodes,
|
||||
Down: ScanCodes,
|
||||
Right: ScanCodes,
|
||||
Left: ScanCodes,
|
||||
|
||||
// the punches
|
||||
LightPunch: u32,
|
||||
MediumPunch: u32,
|
||||
HeavyPunch: u32,
|
||||
LightPunch: ScanCodes,
|
||||
MediumPunch: ScanCodes,
|
||||
HeavyPunch: ScanCodes,
|
||||
|
||||
// the kicks
|
||||
LightKick: u32,
|
||||
MediumKick: u32,
|
||||
HeavyKick: u32,
|
||||
LightKick: ScanCodes,
|
||||
MediumKick: ScanCodes,
|
||||
HeavyKick: ScanCodes,
|
||||
|
||||
// Macros
|
||||
PunchMacro: u32,
|
||||
KickMacro: u32,
|
||||
PunchMacro: ScanCodes,
|
||||
KickMacro: ScanCodes,
|
||||
}
|
||||
|
||||
impl Default for KeyboardConfig {
|
||||
|
@ -64,6 +64,7 @@ impl Default for KeyboardConfig {
|
|||
/// TODO finish this
|
||||
/// UNTESTED AND UNFINISHED
|
||||
#[repr(u32)]
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub enum ScanCodes {
|
||||
Escape = 0x01,
|
||||
Key1 = 0x02,
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
use std::rc::Rc;
|
||||
use std::sync::Arc;
|
||||
use std::thread;
|
||||
use std::time::{Duration, Instant};
|
||||
|
@ -18,6 +17,7 @@ use glutin::{context::Version, prelude::*};
|
|||
use glutin_winit::DisplayBuilder;
|
||||
use glutin_winit::{self, GlWindow};
|
||||
|
||||
pub mod config;
|
||||
pub mod gui;
|
||||
pub mod renderer;
|
||||
fn main() {
|
||||
|
|
Loading…
Reference in New Issue