Macintosh-Tools/moa
1
0
Fork 0
mirror of https://github.com/transistorfet/moa.git synced 2024-11-24 08:30:50 +00:00
Code Issues Projects Releases Wiki Activity

Fixed version issue with Pixels frontend and updated to 0.12

Browse Source
This commit is contained in:
transistor 2023-05-13 15:14:11 -07:00
parent 57f9f93cc9
commit e959b8df1c
5 changed files with 1154 additions and 712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

706
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

1141
emulator/frontends/pixels/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
emulator/frontends/pixels/Cargo.toml
View File

@ -5,8 +5,8 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
pixels = "0.9" pixels = "0.12"
winit = "0.26" winit = "0.28"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_common = { path = "../common", features = ["audio"] } moa_common = { path = "../common", features = ["audio"] }
@ -15,12 +15,12 @@ moa_systems_genesis = { path = "../../systems/genesis" }
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1" console_error_panic_hook = "0.1"
console_log = "0.2" console_log = "1.0"
wasm-bindgen = "0.2.78" wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4" wasm-bindgen-futures = "0.4"
web-sys = "0.3" web-sys = "0.3"
wgpu = { version = "0.12", features = ["webgl"] } wgpu = { version = "0.15", features = ["webgl"] }
instant = { version = "0.1", features = [ "stdweb" ] } instant = { version = "0.1", features = [ "wasm-bindgen" ] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
env_logger = "0.9" env_logger = "0.9"

6
emulator/frontends/pixels/src/frontend.rs
View File

@ -1,6 +1,4 @@
use std::rc::Rc;
use instant::Instant; use instant::Instant;
use pixels::{Pixels, SurfaceTexture}; use pixels::{Pixels, SurfaceTexture};
use winit::event::{Event, VirtualKeyCode, WindowEvent, ElementState}; use winit::event::{Event, VirtualKeyCode, WindowEvent, ElementState};
@ -110,7 +108,7 @@ pub async fn run_loop(host: PixelsFrontend) {
pixels.resize_buffer(last_frame.width, last_frame.height); pixels.resize_buffer(last_frame.width, last_frame.height);
} }
let buffer = pixels.get_frame(); let buffer = pixels.frame_mut();
buffer.copy_from_slice(unsafe { std::slice::from_raw_parts(last_frame.bitmap.as_ptr() as *const u8, last_frame.bitmap.len() * 4) }); buffer.copy_from_slice(unsafe { std::slice::from_raw_parts(last_frame.bitmap.as_ptr() as *const u8, last_frame.bitmap.len() * 4) });
} }
@ -159,7 +157,7 @@ pub async fn run_loop(host: PixelsFrontend) {
// Check if the run flag is no longer true, and exit the loop // Check if the run flag is no longer true, and exit the loop
if !settings::get().run { if !settings::get().run {
// Clear the screen // Clear the screen
let buffer = pixels.get_frame(); let buffer = pixels.frame_mut();
buffer.iter_mut().for_each(|byte| *byte = 0); buffer.iter_mut().for_each(|byte| *byte = 0);
if pixels if pixels

1
emulator/frontends/pixels/src/web.rs
View File

@ -150,7 +150,6 @@ pub fn run_system_for(handle: &mut SystemHandle, nanos: u32) -> usize {
pub fn create_window<T>(event_loop: &EventLoop<T>) -> Rc<Window> { pub fn create_window<T>(event_loop: &EventLoop<T>) -> Rc<Window> {
use web_sys::HtmlCanvasElement; use web_sys::HtmlCanvasElement;
use wasm_bindgen::JsCast;
use winit::platform::web::{WindowExtWebSys, WindowBuilderExtWebSys}; use winit::platform::web::{WindowExtWebSys, WindowBuilderExtWebSys};
let canvas = web_sys::window() let canvas = web_sys::window()