Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add numerous events and input display example #15

Merged
merged 2 commits into from
Apr 27, 2019
Merged

Add numerous events and input display example #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c67e22
Add numerous events and input display example
jalbert-dev Apr 25, 2019
36be311
Revised example; fixed logical->physical coords
jalbert-dev Apr 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
316 changes: 316 additions & 0 deletions examples/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,316 @@
//! A simple example that demonstrates capturing window and input events.
hecrj marked this conversation as resolved.
Show resolved Hide resolved
use coffee::{Game, Result, Timer};
use coffee::graphics::{
Batch, Color, Font, Gpu, Image, Point, Rectangle, Sprite,
Text, Window, WindowSettings
};
use coffee::input;
use coffee::load::{loading_screen, Join, LoadingScreen, Task};

fn main() -> Result<()> {
InputExample::run(WindowSettings {
title: String::from("Input Example - Coffee"),
size: (720, 240),
resizable: false,
})
}

struct Input {
cursor_position: Point,
mouse_wheel: Point,
pressed_keys: Vec<input::KeyCode>,
released_keys: Vec<input::KeyCode>,
pressed_mouse: Vec<input::MouseButton>,
released_mouse: Vec<input::MouseButton>,
text_buffer: String,
}

impl Input {
fn new() -> Input {
Input {
cursor_position: Point::new(0.0, 0.0),
mouse_wheel: Point::new(0.0, 0.0),
pressed_keys: Vec::new(),
released_keys: Vec::new(),
pressed_mouse: Vec::new(),
released_mouse: Vec::new(),
text_buffer: String::new(),
}
}
}

struct View {
palette: Image,
font: Font,
}

impl View {
const COLORS: [Color; 1] = [
Color {
r: 1.0,
g: 0.0,
b: 0.0,
a: 1.0,
},
];

fn load() -> Task<View> {
(
Task::using_gpu(|gpu| Image::from_colors(gpu, &Self::COLORS)),
Font::load(include_bytes!(
"../resources/font/Inconsolata-Regular.ttf"
)),
)
.join()
.map(|(palette, font)| View {
palette,
font,
})
}
}

struct InputExample {
mouse_x: f32,
mouse_y: f32,
wheel_x: f32,
wheel_y: f32,
text_buffer: String,
pressed_keys: String,
released_keys: String,
pressed_mousebuttons: String,
released_mousebuttons: String,
}

impl InputExample {

}

