summaryrefslogtreecommitdiff
path: root/src/common/overlay
diff options
context:
space:
mode:
authorLLLL Colonq <llll@colonq>2025-01-28 12:03:11 -0500
committerLLLL Colonq <llll@colonq>2025-01-28 12:03:11 -0500
commit23d651bbad510f14484cf1c0a8081ffff890565e (patch)
tree3645723cb9383bcf8ea3733d50d76ba1fe86e131 /src/common/overlay
parentf448de77d84b985047a332150c0382adc1836899 (diff)
Working overlay
Diffstat (limited to 'src/common/overlay')
-rw-r--r--src/common/overlay/assets.rs27
-rw-r--r--src/common/overlay/assets/audio/test.wavbin0 -> 924 bytes
-rw-r--r--src/common/overlay/assets/fonts/iosevka-comfy-regular.ttfbin0 -> 7811628 bytes
-rw-r--r--src/common/overlay/assets/fonts/terminus.pngbin0 -> 1215 bytes
-rw-r--r--src/common/overlay/assets/fonts/terminus.ttfbin0 -> 500668 bytes
-rw-r--r--src/common/overlay/assets/meshes/square.obj15
-rw-r--r--src/common/overlay/assets/scenes/lcolonq.vrmbin0 -> 12451548 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/textures/test.pngbin0 -> 714 bytes
-rw-r--r--src/common/overlay/fig.rs40
-rw-r--r--src/common/overlay/terminal.rs122
14 files changed, 248 insertions, 0 deletions
diff --git a/src/common/overlay/assets.rs b/src/common/overlay/assets.rs
new file mode 100644
index 0000000..9a0cefc
--- /dev/null
+++ b/src/common/overlay/assets.rs
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000..0eabe85
--- /dev/null
+++ b/src/common/overlay/assets/audio/test.wav
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
new file mode 100644
index 0000000..b474adc
--- /dev/null
+++ b/src/common/overlay/assets/fonts/iosevka-comfy-regular.ttf
Binary files differ
diff --git a/src/common/overlay/assets/fonts/terminus.png b/src/common/overlay/assets/fonts/terminus.png
new file mode 100644
index 0000000..287810b
--- /dev/null
+++ b/src/common/overlay/assets/fonts/terminus.png
Binary files differ
diff --git a/src/common/overlay/assets/fonts/terminus.ttf b/src/common/overlay/assets/fonts/terminus.ttf
new file mode 100644
index 0000000..d125e63
--- /dev/null
+++ b/src/common/overlay/assets/fonts/terminus.ttf
Binary files differ
diff --git a/src/common/overlay/assets/meshes/square.obj b/src/common/overlay/assets/meshes/square.obj
new file mode 100644
index 0000000..7328a6c
--- /dev/null
+++ b/src/common/overlay/assets/meshes/square.obj
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 0000000..49fa4a4
--- /dev/null
+++ b/src/common/overlay/assets/scenes/lcolonq.vrm
Binary files differ
diff --git a/src/common/overlay/assets/shaders/flat/frag.glsl b/src/common/overlay/assets/shaders/flat/frag.glsl
new file mode 100644
index 0000000..7006a2b
--- /dev/null
+++ b/src/common/overlay/assets/shaders/flat/frag.glsl
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..e324f7e
--- /dev/null
+++ b/src/common/overlay/assets/shaders/flat/vert.glsl
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..81e08b9
--- /dev/null
+++ b/src/common/overlay/assets/shaders/scene/frag.glsl
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..64f400c
--- /dev/null
+++ b/src/common/overlay/assets/shaders/scene/vert.glsl
@@ -0,0 +1,18 @@
+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/textures/test.png b/src/common/overlay/assets/textures/test.png
new file mode 100644
index 0000000..1f1edca
--- /dev/null
+++ b/src/common/overlay/assets/textures/test.png
Binary files differ
diff --git a/src/common/overlay/fig.rs b/src/common/overlay/fig.rs
new file mode 100644
index 0000000..b60f8e9
--- /dev/null
+++ b/src/common/overlay/fig.rs
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 0000000..a2382b1
--- /dev/null
+++ b/src/common/overlay/terminal.rs
@@ -0,0 +1,122 @@
+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 struct Terminal {
+ pub font: font::Bitmap,
+ pub base_color: Layer<glam::Vec3>,
+ pub set_color: Layer<glam::Vec3>,
+ pub set_char: Layer<CharPair>,
+}
+impl Terminal {
+ pub fn new(ctx: &context::Context) -> Self {
+ let mut set_char = Layer::new();
+ set_char.from_str("lcolonq");
+ Self {
+ font: font::Bitmap::from_image(ctx, 6, 12, 96, 72, include_bytes!("assets/fonts/terminus.png")),
+ base_color: Layer::new(),
+ set_color: Layer::new(),
+ set_char,
+ }
+ }
+ pub fn get_color(&self, pos: Pos) -> glam::Vec3 {
+ if let Some(c) = self.base_color.get(pos) {
+ c.clone()
+ } else {
+ glam::Vec3::new(1.0, 1.0, 1.0)
+ }
+ }
+ 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 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 new = if let Some(p) = self.set_char.get(pos) {
+ format!("{}{}", p.first, if let Some(snd) = p.second { snd } else { ' ' })
+ } else {
+ String::from(" ")
+ };
+ s += &new;
+ let c = self.get_color(pos);
+ colors.push(c); colors.push(c);
+ }
+ s += "\n";
+ colors.push(glam::Vec3::new(1.0, 1.0, 1.0));
+ }
+ self.font.render_text_helper(ctx, pos, &s, &colors);
+ }
+}