diff options
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | crates/renderer/src/overlay/multi.rs | 2 | ||||
| -rw-r--r-- | crates/throwshade/src/lib.rs | 12 |
3 files changed, 12 insertions, 10 deletions
@@ -1783,7 +1783,7 @@ name = "newton_client" version = "0.1.0" dependencies = [ "base64 0.22.1", - "bitflags 1.3.2", + "bitflags 2.8.0", "clap", "env_logger", "glam", @@ -1805,7 +1805,7 @@ name = "newton_renderer" version = "0.1.0" dependencies = [ "base64 0.22.1", - "bitflags 1.3.2", + "bitflags 2.8.0", "clap", "env_logger", "glam", @@ -1830,7 +1830,7 @@ version = "0.1.0" name = "newton_throwshade" version = "0.1.0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.8.0", "cfg-if", "glam", "lazy_static", @@ -2971,7 +2971,7 @@ dependencies = [ [[package]] name = "teleia" version = "0.1.0" -source = "git+https://github.com/lcolonq/teleia#6f1269aab5f4d7e218e7f59bd82b34f6dcaed4a1" +source = "git+https://github.com/lcolonq/teleia#fa62367de73065ea6ca6da45d9c8745bb80a21e3" dependencies = [ "bimap", "bincode", diff --git a/crates/renderer/src/overlay/multi.rs b/crates/renderer/src/overlay/multi.rs index 7737a1e..41ec12f 100644 --- a/crates/renderer/src/overlay/multi.rs +++ b/crates/renderer/src/overlay/multi.rs @@ -188,7 +188,7 @@ impl teleia::state::Game for Overlay { self.term.update(ctx, &self.fb); ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); ctx.clear(); - self.term.render(ctx, &glam::Vec2::new(0.0, 0.0)); + self.term.render(ctx, &glam::Vec2::new(32.0, 32.0)); Ok(()) } } diff --git a/crates/throwshade/src/lib.rs b/crates/throwshade/src/lib.rs index f6ee8a6..ab1c9bf 100644 --- a/crates/throwshade/src/lib.rs +++ b/crates/throwshade/src/lib.rs @@ -41,7 +41,7 @@ cfg_if::cfg_if! { throwshade: ThrowShade, } impl Game { - pub async fn new(_ctx: &context::Context) -> Self { + pub fn new(_ctx: &context::Context) -> Self { Self { throwshade: ThrowShade::new(), } @@ -65,18 +65,20 @@ cfg_if::cfg_if! { use wasm_bindgen::prelude::*; #[wasm_bindgen] - pub async fn main_js() { - teleia::run(1920, 1080, teleia::Options::NORESIZE, Game::new).await; + pub fn main_js() { + teleia::run(1920, 1080, teleia::Options::NORESIZE, Game::new); } #[wasm_bindgen] - pub async fn set_shader(s: &str) { + pub async fn set_shader(s: &str) -> Result<(), String> { contextualize(|ctx, st, g: &mut Game| { log::info!("set shader: {}", s); if let Err(e) = g.throwshade.set(ctx, st, &s) { log::warn!("error compiling shader: {}", e); g.throwshade.shader = None; + return Err(format!("{}", e)); } - }); + Ok(()) + }) } } } |