diff options
Diffstat (limited to 'crates/renderer/src/overlay')
| -rw-r--r-- | crates/renderer/src/overlay/automata.rs | 51 | ||||
| -rw-r--r-- | crates/renderer/src/overlay/drawing.rs | 21 | ||||
| -rw-r--r-- | crates/renderer/src/overlay/mod.rs | 5 | ||||
| -rw-r--r-- | crates/renderer/src/overlay/model.rs | 215 | ||||
| -rw-r--r-- | crates/renderer/src/overlay/multi.rs | 194 | ||||
| -rw-r--r-- | crates/renderer/src/overlay/shader.rs | 259 |
6 files changed, 147 insertions, 598 deletions
diff --git a/crates/renderer/src/overlay/automata.rs b/crates/renderer/src/overlay/automata.rs index 869fd88..b5d749e 100644 --- a/crates/renderer/src/overlay/automata.rs +++ b/crates/renderer/src/overlay/automata.rs @@ -2,11 +2,13 @@ use teleia::*; use glow::HasContext; +use crate::overlay; + const SCALE: usize = 15; const WIDTH: usize = 1920 / SCALE; const HEIGHT: usize = 1080 / SCALE; -struct Pattern { +pub struct Pattern { w: usize, h: usize, cells: Vec<bool>, } @@ -36,7 +38,6 @@ impl Pattern { w, h, cells: vec![false; w * h], }; - log::info!("dims: {w} {h} data: {data}"); ret.populate(&data); Some(ret) } @@ -52,7 +53,6 @@ impl Pattern { pub fn set(&mut self, x: i32, y: i32) { let idx = self.idx(x, y); self.cells[idx] = true; - log::info!("pattern: {x} {y}"); } pub fn populate(&mut self, s: &str) { let mut run = 0; @@ -127,7 +127,7 @@ impl CellBuffer { } } -pub struct Board { +pub struct Overlay { shader: shader::Shader, tex: texture::Texture, active: bool, @@ -135,13 +135,13 @@ pub struct Board { buf1: CellBuffer, rules: [CellRule; 256], } -impl Board { +impl Overlay { pub fn new(ctx: &context::Context) -> Self { let rules = std::array::from_fn(|idx| match idx { 0 => CellRule { color: glam::Vec4::new(0.0, 0.0, 0.0, 0.0) }, _ => CellRule { color: glam::Vec4::new(1.0, 1.0, 1.0, 1.0) }, }); - Self { + let mut ret = Self { shader: shader::Shader::new( ctx, include_str!("../assets/shaders/automata/vert.glsl"), @@ -152,24 +152,7 @@ impl Board { buf0: CellBuffer::new(), buf1: CellBuffer::new(), rules, - } - } - pub fn spawn(&mut self, x: i32, y: i32, c: Cell, pat: &Pattern) { - let cur = if self.active { &mut self.buf0 } else { &mut self.buf1 }; - for uxoff in 0..pat.w { - for uyoff in 0..pat.h { - let xoff = uxoff as i32; let yoff = uyoff as i32; - cur.set(x + xoff, y + yoff, if pat.get(xoff, yoff) { c } else { 0 }); - } - } - } - pub fn test_glider(&mut self) { - // let cur = if self.active { &mut self.buf0 } else { &mut self.buf1 }; - // cur.set(1, 0, 1); - // cur.set(2, 1, 1); - // cur.set(0, 2, 1); - // cur.set(1, 2, 1); - // cur.set(2, 2, 1); + }; if let Some(pat) = Pattern::from_rle(" #N Tanner's p46 #O Tanner Jacobi @@ -180,7 +163,17 @@ x = 13, y = 26, rule = B3/S23 2o2b$o7bobo2b$b2o6bo3b$b2o7b3o$12bo$13b$13b$13b$13b$13b$13b$b2o10b$b2o 2b2o6b$5bobo5b$7bo5b$7b2o4b! ") { - self.spawn(30, 10, 1, &pat); + ret.spawn(30, 10, 1, &pat); + } + ret + } + pub fn spawn(&mut self, x: i32, y: i32, c: Cell, pat: &Pattern) { + let cur = if self.active { &mut self.buf0 } else { &mut self.buf1 }; + for uxoff in 0..pat.w { + for uyoff in 0..pat.h { + let xoff = uxoff as i32; let yoff = uyoff as i32; + cur.set(x + xoff, y + yoff, if pat.get(xoff, yoff) { c } else { 0 }); + } } } pub fn step(&mut self) { @@ -223,13 +216,16 @@ x = 13, y = 26, rule = B3/S23 ctx.gl.generate_mipmap(glow::TEXTURE_2D); } } - pub fn update(&mut self, ctx: &context::Context, st: &mut state::State) { +} +impl overlay::Overlay for Overlay { + fn update(&mut self, ctx: &context::Context, st: &mut state::State, _ost: &mut overlay::State) -> Erm<()> { if st.tick % 10 == 0 { self.step(); self.upload(ctx); } + Ok(()) } - pub fn render(&self, ctx: &context::Context, st: &mut state::State) { + fn render(&mut self, ctx: &context::Context, st: &mut state::State, _ost: &mut overlay::State) -> Erm<()> { st.bind_2d(ctx, &self.shader); self.tex.bind(ctx); self.shader.set_position_2d( @@ -238,5 +234,6 @@ x = 13, y = 26, rule = B3/S23 &glam::Vec2::new(1920.0, 1080.0) ); st.mesh_square.render(ctx); + Ok(()) } } diff --git a/crates/renderer/src/overlay/drawing.rs b/crates/renderer/src/overlay/drawing.rs index 8088b5a..1d5ca96 100644 --- a/crates/renderer/src/overlay/drawing.rs +++ b/crates/renderer/src/overlay/drawing.rs @@ -2,19 +2,19 @@ use teleia::*; use glow::HasContext; -use crate::{background, input}; +use crate::{input, overlay}; pub const SCALE: usize = 4; pub const WIDTH: usize = 1920 / SCALE; pub const HEIGHT: usize = 1080 / SCALE; -pub struct Drawing { +pub struct Overlay { pub tex: texture::Texture, pub pixels: [u8; WIDTH * HEIGHT], pub last_point: Option<(i32, i32)>, pub shader_white: shader::Shader, pub shader_background: shader::Shader, } -impl Drawing { +impl Overlay { pub fn new(ctx: &context::Context) -> Self { let shader_background = shader::Shader::new( ctx, @@ -90,10 +90,12 @@ impl Drawing { ctx.gl.generate_mipmap(glow::TEXTURE_2D); } } - pub fn update(&mut self, ctx: &context::Context, st: &mut state::State, inp: &mut input::Input) { - match inp.get_command() { +} +impl overlay::Overlay for Overlay { + fn update(&mut self, ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State) -> Erm<()> { + match ost.input.get_command() { input::Command::Drawing => { - let (sx, sy) = inp.get_mouse(); + let (sx, sy) = ost.input.get_mouse(); let x = sx / (SCALE as i32); let y = sy / (SCALE as i32); if let Some(last) = self.last_point { @@ -110,19 +112,20 @@ impl Drawing { input::Command::None => { self.last_point = None; }, - _ => {}, } self.upload(ctx); + Ok(()) } - pub fn render(&self, ctx: &context::Context, st: &mut state::State, bg: &background::Backgrounds) { + fn render(&mut self, ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State) -> Erm<()> { st.bind_2d(ctx, &self.shader_background); self.tex.bind(ctx); - bg.drawing.bind_index(ctx, 1); + ost.backgrounds.drawing.bind_index(ctx, 1); self.shader_background.set_position_2d( ctx, &glam::Vec2::new(0.0, 0.0), &glam::Vec2::new(1920.0, 1080.0) ); st.mesh_square.render(ctx); + Ok(()) } } diff --git a/crates/renderer/src/overlay/mod.rs b/crates/renderer/src/overlay/mod.rs deleted file mode 100644 index 6bfa1ae..0000000 --- a/crates/renderer/src/overlay/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub mod model; -pub mod shader; -pub mod multi; -pub mod drawing; -pub mod automata; diff --git a/crates/renderer/src/overlay/model.rs b/crates/renderer/src/overlay/model.rs index 14f6076..98b008e 100644 --- a/crates/renderer/src/overlay/model.rs +++ b/crates/renderer/src/overlay/model.rs @@ -1,134 +1,85 @@ use teleia::*; use termion::raw::IntoRawMode; -use std::{collections::HashMap, f32::consts::PI}; +use std::f32::consts::PI; use lexpr::sexp; use base64::prelude::*; -use crate::{assets, terminal, toggle}; +use crate::{overlay, terminal}; -pub enum RenderMode { - Overlay, - Terminal(termion::raw::RawTerminal<std::io::Stdout>), -} - -pub struct Overlay { - mode: RenderMode, - assets: assets::Assets, - model: scene::Scene, - model_neck_base: glam::Mat4, - model_fb: framebuffer::Framebuffer, +pub struct Terminal { + ost: overlay::State, + output: termion::raw::RawTerminal<std::io::Stdout>, terminal: terminal::Terminal, - fig: fig::SexpClient, - tracking_eyes: (f32, f32), - tracking_mouth: f32, - tracking_neck: glam::Quat, - toggles: toggle::Toggles, + model_fb: framebuffer::Framebuffer, } - -impl Overlay { - pub fn new(ctx: &context::Context, mode: RenderMode) -> Self { - let model = scene::Scene::from_gltf(ctx, include_bytes!("../assets/scenes/lcolonq.vrm")); - let model_neck_base = model.nodes_by_name.get("J_Bip_C_Neck") - .and_then(|i| model.nodes.get(*i)) - .expect("failed to find neck joint") - .transform; +impl Terminal { + pub fn new(ctx: &context::Context) -> Self { Self { - mode, - assets: assets::Assets::new(ctx), - model, - model_neck_base, + ost: overlay::State::new(ctx), + output: std::io::stdout().into_raw_mode().expect("failed to set raw mode"), + terminal: terminal::Terminal::new(ctx, 64, 64), model_fb: framebuffer::Framebuffer::new( ctx, &glam::Vec2::new(64.0, 64.0), &glam::Vec2::ZERO ), - terminal: terminal::Terminal::new(ctx, 64, 64), - fig: fig::SexpClient::new("shiro:32050", &[ - sexp!((avatar toggle)), - sexp!((avatar toggle set)), - sexp!((avatar toggle unset)), - sexp!((avatar text)), - sexp!((avatar frame)), - sexp!((avatar reset)), - sexp!((avatar tracking)), - ]), - tracking_eyes: (1.0, 1.0), - tracking_mouth: 0.0, - tracking_neck: glam::Quat::IDENTITY, - toggles: toggle::Toggles::new(), } } - pub fn overlay(ctx: &context::Context) -> Self { - Self::new(ctx, RenderMode::Overlay) - } - pub fn terminal(ctx: &context::Context) -> Self { - let raw_stdout = std::io::stdout().into_raw_mode().expect("failed to set raw mode"); - Self::new(ctx, RenderMode::Terminal(raw_stdout)) - } - pub fn handle_reset(&mut self, _ctx: &context::Context) { - // TODO also reset terminal - self.toggles.reset(); - } - pub fn handle_tracking(&mut self, msg: fig::SexpMessage) -> Option<()> { - let eyes = msg.data.get(0)?; - let eye_left = eyes.get(0)?.as_str()?.parse::<f32>().ok()?; - let eye_right = eyes.get(1)?.as_str()?.parse::<f32>().ok()?; - let mouth = msg.data.get(1)?.as_str()?.parse::<f32>().ok()?; - let euler = msg.data.get(2)?; - let euler_x = euler.get(0)?.as_str()?.parse::<f32>().ok()?.to_radians(); - let euler_y = PI - euler.get(1)?.as_str()?.parse::<f32>().ok()?.to_radians(); - let euler_z = euler.get(2)?.as_str()?.parse::<f32>().ok()?.to_radians() + PI/2.0; - self.tracking_eyes = (eye_left, eye_right); - self.tracking_mouth = mouth; - self.tracking_neck = glam::Quat::from_euler(glam::EulerRot::XYZ, euler_x, euler_y, euler_z); - Some(()) - } - pub fn handle_text(&mut self, msg: fig::SexpMessage) -> Option<()> { - let bs = BASE64_STANDARD.decode(msg.data.get(0)?.as_str()?).ok()?; - let s = std::str::from_utf8(&bs).ok()?; - log::info!("handle_text: {}", s); - self.terminal.fill_string(s); - Some(()) - } - pub fn handle_frame(&mut self, msg: fig::SexpMessage) -> Option<()> { - let data = BASE64_STANDARD.decode(msg.data.get(0)?.as_str()?).ok()?; - for (i, c) in data.chunks_exact(3).enumerate() { - if let [r, g, b] = c { - let ii = i as i32; - let p = terminal::Pos::new(ii % 64, ii / 64); - self.terminal.base_color.set( - p, - glam::Vec3::new(*r as f32 / 255.0, *g as f32 / 255.0, *b as f32 / 255.0) - ); - } - } - Some(()) +} +impl teleia::state::Game for Terminal { + fn update(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { + st.projection = glam::Mat4::perspective_lh( + PI / 4.0, + self.terminal.width as f32 / self.terminal.height as f32, + 0.1, 10.0 + ); + Ok(()) } - fn render_model_terminal(&mut self, ctx: &context::Context, st: &mut state::State) -> Option<()> { + fn render(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { self.model_fb.bind(ctx); ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); ctx.clear(); - st.bind_3d(ctx, &self.assets.shader_scene); - self.assets.shader_scene.set_position_3d( + st.bind_3d(ctx, &self.ost.assets.shader_scene); + self.ost.assets.shader_scene.set_position_3d( ctx, &glam::Mat4::from_translation( glam::Vec3::new(0.0, -1.63, 0.42), ), ); - self.model.render(ctx, &self.assets.shader_scene); + self.ost.model.render(ctx, &self.ost.assets.shader_scene); st.render_framebuffer.bind(ctx); self.terminal.update(ctx, &self.model_fb); - match &mut self.mode { - RenderMode::Overlay => { - ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); - ctx.clear(); - self.terminal.render(ctx, &glam::Vec2::new(12.0, 250.0)); - }, - RenderMode::Terminal(stdout) => if st.tick % 6 == 0 { - self.terminal.write_tty(stdout); - }, + ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); + ctx.clear(); + self.terminal.render(ctx, &glam::Vec2::new(12.0, 250.0)); + Ok(()) + } +} + +pub struct Overlay { + terminal: terminal::Terminal, + model_fb: framebuffer::Framebuffer, +} +impl Overlay { + pub fn new(ctx: &context::Context) -> Self { + Self { + terminal: terminal::Terminal::new(ctx, 64, 64), + model_fb: framebuffer::Framebuffer::new( + ctx, + &glam::Vec2::new(64.0, 64.0), + &glam::Vec2::ZERO + ), } + } + pub fn handle_text(&mut self, msg: fig::SexpMessage) -> Option<()> { + let bs = BASE64_STANDARD.decode(msg.data.get(0)?.as_str()?).ok()?; + let s = std::str::from_utf8(&bs).ok()?; + log::info!("handle_text: {}", s); + self.terminal.fill_string(s); + Some(()) + } + fn render_model(&mut self, ctx: &context::Context, st: &mut state::State) -> Option<()> { // self.model_fb.blit( // ctx, &st.render_framebuffer, // &glam::Vec2::new(ctx.render_width / 2.0 - 512.0, ctx.render_height / 2.0 - 512.0), @@ -138,54 +89,38 @@ impl Overlay { } } -impl teleia::state::Game for Overlay { - fn initialize_audio(&self, ctx: &context::Context, st: &state::State, actx: &audio::Context) -> HashMap<String, audio::Audio> { - HashMap::new() +impl overlay::Overlay for Overlay { + fn handle(&mut self, ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State, msg: fig::SexpMessage) -> Erm<()> { + let malformed = format!("malformed {} data: {}", msg.event, msg.data); + if msg.event == sexp!((avatar text)) { + if self.handle_text(msg).is_none() { log::warn!("{}", malformed) } + } + Ok(()) } - fn finish_title(&mut self, _st: &mut state::State) {} - fn mouse_press(&mut self, _ctx: &context::Context, _st: &mut state::State) {} - fn mouse_move(&mut self, _ctx: &context::Context, _st: &mut state::State, _x: i32, _y: i32) {} - fn update(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { + fn render(&mut self, ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State) -> Erm<()> { + let old_projection = st.projection; st.projection = glam::Mat4::perspective_lh( PI / 4.0, self.terminal.width as f32 / self.terminal.height as f32, 0.1, 10.0 ); - st.move_camera( + self.model_fb.bind(ctx); + ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); + ctx.clear(); + st.bind_3d(ctx, &ost.assets.shader_scene); + ost.assets.shader_scene.set_position_3d( ctx, - &glam::Vec3::new(0.0, 0.0, 1.0), - &glam::Vec3::new(0.0, 0.0, -1.0), - &glam::Vec3::new(0.0, 1.0, 0.0), + &glam::Mat4::from_translation( + glam::Vec3::new(0.0, -1.63, 0.42), + ), ); - while let Some(msg) = self.fig.pump() { - let malformed = format!("malformed {} data: {}", msg.event, msg.data); - if msg.event == sexp!((avatar tracking)) { - if self.handle_tracking(msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar reset)) { - self.handle_reset(ctx); - } else if msg.event == sexp!((avatar toggle)) { - if self.toggles.handle(ctx, st, msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar toggle set)) { - if self.toggles.handle_set(ctx, st, msg, true).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar toggle unset)) { - if self.toggles.handle_set(ctx, st, msg, false).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar text)) { - if self.handle_text(msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar frame)) { - if self.handle_frame(msg).is_none() { log::warn!("{}", malformed) } - } else { - log::info!("received unhandled event {} with data: {}", msg.event, msg.data); - } - } - if let Some(n) = self.model.nodes_by_name.get("J_Bip_C_Neck").and_then(|i| self.model.nodes.get_mut(*i)) { - n.transform = self.model_neck_base * glam::Mat4::from_quat(self.tracking_neck); - } - Ok(()) - } - fn render(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { + ost.model.render(ctx, &ost.assets.shader_scene); + st.render_framebuffer.bind(ctx); + self.terminal.update(ctx, &self.model_fb); ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); ctx.clear(); - self.render_model_terminal(ctx, st); + self.terminal.render(ctx, &glam::Vec2::new(12.0, 250.0)); + st.projection = old_projection; Ok(()) } } diff --git a/crates/renderer/src/overlay/multi.rs b/crates/renderer/src/overlay/multi.rs deleted file mode 100644 index e3d0100..0000000 --- a/crates/renderer/src/overlay/multi.rs +++ /dev/null @@ -1,194 +0,0 @@ -use std::{collections::HashMap, f32::consts::PI}; - -use teleia::*; - -use lexpr::sexp; -use crate::{assets, fig, terminal}; - -struct Model { - model: scene::Scene, - pos: glam::Vec3, - neck_base: glam::Mat4, - tracking_eyes: (f32, f32), - tracking_mouth: f32, - tracking_neck: glam::Quat, -} -impl Model { - pub fn new(ctx: &context::Context, pos: glam::Vec3) -> Self { - let model = scene::Scene::from_gltf(ctx, include_bytes!("../assets/scenes/lcolonq.vrm")); - let neck_base = model.nodes_by_name.get("J_Bip_C_Neck") - .and_then(|i| model.nodes.get(*i)) - .expect("failed to find neck joint") - .transform; - Self { - model, - pos, - neck_base, - tracking_eyes: (1.0, 1.0), - tracking_mouth: 0.0, - tracking_neck: glam::Quat::IDENTITY, - } - } - pub fn handle_tracking(&mut self, msg: fig::SexpMessage) -> Option<()> { - let eyes = msg.data.get(0)?; - let eye_left = eyes.get(0)?.as_str()?.parse::<f32>().ok()?; - let eye_right = eyes.get(1)?.as_str()?.parse::<f32>().ok()?; - let mouth = msg.data.get(1)?.as_str()?.parse::<f32>().ok()?; - let euler = msg.data.get(2)?; - let euler_x = euler.get(0)?.as_str()?.parse::<f32>().ok()?.to_radians(); - let euler_y = PI - euler.get(1)?.as_str()?.parse::<f32>().ok()?.to_radians(); - let euler_z = euler.get(2)?.as_str()?.parse::<f32>().ok()?.to_radians() + PI/2.0; - self.tracking_eyes = (eye_left, eye_right); - self.tracking_mouth = mouth; - self.tracking_neck = glam::Quat::from_euler(glam::EulerRot::XYZ, euler_x, euler_y, euler_z); - Some(()) - } - fn render( - &mut self, - ctx: &context::Context, st: &mut state::State, - a: &assets::Assets, - ) -> Option<()> { - if let Some(n) = self.model.nodes_by_name.get("J_Bip_C_Neck").and_then(|i| self.model.nodes.get_mut(*i)) { - n.transform = self.neck_base * glam::Mat4::from_quat(self.tracking_neck); - } - st.bind_3d(ctx, &a.shader_scene); - a.shader_scene.set_position_3d( - ctx, - &glam::Mat4::from_translation(self.pos), - ); - self.model.render(ctx, &a.shader_scene); - Some(()) - } -} - -pub struct Overlay { - assets: assets::Assets, - models: Vec<Model>, - fb: framebuffer::Framebuffer, - term: terminal::Terminal, - fig: fig::SexpClient, -} -impl Overlay { - pub fn new(ctx: &context::Context) -> Self { - let models = vec![ - Model::new(ctx, glam::Vec3::new(0.2, -1.63, 0.42)), - Model::new(ctx, glam::Vec3::new(-0.2, -1.63, 0.42)), - ]; - Self { - assets: assets::Assets::new(ctx), - fb: framebuffer::Framebuffer::new( - ctx, - &glam::Vec2::new(128.0, 64.0), - &glam::Vec2::ZERO - ), - term: terminal::Terminal::new(ctx, 128, 64), - models, - fig: fig::SexpClient::new("shiro:32050", &[ - sexp!((avatar toggle)), - sexp!((avatar toggle set)), - sexp!((avatar toggle unset)), - sexp!((avatar text)), - sexp!((avatar frame)), - sexp!((avatar reset)), - sexp!((avatar tracking)), - ]), - } - } - fn render_texture(&self, ctx: &context::Context, st: &mut state::State, tex: &texture::Texture, pos: glam::Vec2, dims: glam::Vec2) { - self.assets.shader_flat.bind(ctx); - self.assets.shader_flat.set_mat4(&ctx, "projection", &glam::Mat4::IDENTITY); - let width = self.term.width as f32; - let halfwidth = dims.x / 2.0; - let height = self.term.height as f32; - let halfheight = dims.y / 2.0; - self.assets.shader_flat.set_mat4( - ctx, "view", - &glam::Mat4::from_scale( - glam::Vec3::new( - 2.0 / width, - 2.0 / height, - 1.0, - ), - ), - ); - self.assets.shader_flat.set_mat4( - &ctx, "position", - &glam::Mat4::from_scale_rotation_translation( - glam::Vec3::new(halfwidth, halfheight, 1.0), - glam::Quat::IDENTITY, - glam::Vec3::new( - -width / 2.0 + pos.x + halfwidth, - height / 2.0 - pos.y - halfheight, - 0.0, - ), - ) - ); - tex.bind(ctx); - st.mesh_square.render(ctx); - } -} -impl teleia::state::Game for Overlay { - fn initialize_audio(&self, ctx: &context::Context, st: &state::State, actx: &audio::Context) -> HashMap<String, audio::Audio> { - HashMap::new() - } - fn finish_title(&mut self, _st: &mut state::State) {} - fn mouse_press(&mut self, _ctx: &context::Context, _st: &mut state::State) {} - fn mouse_move(&mut self, _ctx: &context::Context, _st: &mut state::State, _x: i32, _y: i32) {} - fn update(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { - st.projection = glam::Mat4::perspective_lh( - PI / 4.0, - self.term.width as f32 / self.term.height as f32, - 0.1, 10.0 - ); - st.move_camera( - ctx, - &glam::Vec3::new(0.0, 0.0, 1.0), - &glam::Vec3::new(0.0, 0.0, -1.0), - &glam::Vec3::new(0.0, 1.0, 0.0), - ); - while let Some(msg) = self.fig.pump() { - let malformed = format!("malformed {} data: {}", msg.event, msg.data); - if msg.event == sexp!((avatar tracking)) { - if let Some(eidx) = msg.data.get(3) { - if let Some(idx) = eidx.as_u64() { - if let Some(m) = self.models.get_mut(idx as usize) { - if m.handle_tracking(msg.clone()).is_none() { log::warn!("{}", malformed) } - } else { log::warn!("index {} out of bounds", idx) } - } - } else { log::warn!("missing index") } - } - } - Ok(()) - } - fn render(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { - self.fb.bind(ctx); - ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); - ctx.clear(); - self.render_texture( - ctx, st, &self.assets.texture_operatop, - glam::Vec2::new(0.0, 0.0), - glam::Vec2::new(128.0, 76.0), - ); - ctx.clear_depth(); - for m in self.models.iter_mut() { - m.render(ctx, st, &self.assets); - } - ctx.clear_depth(); - self.render_texture( - ctx, st, &self.assets.texture_mod, - glam::Vec2::new(32.0, 0.0), - glam::Vec2::new(32.0, 16.0), - ); - self.render_texture( - ctx, st, &self.assets.texture_operabottom, - glam::Vec2::new(0.0, 55.0), - glam::Vec2::new(128.0, 22.0), - ); - st.render_framebuffer.bind(ctx); - 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(32.0, 32.0)); - Ok(()) - } -} diff --git a/crates/renderer/src/overlay/shader.rs b/crates/renderer/src/overlay/shader.rs index 81e29f4..11133bf 100644 --- a/crates/renderer/src/overlay/shader.rs +++ b/crates/renderer/src/overlay/shader.rs @@ -1,121 +1,21 @@ use teleia::*; -use std::{collections::HashMap, f32::consts::PI}; use lexpr::sexp; use base64::prelude::*; -use glow::HasContext; - -use crate::{assets, fig, toggle, input, background}; -use super::{drawing, automata}; - -pub struct Chat { - author: String, - msg: String, - time: f64, - biblicality: f32, -} -impl Chat { - pub fn new() -> Self { - Self { - author: format!(""), - msg: format!(""), - time: 0.0, - biblicality: 0.0, - } - } -} +use crate::{fig, overlay, toggle}; pub struct Overlay { - assets: assets::Assets, - model: scene::Scene, - model_neck_base: glam::Mat4, - fig: fig::SexpClient, - fig_binary: fig::BinaryClient, - tracking_eyes: (f32, f32), - tracking_mouth: f32, - tracking_neck: glam::Quat, - throwshade: newton_throwshade::ThrowShade, - emacs_cursor: (f32, f32), - mouse_cursor: (f32, f32), - emacs_heartrate: i32, - muzak_author: Option<String>, - chat: Chat, - toggles: toggle::Toggles, - input: input::Input, - backgrounds: background::Backgrounds, - drawing: drawing::Drawing, - automata: automata::Board, + visualizer: newton_shader::Visualizer, } impl Overlay { pub fn new(ctx: &context::Context) -> Self { - let model = scene::Scene::from_gltf(ctx, include_bytes!("../assets/scenes/lcolonq.vrm")); - let model_neck_base = model.nodes_by_name.get("J_Bip_C_Neck") - .and_then(|i| model.nodes.get(*i)) - .expect("failed to find neck joint") - .transform; - let throwshade = newton_throwshade::ThrowShade::new(); - let mut automata = automata::Board::new(ctx); - automata.test_glider(); + let visualizer = newton_shader::Visualizer::new(); Self { - assets: assets::Assets::new(ctx), - model, - model_neck_base, - fig: fig::SexpClient::new("shiro:32050", &[ - sexp!((avatar toggle)), - sexp!((avatar toggle set)), - sexp!((avatar toggle unset)), - sexp!((avatar text)), - sexp!((avatar frame)), - sexp!((avatar reset)), - sexp!((avatar tracking)), - sexp!((avatar overlay shader)), - sexp!((avatar overlay muzak)), - sexp!((avatar overlay muzak clear)), - sexp!((avatar overlay chat)), - sexp!((avatar overlay cursor)), - sexp!((avatar overlay emacs)), - ]), - fig_binary: fig::BinaryClient::new("shiro:32051", false, &[ - b"background frame" - ]), - tracking_eyes: (1.0, 1.0), - tracking_mouth: 0.0, - tracking_neck: glam::Quat::IDENTITY, - emacs_cursor: (0.0, 0.0), - mouse_cursor: (0.0, 0.0), - emacs_heartrate: 0, - throwshade, - muzak_author: None, - chat: Chat::new(), - toggles: toggle::Toggles::new(), - backgrounds: background::Backgrounds::new(ctx), - input: input::Input::new(), - drawing: drawing::Drawing::new(ctx), - automata, + visualizer, } } - pub fn handle_reset(&mut self, ctx: &context::Context) { - // TODO also reset terminal - if let Some(s) = &mut self.throwshade.shader { s.delete(ctx); } - self.throwshade.shader = None; - self.toggles.reset(); - } - pub fn handle_tracking(&mut self, msg: fig::SexpMessage) -> Option<()> { - let eyes = msg.data.get(0)?; - let eye_left = eyes.get(0)?.as_str()?.parse::<f32>().ok()?; - let eye_right = eyes.get(1)?.as_str()?.parse::<f32>().ok()?; - let mouth = msg.data.get(1)?.as_str()?.parse::<f32>().ok()?; - let euler = msg.data.get(2)?; - let euler_x = euler.get(0)?.as_str()?.parse::<f32>().ok()?.to_radians(); - let euler_y = PI - euler.get(1)?.as_str()?.parse::<f32>().ok()?.to_radians(); - let euler_z = euler.get(2)?.as_str()?.parse::<f32>().ok()?.to_radians() + PI/2.0; - self.tracking_eyes = (eye_left, eye_right); - self.tracking_mouth = mouth; - self.tracking_neck = glam::Quat::from_euler(glam::EulerRot::XYZ, euler_x, euler_y, euler_z); - Some(()) - } pub fn handle_overlay_shader( &mut self, ctx: &context::Context, st: &state::State, @@ -125,145 +25,60 @@ impl Overlay { let author = String::from_utf8_lossy(&ba); let bs = BASE64_STANDARD.decode(msg.data.get(1)?.as_str()?).ok()?; let s = String::from_utf8_lossy(&bs); - self.throwshade.author = author.to_string(); - if let Err(e) = self.throwshade.set(ctx, st, &s) { + self.visualizer.author = author.to_string(); + if let Err(e) = self.visualizer.set(ctx, st, &s) { log::warn!("error compiling shader: {}", e); - self.throwshade.shader = None; + self.visualizer.shader = None; } Some(()) } - pub fn handle_overlay_muzak(&mut self, msg: fig::SexpMessage) -> Option<()> { - let ba = BASE64_STANDARD.decode(msg.data.get(0)?.as_str()?).ok()?; - let author = String::from_utf8_lossy(&ba); - self.muzak_author = Some(author.to_string()); - Some(()) - } - pub fn handle_overlay_muzak_clear(&mut self) -> Option<()> { - self.muzak_author = None; - Some(()) - } - pub fn handle_overlay_chat(&mut self, msg: fig::SexpMessage) -> Option<()> { - let ba = BASE64_STANDARD.decode(msg.data.get(0)?.as_str()?).ok()?; - let a = String::from_utf8_lossy(&ba); - let bs = BASE64_STANDARD.decode(msg.data.get(1)?.as_str()?).ok()?; - let s = String::from_utf8_lossy(&bs); - let time = msg.data.get(2)?.as_str()?.parse::<f64>().ok()?; - let biblicality = msg.data.get(3)?.as_str()?.parse::<f32>().ok()?; - self.chat.author = a.to_string(); - self.chat.msg = s.to_string(); - self.chat.time = time; - self.chat.biblicality = biblicality; - Some(()) - } - pub fn handle_overlay_cursor(&mut self, msg: fig::SexpMessage) -> Option<()> { - let cursor_x = msg.data.get(0)?.as_i64()? as f32; - let cursor_y = msg.data.get(1)?.as_i64()? as f32; - self.emacs_cursor = (cursor_x, cursor_y); - Some(()) - } - pub fn handle_overlay_emacs(&mut self, msg: fig::SexpMessage) -> Option<()> { - self.emacs_heartrate = msg.data.get(0)?.as_i64()? as i32; - Some(()) - } } -impl teleia::state::Game for Overlay { - fn initialize_audio(&self, ctx: &context::Context, st: &state::State, actx: &audio::Context) -> HashMap<String, audio::Audio> { - HashMap::new() +impl overlay::Overlay for Overlay { + fn reset(&mut self, ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State) -> Erm<()> { + if let Some(s) = &mut self.visualizer.shader { s.delete(ctx); } + self.visualizer.shader = None; + Ok(()) } - fn finish_title(&mut self, _st: &mut state::State) {} - fn mouse_press(&mut self, _ctx: &context::Context, _st: &mut state::State) {} - fn mouse_move(&mut self, _ctx: &context::Context, _st: &mut state::State, _x: i32, _y: i32) {} - fn update(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { - st.move_camera( - ctx, - &glam::Vec3::new(0.0, 0.0, 1.0), - &glam::Vec3::new(0.0, 0.0, -1.0), - &glam::Vec3::new(0.0, 1.0, 0.0), - ); - let (x, y) = self.input.get_mouse(); - self.mouse_cursor = (x as f32, y as f32); - while let Some(msg) = self.fig.pump() { + fn handle(&mut self, ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State, msg: fig::SexpMessage) -> Erm<()> { + if msg.event == sexp!((avatar overlay shader)) { let malformed = format!("malformed {} data: {}", msg.event, msg.data); - if msg.event == sexp!((avatar tracking)) { - if self.handle_tracking(msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar reset)) { - self.handle_reset(ctx); - } else if msg.event == sexp!((avatar toggle)) { - if self.toggles.handle(ctx, st, msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar toggle set)) { - if self.toggles.handle_set(ctx, st, msg, true).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar toggle unset)) { - if self.toggles.handle_set(ctx, st, msg, false).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar overlay shader)) { - if self.handle_overlay_shader(ctx, st, msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar overlay muzak)) { - if self.handle_overlay_muzak(msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar overlay muzak clear)) { - if self.handle_overlay_muzak_clear().is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar overlay chat)) { - if self.handle_overlay_chat(msg).is_none() { log::warn!("{}", malformed) } - } else if msg.event == sexp!((avatar overlay cursor)) { - if self.handle_overlay_cursor(msg).is_none() { log::warn!("{}", malformed) } - } else { - log::info!("received unhandled event {} with data: {}", msg.event, msg.data); - } - } - while let Some(msg) = self.fig_binary.pump() { - match &*msg.event { - b"background frame" => { - if let Some(f) = background::Frame::parse(&mut &*msg.data) { - self.backgrounds.update(ctx, f); - } else { - log::warn!("failed to parse frame"); - } - }, - ev => { - log::info!("unhandled event: {:?}", ev); - }, - } - } - if let Some(n) = self.model.nodes_by_name.get("J_Bip_C_Neck").and_then(|i| self.model.nodes.get_mut(*i)) { - n.transform = self.model_neck_base * glam::Mat4::from_quat(self.tracking_neck); + if self.handle_overlay_shader(ctx, st, msg).is_none() { log::warn!("{}", malformed) } } - self.drawing.update(ctx, st, &mut self.input); - self.automata.update(ctx, st); Ok(()) } - fn render(&mut self, ctx: &context::Context, st: &mut state::State) -> Erm<()> { - ctx.clear_color(glam::Vec4::new(0.0, 0.0, 0.0, 0.0)); - ctx.clear(); - if let Some(s) = &self.throwshade.shader { + fn render(&mut self, ctx: &context::Context, st: &mut state::State, ost: &mut overlay::State) -> Erm<()> { + if let Some(s) = &self.visualizer.shader { s.bind(ctx); s.set_f32( ctx, "opacity", - if let Some(t@toggle::Toggle { val: true, .. }) = self.toggles.get(ctx, st, "shaderclarity") { + if let Some(t@toggle::Toggle { val: true, .. }) = ost.toggles.get(ctx, st, "shaderclarity") { ((st.tick - t.set_time) as f32 / 60.0).clamp(0.0, 1.0) * 0.5 + 0.5 - } else if let Some(t@toggle::Toggle { val: false, .. }) = self.toggles.get(ctx, st, "shaderclarity") { + } else if let Some(t@toggle::Toggle { val: false, .. }) = ost.toggles.get(ctx, st, "shaderclarity") { (1.0 - ((st.tick - t.set_time) as f32 / 60.0).clamp(0.0, 1.0)) * 0.5 + 0.5 } else { 0.5 } ); s.set_vec2(ctx, "resolution", &glam::Vec2::new(ctx.render_width, ctx.render_height)); - let elapsed = (st.tick - self.throwshade.tickset) as f32 / 60.0; + let elapsed = (st.tick - self.visualizer.tickset) as f32 / 60.0; s.set_f32(ctx, "time", elapsed); - s.set_f32(ctx, "chat_time", (self.chat.time - self.throwshade.timeset) as f32); + s.set_f32(ctx, "chat_time", (ost.chat.time - self.visualizer.timeset) as f32); ctx.render_no_geometry(); - s.set_f32(ctx, "tracking_mouth", self.tracking_mouth); + s.set_f32(ctx, "tracking_mouth", ost.tracking_mouth); // log::info!("eyes: {:?}", self.tracking_eyes); - s.set_vec2(ctx, "tracking_eyes", &glam::Vec2::new(self.tracking_eyes.0, self.tracking_eyes.1)); - s.set_mat4(ctx, "tracking_neck", &glam::Mat4::from_quat(self.tracking_neck)); - s.set_vec2(ctx, "emacs_cursor", &glam::Vec2::new(self.emacs_cursor.0, self.emacs_cursor.1)); - s.set_vec2(ctx, "mouse_cursor", &glam::Vec2::new(self.mouse_cursor.0, self.mouse_cursor.1)); - s.set_i32(ctx, "heartrate", self.emacs_heartrate); + s.set_vec2(ctx, "tracking_eyes", &glam::Vec2::new(ost.tracking_eyes.0, ost.tracking_eyes.1)); + s.set_mat4(ctx, "tracking_neck", &glam::Mat4::from_quat(ost.tracking_neck)); + s.set_vec2(ctx, "emacs_cursor", &glam::Vec2::new(ost.emacs_cursor.0, ost.emacs_cursor.1)); + s.set_vec2(ctx, "mouse_cursor", &glam::Vec2::new(ost.mouse_cursor.0, ost.mouse_cursor.1)); + s.set_i32(ctx, "heartrate", ost.emacs_heartrate); } - if let Some(t@toggle::Toggle { val: true, .. }) = self.toggles.get(ctx, st, "adblock") { - st.bind_2d(ctx, &self.assets.shader_flat); - self.assets.texture_adblock.bind(ctx); + if let Some(t@toggle::Toggle { val: true, .. }) = ost.toggles.get(ctx, st, "adblock") { + st.bind_2d(ctx, &ost.assets.shader_flat); + ost.assets.texture_adblock.bind(ctx); let tr = 1.0 - ((st.tick - t.set_time) as f32 / 60.0).clamp(0.0, 1.0); - self.assets.shader_flat.set_f32(ctx, "transparency", tr); - self.assets.shader_flat.set_position_2d( + ost.assets.shader_flat.set_f32(ctx, "transparency", tr); + ost.assets.shader_flat.set_position_2d( ctx, &glam::Vec2::new(1100.0, 300.0), &glam::Vec2::new(800.0, 600.0) @@ -271,16 +86,14 @@ impl teleia::state::Game for Overlay { st.mesh_square.render(ctx); } let mut authors = Vec::new(); - if let Some(_) = &self.throwshade.shader { - authors.push(format!("shader by {}", self.throwshade.author)); + if let Some(_) = &self.visualizer.shader { + authors.push(format!("shader by {}", self.visualizer.author)); } - if let Some(a) = &self.muzak_author { + if let Some(a) = &ost.muzak_author { authors.push(format!("music by {}", a)); } let astr: String = authors.join(", "); - self.assets.font.render_text(ctx, &glam::Vec2::new(0.0, 0.0), &astr); - self.drawing.render(ctx, st, &self.backgrounds); - self.automata.render(ctx, st); + ost.assets.font.render_text(ctx, &glam::Vec2::new(0.0, 0.0), &astr); Ok(()) } } |