ed/SectrPrototype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed hot-reload for sokol

Browse Source
This commit is contained in:
Edward R. Gonzalez 2024-05-26 13:33:54 -04:00
parent 424587e6d1
commit 469fa5f8ec
4 changed files with 28 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
code/sectr/engine/client_api.odin
View File

@ -381,12 +381,34 @@ reload :: proc( prof : ^SpallProfiler, persistent_mem, frame_mem, transient_mem,
transient = transient_mem
files_buffer = files_buffer_mem
context.allocator = persistent_allocator()
context.allocator = transient_allocator()
context.temp_allocator = transient_allocator()
Memory_App.state = get_state()
using state
sokol_context = context
Sokol:
{
desc_app := sokol_app.DescReload {
init_cb = sokol_app_init_callback,
frame_cb = sokol_app_frame_callback,
cleanup_cb = sokol_app_cleanup_callback,
event_cb = sokol_app_event_callback,
logger = { sokol_app_log_callback, nil },
allocator = { sokol_app_alloc, sokol_app_free, nil },
}
sokol_app.client_reload( desc_app )
desc_gfx := sokol_gfx.DescReload {
allocator = { sokol_gfx_alloc, sokol_gfx_free, nil },
logger = { sokol_gfx_log_callback, nil },
}
sokol_gfx.client_reload( desc_gfx )
}
// Procedure Addresses are not preserved on hot-reload. They must be restored for persistent data.
// The only way to alleviate this is to either do custom handles to allocators
// Or as done below, correct containers using allocators on reload.

5
code/sectr/engine/render_sokol.odin
View File

@ -7,8 +7,11 @@ render :: proc()
{
state := get_state(); using state
do_nothing : bool
do_nothing = false
// Clear Demo
if false
if true
{
green_value := debug.gfx_clear_demo_pass_action.colors[0].clear_value.g + 0.01
debug.gfx_clear_demo_pass_action.colors[0].clear_value.g = green_value > 1.0 ? 0.0 : green_value

154
launch.odin_old
View File

@ -1,154 +0,0 @@
package sectr_old
import "core:io"
import "core:fmt"
import "core:mem"
import "core:mem/virtual"
import "core:strings"
import "core:unicode/utf8"
import rl "vendor:raylib"
kilobytes :: proc( kb : $integer_type ) -> integer_type {
return kb * 1024
}
megabytes :: proc( kb : $integer_type ) -> integer_type {
return kb * 1024 * 1024
}
Frame :: struct {
bounds : rl.Rectangle
// collision_bounds : rl.Rectangle, // Interaction space
// nav_bounds : rl.Rectangle // Navigation space
}
TextLine :: [dynamic]u8
TextBox :: struct {
using frame : Frame,
text : strings.Builder,
// TODO(Ed) : Make use of the lines view, this will tell use when a line begins or ends
lines : [dynamic]TextLine,
cursor_pos : i32
}
// TextBlob :: struct {
// buffer : string
// }
Null_Rune : rune = 0
Color_BG :: rl.Color { 41, 41, 45, 255 }
Color_BG_TextBox :: rl.Color { 32, 32, 32, 255 }
Color_Frame_Hover :: rl.Color { 122, 122, 125, 255 }
Color_Frame_Select :: rl.Color { 188, 188, 188, 255 }
Path_Assets :: "../assets/"
main :: proc()
{
// Rough setup of window with rl stuff
screen_width : i32 = 1280
screen_height : i32 = 1000
win_title : cstring = "Sectr Prototype"
rl.InitWindow( screen_width, screen_height, win_title )
defer {
rl.CloseWindow()
}
monitor_id := rl.GetCurrentMonitor()
monitor_refresh_rate := rl.GetMonitorRefreshRate( monitor_id )
rl.SetTargetFPS( monitor_refresh_rate )
font_rec_mono_semicasual_reg : rl.Font; {
path_rec_mono_semicasual_reg := strings.concatenate( { Path_Assets, "RecMonoSemicasual-Regular-1.084.ttf" } )
cstr := strings.clone_to_cstring(path_rec_mono_semicasual_reg)
font_rec_mono_semicasual_reg = rl.LoadFontEx( cstr, 24, nil, 0 )
delete( cstr )
}
hovered_frame : ^Frame = nil
focused_frame : ^Frame = nil
text_box : TextBox
{
builder, err := strings.builder_make_len_cap( 0, megabytes( cast(int) 1 ) / 4 )
if err != mem.Allocator_Error.None {
fmt.println( "Failed to allocate text arena!" )
return
}
text_box.text = builder
}
for ; ! rl.WindowShouldClose() ;
{
mouse_pos := rl.GetMousePosition()
// Logic Update
{
rect := &text_box.bounds
rect.width = 900
rect.height = 400
rect.x = cast(f32) (screen_width / 2) - rect.width / 2.0
rect.y = cast(f32) (screen_height / 2) - rect.height
if rl.CheckCollisionPointRec( mouse_pos, rect^ ) {
hovered_frame = & text_box
}
else {
hovered_frame = nil
}
if rl.IsMouseButtonPressed( rl.MouseButton.LEFT )
{
if hovered_frame != nil {
focused_frame = hovered_frame
}
else {
focused_frame = nil
}
}
if focused_frame != nil {
for code_point := rl.GetCharPressed();
code_point != Null_Rune;
{
strings.write_rune( & text_box.text, code_point );
code_point = rl.GetCharPressed()
}
}
}
// Rendering
{
rl.BeginDrawing()
rl.ClearBackground( Color_BG )
// Text Box
{
rl.DrawRectangleRec( text_box.bounds, Color_BG_TextBox )
if focused_frame != nil {
rl.DrawRectangleLinesEx( focused_frame.bounds, 2, Color_Frame_Select )
}
else if hovered_frame != nil {
rl.DrawRectangleLinesEx( hovered_frame.bounds, 2, Color_Frame_Hover )
}
txt_str := strings.to_string( text_box.text )
runes := utf8.string_to_runes(txt_str)
rl.GuiSetFont( font_rec_mono_semicasual_reg )
if len(txt_str) > 0 {
rl.DrawTextCodepoints( font_rec_mono_semicasual_reg, raw_data( runes ),
cast(i32) len(runes),
rl.Vector2 { text_box.bounds.x + 10, text_box.bounds.y + 10 },
24.0, // font size
0.0, // font spacing
rl.WHITE
)
}
}
rl.EndDrawing()
}
}
}

2
thirdparty/sokol vendored

@ -1 +1 @@
Subproject commit bb8e3081b913d2df5aa184122ed911ad1be151ee
Subproject commit 78ddcd8c83668fe388f45687d1ac4d4d8837adff