diff options
Diffstat (limited to '2026/framing')
| -rw-r--r-- | 2026/framing/dist/game_lib-161bc7c290ad464f.js (renamed from 2026/framing/dist/game_lib-28e9fb71c2b1e759.js) | 14 | ||||
| -rw-r--r-- | 2026/framing/dist/game_lib-161bc7c290ad464f_bg.wasm (renamed from 2026/framing/dist/game_lib-28e9fb71c2b1e759_bg.wasm) | bin | 3551599 -> 3552479 bytes | |||
| -rw-r--r-- | 2026/framing/dist/index.html | 6 | ||||
| -rw-r--r-- | 2026/framing/src/game.rs | 21 |
4 files changed, 23 insertions, 18 deletions
diff --git a/2026/framing/dist/game_lib-28e9fb71c2b1e759.js b/2026/framing/dist/game_lib-161bc7c290ad464f.js index 56a4b8d..95c2c03 100644 --- a/2026/framing/dist/game_lib-28e9fb71c2b1e759.js +++ b/2026/framing/dist/game_lib-161bc7c290ad464f.js @@ -1457,31 +1457,31 @@ function __wbg_get_imports() { const ret = false; return ret; }; - imports.wbg.__wbindgen_closure_wrapper3071 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper3073 = function(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 523, __wbg_adapter_43); return ret; }; - imports.wbg.__wbindgen_closure_wrapper3072 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper3074 = function(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 523, __wbg_adapter_43); return ret; }; - imports.wbg.__wbindgen_closure_wrapper3073 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper3075 = function(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 523, __wbg_adapter_43); return ret; }; - imports.wbg.__wbindgen_closure_wrapper3074 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper3076 = function(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 523, __wbg_adapter_43); return ret; }; - imports.wbg.__wbindgen_closure_wrapper3075 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper3077 = function(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 523, __wbg_adapter_43); return ret; }; - imports.wbg.__wbindgen_closure_wrapper3076 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper3078 = function(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 523, __wbg_adapter_54); return ret; }; - imports.wbg.__wbindgen_closure_wrapper3302 = function(arg0, arg1, arg2) { + imports.wbg.__wbindgen_closure_wrapper3304 = function(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 598, __wbg_adapter_57); return ret; }; diff --git a/2026/framing/dist/game_lib-28e9fb71c2b1e759_bg.wasm b/2026/framing/dist/game_lib-161bc7c290ad464f_bg.wasm Binary files differindex 35e45e1..8381180 100644 --- a/2026/framing/dist/game_lib-28e9fb71c2b1e759_bg.wasm +++ b/2026/framing/dist/game_lib-161bc7c290ad464f_bg.wasm diff --git a/2026/framing/dist/index.html b/2026/framing/dist/index.html index 9f9e64e..91ba7d6 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-28e9fb71c2b1e759.js'; -const wasm = await init({ module_or_path: '/framing/dist/game_lib-28e9fb71c2b1e759_bg.wasm' }); +import init, * as bindings from '/framing/dist/game_lib-161bc7c290ad464f.js'; +const wasm = await init({ module_or_path: '/framing/dist/game_lib-161bc7c290ad464f_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>TODO TITLE</title> - <link rel="modulepreload" href="/framing/dist/game_lib-28e9fb71c2b1e759.js" crossorigin="anonymous" integrity="sha384-xa3oynUWjM2KyWPGXEx1cqgUHqbEUzH9HNTkgOzWX2AFcHicMUeteWK8fHpDzGqH"><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-28e9fb71c2b1e759_bg.wasm" crossorigin="anonymous" integrity="sha384-BGNmZdRCu87E5ofQwyzgvlr/1L4/7UauotKhsQdBWl1f9/DxnZEqucD1CqR+YMft" as="fetch" type="application/wasm"></head> + <link rel="modulepreload" href="/framing/dist/game_lib-161bc7c290ad464f.js" crossorigin="anonymous" integrity="sha384-j/ezI19C1/9urd+eyiEyjiBH7hD3nF6IlprOjtj9hqdoQYfnLImA5suIKmtTRKGs"><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-161bc7c290ad464f_bg.wasm" crossorigin="anonymous" integrity="sha384-YPT1CEtEYnmTM/T0npwaeRP9T5p0YnINag7bG9FwAJHC5yYIvo8zPtnn97HN1Kvl" as="fetch" type="application/wasm"></head> <body> <script type="module"> window.addEventListener("TrunkApplicationStarted", async (event) => { diff --git a/2026/framing/src/game.rs b/2026/framing/src/game.rs index 43f39fd..2bbfa0f 100644 --- a/2026/framing/src/game.rs +++ b/2026/framing/src/game.rs @@ -191,15 +191,20 @@ impl teleia::state::Game for Game { self.lives.render(ctx, st, &mut self.renderer)?; }, Mode::InGame => { - let prog = t / 10; self.renderer.begin_frame(ctx, st, Vec4::ZERO); - if prog < 6 { - self.renderer.bind_uber_2d(ctx, st, UberFlags::TEXTURE_COLOR | UberFlags::TEXTURE_FLIP | UberFlags::SPRITE | UberFlags::OPACITY); - self.renderer.bind_texture(ctx, st, assets::Texture::Mrworld); - self.renderer.set_texture_offset(ctx, st, 8, 1, 2 + prog as i32, 0); - self.renderer.set_position_2d(ctx, st, Vec2::ZERO, st.render_dims); - self.renderer.set_vec2(ctx, st, "texture_flip", glam::Vec2::new(0.0, 1.0)); - self.renderer.set_f32(ctx, st, "opacity", (5.0 - prog as f32) / 5.0); + self.renderer.bind_uber_2d(ctx, st, UberFlags::TEXTURE_COLOR | UberFlags::TEXTURE_FLIP | UberFlags::SPRITE | UberFlags::OPACITY); + self.renderer.bind_texture(ctx, st, assets::Texture::Mrworld); + self.renderer.set_position_2d(ctx, st, Vec2::ZERO, st.render_dims); + self.renderer.set_vec2(ctx, st, "texture_flip", glam::Vec2::new(0.0, 1.0)); + if t < 35 { + self.renderer.set_texture_offset(ctx, st, 8, 1, 2 + (t / 5).clamp(0, 5) as i32, 0); + self.renderer.set_f32(ctx, st, "opacity", 1.0); + self.renderer.render_square(ctx, st); + } else if t < 70 { + let since = ((t - 35) as f32).clamp(0.0, 34.0); + let opacity = (34.0 - since) / 34.0; + self.renderer.set_texture_offset(ctx, st, 8, 1, 7, 0); + self.renderer.set_f32(ctx, st, "opacity", opacity); self.renderer.render_square(ctx, st); } self.lives.render(ctx, st, &mut self.renderer)?; |
