riyyi/sindri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor modules architecture

Browse Source
This commit is contained in:
Riyyi
2026-09-17 22:09:05 +02:00
parent eb495f67c2
commit 22be96ee45
11 changed files with 93 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event/event.odin → src/base/event.odin
+11 -13
View File
@@ -1,9 +1,7 @@
package event
package base
import "core:fmt"
import "sindri:input"
// -----------------------------------------
// Types
@@ -51,32 +49,32 @@ Joystick_Disconnect_Event :: struct {
Key_Press_Event :: struct {
handled: bool,
key: input.Key,
mods: input.Mod_Set,
key: Key,
mods: Mod_Set,
}
Key_Release_Event :: struct {
handled: bool,
key: input.Key,
mods: input.Mod_Set,
key: Key,
mods: Mod_Set,
}
Key_Repeat_Event :: struct {
handled: bool,
key: input.Key,
mods: input.Mod_Set,
key: Key,
mods: Mod_Set,
}
Mouse_Button_Press_Event :: struct {
handled: bool,
button: input.Mouse_Button,
mods: input.Mod_Set,
button: Mouse_Button,
mods: Mod_Set,
}
Mouse_Button_Release_Event :: struct {
handled: bool,
button: input.Mouse_Button,
mods: input.Mod_Set,
button: Mouse_Button,
mods: Mod_Set,
}
Mouse_Position_Event :: struct {
src/hot_reload/hot_reload.odin → src/base/hot_reload.odin
+2 -4
View File
@@ -1,4 +1,4 @@
package hot_reload
package base
import "core:c"
import "core:dynlib"
@@ -6,8 +6,6 @@ import "core:fmt"
import "core:os"
import "core:time"
import "sindri:core"
when ODIN_OS == .Windows {
LIB_EXT :: ".dll"
} else when ODIN_OS == .Darwin {
@@ -42,7 +40,7 @@ Game_API :: struct {
memory_free: proc(),
memory_size: proc() -> int,
memory_set: proc(mem: rawptr),
settings: proc() -> core.Settings,
settings: proc() -> Settings,
init_once: proc(),
init: proc(),
update: proc(_: f32),
src/input/keycodes.odin → src/base/keycodes.odin
+1 -1
View File
@@ -1,4 +1,4 @@
package input
package base
// -----------------------------------------
src/core/settings.odin → src/base/settings.odin
+1 -1
View File
@@ -1,4 +1,4 @@
package core
package base
// -----------------------------------------
src/core/input.odin
+25
View File
@@ -0,0 +1,25 @@
package core
import "sindri:base"
import "sindri:platform"
// -----------------------------------------
// Public functions
// Returns the state of the keyboard key
key_state :: proc(key: base.Key) -> base.Action {
return platform.os_key_state(key)
}
// Returns the state of the mouse button
mouse_button_state :: proc(button: base.Mouse_Button) -> base.Action {
return platform.os_mouse_button_state(button)
}
// Returns the position of the mouse cursor
mouse_position :: proc() -> (x_pos: f32, y_pos: f32) {
return platform.os_mouse_position()
}
// -----------------------------------------
// Private functions
src/input/input.odin
-19
View File
@@ -1,19 +0,0 @@
package input
// -----------------------------------------
// Public functions
// Returns the state of the keyboard key
// implementation in platform package, to prevent cyclic dependency
key_state: proc(key: Key) -> Action
// Returns the state of the mouse button
// implementation in platform package, to prevent cyclic dependency
mouse_button_state: proc(button: Mouse_Button) -> Action
// Returns the position of the mouse cursor
// implementation in platform package, to prevent cyclic dependency
mouse_position: proc() -> (x_pos: f32, y_pos: f32)
// -----------------------------------------
// Private functions
src/main.odin
+6 -6
View File
@@ -3,7 +3,7 @@ package sindri
import "core:fmt"
import "core:time"
import "sindri:hot_reload"
import "sindri:base"
import "sindri:platform"
VERSION :: #config(VERSION, "dev")
@@ -14,10 +14,10 @@ main :: proc() {
fmt.println("hello world!")
// Hot reload development functionality
hr, err := hot_reload.hot_reload_init()
defer hot_reload.hot_reload_destroy(&hr)
hr, err := base.hot_reload_init()
defer base.hot_reload_destroy(&hr)
api := hot_reload.active_lib(&hr)
api := base.active_lib(&hr)
settings := api.settings()
// Initialize Window
@@ -35,7 +35,7 @@ main :: proc() {
gt: f64 = 0
dt: f32
for !platform.os_should_close() && !hot_reload.should_close(&hr) {
for !platform.os_should_close() && !base.should_close(&hr) {
start := time.tick_now()
platform.os_poll_events()
@@ -47,7 +47,7 @@ main :: proc() {
gt += f64(dt)
// Hot reload
api, err = hot_reload.reload_game_lib(&hr)
api, err = base.reload_game_lib(&hr)
if err != nil do break
}
src/platform/glfw.odin
+36 -46
View File
@@ -7,9 +7,7 @@ import "vendor:glfw"
import "wgpu:wgpu"
import "wgpu:wgpu/glfwglue"
import "sindri:core"
import "sindri:event"
import "sindri:input"
import "sindri:base"
// -----------------------------------------
// Types
@@ -21,7 +19,7 @@ OS :: struct {
// -----------------------------------------
// Constructor / destructor
os_init :: proc(settings: core.Settings) {
os_init :: proc(settings: base.Settings) {
if !glfw.Init() {
panic("[glfw] init failure")
}
@@ -48,11 +46,6 @@ os_init :: proc(settings: core.Settings) {
glfw.SetCursorPosCallback(state.os.window, cursor_pos_callback)
glfw.SetScrollCallback(state.os.window, scroll_callback)
glfw.SetJoystickCallback(joystick_callback)
// Register input functions
input.key_state = key_state
input.mouse_button_state = mouse_button_state
input.mouse_position = mouse_position
}
os_destroy :: proc() {
@@ -63,7 +56,7 @@ os_destroy :: proc() {
// -----------------------------------------
// Public functions
os_set_monitor :: proc(settings: core.Settings) {
os_set_monitor :: proc(settings: base.Settings) {
monitor := glfw.GetPrimaryMonitor()
x_pos: i32
y_pos: i32
@@ -140,47 +133,44 @@ os_get_surface :: proc(instance: wgpu.Instance) -> wgpu.Surface {
return glfwglue.GetSurface(instance, state.os.window)
}
// -----------------------------------------
// Private functions
@(private = "file")
key_state :: proc(key: input.Key) -> input.Action {
os_key_state :: proc(key: base.Key) -> base.Action {
return input_action(glfw.GetKey(state.os.window, i32(key)))
}
@(private = "file")
mouse_button_state :: proc(button: input.Mouse_Button) -> input.Action {
os_mouse_button_state :: proc(button: base.Mouse_Button) -> base.Action {
return input_action(glfw.GetMouseButton(state.os.window, i32(button)))
}
@(private = "file")
mouse_position :: proc() -> (x_pos: f32, y_pos: f32) {
os_mouse_position :: proc() -> (x_pos: f32, y_pos: f32) {
x_pos_f64, y_pos_64 := glfw.GetCursorPos(state.os.window)
return f32(x_pos_f64), f32(y_pos_64)
}
// -----------------------------------------
// Private functions
@(private = "file")
input_action :: proc(action: i32) -> input.Action {
if action == glfw.RELEASE do return input.Action.Release
else if action == glfw.PRESS do return input.Action.Press
else if action == glfw.REPEAT do return input.Action.Repeat
input_action :: proc(action: i32) -> base.Action {
if action == glfw.RELEASE do return base.Action.Release
else if action == glfw.PRESS do return base.Action.Press
else if action == glfw.REPEAT do return base.Action.Repeat
when ODIN_DEBUG do panic("[glfw] unknown action")
return .None
}
@(private = "file")
input_key :: proc(key: i32) -> input.Key {
return input.Key(key) // values match
input_key :: proc(key: i32) -> base.Key {
return base.Key(key) // values match
}
@(private = "file")
input_mod_set :: proc(mods: i32) -> (set: input.Mod_Set) {
return transmute(input.Mod_Set)i8(mods & 0x3f) // values match bit position
input_mod_set :: proc(mods: i32) -> (set: base.Mod_Set) {
return transmute(base.Mod_Set)i8(mods & 0x3f) // values match bit position
}
@(private = "file")
input_mouse_button :: proc(button: i32) -> input.Mouse_Button {
return input.Mouse_Button(button) // values match
input_mouse_button :: proc(button: i32) -> base.Mouse_Button {
return base.Mouse_Button(button) // values match
}
// Error callback
@@ -194,7 +184,7 @@ error_callback :: proc "c" (error: i32, description: cstring) {
@(private = "file")
window_close_callback :: proc "c" (window: glfw.WindowHandle) {
context = state.ctx
event.on_event(event.Window_Close_Event{})
base.on_event(base.Window_Close_Event{})
} // GLFWwindowclosefun
// Window resize callback
@@ -211,24 +201,24 @@ key_callback :: proc "c" (
) {
context = state.ctx
if action == glfw.PRESS {
event.on_event(
event.Key_Press_Event {
base.on_event(
base.Key_Press_Event {
key = input_key(key),
mods = input_mod_set(mods),
},
)
}
if action == glfw.RELEASE {
event.on_event(
event.Key_Release_Event {
base.on_event(
base.Key_Release_Event {
key = input_key(key),
mods = input_mod_set(mods),
},
)
}
if action == glfw.REPEAT {
event.on_event(
event.Key_Repeat_Event {
base.on_event(
base.Key_Repeat_Event {
key = input_key(key),
mods = input_mod_set(mods),
},
@@ -244,16 +234,16 @@ mouse_button_callback :: proc "c" (
) {
context = state.ctx
if action == glfw.PRESS {
event.on_event(
event.Mouse_Button_Press_Event {
base.on_event(
base.Mouse_Button_Press_Event {
button = input_mouse_button(button),
mods = input_mod_set(mods),
},
)
}
if action == glfw.RELEASE {
event.on_event(
event.Mouse_Button_Release_Event {
base.on_event(
base.Mouse_Button_Release_Event {
button = input_mouse_button(button),
mods = input_mod_set(mods),
},
@@ -268,8 +258,8 @@ cursor_pos_callback :: proc "c" (
x_pos, y_pos: f64,
) {
context = state.ctx
event.on_event(
event.Mouse_Position_Event{x_pos = f32(x_pos), y_pos = f32(y_pos)},
base.on_event(
base.Mouse_Position_Event{x_pos = f32(x_pos), y_pos = f32(y_pos)},
)
} // GLFWcursorposfun
@@ -280,8 +270,8 @@ scroll_callback :: proc "c" (
x_offset, y_offset: f64,
) {
context = state.ctx
event.on_event(
event.Mouse_Scroll_Event {
base.on_event(
base.Mouse_Scroll_Event {
x_offset = f32(x_offset),
y_offset = f32(y_offset),
},
@@ -293,9 +283,9 @@ scroll_callback :: proc "c" (
joystick_callback :: proc "c" (id, connected: i32) {
context = state.ctx
if connected == glfw.CONNECTED {
event.on_event(event.Joystick_Connect_Event{id = id})
base.on_event(base.Joystick_Connect_Event{id = id})
} else {
event.on_event(event.Joystick_Disconnect_Event{id = id})
base.on_event(base.Joystick_Disconnect_Event{id = id})
}
} // GLFWjoystickfun
src/platform/wgpu.odin
+2 -2
View File
@@ -6,7 +6,7 @@ import "core:slice"
import "wgpu:wgpu"
import "sindri:core"
import "sindri:base"
// -----------------------------------------
// Variables
@@ -33,7 +33,7 @@ state: struct {
// -----------------------------------------
// Constructor/destructor
instance_init :: proc(settings: core.Settings) {
instance_init :: proc(settings: base.Settings) {
state.ctx = context
wgpu.SetLogCallback(log_callback, nil)