summaryrefslogtreecommitdiff
path: root/2026/framing
diff options
context:
space:
mode:
authorLLLL Colonq <llll@colonq>2026-08-24 19:29:30 -0400
committerLLLL Colonq <llll@colonq>2026-08-24 19:29:30 -0400
commit242943e5b023ce40eb3be826c418a478d4672f78 (patch)
tree718e4c1ba759ea43d91f80cabd21585a71f787fb /2026/framing
parent678d94b4650e298b7aa38d7b3e3e90ed625f0e3e (diff)
Send name to framing
Diffstat (limited to '2026/framing')
-rw-r--r--2026/framing/dist/game_lib-3c25edac4e9a3f84.js (renamed from 2026/framing/dist/game_lib-138a5d10eb1dc5d0.js)25
-rw-r--r--2026/framing/dist/game_lib-3c25edac4e9a3f84_bg.wasm (renamed from 2026/framing/dist/game_lib-138a5d10eb1dc5d0_bg.wasm)bin21820613 -> 21821414 bytes
-rw-r--r--2026/framing/dist/index.html8
-rw-r--r--2026/framing/index.html2
-rw-r--r--2026/framing/src/game.rs12
5 files changed, 25 insertions, 22 deletions
diff --git a/2026/framing/dist/game_lib-138a5d10eb1dc5d0.js b/2026/framing/dist/game_lib-3c25edac4e9a3f84.js
index d064b5e..0dcaf19 100644
--- a/2026/framing/dist/game_lib-138a5d10eb1dc5d0.js
+++ b/2026/framing/dist/game_lib-3c25edac4e9a3f84.js
@@ -221,12 +221,15 @@ export function titlescreen_click() {
}
/**
+ * @param {string} nm
* @param {string | null} [verb]
*/
-export function start_game(verb) {
- var ptr0 = isLikeNone(verb) ? 0 : passStringToWasm0(verb, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
- var len0 = WASM_VECTOR_LEN;
- wasm.start_game(ptr0, len0);
+export function start_game(nm, verb) {
+ const ptr0 = passStringToWasm0(nm, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+ const len0 = WASM_VECTOR_LEN;
+ var ptr1 = isLikeNone(verb) ? 0 : passStringToWasm0(verb, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+ var len1 = WASM_VECTOR_LEN;
+ wasm.start_game(ptr0, len0, ptr1, len1);
}
/**
@@ -1495,31 +1498,31 @@ function __wbg_get_imports() {
const ret = false;
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper3231 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper3233 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper3232 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper3234 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper3233 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper3235 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper3234 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper3236 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper3235 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper3237 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_43);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper3236 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper3238 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 530, __wbg_adapter_54);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper3462 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper3464 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 605, __wbg_adapter_57);
return ret;
};
diff --git a/2026/framing/dist/game_lib-138a5d10eb1dc5d0_bg.wasm b/2026/framing/dist/game_lib-3c25edac4e9a3f84_bg.wasm
index e13f703..6959c8a 100644
--- a/2026/framing/dist/game_lib-138a5d10eb1dc5d0_bg.wasm
+++ b/2026/framing/dist/game_lib-3c25edac4e9a3f84_bg.wasm
Binary files differ
diff --git a/2026/framing/dist/index.html b/2026/framing/dist/index.html
index cf6cd69..c795ef3 100644
--- a/2026/framing/dist/index.html
+++ b/2026/framing/dist/index.html
@@ -6,8 +6,8 @@
<meta charset="UTF-8">
<script type="module">
-import init, * as bindings from '/framing/dist/game_lib-138a5d10eb1dc5d0.js';
-const wasm = await init({ module_or_path: '/framing/dist/game_lib-138a5d10eb1dc5d0_bg.wasm' });
+import init, * as bindings from '/framing/dist/game_lib-3c25edac4e9a3f84.js';
+const wasm = await init({ module_or_path: '/framing/dist/game_lib-3c25edac4e9a3f84_bg.wasm' });
window.wasmBindings = bindings;
@@ -23,7 +23,7 @@ dispatchEvent(new CustomEvent("TrunkApplicationStarted", {detail: {wasm}}));
<link rel="icon" href="data:;base64,iVBORw0KGgo=">
<link rel="stylesheet" href="/framing/dist/index-1e3cd2ca0ba4d1ec.css" integrity="sha384-1q3UDTmLdOyf9/QxW+Imap//HWhTWNfvn7j2iwuUap3HSD6IOGG7pDS9VJMk7nKv"/>
<title>Jam 2026 Framing Device</title>
- <link rel="modulepreload" href="/framing/dist/game_lib-138a5d10eb1dc5d0.js" crossorigin="anonymous" integrity="sha384-34feKGwj4If/0actH/hiCFakcYWMtlOocNU1HlGnqccoo50laWtXrwhn8jl/peMw"><link rel="modulepreload" href="/framing/dist/snippets/game_lib-09da6449fcb9d06e/src/bindings.js" crossorigin="anonymous" integrity="sha384-5OqMgKkpxoyJdg0zjf0uRBl5lKhgxNx4rdX+ML4CRyveCr3dizM3Lbxs58MxUzTz"><link rel="modulepreload" href="/framing/dist/snippets/teleia-727bf4351691f1c8/src/helpers.js" crossorigin="anonymous" integrity="sha384-HhtEY2WfGmhyPUSRWKZvqsRxYsdT/DLEdFUqWyDZt6G6lrNHmE1zMlw4BJ3RycRd"><link rel="preload" href="/framing/dist/game_lib-138a5d10eb1dc5d0_bg.wasm" crossorigin="anonymous" integrity="sha384-UJRhBMW9WTTBMjCFsSt7lnKfdh4W1Wl7HuWwqsB0vff5cYn0/pm/Bm+M17uGUHfi" as="fetch" type="application/wasm"></head>
+ <link rel="modulepreload" href="/framing/dist/game_lib-3c25edac4e9a3f84.js" crossorigin="anonymous" integrity="sha384-/c3xUom9xSH9SCAZcjRTaXo6GSFWc4cOKxr+FqqMu8RDWu7NLn0J0OrQKE7Y6lsF"><link rel="modulepreload" href="/framing/dist/snippets/teleia-727bf4351691f1c8/src/helpers.js" crossorigin="anonymous" integrity="sha384-HhtEY2WfGmhyPUSRWKZvqsRxYsdT/DLEdFUqWyDZt6G6lrNHmE1zMlw4BJ3RycRd"><link rel="modulepreload" href="/framing/dist/snippets/game_lib-09da6449fcb9d06e/src/bindings.js" crossorigin="anonymous" integrity="sha384-5OqMgKkpxoyJdg0zjf0uRBl5lKhgxNx4rdX+ML4CRyveCr3dizM3Lbxs58MxUzTz"><link rel="preload" href="/framing/dist/game_lib-3c25edac4e9a3f84_bg.wasm" crossorigin="anonymous" integrity="sha384-+LSmZtknxVkt+J70C0azEmZhgVXpHWAwU1hSq8jBbDeTgCArVCnlTezzGySyZLxG" as="fetch" type="application/wasm"></head>
<body>
<script type="module">
window.addEventListener("TrunkApplicationStarted", async (event) => {
@@ -44,7 +44,7 @@ dispatchEvent(new CustomEvent("TrunkApplicationStarted", {detail: {wasm}}));
window.wasmBindings.titlescreen_click();
break;
case "startgame":
- window.wasmBindings.start_game(ev.data.verb);
+ window.wasmBindings.start_game(ev.data.name, ev.data.verb);
break;
case "endgame":
window.wasmBindings.end_game(ev.data.win);
diff --git a/2026/framing/index.html b/2026/framing/index.html
index 60efac4..aab475b 100644
--- a/2026/framing/index.html
+++ b/2026/framing/index.html
@@ -33,7 +33,7 @@
window.wasmBindings.titlescreen_click();
break;
case "startgame":
- window.wasmBindings.start_game(ev.data.verb);
+ window.wasmBindings.start_game(ev.data.name, ev.data.verb);
break;
case "endgame":
window.wasmBindings.end_game(ev.data.win);
diff --git a/2026/framing/src/game.rs b/2026/framing/src/game.rs
index a473d8e..ae7b897 100644
--- a/2026/framing/src/game.rs
+++ b/2026/framing/src/game.rs
@@ -165,7 +165,7 @@ pub struct Game {
font2: font::Bitmap,
lives: Lives,
streak: i32,
- verb: Option<String>,
+ current: Option<(String, String)>,
highscore: Option<i32>,
}
@@ -179,7 +179,7 @@ impl Game {
font2: font::Bitmap::from_image(ctx, 32, 48, 512, 288, include_bytes!("assets/fonts/font2.png")),
lives: Lives::new(),
streak: 0,
- verb: None,
+ current: None,
highscore: None,
}
}
@@ -188,7 +188,7 @@ impl Game {
self.mode_started = 0;
self.lives = Lives::new();
self.streak = 0;
- self.verb = None;
+ self.current = None;
}
pub fn switch(&mut self, _ctx: &context::Context, st: &mut state::State, m: Mode) {
self.mode = m;
@@ -217,7 +217,7 @@ impl Game {
1.0
};
self.renderer.render_square(ctx, st);
- if let Some(v) = &self.verb && let Some(t) = fadeout && t > 5 && t < 70 {
+ if let Some((nm, v)) = &self.current && let Some(t) = fadeout && t > 5 && t < 70 {
let tick = st.tick;
self.renderer.text_screen(ctx, st,
glam::Vec2::new(st.render_dims.x / 2.0, st.render_dims.y / 2.0),
@@ -375,10 +375,10 @@ pub fn titlescreen_click() {
}
#[wasm_bindgen]
-pub fn start_game(verb: Option<String>) {
+pub fn start_game(nm: String, verb: Option<String>) {
contextualize(|ctx, st, g: &mut Game| {
g.switch(ctx, st, Mode::InGame);
- g.verb = verb.as_ref().map(|x| x.to_ascii_uppercase());
+ g.current = verb.as_ref().map(|x| (nm.clone(), x.to_ascii_uppercase()));
st.audio.mute_music(0.0);
});
}