From 02ee850e820cda58ec30ec4393dbdd41dc73ce15 Mon Sep 17 00:00:00 2001 From: Jason Hilder Date: Thu, 11 Jun 2026 09:11:07 +0200 Subject: [PATCH] Small cleanup/refactor. --- src/main.odin | 2 +- src/simulator/gui.odin | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/main.odin b/src/main.odin index 746e454..7e4bdc7 100644 --- a/src/main.odin +++ b/src/main.odin @@ -23,7 +23,7 @@ main :: proc() { // Init the emu 8 "cpu" system := emu.init() - // TODO: move this into a gui component + // @TODO: move this into a gui component // load rom, hardcoded for now, will eventually be cli or gui err := emu.load_rom(&system, "./test_roms/7-beep.ch8") if err != nil { diff --git a/src/simulator/gui.odin b/src/simulator/gui.odin index 8f184f4..9001087 100644 --- a/src/simulator/gui.odin +++ b/src/simulator/gui.odin @@ -14,11 +14,11 @@ CONTROL_BAR_H :: f32(50) STATUS_BAR_H :: f32(30) Layout :: struct { - control_bar : rl.Rectangle, - left_panel : rl.Rectangle, - display : rl.Rectangle, - right_panel : rl.Rectangle, - status_bar : rl.Rectangle, + control_bar : rl.Rectangle, + left_panel : rl.Rectangle, + display : rl.Rectangle, + right_panel : rl.Rectangle, + status_bar : rl.Rectangle, } // Initialize main the gui 'window' @@ -32,7 +32,7 @@ run_gui :: proc(sim: ^Simulator) { // Load fonts font := rl.LoadFontEx("./assets/fonts/Inter_18pt-Regular.ttf", 18, nil, 0) rl.SetTextureFilter(font.texture, .BILINEAR) - sim.font = font + sim.font = font rl.GuiLoadStyleDefault() rl.GuiLoadStyle("./assets/raygui_styles/style_dark.rgs") @@ -91,7 +91,6 @@ run_gui :: proc(sim: ^Simulator) { } // @TODO: If this grows lets move it into its own file - calc_layout :: proc(screen_width: f32, screen_height: f32) -> Layout { sidebar_width := screen_width * SIDEBAR_PERCENT content_height := screen_height - CONTROL_BAR_H - STATUS_BAR_H @@ -99,33 +98,33 @@ calc_layout :: proc(screen_width: f32, screen_height: f32) -> Layout { return Layout { control_bar = rl.Rectangle { - x = 0, + x = 0, y = 0, - width = screen_width, + width = screen_width, height = CONTROL_BAR_H, }, left_panel = rl.Rectangle { - x = 0, + x = 0, y = CONTROL_BAR_H, - width = sidebar_width, + width = sidebar_width, height = content_height, }, display = rl.Rectangle { - x = sidebar_width, + x = sidebar_width, y = CONTROL_BAR_H, - width = screen_width - (sidebar_width * 2), + width = screen_width - (sidebar_width * 2), height = display_height, }, right_panel = rl.Rectangle { - x = screen_width - sidebar_width, + x = screen_width - sidebar_width, y = CONTROL_BAR_H, - width = sidebar_width, + width = sidebar_width, height = content_height, }, status_bar = rl.Rectangle { - x = 0, + x = 0, y = screen_height - STATUS_BAR_H, width = screen_width, height = STATUS_BAR_H, }, } -} \ No newline at end of file +}