forked from koniifer/ableos
judy hopps
This commit is contained in:
Elfein Landers
parent
0404fdd41f
commit
bbed40d46d
|
|
@ -1,186 +1,187 @@
|
||||||
use alloc::{
|
use alloc::{
|
||||||
format,
|
format,
|
||||||
string::{String, ToString},
|
string::{String, ToString},
|
||||||
vec,
|
vec,
|
||||||
};
|
};
|
||||||
use picorand::PicoRandGenerate;
|
use picorand::PicoRandGenerate;
|
||||||
use rkyv::{ser::serializers::AllocSerializer, Deserialize};
|
use rkyv::{ser::serializers::AllocSerializer, Deserialize};
|
||||||
use shadeable::pixel_format::from_vga_16;
|
use shadeable::pixel_format::from_vga_16;
|
||||||
|
use vga::colors::Color16;
|
||||||
use y_compositor_protocol::Version;
|
use y_compositor_protocol::Version;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
kmain::{BOOT_CONF, TICK},
|
kmain::{BOOT_CONF, TICK},
|
||||||
network::socket::{SimpleSock, Socket, SocketReturns},
|
network::socket::{SimpleSock, Socket, SocketReturns},
|
||||||
num_to_vga16, vga_e, VgaBuffer, SCREEN_BUFFER,
|
num_to_vga16, vga_e, VgaBuffer, SCREEN_BUFFER,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub fn run_tests() {
|
pub fn run_tests() {
|
||||||
if BOOT_CONF.run_tests {
|
if BOOT_CONF.run_tests {
|
||||||
// quick and dirty testing framework
|
// quick and dirty testing framework
|
||||||
screen_writer_test();
|
screen_writer_test();
|
||||||
socket_test();
|
socket_test();
|
||||||
graphics_pipe_test();
|
graphics_pipe_test();
|
||||||
socket_startup_rng();
|
socket_startup_rng();
|
||||||
socket_test_rng();
|
socket_test_rng();
|
||||||
}
|
}
|
||||||
|
|
||||||
if BOOT_CONF.run_demos {
|
if BOOT_CONF.run_demos {
|
||||||
graphics_api_demo();
|
graphics_api_demo();
|
||||||
}
|
}
|
||||||
|
|
||||||
if BOOT_CONF.run_shader_tests {
|
if BOOT_CONF.run_shader_tests {
|
||||||
shader_tests();
|
shader_tests();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn socket_test() {
|
pub fn socket_test() {
|
||||||
let mut xyz = SimpleSock::new();
|
let mut xyz = SimpleSock::new();
|
||||||
|
|
||||||
xyz.peek();
|
xyz.peek();
|
||||||
|
|
||||||
xyz.write(vec![0, 1, 2, 3]);
|
xyz.write(vec![0, 1, 2, 3]);
|
||||||
|
|
||||||
let x = "simple 🧦".to_string().into_bytes();
|
let x = "simple 🧦".to_string().into_bytes();
|
||||||
xyz.write(x);
|
xyz.write(x);
|
||||||
|
|
||||||
info!("{:?}", &xyz.read(4).unwrap());
|
info!("{:?}", &xyz.read(4).unwrap());
|
||||||
|
|
||||||
match &xyz.peek() {
|
match &xyz.peek() {
|
||||||
SocketReturns::ReadOk(strr) => {
|
SocketReturns::ReadOk(strr) => {
|
||||||
let out = String::from_utf8_lossy(strr);
|
let out = String::from_utf8_lossy(strr);
|
||||||
|
|
||||||
info!("{}", out);
|
info!("{}", out);
|
||||||
}
|
}
|
||||||
SocketReturns::ReadIndexOutOfBounds => todo!(),
|
SocketReturns::ReadIndexOutOfBounds => todo!(),
|
||||||
SocketReturns::WriteOk => todo!(),
|
SocketReturns::WriteOk => todo!(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn socket_test_rng() {
|
pub fn socket_test_rng() {
|
||||||
let mut test_sock = SimpleSock::grab_socket("RNGProvider".to_string()).unwrap();
|
let mut test_sock = SimpleSock::grab_socket("RNGProvider".to_string()).unwrap();
|
||||||
info!(
|
info!(
|
||||||
"Recieving {} from protocol {}",
|
"Recieving {} from protocol {}",
|
||||||
test_sock.read(1).unwrap()[0],
|
test_sock.read(1).unwrap()[0],
|
||||||
test_sock.protocol().unwrap()
|
test_sock.protocol().unwrap()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn socket_startup_rng() {
|
pub fn socket_startup_rng() {
|
||||||
use picorand::{WyRand, RNG};
|
use picorand::{WyRand, RNG};
|
||||||
let mut random_socket = SimpleSock::new();
|
let mut random_socket = SimpleSock::new();
|
||||||
|
|
||||||
random_socket.register_protocol("RNGProvider".to_string());
|
random_socket.register_protocol("RNGProvider".to_string());
|
||||||
let bruh = TICK.load(core::sync::atomic::Ordering::Relaxed);
|
let bruh = TICK.load(core::sync::atomic::Ordering::Relaxed);
|
||||||
|
|
||||||
let mut rng = RNG::<WyRand, u8>::new(bruh);
|
let mut rng = RNG::<WyRand, u8>::new(bruh);
|
||||||
|
|
||||||
for _ in 0..512 {
|
for _ in 0..512 {
|
||||||
let x = rng.generate();
|
let x = rng.generate();
|
||||||
random_socket.write(vec![x]);
|
random_socket.write(vec![x]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn screen_writer_test() {
|
pub fn screen_writer_test() {
|
||||||
let mut sock_print_id = SimpleSock::new();
|
let mut sock_print_id = SimpleSock::new();
|
||||||
|
|
||||||
sock_print_id.register_protocol("Screen Printer".to_string());
|
sock_print_id.register_protocol("Screen Printer".to_string());
|
||||||
// sock_print_id.write(format!("a原 b画 cフ dァ eイ fル 集").into());
|
// sock_print_id.write(format!("a原 b画 cフ dァ eイ fル 集").into());
|
||||||
// sock_print_id.write(format!("⋮").into());
|
// sock_print_id.write(format!("⋮").into());
|
||||||
|
|
||||||
sock_print_id.write(format!("λ³ Half Life 3 booting up ㎣").into());
|
sock_print_id.write(format!("λ³ Half Life 3 booting up ㎣").into());
|
||||||
// sock_print_id.write(format!("Happy birthday 🎉").into());
|
// sock_print_id.write(format!("Happy birthday 🎉").into());
|
||||||
// sock_print_id.write(format!("I look forward to ur ai stuff :^>").into());
|
// sock_print_id.write(format!("I look forward to ur ai stuff :^>").into());
|
||||||
// sock_print_id.write(format!("1....2....3....4....5....6....7....8....9").into());
|
// sock_print_id.write(format!("1....2....3....4....5....6....7....8....9").into());
|
||||||
|
|
||||||
for current in (*String::from_utf8_lossy(&sock_print_id.peek().unwrap())).chars() {
|
for current in (*String::from_utf8_lossy(&sock_print_id.peek().unwrap())).chars() {
|
||||||
vga_e::draw_char(0, 0, current, 0);
|
vga_e::draw_char(0, 0, current, from_vga_16(Color16::Red));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn vga_boot_screen() {
|
pub fn vga_boot_screen() {
|
||||||
let mut abcde = SCREEN_BUFFER.lock();
|
let mut abcde = SCREEN_BUFFER.lock();
|
||||||
|
|
||||||
for y in 0..480 {
|
for y in 0..480 {
|
||||||
for x in 0..640 {
|
for x in 0..640 {
|
||||||
let segment_x = x * 4 / 640;
|
let segment_x = x * 4 / 640;
|
||||||
let segment_y = y * 4 / 480;
|
let segment_y = y * 4 / 480;
|
||||||
let segment = segment_x + segment_y * 4;
|
let segment = segment_x + segment_y * 4;
|
||||||
|
|
||||||
abcde.set_pixel(x, y, from_vga_16(num_to_vga16(segment as u8)));
|
abcde.set_pixel(x, y, from_vga_16(num_to_vga16(segment as u8)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn graphics_pipe_test() {
|
pub fn graphics_pipe_test() {
|
||||||
let mut graphics_pipe = SimpleSock::grab_socket("YCompositor".to_string()).unwrap();
|
let mut graphics_pipe = SimpleSock::grab_socket("YCompositor".to_string()).unwrap();
|
||||||
|
|
||||||
let version = Version {
|
let version = Version {
|
||||||
major: 13,
|
major: 13,
|
||||||
minor: 123,
|
minor: 123,
|
||||||
patch: 0,
|
patch: 0,
|
||||||
};
|
};
|
||||||
use rkyv::ser::Serializer;
|
use rkyv::ser::Serializer;
|
||||||
let mut serializer = AllocSerializer::<0>::default();
|
let mut serializer = AllocSerializer::<0>::default();
|
||||||
serializer.serialize_value(&version).unwrap();
|
serializer.serialize_value(&version).unwrap();
|
||||||
// let bytes = serializer.into_serializer().into_inner();
|
// let bytes = serializer.into_serializer().into_inner();
|
||||||
|
|
||||||
// info!("{:?}", bytes);
|
// info!("{:?}", bytes);
|
||||||
let bytes = serializer.into_serializer().into_inner();
|
let bytes = serializer.into_serializer().into_inner();
|
||||||
graphics_pipe.write(bytes.into_vec());
|
graphics_pipe.write(bytes.into_vec());
|
||||||
unsafe {
|
unsafe {
|
||||||
let the_bytes = graphics_pipe.read(3).unwrap();
|
let the_bytes = graphics_pipe.read(3).unwrap();
|
||||||
let archived = rkyv::archived_root::<Version>(&the_bytes);
|
let archived = rkyv::archived_root::<Version>(&the_bytes);
|
||||||
let deserialized: Version = archived.deserialize(&mut rkyv::Infallible).unwrap();
|
let deserialized: Version = archived.deserialize(&mut rkyv::Infallible).unwrap();
|
||||||
trace!("{:?}", deserialized);
|
trace!("{:?}", deserialized);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn graphics_pipe_startup() {
|
pub fn graphics_pipe_startup() {
|
||||||
let mut graphics_pipe = SimpleSock::new();
|
let mut graphics_pipe = SimpleSock::new();
|
||||||
|
|
||||||
graphics_pipe.register_protocol("YCompositor".to_string());
|
graphics_pipe.register_protocol("YCompositor".to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn graphics_api_demo() {
|
pub fn graphics_api_demo() {
|
||||||
let mut abcde = SCREEN_BUFFER.lock();
|
let mut abcde = SCREEN_BUFFER.lock();
|
||||||
abcde.force_redraw();
|
abcde.force_redraw();
|
||||||
|
|
||||||
abcde.draw_filled_circle(100, 100, 300, 0x0000ff00);
|
abcde.draw_filled_circle(100, 100, 300, 0x0000ff00);
|
||||||
abcde.draw_unfilled_rect(100, 100, 400, 200, 0xff000000);
|
abcde.draw_unfilled_rect(100, 100, 400, 200, 0xff000000);
|
||||||
abcde.draw_filled_rect(300, 300, 400, 400, 0xff000000);
|
abcde.draw_filled_rect(300, 300, 400, 400, 0xff000000);
|
||||||
abcde.draw_line(100, 100, 400, 200, 0xff000000);
|
abcde.draw_line(100, 100, 400, 200, 0xff000000);
|
||||||
abcde.copy_to_buffer();
|
abcde.copy_to_buffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn shader_tests() {
|
pub fn shader_tests() {
|
||||||
let mut graphics = SCREEN_BUFFER.lock();
|
let mut graphics = SCREEN_BUFFER.lock();
|
||||||
|
|
||||||
graphics.clear();
|
graphics.clear();
|
||||||
graphics.force_redraw();
|
graphics.force_redraw();
|
||||||
graphics.draw_filled_rect(25, 25, 50, 50, 0xff000000);
|
graphics.draw_filled_rect(25, 25, 50, 50, 0xff000000);
|
||||||
graphics.set_pixel(50, 50, 0xffffff00);
|
graphics.set_pixel(50, 50, 0xffffff00);
|
||||||
graphics.shade();
|
graphics.shade();
|
||||||
|
|
||||||
graphics.copy_to_buffer();
|
graphics.copy_to_buffer();
|
||||||
|
|
||||||
// drop(graphics)
|
// drop(graphics)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn ser_de_test() {
|
pub fn ser_de_test() {
|
||||||
let mut proc_1 = SimpleSock::new();
|
let mut proc_1 = SimpleSock::new();
|
||||||
proc_1.register_protocol("ProcessSpawner".to_string());
|
proc_1.register_protocol("ProcessSpawner".to_string());
|
||||||
|
|
||||||
let version = 0;
|
let version = 0;
|
||||||
use rkyv::ser::Serializer;
|
use rkyv::ser::Serializer;
|
||||||
let mut serializer = AllocSerializer::<0>::default();
|
let mut serializer = AllocSerializer::<0>::default();
|
||||||
serializer.serialize_value(&version).unwrap();
|
serializer.serialize_value(&version).unwrap();
|
||||||
|
|
||||||
let bytes = serializer.into_serializer().into_inner();
|
let bytes = serializer.into_serializer().into_inner();
|
||||||
proc_1.write(bytes.into_vec());
|
proc_1.write(bytes.into_vec());
|
||||||
unsafe {
|
unsafe {
|
||||||
let the_bytes = proc_1.read(3).unwrap();
|
let the_bytes = proc_1.read(3).unwrap();
|
||||||
let archived = rkyv::archived_root::<Version>(&the_bytes);
|
let archived = rkyv::archived_root::<Version>(&the_bytes);
|
||||||
let deserialized: Version = archived.deserialize(&mut rkyv::Infallible).unwrap();
|
let deserialized: Version = archived.deserialize(&mut rkyv::Infallible).unwrap();
|
||||||
trace!("{:?}", deserialized);
|
trace!("{:?}", deserialized);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,10 @@ const GLYPH_WIDTH: f32 = 10.0;
|
||||||
/// * `glyph` - the glyph to draw
|
/// * `glyph` - the glyph to draw
|
||||||
/// * `color` - the color of the glyph
|
/// * `color` - the color of the glyph
|
||||||
pub fn draw_char(mut x: u32, mut y: u32, character: char, color: Rgba64) {
|
pub fn draw_char(mut x: u32, mut y: u32, character: char, color: Rgba64) {
|
||||||
|
// trace!["Judy Hopps is thicc af"];
|
||||||
// let mode = *VGAE.lock();
|
// let mode = *VGAE.lock();
|
||||||
let mut mode = SCREEN_BUFFER.lock();
|
let mut mode = SCREEN_BUFFER.lock();
|
||||||
|
// trace!["She got them bouncy bunny buns"];
|
||||||
|
|
||||||
let basic_multingual_plane = FontRef::try_from_slice(include_bytes!(
|
let basic_multingual_plane = FontRef::try_from_slice(include_bytes!(
|
||||||
"../../ableos/assets/fonts/unifont-14.0.01.ttf"
|
"../../ableos/assets/fonts/unifont-14.0.01.ttf"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue