summaryrefslogtreecommitdiff
path: root/src/common/overlay
diff options
context:
space:
mode:
authorLLLL Colonq <llll@colonq>2025-02-16 22:55:43 -0500
committerLLLL Colonq <llll@colonq>2025-02-16 22:55:43 -0500
commit4d0a8140130ebd0f46744b86eeb2a708657a942e (patch)
tree6b1a11e07173c769d0f3522c2f6088409b69332d /src/common/overlay
parent33d69b282e082acce3c5d36cc08cd99a7ccf738d (diff)
Switch to workspace
Diffstat (limited to 'src/common/overlay')
-rw-r--r--src/common/overlay/assets.rs27
-rw-r--r--src/common/overlay/assets/audio/test.wavbin924 -> 0 bytes
-rw-r--r--src/common/overlay/assets/fonts/iosevka-comfy-regular.ttfbin7811628 -> 0 bytes
-rw-r--r--src/common/overlay/assets/fonts/terminus.pngbin1215 -> 0 bytes
-rw-r--r--src/common/overlay/assets/fonts/terminus.ttfbin500668 -> 0 bytes
-rw-r--r--src/common/overlay/assets/meshes/square.obj15
-rw-r--r--src/common/overlay/assets/scenes/lcolonq.vrmbin12451548 -> 0 bytes
-rw-r--r--src/common/overlay/assets/shaders/flat/frag.glsl11
-rw-r--r--src/common/overlay/assets/shaders/flat/vert.glsl4
-rw-r--r--src/common/overlay/assets/shaders/scene/frag.glsl11
-rw-r--r--src/common/overlay/assets/shaders/scene/vert.glsl18
-rw-r--r--src/common/overlay/assets/shaders/throwshade/frag.glsl26
-rw-r--r--src/common/overlay/assets/shaders/throwshade/vert.glsl22
-rw-r--r--src/common/overlay/assets/textures/test.pngbin714 -> 0 bytes
-rw-r--r--src/common/overlay/fig.rs40
-rw-r--r--src/common/overlay/terminal.rs251
-rw-r--r--src/common/overlay/throwshade.rs33
17 files changed, 0 insertions, 458 deletions
diff --git a/src/common/overlay/assets.rs b/src/common/overlay/assets.rs
deleted file mode 100644
index 9a0cefc..0000000
--- a/src/common/overlay/assets.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use teleia::*;
-
-pub struct Assets {
- pub font: font::Bitmap,
- pub shader_flat: shader::Shader,
- pub shader_scene: shader::Shader,
- pub mesh_square: mesh::Mesh,
-}
-
-impl Assets {
- pub fn new(ctx: &context::Context) -> Self {
- Self {
- font: font::Bitmap::new(ctx),
- shader_flat: shader::Shader::new(
- ctx,
- include_str!("assets/shaders/flat/vert.glsl"),
- include_str!("assets/shaders/flat/frag.glsl"),
- ),
- shader_scene: shader::Shader::new(
- ctx,
- include_str!("assets/shaders/scene/vert.glsl"),
- include_str!("assets/shaders/scene/frag.glsl")
- ),
- mesh_square: mesh::Mesh::from_obj(ctx, include_bytes!("assets/meshes/square.obj")),
- }
- }
-}
diff --git a/src/common/overlay/assets/audio/test.wav b/src/common/overlay/assets/audio/test.wav
deleted file mode 100644
index 0eabe85..0000000
--- a/src/common/overlay/assets/audio/test.wav
+++ /dev/null
Binary files differ
diff --git a/src/common/overlay/assets/fonts/iosevka-comfy-regular.ttf b/src/common/overlay/assets/fonts/iosevka-comfy-regular.ttf
deleted file mode 100644
index b474adc..0000000
--- a/src/common/overlay/assets/fonts/iosevka-comfy-regular.ttf
+++ /dev/null
Binary files differ
diff --git a/src/common/overlay/assets/fonts/terminus.png b/src/common/overlay/assets/fonts/terminus.png
deleted file mode 100644
index 287810b..0000000
--- a/src/common/overlay/assets/fonts/terminus.png
+++ /dev/null
Binary files differ
diff --git a/src/common/overlay/assets/fonts/terminus.ttf b/src/common/overlay/assets/fonts/terminus.ttf
deleted file mode 100644
index d125e63..0000000
--- a/src/common/overlay/assets/fonts/terminus.ttf
+++ /dev/null
Binary files differ
diff --git a/src/common/overlay/assets/meshes/square.obj b/src/common/overlay/assets/meshes/square.obj
deleted file mode 100644
index 7328a6c..0000000
--- a/src/common/overlay/assets/meshes/square.obj
+++ /dev/null
@@ -1,15 +0,0 @@
-# Blender 3.6.2
-# www.blender.org
-o Cube
-v -1.000000 -1.000000 0.000000
-v 1.000000 -1.000000 0.000000
-v -1.000000 1.000000 0.000000
-v 1.000000 1.000000 0.000000
-vn -0.0000 -0.0000 -1.0000
-vt 0.0 1.0
-vt 1.0 0.0
-vt 0.0 0.0
-vt 1.0 1.0
-s 0
-f 3/1/1 2/2/1 1/3/1
-f 3/1/1 4/4/1 2/2/1
diff --git a/src/common/overlay/assets/scenes/lcolonq.vrm b/src/common/overlay/assets/scenes/lcolonq.vrm
deleted file mode 100644
index 49fa4a4..0000000
--- a/src/common/overlay/assets/scenes/lcolonq.vrm
+++ /dev/null
Binary files differ
diff --git a/src/common/overlay/assets/shaders/flat/frag.glsl b/src/common/overlay/assets/shaders/flat/frag.glsl
deleted file mode 100644
index 7006a2b..0000000
--- a/src/common/overlay/assets/shaders/flat/frag.glsl
+++ /dev/null
@@ -1,11 +0,0 @@
-uniform sampler2D texture_data;
-
-void main()
-{
- vec2 tcfull = vec2(vertex_texcoord.x, 1.0 - vertex_texcoord.y);
- vec4 texel = texture(texture_data, tcfull);
- if (texel.a != 1.0) {
- discard;
- }
- frag_color = texel;
-}
diff --git a/src/common/overlay/assets/shaders/flat/vert.glsl b/src/common/overlay/assets/shaders/flat/vert.glsl
deleted file mode 100644
index e324f7e..0000000
--- a/src/common/overlay/assets/shaders/flat/vert.glsl
+++ /dev/null
@@ -1,4 +0,0 @@
-void main()
-{
- default_main();
-} \ No newline at end of file
diff --git a/src/common/overlay/assets/shaders/scene/frag.glsl b/src/common/overlay/assets/shaders/scene/frag.glsl
deleted file mode 100644
index 81e08b9..0000000
--- a/src/common/overlay/assets/shaders/scene/frag.glsl
+++ /dev/null
@@ -1,11 +0,0 @@
-uniform sampler2D texture_data;
-
-void main()
-{
- vec4 texel = texture(texture_data, vertex_texcoord);
- if (texel.a != 1.0) {
- discard;
- }
-
- frag_color = vec4(texel.rgb, texel.a);
-}
diff --git a/src/common/overlay/assets/shaders/scene/vert.glsl b/src/common/overlay/assets/shaders/scene/vert.glsl
deleted file mode 100644
index 64f400c..0000000
--- a/src/common/overlay/assets/shaders/scene/vert.glsl
+++ /dev/null
@@ -1,18 +0,0 @@
-in vec4 joint;
-in vec4 weight;
-
-uniform mat4 joint_matrices[128];
-
-void main()
-{
- vertex_texcoord = texcoord;
- vertex_normal = (normal_matrix * vec4(normal, 1.0)).xyz;
- mat4 skin
- = weight.x * joint_matrices[int(joint.x)]
- + weight.y * joint_matrices[int(joint.y)]
- + weight.z * joint_matrices[int(joint.z)]
- + weight.w * joint_matrices[int(joint.w)];
- vec3 pos = (position * skin * vec4(vertex, 1.0)).xyz;
- vertex_view_vector = camera_pos - pos;
- gl_Position = projection * view * vec4(pos, 1.0);
-}
diff --git a/src/common/overlay/assets/shaders/throwshade/frag.glsl b/src/common/overlay/assets/shaders/throwshade/frag.glsl
deleted file mode 100644
index 2acc78d..0000000
--- a/src/common/overlay/assets/shaders/throwshade/frag.glsl
+++ /dev/null
@@ -1,26 +0,0 @@
-#version 300 es
-precision highp float;
-
-in vec2 vertex_texcoord;
-out vec4 frag_color;
-
-uniform vec2 resolution;
-
-uniform float time;
-
-uniform float bpm;
-
-uniform vec2 cursor;
-
-uniform float chat_time;
-uniform float chat_biblicality;
-
-vec4 shade(vec2);
-
-void main() {
- vec2 inverted = vec2(vertex_texcoord.x, 1.0 - vertex_texcoord.y);
- frag_color = shade(inverted);
- frag_color.a = clamp(frag_color.a * 0.5, 0.0, 0.5);
-}
-
-// "The Cutoff"
diff --git a/src/common/overlay/assets/shaders/throwshade/vert.glsl b/src/common/overlay/assets/shaders/throwshade/vert.glsl
deleted file mode 100644
index e05bbb6..0000000
--- a/src/common/overlay/assets/shaders/throwshade/vert.glsl
+++ /dev/null
@@ -1,22 +0,0 @@
-#version 300 es
-precision highp float;
-
-out vec2 vertex_texcoord;
-
-void main() {
- const vec2 positions[4] = vec2[](
- vec2(-1, -1),
- vec2(+1, -1),
- vec2(-1, +1),
- vec2(+1, +1)
- );
- const vec2 coords[4] = vec2[](
- vec2(0, 0),
- vec2(1, 0),
- vec2(0, 1),
- vec2(1, 1)
- );
-
- vertex_texcoord = coords[gl_VertexID];
- gl_Position = vec4(positions[gl_VertexID], 0.0, 1.0);
-}
diff --git a/src/common/overlay/assets/textures/test.png b/src/common/overlay/assets/textures/test.png
deleted file mode 100644
index 1f1edca..0000000
--- a/src/common/overlay/assets/textures/test.png
+++ /dev/null
Binary files differ
diff --git a/src/common/overlay/fig.rs b/src/common/overlay/fig.rs
deleted file mode 100644
index b60f8e9..0000000
--- a/src/common/overlay/fig.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use std::io::{BufRead, Write};
-
-#[derive(Debug, Clone)]
-pub struct Message {
- pub event: lexpr::Value,
- pub data: lexpr::Value,
-}
-
-pub struct Client {
- reader: std::io::BufReader<std::net::TcpStream>,
-}
-impl Client {
- pub fn new(addr: &str, subs: &[lexpr::Value]) -> Self {
- let mut socket = std::net::TcpStream::connect(addr).expect("failed to connect to message bus");
- socket.set_nonblocking(true).expect("failed to set message bus socket nonblocking");
- for s in subs {
- write!(socket, "(sub {})\n", s).expect("failed to send subscribe message to bus");
- }
- let reader = std::io::BufReader::new(socket);
- Self { reader, }
- }
- pub fn pump(&mut self) -> Option<Message> {
- let mut buf = String::new();
- match self.reader.read_line(&mut buf) {
- Ok(l) => match lexpr::from_str(&buf) {
- Ok(v) => {
- match v.as_cons() {
- Some(cs) => {
- Some(Message { event: cs.car().clone(), data: cs.cdr().clone() })
- },
- _ => { log::error!("malformed message bus input s-expression: {}", v); None },
- }
- },
- Err(e) => { log::error!("malformed message bus input line: {}", e); None },
- },
- Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => None,
- Err(e) => panic!("IO error on message bus: {}", e),
- }
- }
-}
diff --git a/src/common/overlay/terminal.rs b/src/common/overlay/terminal.rs
deleted file mode 100644
index e65aaba..0000000
--- a/src/common/overlay/terminal.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-use std::{collections::HashMap, io::Write};
-
-use teleia::*;
-
-pub const WIDTH: usize = 64;
-pub const HEIGHT: usize = 64;
-
-#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq)]
-pub struct Pos {
- pub x: i32, pub y: i32,
-}
-impl Pos {
- pub fn new(x: i32, y: i32) -> Self { Self { x, y } }
-}
-impl std::ops::Add for Pos {
- type Output = Pos;
- fn add(self, rhs: Self) -> Self { Self {x: self.x + rhs.x, y: self.y + rhs.y } }
-}
-
-#[derive(Debug, Clone)]
-pub struct CharPair {
- pub first: char,
- pub second: Option<char>,
-}
-impl Default for CharPair {
- fn default() -> Self {
- Self {
- first: 'a',
- second: Some('b'),
- }
- }
-}
-
-pub struct Layer<T> {
- pub data: [T; WIDTH * HEIGHT],
-}
-impl<T> Layer<T> {
- pub fn new() -> Self where T: Default {
- Self {
- data: [(); WIDTH * HEIGHT].map(|_| T::default()),
- }
- }
- pub fn get(&self, p: Pos) -> Option<&T> {
- if p.x < 0 || p.x >= WIDTH as _ || p.y < 0 || p.y >= HEIGHT as _ { return None }
- let idx = p.x as usize + p.y as usize * WIDTH;
- Some(&self.data[idx])
- }
- pub fn set(&mut self, p: Pos, x: T) {
- if p.x < 0 || p.x >= WIDTH as _ || p.y < 0 || p.y >= HEIGHT as _ { return }
- let idx = p.x as usize + p.y as usize * WIDTH;
- self.data[idx] = x;
- }
-}
-impl Layer<CharPair> {
- pub fn from_str(&mut self, s: &str) {
- let chars: Vec<char> = s.chars().collect();
- if chars.is_empty() { return }
- let mut i: usize = 0;
- for row in 0..64 {
- for col in 0..64 {
- let first = chars[i]; i += 1; i %= chars.len();
- let second = Some(chars[i]); i += 1; i %= chars.len();
- self.set(Pos::new(col, row), CharPair { first, second });
- }
- }
- }
-}
-impl Layer<glam::Vec3> {
- pub fn from_framebuffer(&mut self, ctx: &context::Context, fb: &framebuffer::Framebuffer) {
- fb.get_pixels(ctx, &mut self.data);
- }
- pub fn get_surrounding(&self, pos: Pos, bgcolor: &glam::Vec3) -> u8 {
- let offs = [
- Pos::new(-1, -1),
- Pos::new(0, -1),
- Pos::new(1, -1),
- Pos::new(-1, 0),
- Pos::new(1, 0),
- Pos::new(-1, 1),
- Pos::new(0, 1),
- Pos::new(1, 1),
- ];
- let mut ret = 0;
- for o in offs {
- ret <<= 1;
- let v = (self.get(pos + o) != Some(bgcolor)) as u8;
- ret |= v;
- }
- ret
- }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum PaletteType {
- Hair,
- Eyes,
- Skin,
- Highlight,
- Eyebags,
-}
-impl PaletteType {
- pub fn from_string(s: &str) -> Option<Self> {
- match s {
- "hair" => Some(Self::Hair),
- "eyes" => Some(Self::Eyes),
- "skin" => Some(Self::Skin),
- "highlight" => Some(Self::Highlight),
- "eyebags" => Some(Self::Eyebags),
- _ => None,
- }
- }
- pub fn from_color(c: &glam::Vec3) -> Option<Self> {
- let r = (c.x * 255.0) as u8;
- let g = (c.y * 255.0) as u8;
- let b = (c.z * 255.0) as u8;
- if r >= 186 && r <= 188 && g >= 176 && g <= 178 && b >= 189 && b <= 191 {
- Some(Self::Hair)
- } else if r >= 158 && r <= 162 && g >= 148 && g <= 152 && b >= 159 && b <= 162 {
- Some(Self::Highlight)
- } else if g > r && g > b {
- Some(Self::Eyes)
- } else if r >= 242 && r <= 246 && g >= 238 && g <= 242 && b >= 234 && b <= 238 {
- Some(Self::Skin)
- } else if r == 182 && g == 142 && b == 139 {
- Some(Self::Eyebags)
- } else {
- None
- }
- }
-}
-
-pub struct PaletteEntry {
- pub color: Layer<glam::Vec3>,
- pub char: Layer<CharPair>,
-}
-
-pub struct Terminal {
- pub font: font::Bitmap,
- pub base_color: Layer<glam::Vec3>,
- pub palette: HashMap<PaletteType, PaletteEntry>,
-}
-impl Terminal {
- pub fn new(ctx: &context::Context) -> Self {
- Self {
- font: font::Bitmap::from_image(ctx, 6, 12, 96, 72, include_bytes!("assets/fonts/terminus.png")),
- base_color: Layer::new(),
- palette: HashMap::new(),
- }
- }
- pub fn update(&mut self, ctx: &context::Context, fb: &framebuffer::Framebuffer) {
- self.base_color.from_framebuffer(ctx, fb);
- }
- pub fn fill_string(&mut self, s: &str) {
- // self.set_char.from_str(s);
- }
- pub fn outline_pattern(&self, pos: Pos) -> Option<String> {
- let sur = self.base_color.get_surrounding(pos, &glam::Vec3::new(0.0, 0.0, 0.0));
- let res = match sur {
- 0b01101011 | 0b01101111 => " |",
- 0b11010110 | 0b11010111 => "| ",
- 0b00101011 | 0b00101111 | 0b00101110 | 0b00101100 | 0b00001011 => " /",
- 0b10010110 | 0b10010111 | 0b10010011 | 0b10010001 | 0b00010110 => "\\ ",
- 0b00111111 => "-/", 0b10011111 => "\\-",
- 0b00011111 => "--", 0b00000111 => "__",
- 0b00001111 => " _", 0b00010111 => "_ ",
- _ => return None,
- };
- Some(res.to_owned())
- }
- pub fn get(&self, pos: Pos) -> (CharPair, glam::Vec3) {
- if let Some(c) = self.base_color.get(pos) {
- if *c != glam::Vec3::new(0.0, 0.0, 0.0) {
- return *c;
- }
- }
- let c = self.get_color(pos);
- colors.push(c); colors.push(c);
- let new = if let Some(p) = self.set_char.get(pos) {
- if c == glam::Vec3::new(0.0, 0.0, 0.0) {
- String::from(" ")
- } else if let Some(pat) = self.outline_pattern(pos) {
- pat
- } else {
- format!("{}{}", p.first, if let Some(snd) = p.second { snd } else { ' ' })
- }
- } else {
- String::from(" ")
- };
- glam::Vec3::new(0.0, 0.0, 0.0)
- }
- pub fn render(&self, ctx: &context::Context, pos: &glam::Vec2) {
- let mut s = String::new();
- let mut colors = Vec::new();
- for row in 0..64 {
- for col in 0..64 {
- let pos = Pos::new(col, row);
- let c = self.get_color(pos);
- colors.push(c); colors.push(c);
- let new = if let Some(p) = self.set_char.get(pos) {
- if c == glam::Vec3::new(0.0, 0.0, 0.0) {
- String::from(" ")
- } else if let Some(pat) = self.outline_pattern(pos) {
- pat
- } else {
- format!("{}{}", p.first, if let Some(snd) = p.second { snd } else { ' ' })
- }
- } else {
- String::from(" ")
- };
- s += &new;
- }
- s += "\n";
- colors.push(glam::Vec3::new(1.0, 1.0, 1.0));
- }
- self.font.render_text_helper(ctx, pos, &s, &colors);
- }
- pub fn write_tty<W>(&self, out: &mut W)
- where W: Write {
- let mut output: Vec<u8> = Vec::new();
- write!(output, "\x1b[2J\x1b[1;1H").expect("failed to write output");
- for row in 0..64 {
- for col in 0..64 {
- let pos = Pos::new(col, row);
- let c = self.get_color(pos);
- let new = if let Some(p) = self.set_char.get(pos) {
- if c == glam::Vec3::new(0.0, 0.0, 0.0) {
- String::from(" ")
- } else if let Some(pat) = self.outline_pattern(pos) {
- pat
- } else {
- format!("{}{}", p.first, if let Some(snd) = p.second { snd } else { ' ' })
- }
- } else {
- String::from(" ")
- };
- write!(
- output, "{}{}",
- termion::color::Fg(
- termion::color::Rgb(
- (c.x * 255.0) as u8,
- (c.y * 255.0) as u8,
- (c.z * 255.0) as u8),
- ),
- new
- ).unwrap();
- }
- write!(output, "\r\n").unwrap();
- }
- out.write(&output).expect("failed to write to terminal");
- }
-}
diff --git a/src/common/overlay/throwshade.rs b/src/common/overlay/throwshade.rs
deleted file mode 100644
index c6b8f2e..0000000
--- a/src/common/overlay/throwshade.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use teleia::*;
-
-const VERT: &'static str = include_str!("assets/shaders/throwshade/vert.glsl");
-const FRAG: &'static str = include_str!("assets/shaders/throwshade/frag.glsl");
-
-pub struct ThrowShade {
- pub tickset: u64,
- pub timeset: f64,
- pub shader: Option<shader::Shader>,
-}
-impl ThrowShade {
- pub fn new() -> Self {
- Self {
- tickset: 0,
- timeset: 0.0,
- shader: None,
- }
- }
- pub fn set(&mut self, ctx: &context::Context, st: &state::State, src: &str) -> Result<(), String> {
- let fsrc = format!("{}\n{}\n", FRAG, src);
- self.tickset = st.tick;
- if let Ok(dur) = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH) {
- self.timeset = dur.as_secs_f64();
- log::info!("the time: {}", self.timeset);
- }
- if let Some(s) = &mut self.shader {
- s.replace(ctx, VERT, &fsrc)?;
- } else {
- self.shader = Some(shader::Shader::new_helper(ctx, VERT, &fsrc)?);
- }
- Ok(())
- }
-}