force raylib logging to look my other logging frfr

1 files changed, 30 insertions, 41 deletions

diff --git a/src/main.odin b/src/main.odin
index 88e4173..0ce4fac 100644
--- a/src/main.odin
+++ b/src/main.odin
@@ -1,11 +1,9 @@
 package demonchime
 
-// import "core:math"
-// import "core:math/rand"
-// import "core:time"
-
 import "base:runtime"
 
+import "core:c"
+import "core:c/libc"
 import "core:fmt"
 import "core:log"
 import "core:mem"
@@ -15,7 +13,6 @@ import rl "vendor:raylib"
 
 import "draw"
 import "phys"
-// import "tiled"
 
 Vec2 :: [2]f32
 
@@ -31,30 +28,32 @@ state: struct {
 
 logger: log.Logger
 
-// raylib_log :: proc "c" (
-//   msg_type: rl.TraceLogLevel,
-//   fmt: cstring,
-//   args: ^c.va_list,
-// ) {
-//   context = runtime.default_context()
-//   context.logger = logger
-//
-//   fmt_len := libc.vsnprintf(nil, 0, fmt, args)
-//
-//   msg_bytes := make([]u8, fmt_len + 1, allocator = context.temp_allocator)
-//   log.info(len(msg_bytes), raw_data(msg_bytes))
-//   log.info(libc.vsnprintf(raw_data(msg_bytes), len(msg_bytes), fmt, args))
-//
-//   msg := string(msg_bytes)
-//
-//   #partial switch msg_type {
-//   case .DEBUG: log.debug(msg)
-//   case .INFO: log.info(msg)
-//   case .WARNING: log.warn(msg)
-//   case .ERROR: log.error(msg)
-//   case .FATAL: log.fatal(msg)
-//   }
-// }
+raylib_log :: proc "c" (
+  msg_type: rl.TraceLogLevel,
+  fmt: cstring,
+  args: ^c.va_list,
+) {
+  context = runtime.default_context()
+  context.logger = logger
+
+  msg_bytes: [1028]u8
+  libc.vsnprintf(raw_data(msg_bytes[:]), 1028, fmt, args)
+
+  msg := string(msg_bytes[:])
+
+  #partial switch msg_type {
+  case .DEBUG:
+    log.debug(msg)
+  case .INFO:
+    log.info(msg)
+  case .WARNING:
+    log.warn(msg)
+  case .ERROR:
+    log.error(msg)
+  case .FATAL:
+    log.fatal(msg)
+  }
+}
 
 die :: proc(msg: string, args: ..any, #any_int exit_code := 1) {
   log.fatalf(msg, args)
@@ -63,7 +62,6 @@ die :: proc(msg: string, args: ..any, #any_int exit_code := 1) {
 
 init :: proc() {
   state.camera.zoom = 1
-  // state.camera.offset = {draw.SCREEN_WIDTH/2, draw.SCREEN_HEIGHT/2}
 
   init_keybinds()
 
@@ -71,12 +69,6 @@ init :: proc() {
 
   init_player()
 
-  // room, err := tiled.load_map("res/room_begin.tmj")
-  // if err != .NONE {
-  //   log.errorf("Error loading map (%v)", err)
-  // }
-  // state.room = room
-
   open_room(.ROOM_BEGIN)
 
   setup_map_collisions()
@@ -145,7 +137,7 @@ main :: proc() {
   context.logger = logger
   defer log.destroy_console_logger(logger)
 
-  // rl.SetTraceLogCallback(raylib_log)
+  rl.SetTraceLogCallback(raylib_log)
 
   rl.InitWindow(480 * 2, 360 * 2, "Demonchime")
 
@@ -154,13 +146,10 @@ main :: proc() {
   init()
 
   for !rl.WindowShouldClose() {
-    // pbody := phys.get_body(player.body_handle)
-    // state.camera.target = {pbody.pos.x, pbody.pos.y}
-
     frame()
-
     free_all(context.temp_allocator)
   }
 
   cleanup()
 }
+