diff options
| -rw-r--r-- | Cargo.lock | 13 | ||||
| -rw-r--r-- | crates/renderer/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/renderer/src/main.rs | 9 | ||||
| -rw-r--r-- | crates/throwshade/Cargo.toml | 3 | ||||
| -rw-r--r-- | flake.lock | 6 |
5 files changed, 17 insertions, 16 deletions
@@ -676,7 +676,7 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "directories" version = "6.0.0" -source = "git+https://github.com/lcolonq/teleia#8d95be60ea34462cb178389e5ce9c92ad41ecd8b" +source = "git+https://github.com/lcolonq/teleia#e73044fbd51f9c8f15eb6bd60248887ccd8b16f0" dependencies = [ "dirs-sys", ] @@ -1020,7 +1020,7 @@ dependencies = [ [[package]] name = "glfw" version = "0.59.0" -source = "git+https://github.com/lcolonq/teleia#8d95be60ea34462cb178389e5ce9c92ad41ecd8b" +source = "git+https://github.com/lcolonq/teleia#e73044fbd51f9c8f15eb6bd60248887ccd8b16f0" dependencies = [ "bitflags 1.3.2", "objc2 0.5.2", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "gltf" version = "1.4.1" -source = "git+https://github.com/lcolonq/teleia#8d95be60ea34462cb178389e5ce9c92ad41ecd8b" +source = "git+https://github.com/lcolonq/teleia#e73044fbd51f9c8f15eb6bd60248887ccd8b16f0" dependencies = [ "base64 0.13.1", "byteorder", @@ -1076,7 +1076,7 @@ dependencies = [ [[package]] name = "gltf-derive" version = "1.4.1" -source = "git+https://github.com/lcolonq/teleia#8d95be60ea34462cb178389e5ce9c92ad41ecd8b" +source = "git+https://github.com/lcolonq/teleia#e73044fbd51f9c8f15eb6bd60248887ccd8b16f0" dependencies = [ "inflections", "proc-macro2", @@ -1087,7 +1087,7 @@ dependencies = [ [[package]] name = "gltf-json" version = "1.4.1" -source = "git+https://github.com/lcolonq/teleia#8d95be60ea34462cb178389e5ce9c92ad41ecd8b" +source = "git+https://github.com/lcolonq/teleia#e73044fbd51f9c8f15eb6bd60248887ccd8b16f0" dependencies = [ "gltf-derive", "serde", @@ -3051,7 +3051,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "teleia" version = "0.1.0" -source = "git+https://github.com/lcolonq/teleia#8d95be60ea34462cb178389e5ce9c92ad41ecd8b" +source = "git+https://github.com/lcolonq/teleia#e73044fbd51f9c8f15eb6bd60248887ccd8b16f0" dependencies = [ "bimap", "bitflags 2.8.0", @@ -3167,7 +3167,6 @@ dependencies = [ "bitflags 2.8.0", "cfg-if", "glam", - "glow 0.16.0", "lazy_static", "log", "rand", diff --git a/crates/renderer/Cargo.toml b/crates/renderer/Cargo.toml index 50e16ad..f891a7a 100644 --- a/crates/renderer/Cargo.toml +++ b/crates/renderer/Cargo.toml @@ -9,7 +9,7 @@ name = "newton_renderer" path = "src/main.rs" [dependencies] -# teleia = { path = "../teleia" } # engine +# teleia = { path = "../../../teleia" } # engine teleia = { git = "https://github.com/lcolonq/teleia" } # engine throwshade = { path = "../throwshade" } glam = "*" # linear algebra diff --git a/crates/renderer/src/main.rs b/crates/renderer/src/main.rs index 09ed5cf..41d4e35 100644 --- a/crates/renderer/src/main.rs +++ b/crates/renderer/src/main.rs @@ -40,6 +40,7 @@ impl Overlay { .and_then(|i| model.nodes.get(*i)) .expect("failed to find neck joint") .transform; + let throwshade = throwshade::ThrowShade::new(); Self { mode, assets: assets::Assets::new(ctx), @@ -63,7 +64,7 @@ impl Overlay { tracking_eyes: (1.0, 1.0), tracking_mouth: 0.0, tracking_neck: glam::Quat::IDENTITY, - throwshade: throwshade::ThrowShade::new(), + throwshade, chat_msg: format!(""), chat_time: 0.0, chat_biblicality: 0.0, @@ -132,7 +133,7 @@ impl Overlay { let s = String::from_utf8_lossy(&bs); let time = msg.data.get(1)?.as_str()?.parse::<f64>().ok()?; let biblicality = msg.data.get(2)?.as_str()?.parse::<f32>().ok()?; - log::info!("received chat message: {} {} {}", s, time, biblicality); + // log::info!("received chat message: {} {} {}", s, time, biblicality); self.chat_msg = s.to_string(); self.chat_time = time; self.chat_biblicality = biblicality; @@ -214,6 +215,8 @@ impl teleia::state::Game for Overlay { Some(()) } fn render(&mut self, ctx: &context::Context, st: &mut state::State) -> Option<()> { + ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); + ctx.clear(); if let Some(s) = &self.throwshade.shader { s.bind(ctx); s.set_vec2(ctx, "resolution", &glam::Vec2::new(ctx.render_width, ctx.render_height)); @@ -222,7 +225,7 @@ impl teleia::state::Game for Overlay { s.set_f32(ctx, "chat_time", (self.chat_time - self.throwshade.timeset) as f32); ctx.render_no_geometry(); } - self.render_model_terminal(ctx, st); + // self.render_model_terminal(ctx, st); Some(()) } } diff --git a/crates/throwshade/Cargo.toml b/crates/throwshade/Cargo.toml index 0cc7516..c465bf3 100644 --- a/crates/throwshade/Cargo.toml +++ b/crates/throwshade/Cargo.toml @@ -8,10 +8,9 @@ authors.workspace = true crate-type = ["cdylib", "rlib"] [dependencies] -# teleia = { path = "../teleia" } # engine +# teleia = { path = "../../../teleia" } # engine teleia = { git = "https://github.com/lcolonq/teleia" } # engine glam = "*" # linear algebra -glow = "*" # gl bindings bitflags = "*" # C-style bitwise flags rand = "=0.8.5" # rng log = "*" # logging @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1739638817, - "narHash": "sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA=", + "lastModified": 1739898326, + "narHash": "sha256-CqRBf9MKC8eiwDRg9akoWia57Nsjmq3S++YbkmT6p9M=", "owner": "ipetkov", "repo": "crane", - "rev": "bef2b45cd1273a9e621fb5292de89f4ed59ad812", + "rev": "680a2b47cdef830bca3edfd53383e3292154ba7b", "type": "github" }, "original": { |