summaryrefslogtreecommitdiff
path: root/crates/renderer/src/overlay/model.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/renderer/src/overlay/model.rs')
-rw-r--r--crates/renderer/src/overlay/model.rs215
1 files changed, 75 insertions, 140 deletions
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(())
}
}