Hooked in to raylib's logger

.vscode/settings.json

@@ -3,6 +3,7 @@
         "clippy",
         "raylib",
         "renderable",
-        "vergen"
+        "vergen",
+        "vsprintf"
     ]
 }

game/Cargo.toml

@@ -27,6 +27,9 @@ tempfile = "3.2"
 approx = "0.5"
 pkg-version = "1.0"
 cfg-if = "1.0"
+num-derive = "0.3"
+num = "0.4"
+printf = "0.1"
 
 [dev-dependencies]
 puffin_viewer = "0.6"

game/src/lib.rs

@@ -1,6 +1,7 @@
 #![feature(derive_default_enum)]
 #![feature(custom_inner_attributes)]
 #![feature(stmt_expr_attributes)]
+#![feature(c_variadic)]
 #![deny(unsafe_code)]
 #![warn(
     clippy::all,
@@ -75,15 +76,10 @@ use raylib::prelude::*;
 use tracing::{error, info};
 use utilities::discord::DiscordConfig;
 
-use crate::{
-    context::GameContext,
-    discord_rpc::{maybe_set_discord_presence, try_connect_to_local_discord},
-    scenes::{build_screen_state_machine, Scenes},
-    utilities::shaders::{
+use crate::{context::GameContext, discord_rpc::{maybe_set_discord_presence, try_connect_to_local_discord}, scenes::{build_screen_state_machine, Scenes}, utilities::{ffi_logging::hook_raylib_logging, shaders::{
         shader::ShaderWrapper,
         util::{dynamic_screen_texture::DynScreenTexture, render_texture::render_to_texture},
-    },
-};
+    }}};
 
 #[macro_use]
 extern crate thiserror;
@@ -91,6 +87,8 @@ extern crate thiserror;
 extern crate serde;
 #[macro_use]
 extern crate approx;
+#[macro_use]
+extern crate num_derive;
 
 mod context;
 mod discord_rpc;
@@ -135,6 +133,7 @@ pub async fn game_begin(game_config: &GameConfig) -> Result<(), Box<dyn std::err
     let raylib_thread;
     {
         // Set up FFI access to raylib
+        hook_raylib_logging();
         let (mut rl, thread) = raylib::init()
             .size(
                 game_config.base_window_size.0,

game/src/utilities/ffi_logging.rs

@@ -0,0 +1,53 @@
+use std::{convert::TryInto, ffi::c_void};
+
+use num_traits::FromPrimitive;
+use printf::printf;
+
+/// Direct mapping of Raylib's log levels
+/// See: https://github.com/raysan5/raylib/blob/d875891a3c2621ab40733ca3569eca9e054a6506/parser/raylib_api.json#L985-L1026
+#[derive(FromPrimitive)]
+enum RaylibLogLevel {
+    All = 0,
+    Trace = 1,
+    Debug = 2,
+    Info = 3,
+    Warning = 4,
+    Error = 5,
+    Fatal = 6,
+    None = 7,
+}
+
+/// Callback that is called by the FFI code
+#[allow(unsafe_code)]
+#[no_mangle]
+unsafe extern "C" fn raylib_log_callback(
+    level: i32,
+    message: *const i8,
+    args: *mut raylib::ffi::__va_list_tag,
+) {
+    // Get the message as a string
+    let formatted_message = printf(message, args as *mut c_void);
+
+    // Handle the log level
+    match RaylibLogLevel::from_u32(level.try_into().unwrap()) {
+        Some(level) => match level {
+            RaylibLogLevel::Trace => tracing::trace!("{}", formatted_message),
+            RaylibLogLevel::Debug => tracing::debug!("{}", formatted_message),
+            RaylibLogLevel::Warning => tracing::warn!("{}", formatted_message),
+            RaylibLogLevel::Error => tracing::error!("{}", formatted_message),
+            RaylibLogLevel::Fatal => tracing::error!("{}", formatted_message),
+            _ => tracing::info!("{}", formatted_message),
+        },
+        None => {
+            println!("{:?}", formatted_message)
+        }
+    }
+}
+
+/// Call this to replace raylib's logger with the rust logging system
+pub fn hook_raylib_logging() {
+    #[allow(unsafe_code)]
+    unsafe {
+        raylib::ffi::SetTraceLogCallback(Some(raylib_log_callback));
+    }
+}

game/src/utilities/mod.rs

@@ -6,3 +6,4 @@ pub mod shaders;
 pub mod non_ref_raylib;
 pub mod render_layer;
 pub mod game_version;
+pub mod ffi_logging;