Imagenes

Cargo.toml

@@ -14,6 +14,7 @@ members = [
     "crates/ui",
     "crates/x2apic",
     "crates/heapless",
+    "crates/images",
 ]
 
 [workspace.dependencies]
@@ -36,6 +37,7 @@ ui.path = "./crates/ui"
 embedded-graphics = "0.8.1"
 x2apic.path = "./crates/x2apic"
 heapless.path = "./crates/heapless"
+images.path = "./crates/images"
 
 [profile.dev]
 panic = "abort"

crates/images/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "images"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]

crates/images/src/lib.rs

@@ -0,0 +1,5 @@
+#![no_std]
+
+use core::include_bytes;
+
+pub static LOGO_CONTENT: &[u8] = include_bytes!("../static/logo.tga");

crates/ui/Cargo.toml

@@ -8,3 +8,5 @@ embedded-graphics.workspace = true
 fb.workspace = true
 heapless.workspace = true
 arch.workspace = true
+tinytga = "0.5.0"
+images.workspace = true

crates/ui/src/components/image.rs

@@ -0,0 +1,45 @@
+use embedded_graphics::{
+    Drawable,
+    image::Image,
+    pixelcolor::Rgb888,
+    prelude::{DrawTarget, OriginDimensions, Point, RgbColor},
+    primitives::Rectangle,
+};
+use tinytga::Tga;
+
+use crate::components::Component;
+
+pub struct UiImage {
+    pub content: &'static [u8],
+    pub pos: Point,
+}
+
+impl UiImage {
+    pub fn new(content: &'static [u8], pos: Point) -> Self {
+        let tga: Tga<Rgb888> = Tga::from_slice(content).unwrap();
+        let size = tga.size();
+
+        Self {
+            content,
+            pos: Point::new(pos.x - size.width as i32, pos.y - size.height as i32),
+        }
+    }
+}
+
+impl Component for UiImage {
+    fn render(&mut self, screen: &mut fb::display::FbDisplay, space: Point) {
+        let tga: Tga<Rgb888> = Tga::from_slice(self.content).unwrap();
+
+        let image = Image::new(&tga, self.pos + space);
+
+        image.draw(screen).unwrap();
+    }
+    fn clear(&self, screen: &mut fb::display::FbDisplay, space: Point) {
+        let tga: Tga<Rgb888> = Tga::from_slice(self.content).unwrap();
+        let size = tga.size();
+
+        screen
+            .fill_solid(&Rectangle::new(self.pos + space, size), Rgb888::BLACK)
+            .unwrap();
+    }
+}

crates/ui/src/components/mod.rs

@@ -1,6 +1,7 @@
 use embedded_graphics::prelude::Point;
 use fb::display::FbDisplay;
 
+pub mod image;
 pub mod placeholder;
 pub mod text;
 pub mod textarea;

crates/ui/src/sections/loading.rs

@@ -0,0 +1,35 @@
+use embedded_graphics::prelude::{OriginDimensions, Point};
+use fb::get_ui_writer;
+use images::LOGO_CONTENT;
+
+use crate::{
+    Section,
+    components::{Component, image::UiImage},
+};
+
+pub struct LoadingSection {
+    pub pos: Point,
+    logo: UiImage,
+}
+
+impl LoadingSection {
+    pub fn new(pos: Point) -> Self {
+        let mut logo = UiImage::new(
+            LOGO_CONTENT,
+            Point::new(
+                get_ui_writer().size().width as i32,
+                get_ui_writer().size().height as i32,
+            ),
+        );
+        logo.pos.x /= 2;
+        logo.pos.y /= 2;
+
+        Self { pos, logo }
+    }
+}
+
+impl Section for LoadingSection {
+    fn render(&mut self, screen: &mut fb::display::FbDisplay) {
+        self.logo.render(screen, self.pos);
+    }
+}

crates/ui/src/sections/mod.rs

@@ -1,2 +1,3 @@
 pub mod cpu_info;
+pub mod loading;
 pub mod test_info;

flake.nix

@@ -59,7 +59,7 @@
           ...
         }:
           (craneLib target).devShell {
-            packages = with pkgs; [qemu just libisoburn];
+            packages = with pkgs; [qemu just libisoburn imagemagick gdb];
             buildInputs = hook.enabledPackages;
             shellHook = ''
               echo "DevShell for ${name} (${target})"

kernel/src/main.rs

@@ -18,10 +18,11 @@ use core::f32;
 use core::fmt::Write;
 use core::time::Duration;
 use embedded_graphics::Drawable;
+use embedded_graphics::image::Image;
 use embedded_graphics::mono_font::MonoTextStyle;
 use embedded_graphics::mono_font::iso_8859_9::FONT_6X10;
 use embedded_graphics::pixelcolor::Rgb888;
-use embedded_graphics::prelude::{DrawTarget, Point, RgbColor};
+use embedded_graphics::prelude::{DrawTarget, OriginDimensions, Point, RgbColor};
 use embedded_graphics::primitives::{PrimitiveStyle, StyledDrawable};
 use embedded_graphics::text::Text;
 use fb::{color_print, get_fb_writer, get_ui_writer, init_ui, println};
@@ -31,8 +32,12 @@ use march_c::MarchC;
 use mem::allocator::Allocator;
 use modulo_n::ModuloN;
 use sync::Once;
+use ui::sections::loading::LoadingSection;
+
 use ui::sections::test_info::TestInfoSection;
-use ui::{RenderSection, UiState, get_ui_state, init_ui_state, render_section, render_ui_state};
+use ui::{
+    RenderSection, Section, UiState, get_ui_state, init_ui_state, render_section, render_ui_state,
+};
 
 use x86_64::VirtAddr;
 
@@ -77,6 +82,8 @@ extern "C" fn kmain() -> ! {
 
     HIGHER_HALF_OFFSET.call_once(|| hhdm);
 
+    get_ui_writer().clear(Rgb888::new(11, 11, 10)).unwrap();
+
     let mem_map = &boot::requests::MEMORY_MAP_REQUEST;
     let entries = mem_map.get_response().unwrap().entries();
 
@@ -85,8 +92,9 @@ extern "C" fn kmain() -> ! {
 
     init_idt();
 
-    println!("Starting memsos");
-    println!("Calibrating tsc...");
+    let mut loading = LoadingSection::new(Point::zero());
+    loading.render(get_ui_writer());
+
     calibrate_tsc();
     restore_rtc();
     init_mem_module(entries);
@@ -110,7 +118,6 @@ extern "C" fn kmain() -> ! {
     beep();
 
     color_print!(Rgb888::CYAN, "It works! {}", reports.is_empty());
-    println!("asd");
 
     hcf();
 }

tga.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+for tga in crates/images/static/*; do
+    echo $tga
+    magick $tga -alpha off -depth 8 $tga
+done