From 7ab13a585cf4f07e7dc63da53eaf9782070b33da Mon Sep 17 00:00:00 2001
From: Schr3da <strieder.georg@gmail.com>
Date: Fri, 15 Dec 2023 23:14:11 +0100
Subject: [PATCH 1/2] :sparkles: Added steamdeck support

---
 examples/Cargo.toml              |  4 ++++
 src/runty8-core/src/input.rs     |  4 ++--
 src/runty8-core/src/lib.rs       |  2 ++
 src/runty8-editor/Cargo.toml     |  5 ++++-
 src/runty8-event-loop/Cargo.toml |  4 ++++
 src/runty8-event-loop/src/lib.rs | 11 ++++++++++-
 src/runty8-runtime/Cargo.toml    |  5 ++++-
 src/runty8-winit/src/lib.rs      |  2 +-
 src/runty8/Cargo.toml            |  3 +++
 9 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 60a33334..613bf15e 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -9,6 +9,10 @@ runty8 = { path = "../src/runty8" }
 runty8-core = { path = "../src/runty8-core" }
 log = "0.4"
 
+[features]
+default = []
+steamdeck = ["runty8/steamdeck"]
+
 [[bin]]
 name = "celeste"
 path = "./celeste/main.rs"
diff --git a/src/runty8-core/src/input.rs b/src/runty8-core/src/input.rs
index ec467266..922284a5 100644
--- a/src/runty8-core/src/input.rs
+++ b/src/runty8-core/src/input.rs
@@ -69,8 +69,8 @@ impl Input {
 
 fn key_to_button(key: Key) -> Option<Button> {
     match key {
-        Key::X => Some(Button::Cross),
-        Key::C => Some(Button::Circle),
+        Key::X | Key::Escape => Some(Button::Cross),
+        Key::C | Key::Enter => Some(Button::Circle),
         Key::LeftArrow => Some(Button::Left),
         Key::RightArrow => Some(Button::Right),
         Key::UpArrow => Some(Button::Up),
diff --git a/src/runty8-core/src/lib.rs b/src/runty8-core/src/lib.rs
index efa48f9f..07043164 100644
--- a/src/runty8-core/src/lib.rs
+++ b/src/runty8-core/src/lib.rs
@@ -161,6 +161,8 @@ pub enum Key {
     Alt,
     ///
     Space,
+    ///
+    Enter,
 }
 
 /// Keyboard event (key up/down).
diff --git a/src/runty8-editor/Cargo.toml b/src/runty8-editor/Cargo.toml
index ae97d454..c79f9a6e 100644
--- a/src/runty8-editor/Cargo.toml
+++ b/src/runty8-editor/Cargo.toml
@@ -6,13 +6,16 @@ edition = "2021"
 [dependencies]
 runty8-core = { path = "../runty8-core" }
 runty8-winit = { path = "../runty8-winit" }
-runty8-event-loop = { path = "../runty8-event-loop" }
 itertools = "0.10"
 instant = "0.1"
 once_cell = "1.16"
 log = "0.4"
+runty8-event-loop = { path = "../runty8-event-loop"}
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = { version = "0.3", features = ["Window", "Storage"] }
 js-sys = { version = "0.3" }
 wasm-bindgen = "0.2"
+
+[features]
+steamdeck = ["runty8-event-loop/steamdeck"]
diff --git a/src/runty8-event-loop/Cargo.toml b/src/runty8-event-loop/Cargo.toml
index 06e99967..a38a2bf6 100644
--- a/src/runty8-event-loop/Cargo.toml
+++ b/src/runty8-event-loop/Cargo.toml
@@ -3,6 +3,10 @@ name = "runty8-event-loop"
 version = "0.1.0"
 edition = "2021"
 
+[features]
+default = []
+steamdeck = []
+
 [dependencies]
 runty8-core = { path = "../runty8-core" }
 runty8-winit = { path = "../runty8-winit" }
diff --git a/src/runty8-event-loop/src/lib.rs b/src/runty8-event-loop/src/lib.rs
index 41fa183b..c2c3d701 100644
--- a/src/runty8-event-loop/src/lib.rs
+++ b/src/runty8-event-loop/src/lib.rs
@@ -23,7 +23,9 @@ pub fn event_loop(
     mut on_event: impl FnMut(Event, &mut ControlFlow, &dyn Fn(&[u8], &mut ControlFlow), &dyn Fn(&str))
         + 'static,
 ) {
-    let mut screen_info = ScreenInfo::new(640.0, 640.0);
+    let (width, height) = get_window_size();
+
+    let mut screen_info = ScreenInfo::new(width, height);
 
     let event_loop = EventLoop::new();
 
@@ -72,6 +74,13 @@ pub fn event_loop(
     })
 }
 
+fn get_window_size() -> (f64, f64) {
+    #[cfg(not(feature = "steamdeck"))]
+    return (640.0, 640.0);
+    #[cfg(feature = "steamdeck")]
+    return (320.0, 320.0);
+}
+
 fn draw(gl: &glow::Context, texture: glow::Texture, pixels: &[u8]) {
     unsafe {
         gl::upload_pixels(gl, texture, pixels);
diff --git a/src/runty8-runtime/Cargo.toml b/src/runty8-runtime/Cargo.toml
index 63162e7c..53992c2e 100644
--- a/src/runty8-runtime/Cargo.toml
+++ b/src/runty8-runtime/Cargo.toml
@@ -6,5 +6,8 @@ edition = "2021"
 [dependencies]
 runty8-core = { path = "../runty8-core" }
 runty8-winit = { path = "../runty8-winit" }
-runty8-event-loop = { path = "../runty8-event-loop" }
 winit = "0.27"
+runty8-event-loop = { path = "../runty8-event-loop"}
+
+[features]
+steamdeck = ["runty8-event-loop/steamdeck"]
diff --git a/src/runty8-winit/src/lib.rs b/src/runty8-winit/src/lib.rs
index 1b711952..4a0606c7 100644
--- a/src/runty8-winit/src/lib.rs
+++ b/src/runty8-winit/src/lib.rs
@@ -164,7 +164,7 @@ impl Runty8KeyExt for Key {
             VirtualKeyCode::Down => Some(Self::DownArrow),
             VirtualKeyCode::Escape => Some(Self::Escape),
             VirtualKeyCode::LAlt => Some(Self::Alt),
-            VirtualKeyCode::Space => Some(Self::Space),
+            VirtualKeyCode::Space => Some(Self::Enter),
             _ => None,
         }
     }
diff --git a/src/runty8/Cargo.toml b/src/runty8/Cargo.toml
index c9327801..9c729b76 100644
--- a/src/runty8/Cargo.toml
+++ b/src/runty8/Cargo.toml
@@ -7,3 +7,6 @@ edition = "2021"
 runty8-core = { path = "../runty8-core" }
 runty8-runtime = { path = "../runty8-runtime" }
 runty8-editor = { path = "../runty8-editor" }
+
+[features]
+steamdeck = ["runty8-runtime/steamdeck"] 

From b0e351554b5a617340099319e6aeea2c6c441c9a Mon Sep 17 00:00:00 2001
From: Georg Strieder <Schr3da@users.noreply.github.com>
Date: Sat, 16 Dec 2023 12:42:39 +0100
Subject: [PATCH 2/2] Update README.md

---
 README.md | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d9717394..3890cb73 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ See [the contributing guide](./CONTRIBUTING.md) for instructions on how to get s
 - [Confetti mouse demo](./examples/confetti/main.rs)
 - [Moving box](./examples/moving-box/main.rs)
 
-## Running
+## Running in native window
 
 Run examples (`celeste`, `moving_box`, `confetti`) with:
 
@@ -49,3 +49,34 @@ Or run `cargo run --bin` to get a list of the available examples.
 
 Press the `Escape` key to switch between the game and the editor.
 
+## Running on the Steamdeck
+
+Run examples (`celeste`, `moving_box`, `confetti`) with:
+
+```bash
+cargo run --bin celeste -- --game --feature steamdeck
+cargo run --bin confetti -- --game --feature steamdeck
+cargo run --bin moving-box -- --game --feature steamdeck
+```
+
+This will ensure to have a better scale/window size which fits the small screen. 
+Please note for now it only works in desktop mode on the deck
+
+## Running in browser using WASM
+
+Run examples (`celeste`, `moving_box`, `confetti`) with:
+
+```bash
+rustup target add wasm32-unknown-emscripten
+rustup target add wasm32-unknown-unknown
+cargo install wasm-bindgen-cli
+
+./build_script.sh celeste
+```
+
+If you see an error with serve ensure to install the tool as well via cargo. 
+Alternative you can use any static web server to host the files located in the folder generated
+
+```bash
+cd ./generated
+```