xevion/rust-sdl2-emscripten
1
0
Fork 0
mirror of https://github.com/Xevion/rust-sdl2-emscripten.git synced 2025-12-12 09:11:22 -06:00
Code Issues Packages Projects Releases 1 Wiki Activity

Latest emscripten attempt

Browse Source
This commit is contained in:
Xevion
2024-04-14 01:18:31 -05:00
parent bda8a667c4
commit d0b8ebfff5
9 changed files with 209 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/main.rs
View File

@@ -4,9 +4,12 @@ use tracing::event;
use tracing_error::ErrorLayer;
use tracing_subscriber::layer::SubscriberExt;
#[cfg(target_family = "wasm")]
pub mod emscripten;
pub fn main() {
let sdl_context = sdl2::init().unwrap();
let video_subsystem = sdl_context.video().unwrap();
let ctx = sdl2::init().unwrap();
let video = ctx.video().unwrap();
// Setup tracing
let subscriber = tracing_subscriber::fmt()
@@ -17,14 +20,16 @@ pub fn main() {
tracing::subscriber::set_global_default(subscriber).expect("Could not set global default");
let window = video_subsystem
let window = video
.window("SDL2 Test", 800, 800)
.position_centered()
.opengl()
.build()
.expect("Could not initialize window");
let mut canvas = window
.into_canvas()
.present_vsync()
.build()
.expect("Could not build canvas");
@@ -34,7 +39,7 @@ pub fn main() {
// let texture_creator = canvas.texture_creator();
let mut event_pump = sdl_context
let mut event_pump = ctx
.event_pump()
.expect("Could not get SDL EventPump");
@@ -44,55 +49,59 @@ pub fn main() {
// The start of a period of time over which we average the frame time.
let mut sleep_time = Duration::ZERO;
let mut main_loop = || {
let mut main_loop = move || {
let start = Instant::now();
// TODO: Fix key repeat delay issues by using VecDeque for instant key repeat
for event in event_pump.poll_iter() {
match event {
Event::Window { win_event, .. } => match win_event {
WindowEvent::Hidden => {
event!(tracing::Level::WARN, "Window hidden");
shown = false;
}
WindowEvent::Shown => {
event!(tracing::Level::WARN, "Window shown");
shown = true;
}
_ => {}
},
// Handle quitting keys or window close
Event::Quit { .. } => {
event!(tracing::Level::INFO, "Exit requested. Exiting...");
return false;
}
_ => {
event!(tracing::Level::WARN, "Unhandled event: {:?}", event);
}
}
}
// for event in event_pump.poll_iter() {
// match event {
// Event::Window { win_event, .. } => match win_event {
// WindowEvent::Hidden => {
// event!(tracing::Level::WARN, "Window hidden");
// shown = false;
// }
// WindowEvent::Shown => {
// event!(tracing::Level::WARN, "Window shown");
// shown = true;
// }
// _ => {}
// },
// // Handle quitting keys or window close
// Event::KeyDown {
// keycode: Some(sdl2::keyboard::Keycode::Escape),
// ..
// }
// | Event::Quit { .. } => {
// event!(tracing::Level::INFO, "Exit requested. Exiting...");
// return;
// }
// _ => {
// event!(tracing::Level::WARN, "Unhandled event: {:?}", event);
// }
// }
// }
if shown {
// Set background to black
canvas.set_draw_color(sdl2::pixels::Color::RGB(0, 0, 0));
canvas.clear();
// Draw a square under the mouse
let mouse_state = event_pump.mouse_state();
let mouse_x = mouse_state.x();
let mouse_y = mouse_state.y();
let square = sdl2::rect::Rect::new(mouse_x - 25, mouse_y - 25, 50, 50);
// // Draw a square under the mouse
// let mouse_state = event_pump.mouse_state();
// let mouse_x = mouse_state.x();
// let mouse_y = mouse_state.y();
// let square = sdl2::rect::Rect::new(mouse_x - 25, mouse_y - 25, 50, 50);
canvas.set_draw_color(sdl2::pixels::Color::RGB(0, 255, 255));
canvas.fill_rect(square).unwrap();
// canvas.set_draw_color(sdl2::pixels::Color::RGB(0, 255, 255));
// canvas.fill_rect(square).unwrap();
canvas.set_draw_color(sdl2::pixels::Color::RGBA(255, 255, 255, 50));
canvas
.draw_line(
sdl2::rect::Point::new(0, 0),
sdl2::rect::Point::new(mouse_x, mouse_y),
)
.unwrap();
// canvas.set_draw_color(sdl2::pixels::Color::RGBA(255, 255, 255, 50));
// canvas
// .draw_line(
// sdl2::rect::Point::new(0, 0),
// sdl2::rect::Point::new(mouse_x, mouse_y),
// )
// .unwrap();
canvas.present();
@@ -124,13 +133,21 @@ pub fn main() {
);
}
}
true
};
loop {
if !main_loop() {
break;
#[cfg(target_family = "wasm")]
use crate::emscripten;
#[cfg(target_family = "wasm")]
emscripten::set_main_loop_callback(main_loop);
#[cfg(not(target_family = "wasm"))]
{
use std::thread::sleep;
loop {
// main_loop(Rc::clone(&ctx), Rc::clone(&rect), Rc::clone(&canvas))();
main_loop();
sleep(Duration::from_millis(10))
}
}
}