impl Game for InputExample {
type View = View;
type Input = Input;

const TICKS_PER_SECOND: u16 = 10;

fn new(window: &mut Window) -> Result<(InputExample, Self::View, Self::Input)> {
let task = Task::stage("Loading font...", View::load());

let mut loading_screen = loading_screen::ProgressBar::new(window.gpu());
let view = loading_screen.run(task, window)?;

Ok((InputExample{
mouse_x: 0.0,
mouse_y: 0.0,
wheel_x: 0.0,
wheel_y: 0.0,
text_buffer: String::with_capacity(256),
pressed_keys: String::new(),
released_keys: String::new(),
pressed_mousebuttons: String::new(),
released_mousebuttons: String::new(),
}, view, Input::new()))
}

fn on_input(&self, input: &mut Input, event: input::Event) {
match event {
input::Event::CursorMoved { x, y } => {
input.cursor_position = Point::new(x, y);
}
input::Event::TextInput { character } => {
input.text_buffer.push(character);
}
input::Event::MouseWheel { delta_x, delta_y } => {
input.mouse_wheel = Point::new(delta_x, delta_y);
}
input::Event::KeyboardInput {
key_code,
state
} => {
match state {
input::ButtonState::Pressed => input.pressed_keys.push(key_code),
input::ButtonState::Released => input.released_keys.push(key_code),
};
}
input::Event::MouseInput {
state,
button
} => {
match state {
input::ButtonState::Pressed => input.pressed_mouse.push(button),
input::ButtonState::Released => input.released_mouse.push(button),
};
}
_ => {}
}
}

fn update(&mut self, _view: &Self::View, _window: &Window) {
}

fn interact(&mut self, input: &mut Input, _view: &mut View, _gpu: &mut Gpu) {
self.mouse_x = input.cursor_position.x;
self.mouse_y = input.cursor_position.y;

self.wheel_x = input.mouse_wheel.x;
self.wheel_y = input.mouse_wheel.y;
input.mouse_wheel.x = 0.0;
input.mouse_wheel.y = 0.0;

if !input.text_buffer.is_empty() {
for c in input.text_buffer.chars() {
match c {
'\u{0008}' => {
self.text_buffer.pop();
}
_ => {
if self.text_buffer.chars().count() < 30 {
self.text_buffer.push_str(&input.text_buffer);
}
}
}
}
input.text_buffer.clear();
}

self.pressed_keys = input.pressed_keys.iter()
.map(|k| format!("{:?}", k))
.collect::<Vec<_>>()
.join(", ");

self.released_keys = input.released_keys.iter()
.map(|k| format!("{:?}", k))
.collect::<Vec<_>>()
.join(", ");

input.pressed_keys.clear();
input.released_keys.clear();

self.pressed_mousebuttons = input.pressed_mouse.iter()
.map(|k| format!("{:?}", k))
.collect::<Vec<_>>()
.join(", ");

self.released_mousebuttons = input.released_mouse.iter()
.map(|k| format!("{:?}", k))
.collect::<Vec<_>>()
.join(", ");

input.pressed_mouse.clear();
input.released_mouse.clear();
}
hecrj marked this conversation as resolved.
Show resolved Hide resolved

fn draw(&self, view: &mut Self::View, window: &mut Window, _timer: &Timer) {
let mut frame = window.frame();
frame.clear(Color::BLACK);

view.font.add(Text {
content: String::from("Text Buffer (type):"),
position: Point::new(20.0, frame.height() - 40.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: self.text_buffer.clone(),
position: Point::new(280.0, frame.height() - 40.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: String::from("Pressed keys:"),
position: Point::new(20.0, 20.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: self.pressed_keys.clone(),
position: Point::new(280.0, 20.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::from_rgb(0, 255, 0),
});

view.font.add(Text {
content: String::from("Released keys:"),
position: Point::new(20.0, 50.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: self.released_keys.clone(),
position: Point::new(280.0, 50.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::from_rgb(255, 0, 0),
});

view.font.add(Text {
content: String::from("Mouse wheel scroll:"),
position: Point::new(20.0, 80.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: format!("{}, {}", self.wheel_x, self.wheel_y),
position: Point::new(280.0, 80.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: String::from("Pressed mouse buttons:"),
position: Point::new(20.0, 110.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: self.pressed_mousebuttons.clone(),
position: Point::new(280.0, 110.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::from_rgb(0, 255, 0),
});

view.font.add(Text {
content: String::from("Released mouse buttons:"),
position: Point::new(20.0, 140.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::WHITE,
});

view.font.add(Text {
content: self.released_mousebuttons.clone(),
position: Point::new(280.0, 140.0),
bounds: (frame.width(), frame.height()),
size: 20.0,
color: Color::from_rgb(255, 0, 0),
});

view.font.draw(&mut frame);

let mut batch = Batch::new(view.palette.clone());
// Draw a small square at the mouse cursor's position.
batch.add(Sprite {
source: Rectangle {
x: 0,
y: 0,
width: 6,
height: 6,
},
position: Point::new(self.mouse_x - 3.0, self.mouse_y - 3.0)
});
batch.draw(Point::new(0.0, 0.0), &mut frame.as_target());
}
}
37 changes: 36 additions & 1 deletion src/graphics/window/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,50 @@ impl EventLoop {
state,
button,
})),
winit::WindowEvent::MouseWheel { delta, .. } => match delta
{
winit::MouseScrollDelta::LineDelta(x, y) => {
f(Event::Input(input::Event::MouseWheel {
delta_x: x,
delta_y: y,
}))
}
_ => {}
},

winit::WindowEvent::ReceivedCharacter(codepoint) => {
f(Event::Input(input::Event::TextInput {
character: codepoint,
}))
}
winit::WindowEvent::CursorMoved { position, .. } => {
f(Event::CursorMoved(position))
}
winit::WindowEvent::CloseRequested => {
winit::WindowEvent::CursorEntered { .. } => {
f(Event::Input(input::Event::CursorEntered))
}
winit::WindowEvent::CursorLeft { .. } => {
f(Event::Input(input::Event::CursorLeft))
}
winit::WindowEvent::CloseRequested { .. } => {
f(Event::CloseRequested)
}
winit::WindowEvent::Resized(logical_size) => {
f(Event::Resized(logical_size))
}
winit::WindowEvent::Focused(focus) => {
f(Event::Input(if focus == true {
input::Event::WindowFocused
} else {
input::Event::WindowUnfocused
}))
}
winit::WindowEvent::Moved(
winit::dpi::LogicalPosition { x, y },
) => f(Event::Input(input::Event::WindowMoved {
x: x as f32,
y: y as f32,
})),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now, Coffee exposes all the positions in physical coordinates. Although this may change soon (check out #6), we should convert this into physical coordinates to stay consistent.

The CursorMoved event does this and may serve us as a guide. We simply need to add a new window::Event (we can name it Moved) and then convert it into an input::Event using window.dpi() in the game loop, like we do right here for CursorMoved.

I am aware this is a bit awkward, but if we end up doing #6 this complexity will go away!

_ => {}
},
_ => (),
Expand Down
Loading