randrews/vulcan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Ross Andrews
2022-05-03 18:10:47 -05:00
parent ba55405b69
commit 87fe1ec4c0
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vemu/src/main.rs
+12 -6
View File
@@ -16,7 +16,7 @@ use vasm::assemble_snippet;
use vcore::cpu::CPU; use vcore::cpu::CPU;
use vcore::memory::{Memory, PeekPoke}; use vcore::memory::{Memory, PeekPoke};
use vcore::word::Word; use vcore::word::Word;
use winit::event::ElementState; use winit::event::{DeviceEvent, ElementState};
use winit::window::Window; use winit::window::Window;
fn main() { fn main() {
@@ -69,10 +69,10 @@ fn window_loop(event_loop: EventLoop<()>, window: Window, mut pixels: Pixels, mu
pixels.resize_surface(new_size.width, new_size.height); pixels.resize_surface(new_size.width, new_size.height);
} }
Event::WindowEvent { Event::DeviceEvent {
event: WindowEvent::KeyboardInput { input, .. }, event: DeviceEvent::Key(input),
window_id, device_id: _device_id,
} if window_id == window.id() => { } => {
if let (Some(vk), state) = (input.virtual_keycode, input.state) { if let (Some(vk), state) = (input.virtual_keycode, input.state) {
let byte = convert_keycode(vk); let byte = convert_keycode(vk);
let word = Word::from_bytes([ let word = Word::from_bytes([
@@ -81,9 +81,15 @@ fn window_loop(event_loop: EventLoop<()>, window: Window, mut pixels: Pixels, mu
0, 0,
]); ]);
interrupt_events.push_back((5, Some(word))) interrupt_events.push_back((5, Some(word)))
} else {
println!("scancode: {}", input.scancode);
} }
} }
// Event::WindowEvent {
// event: WindowEvent::KeyboardInput { input, .. },
// window_id,
// } if window_id == window.id() => {
// }
Event::MainEventsCleared => { Event::MainEventsCleared => {
let start = Instant::now(); let start = Instant::now();
draw(pixels.get_frame(), &mut cpu); draw(pixels.get_frame(), &mut cpu);