jasonhilder/octal_cookie
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small cleanup/refactor.

Browse Source
This commit is contained in:
Jason Hilder
2026-06-11 09:11:07 +02:00
parent 01abcfead0
commit 02ee850e82
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.odin
+1 -1
View File
@@ -23,7 +23,7 @@ main :: proc() {
// Init the emu 8 "cpu" // Init the emu 8 "cpu"
system := emu.init() 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 // load rom, hardcoded for now, will eventually be cli or gui
err := emu.load_rom(&system, "./test_roms/7-beep.ch8") err := emu.load_rom(&system, "./test_roms/7-beep.ch8")
if err != nil { if err != nil {
src/simulator/gui.odin
+16 -17
View File
@@ -14,11 +14,11 @@ CONTROL_BAR_H :: f32(50)
STATUS_BAR_H :: f32(30) STATUS_BAR_H :: f32(30)
Layout :: struct { Layout :: struct {
control_bar : rl.Rectangle, control_bar : rl.Rectangle,
left_panel : rl.Rectangle, left_panel : rl.Rectangle,
display : rl.Rectangle, display : rl.Rectangle,
right_panel : rl.Rectangle, right_panel : rl.Rectangle,
status_bar : rl.Rectangle, status_bar : rl.Rectangle,
} }
// Initialize main the gui 'window' // Initialize main the gui 'window'
@@ -32,7 +32,7 @@ run_gui :: proc(sim: ^Simulator) {
// Load fonts // Load fonts
font := rl.LoadFontEx("./assets/fonts/Inter_18pt-Regular.ttf", 18, nil, 0) font := rl.LoadFontEx("./assets/fonts/Inter_18pt-Regular.ttf", 18, nil, 0)
rl.SetTextureFilter(font.texture, .BILINEAR) rl.SetTextureFilter(font.texture, .BILINEAR)
sim.font = font sim.font = font
rl.GuiLoadStyleDefault() rl.GuiLoadStyleDefault()
rl.GuiLoadStyle("./assets/raygui_styles/style_dark.rgs") 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 // @TODO: If this grows lets move it into its own file
calc_layout :: proc(screen_width: f32, screen_height: f32) -> Layout { calc_layout :: proc(screen_width: f32, screen_height: f32) -> Layout {
sidebar_width := screen_width * SIDEBAR_PERCENT sidebar_width := screen_width * SIDEBAR_PERCENT
content_height := screen_height - CONTROL_BAR_H - STATUS_BAR_H 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 { return Layout {
control_bar = rl.Rectangle { control_bar = rl.Rectangle {
x = 0, x = 0,
y = 0, y = 0,
width = screen_width, width = screen_width,
height = CONTROL_BAR_H, height = CONTROL_BAR_H,
}, },
left_panel = rl.Rectangle { left_panel = rl.Rectangle {
x = 0, x = 0,
y = CONTROL_BAR_H, y = CONTROL_BAR_H,
width = sidebar_width, width = sidebar_width,
height = content_height, height = content_height,
}, },
display = rl.Rectangle { display = rl.Rectangle {
x = sidebar_width, x = sidebar_width,
y = CONTROL_BAR_H, y = CONTROL_BAR_H,
width = screen_width - (sidebar_width * 2), width = screen_width - (sidebar_width * 2),
height = display_height, height = display_height,
}, },
right_panel = rl.Rectangle { right_panel = rl.Rectangle {
x = screen_width - sidebar_width, x = screen_width - sidebar_width,
y = CONTROL_BAR_H, y = CONTROL_BAR_H,
width = sidebar_width, width = sidebar_width,
height = content_height, height = content_height,
}, },
status_bar = rl.Rectangle { status_bar = rl.Rectangle {
x = 0, x = 0,
y = screen_height - STATUS_BAR_H, y = screen_height - STATUS_BAR_H,
width = screen_width, height = STATUS_BAR_H, width = screen_width, height = STATUS_BAR_H,
}, },
} }
} }