parent
4aa0222a1f
commit
657fc50a07
GPG Key ID:
90734A9E619C8A6C
@ -0,0 +1,92 @@ |
|||||||
|
use ggez::{ |
||||||
|
event::{EventHandler, KeyCode, KeyMods, MouseButton}, |
||||||
|
Context, GameResult, |
||||||
|
}; |
||||||
|
|
||||||
|
pub struct EventLayer<L: EventHandler> { |
||||||
|
layers: Vec<Box<dyn EventHandler>>, |
||||||
|
render: L, |
||||||
|
} |
||||||
|
|
||||||
|
impl<L: EventHandler> EventLayer<L> { |
||||||
|
pub fn new(render: L) -> Self { |
||||||
|
Self { |
||||||
|
layers: vec![], |
||||||
|
render, |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
impl<L: EventHandler> EventHandler for EventLayer<L> { |
||||||
|
fn update(&mut self, ctx: &mut Context) -> GameResult<()> { |
||||||
|
self.layers |
||||||
|
.iter_mut() |
||||||
|
.map(|l| l.update(ctx)) |
||||||
|
.collect::<GameResult<Vec<()>>>()?; |
||||||
|
|
||||||
|
self.render.update(ctx)?; |
||||||
|
Ok(()) |
||||||
|
} |
||||||
|
|
||||||
|
fn draw(&mut self, ctx: &mut Context) -> GameResult<()> { |
||||||
|
self.render.draw(ctx)?; |
||||||
|
Ok(()) |
||||||
|
} |
||||||
|
|
||||||
|
fn mouse_button_down_event(&mut self, ctx: &mut Context, button: MouseButton, x: f32, y: f32) { |
||||||
|
self.layers |
||||||
|
.iter_mut() |
||||||
|
.map(|l| l.mouse_button_down_event(ctx, button, x, y)) |
||||||
|
.collect::<Vec<_>>(); |
||||||
|
} |
||||||
|
|
||||||
|
fn mouse_button_up_event(&mut self, ctx: &mut Context, button: MouseButton, x: f32, y: f32) { |
||||||
|
self.layers |
||||||
|
.iter_mut() |
||||||
|
.map(|l| l.mouse_button_up_event(ctx, button, x, y)) |
||||||
|
.collect::<Vec<_>>(); |
||||||
|
} |
||||||
|
|
||||||
|
fn mouse_motion_event(&mut self, ctx: &mut Context, x: f32, y: f32, dx: f32, dy: f32) { |
||||||
|
self.layers |
||||||
|
.iter_mut() |
||||||
|
.map(|l| l.mouse_motion_event(ctx, x, y, dx, dy)) |
||||||
|
.collect::<Vec<_>>(); |
||||||
|
} |
||||||
|
|
||||||
|
/// A keyboard button was pressed.
|
||||||
|
///
|
||||||
|
/// The default implementation of this will call `ggez::event::quit()`
|
||||||
|
/// when the escape key is pressed. If you override this with
|
||||||
|
/// your own event handler you have to re-implment that
|
||||||
|
/// functionality yourself.
|
||||||
|
fn key_down_event( |
||||||
|
&mut self, |
||||||
|
ctx: &mut Context, |
||||||
|
keycode: KeyCode, |
||||||
|
keymods: KeyMods, |
||||||
|
repeat: bool, |
||||||
|
) { |
||||||
|
self.layers |
||||||
|
.iter_mut() |
||||||
|
.map(|l| l.key_down_event(ctx, keycode, keymods, repeat)) |
||||||
|
.collect::<Vec<_>>(); |
||||||
|
} |
||||||
|
|
||||||
|
/// A keyboard button was released.
|
||||||
|
fn key_up_event(&mut self, ctx: &mut Context, keycode: KeyCode, keymods: KeyMods) { |
||||||
|
self.layers |
||||||
|
.iter_mut() |
||||||
|
.map(|l| l.key_up_event(ctx, keycode, keymods)) |
||||||
|
.collect::<Vec<_>>(); |
||||||
|
} |
||||||
|
|
||||||
|
/// A unicode character was received, usually from keyboard input.
|
||||||
|
/// This is the intended way of facilitating text input.
|
||||||
|
fn text_input_event(&mut self, ctx: &mut Context, character: char) { |
||||||
|
self.layers |
||||||
|
.iter_mut() |
||||||
|
.map(|l| l.text_input_event(ctx, character)) |
||||||
|
.collect::<Vec<_>>(); |
||||||
|
} |
||||||
|
} |
||||||
@ -1,69 +0,0 @@ |
|||||||
//! Advanced input handler
|
|
||||||
|
|
||||||
use crate::{graphics::Vector2, viewport::Viewport}; |
|
||||||
use ggez::{ |
|
||||||
event::EventHandler, |
|
||||||
input::mouse::{self, MouseButton}, |
|
||||||
Context, GameResult, |
|
||||||
}; |
|
||||||
|
|
||||||
pub struct InputHandle { |
|
||||||
/// The mouse position on the viewport
|
|
||||||
pub mouse_pos: Vector2, |
|
||||||
/// Whether the left mouse button is pressed this frame
|
|
||||||
pub left_pressed: bool, |
|
||||||
/// Whether the middle mouse button is pressed this frame
|
|
||||||
pub middle_pressed: bool, |
|
||||||
/// Whether the right mouse button is pressed this frame
|
|
||||||
pub right_pressed: bool, |
|
||||||
/// Set when pressing left mouse and unset when releasing it
|
|
||||||
pub drag_point: Option<Vector2>, |
|
||||||
/// Get the scroll-wheel position this frame
|
|
||||||
pub scroll_offset: f32, |
|
||||||
} |
|
||||||
|
|
||||||
impl InputHandle { |
|
||||||
pub fn new() -> Self { |
|
||||||
Self { |
|
||||||
mouse_pos: Vector2::new(0.0, 0.0), |
|
||||||
left_pressed: false, |
|
||||||
middle_pressed: false, |
|
||||||
right_pressed: false, |
|
||||||
drag_point: None, |
|
||||||
scroll_offset: 1.0, |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
/// Get the unprojected mouse coordinates
|
|
||||||
pub fn unproject(&self, vp: &Viewport) -> Vector2 { |
|
||||||
// self.mouse_pos.clone() - vp.start().clone()
|
|
||||||
|
|
||||||
todo!() |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
impl EventHandler for InputHandle { |
|
||||||
fn update(&mut self, ctx: &mut Context) -> GameResult<()> { |
|
||||||
self.mouse_pos = mouse::position(&ctx).into(); |
|
||||||
self.left_pressed = mouse::button_pressed(ctx, MouseButton::Left); |
|
||||||
self.middle_pressed = mouse::button_pressed(ctx, MouseButton::Middle); |
|
||||||
self.right_pressed = mouse::button_pressed(ctx, MouseButton::Right); |
|
||||||
|
|
||||||
// Only set the drag_point once and unset when we release Left button
|
|
||||||
if self.middle_pressed && self.drag_point.is_none() { |
|
||||||
self.drag_point = Some(self.mouse_pos.clone()); |
|
||||||
} else if !self.middle_pressed { |
|
||||||
self.drag_point = None; |
|
||||||
} |
|
||||||
|
|
||||||
Ok(()) |
|
||||||
} |
|
||||||
|
|
||||||
fn mouse_wheel_event(&mut self, _ctx: &mut Context, _: f32, y: f32) { |
|
||||||
self.scroll_offset -= y * 0.25; |
|
||||||
} |
|
||||||
|
|
||||||
fn draw(&mut self, _: &mut Context) -> GameResult<()> { |
|
||||||
panic!("Don't draw the input handle!"); |
|
||||||
} |
|
||||||
} |
|
||||||
@ -0,0 +1,76 @@ |
|||||||
|
use super::{InputDriver, MouseButton}; |
||||||
|
use ggez::{ |
||||||
|
event::{EventHandler, KeyCode, KeyMods, MouseButton as EzBtn}, |
||||||
|
Context, GameResult, |
||||||
|
}; |
||||||
|
|
||||||
|
/// Incoming event handler core component
|
||||||
|
///
|
||||||
|
/// An input event handler component that receives events from APIs
|
||||||
|
/// and maps them onto an input subscriber collection. Events can be
|
||||||
|
/// consumed, or passed through priority trees.
|
||||||
|
pub struct InputArbiter { |
||||||
|
map: Vec<Box<dyn InputDriver>>, |
||||||
|
} |
||||||
|
|
||||||
|
impl InputArbiter { |
||||||
|
pub fn new() -> Self { |
||||||
|
Self { map: vec![] } |
||||||
|
} |
||||||
|
|
||||||
|
/// Add a new input handler subscription
|
||||||
|
pub(crate) fn add_handler(&mut self, dri: impl InputDriver + 'static) { |
||||||
|
self.map.push(Box::new(dri)); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/// Implement the ggez event trait for the input arbiter. These
|
||||||
|
/// function calls map onto a little-input system which maps them
|
||||||
|
/// across event handlers. An event handler is attached to a UI
|
||||||
|
/// element, which was subscribed to a partical type and scope.
|
||||||
|
impl EventHandler for InputArbiter { |
||||||
|
fn draw(&mut self, _: &mut Context) -> GameResult<()> { |
||||||
|
Ok(()) |
||||||
|
} |
||||||
|
|
||||||
|
fn update(&mut self, _: &mut Context) -> GameResult<()> { |
||||||
|
Ok(()) |
||||||
|
} |
||||||
|
|
||||||
|
fn mouse_button_down_event(&mut self, _: &mut Context, button: EzBtn, x: f32, y: f32) { |
||||||
|
self.map.iter_mut().for_each(|dri| { |
||||||
|
// TODO: add drag event handling
|
||||||
|
dri.mouse_down(x, y, button.into()); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
fn mouse_button_up_event(&mut self, _: &mut Context, button: EzBtn, x: f32, y: f32) { |
||||||
|
self.map.iter_mut().for_each(|dri| { |
||||||
|
dri.mouse_up(x, y, button.into()); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
fn mouse_motion_event(&mut self, _ctx: &mut Context, _x: f32, _y: f32, _dx: f32, _dy: f32) {} |
||||||
|
|
||||||
|
/// A keyboard button was pressed.
|
||||||
|
///
|
||||||
|
/// The default implementation of this will call `ggez::event::quit()`
|
||||||
|
/// when the escape key is pressed. If you override this with
|
||||||
|
/// your own event handler you have to re-implment that
|
||||||
|
/// functionality yourself.
|
||||||
|
fn key_down_event( |
||||||
|
&mut self, |
||||||
|
ctx: &mut Context, |
||||||
|
keycode: KeyCode, |
||||||
|
_keymods: KeyMods, |
||||||
|
_repeat: bool, |
||||||
|
) { |
||||||
|
} |
||||||
|
|
||||||
|
/// A keyboard button was released.
|
||||||
|
fn key_up_event(&mut self, _ctx: &mut Context, _keycode: KeyCode, _keymods: KeyMods) {} |
||||||
|
|
||||||
|
/// A unicode character was received, usually from keyboard input.
|
||||||
|
/// This is the intended way of facilitating text input.
|
||||||
|
fn text_input_event(&mut self, _ctx: &mut Context, _character: char) {} |
||||||
|
} |
||||||
@ -0,0 +1,75 @@ |
|||||||
|
//! Advanced input handler
|
||||||
|
|
||||||
|
mod arbiter; |
||||||
|
pub use arbiter::*; |
||||||
|
mod traits; |
||||||
|
pub use traits::*; |
||||||
|
|
||||||
|
|
||||||
|
// use crate::{graphics::Vector2, viewport::Viewport};
|
||||||
|
// use ggez::{
|
||||||
|
// event::EventHandler,
|
||||||
|
// input::mouse::{self, MouseButton},
|
||||||
|
// Context, GameResult,
|
||||||
|
// };
|
||||||
|
|
||||||
|
// pub struct InputHandle {
|
||||||
|
// /// The mouse position on the viewport
|
||||||
|
// pub mouse_pos: Vector2,
|
||||||
|
// /// Whether the left mouse button is pressed this frame
|
||||||
|
// pub left_pressed: bool,
|
||||||
|
// /// Whether the middle mouse button is pressed this frame
|
||||||
|
// pub middle_pressed: bool,
|
||||||
|
// /// Whether the right mouse button is pressed this frame
|
||||||
|
// pub right_pressed: bool,
|
||||||
|
// /// Set when pressing left mouse and unset when releasing it
|
||||||
|
// pub drag_point: Option<Vector2>,
|
||||||
|
// /// Get the scroll-wheel position this frame
|
||||||
|
// pub scroll_offset: f32,
|
||||||
|
// }
|
||||||
|
|
||||||
|
// impl InputHandle {
|
||||||
|
// pub fn new() -> Self {
|
||||||
|
// Self {
|
||||||
|
// mouse_pos: Vector2::new(0.0, 0.0),
|
||||||
|
// left_pressed: false,
|
||||||
|
// middle_pressed: false,
|
||||||
|
// right_pressed: false,
|
||||||
|
// drag_point: None,
|
||||||
|
// scroll_offset: 1.0,
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// /// Get the unprojected mouse coordinates
|
||||||
|
// pub fn unproject(&self, vp: &Viewport) -> Vector2 {
|
||||||
|
// // self.mouse_pos.clone() - vp.start().clone()
|
||||||
|
|
||||||
|
// todo!()
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// impl EventHandler for InputHandle {
|
||||||
|
// fn update(&mut self, ctx: &mut Context) -> GameResult<()> {
|
||||||
|
// self.mouse_pos = mouse::position(&ctx).into();
|
||||||
|
// self.left_pressed = mouse::button_pressed(ctx, MouseButton::Left);
|
||||||
|
// self.middle_pressed = mouse::button_pressed(ctx, MouseButton::Middle);
|
||||||
|
// self.right_pressed = mouse::button_pressed(ctx, MouseButton::Right);
|
||||||
|
|
||||||
|
// // Only set the drag_point once and unset when we release Left button
|
||||||
|
// if self.middle_pressed && self.drag_point.is_none() {
|
||||||
|
// self.drag_point = Some(self.mouse_pos.clone());
|
||||||
|
// } else if !self.middle_pressed {
|
||||||
|
// self.drag_point = None;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// Ok(())
|
||||||
|
// }
|
||||||
|
|
||||||
|
// fn mouse_wheel_event(&mut self, _ctx: &mut Context, _: f32, y: f32) {
|
||||||
|
// self.scroll_offset -= y * 0.25;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// fn draw(&mut self, _: &mut Context) -> GameResult<()> {
|
||||||
|
// panic!("Don't draw the input handle!");
|
||||||
|
// }
|
||||||
|
// }
|
||||||
@ -0,0 +1,42 @@ |
|||||||
|
use ggez::event::MouseButton as EzBtn; |
||||||
|
|
||||||
|
/// Encodes a mouse button
|
||||||
|
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] |
||||||
|
pub enum MouseButton { |
||||||
|
/// Left mouse
|
||||||
|
Left, |
||||||
|
/// Right mouse
|
||||||
|
Right, |
||||||
|
/// Middle mouse (or wheel)
|
||||||
|
Middle, |
||||||
|
/// Additional mouse key-codes
|
||||||
|
Other(u16), |
||||||
|
} |
||||||
|
|
||||||
|
impl From<EzBtn> for MouseButton { |
||||||
|
fn from(btn: EzBtn) -> Self { |
||||||
|
match btn { |
||||||
|
EzBtn::Left => Self::Left, |
||||||
|
EzBtn::Right => Self::Right, |
||||||
|
EzBtn::Middle => Self::Middle, |
||||||
|
EzBtn::Other(c) => Self::Other(c), |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/// A trait that represents an input event loop connection
|
||||||
|
///
|
||||||
|
/// Because `little-input` can be built built against different game
|
||||||
|
/// framework backends (ggez, ...), this trait abstracts over these
|
||||||
|
/// different APIs with this trait. This trait is implemented between
|
||||||
|
/// ggez and the `little-input` event arbiter.
|
||||||
|
pub trait InputDriver { |
||||||
|
/// Mouse button pressed events
|
||||||
|
fn mouse_down(&mut self, x: f32, y: f32, btn: MouseButton) {} |
||||||
|
/// Mouse button released events
|
||||||
|
fn mouse_up(&mut self, x: f32, y: f32, btn: MouseButton) {} |
||||||
|
/// Mouse wheel response
|
||||||
|
fn scroll(&mut self, f: f32) {} |
||||||
|
/// Mouse drag events (toggled by mouse_down events)
|
||||||
|
fn mouse_drag(&mut self, x: f32, y: f32, btn: MouseButton) {} |
||||||
|
} |
||||||
Loading…
Reference in new issue