fix: hot reload on all scripts

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
     "files.associations": {
         "*.h": "c",
-        "xstring": "cpp",
-        "iostream": "cpp"
+        "xstring": "cpp"
     }
 }

CMakeLists.txt

@@ -25,18 +25,8 @@ target_include_directories(scriptstdstring
     PUBLIC external/angelscript/sdk/angelscript/include
 )
 
-# ------------------------
-# debugger add-on
-# ------------------------
-add_library(debugger STATIC
-    external/angelscript/sdk/add_on/debugger/debugger.cpp
-)
-
-target_include_directories(debugger PUBLIC
-    external/angelscript/sdk/angelscript/include
-)
 # -------------------------
-# scriptbuilder add-on
+# 3️⃣.1️⃣ scriptbuilder add-on
 # -------------------------
 add_library(scriptbuilder STATIC
     external/angelscript/sdk/add_on/scriptbuilder/scriptbuilder.cpp
@@ -47,7 +37,7 @@ target_include_directories(scriptbuilder
 )
 
 # -------------------------
-# Main executable
+# 4️⃣ Main executable
 # -------------------------
 add_executable(simian 
     main.cpp
@@ -65,7 +55,6 @@ target_include_directories(simian PUBLIC
     external/angelscript/sdk/angelscript/include
     external/angelscript/sdk/add_on/scriptstdstring
     external/angelscript/sdk/add_on/scriptbuilder
-    external/angelscript/sdk/add_on/debugger
 )
 
 target_link_libraries(simian
@@ -73,7 +62,6 @@ target_link_libraries(simian
     angelscript
     scriptstdstring
     scriptbuilder
-    debugger
 )
 
 # -------------------------

include/HotReload.h

@@ -5,14 +5,20 @@
 
 class HotReload {
 public:
-    HotReload(const std::string& filename);
-    
+    // Accept either a single script file or a directory to watch. If a directory is
+    // provided, any change to any file in the directory will trigger a reload.
+    HotReload(const std::string& pathToWatch);
+
     bool CheckForChanges();
     void UpdateLastWriteTime();
 
 private:
-    std::string scriptFile;
+    std::string path;
     std::time_t lastWriteTime;
-    
+
     std::time_t GetFileWriteTime(const std::string& filename);
+    // Return the most recent write time found in the watched path. If `path` is a
+    // directory, this scans all files (non-recursive) and returns the newest
+    // modification time. If it's a file, it returns that file's write time.
+    std::time_t GetLatestWriteTimeInPath();
 };

include/ScriptEngine.h

@@ -2,7 +2,6 @@
 #include "angelscript.h"
 #include "scriptbuilder.h"
 #include <string>
-#include "debugger.h"
 
 class ScriptEngine {
 public:
@@ -18,8 +17,6 @@ public:
     asIScriptEngine* GetEngine() const { return engine; }
     asIScriptFunction* GetUpdateFunction() const { return updateFunc; }
     asIScriptFunction* GetDrawFunction() const { return drawFunc; }
-    void AddFileBreakPoint(const std::string& file, int line);
-    void AddFuncBreakPoint(const std::string& func);
 
 private:
     asIScriptEngine* engine;
@@ -27,7 +24,6 @@ private:
     asIScriptFunction* drawFunc;
     asIScriptModule* currentModule;
     bool hasValidScript;
-    CDebugger* debugger = nullptr;
 
     static void MessageCallback(const asSMessageInfo* msg, void* param);
     static int IncludeCallback(const char* include, const char* from, CScriptBuilder* builder, void* userParam);

scripts/update.as

@@ -2,7 +2,7 @@ float x = 50;
 float y = 100;
 
 void Update(float dt) {
-    x += 50 * dt;
+    x += 500 * dt;
     if (x > 800) {
         x = 0;
         Print("X position reset!");
@@ -10,4 +10,4 @@ void Update(float dt) {
         Log(LOG_WARNING, "Log WARNING: reset happened");
         Log(LOG_ERROR, "Log ERROR: reset happened");
     }
-}
+}//

src/Application.cpp

@@ -2,6 +2,7 @@
 #include "raylib.h"
 #include <chrono>
 #include <thread>
+#include <filesystem>
 #include "log/log.h"
 const char* Application::WINDOW_TITLE = "Raylib + AngelScript";
 const char* Application::SCRIPT_FILE = "scripts/test.as";
@@ -28,8 +29,14 @@ bool Application::Initialize() {
         return false;
     }
 
-    // Initialize hot reload
-    hotReload = new HotReload(SCRIPT_FILE);
+    // Initialize hot reload to watch the scripts directory so any script change
+    // (not just the main file) triggers a reload.
+    {
+        std::filesystem::path p(SCRIPT_FILE);
+        std::string watchPath = p.parent_path().string();
+        if (watchPath.empty()) watchPath = ".";
+        hotReload = new HotReload(watchPath);
+    }
 
     // Compile initial script
     scriptCompilationError = !scriptEngine.CompileScript(SCRIPT_FILE);

src/HotReload.cpp

@@ -3,21 +3,21 @@
 
 namespace fs = std::filesystem;
 
-HotReload::HotReload(const std::string& filename) : scriptFile(filename), lastWriteTime(0) {
+HotReload::HotReload(const std::string& pathToWatch) : path(pathToWatch), lastWriteTime(0) {
     UpdateLastWriteTime();
 }
 
 bool HotReload::CheckForChanges() {
-    std::time_t currentWriteTime = GetFileWriteTime(scriptFile);
-    if (currentWriteTime != lastWriteTime) {
-        lastWriteTime = currentWriteTime;
+    std::time_t current = GetLatestWriteTimeInPath();
+    if (current != lastWriteTime) {
+        lastWriteTime = current;
         return true;
     }
     return false;
 }
 
 void HotReload::UpdateLastWriteTime() {
-    lastWriteTime = GetFileWriteTime(scriptFile);
+    lastWriteTime = GetLatestWriteTimeInPath();
 }
 
 std::time_t HotReload::GetFileWriteTime(const std::string& filename) {
@@ -29,4 +29,28 @@ std::time_t HotReload::GetFileWriteTime(const std::string& filename) {
     } catch (const std::exception&) {
         return 0;
     }
+}
+
+std::time_t HotReload::GetLatestWriteTimeInPath() {
+    try {
+        fs::path p(path);
+        if (fs::is_regular_file(p)) {
+            return GetFileWriteTime(path);
+        }
+
+        // If it's a directory, scan files (non-recursively) and return the
+        // newest write time found.
+        if (fs::is_directory(p)) {
+            std::time_t newest = 0;
+            for (auto &entry : fs::directory_iterator(p)) {
+                if (!fs::is_regular_file(entry.path())) continue;
+                std::time_t t = GetFileWriteTime(entry.path().string());
+                if (t > newest) newest = t;
+            }
+            return newest;
+        }
+    } catch (const std::exception&) {
+        // fall through
+    }
+    return 0;
 }

src/ScriptEngine.cpp

@@ -22,9 +22,6 @@ bool ScriptEngine::Initialize() {
         return false;
     }
 
-    debugger = new CDebugger();
-    debugger->SetEngine(engine);
-
     // Register std::string
     RegisterStdString(engine);
 
@@ -43,11 +40,6 @@ bool ScriptEngine::Initialize() {
 
 void ScriptEngine::Shutdown() {
     ClearCachedFunctions();
-    if (debugger) {
-        debugger->SetEngine(nullptr);
-        delete debugger;
-        debugger = nullptr;
-    }
     if (engine) {
         engine->ShutDownAndRelease();
         engine = nullptr;
@@ -118,11 +110,6 @@ bool ScriptEngine::CompileScript(const std::string& filename) {
     updateFunc = currentModule->GetFunctionByName("Update");
     drawFunc = currentModule->GetFunctionByName("Draw");
     hasValidScript = true;
-    // If debugger is present, add a function breakpoint on Update to stop when Update is entered
-    // The debugger will transform function breakpoints into file breakpoints when the function is entered
-    if (debugger && updateFunc) {
-        debugger->AddFuncBreakPoint("Update");
-    }
     log_info("Script compiled and cached: %s", filename.c_str());
     return true;
 }
@@ -133,10 +120,6 @@ void ScriptEngine::CallScriptFunction(asIScriptFunction* func, float dt) {
     asIScriptContext* ctx = engine->CreateContext();
     if (!ctx) return;
 
-    if (debugger) {
-        ctx->SetLineCallback(asMETHOD(CDebugger, LineCallback), debugger, asCALL_THISCALL);
-    }
-
     int r = ctx->Prepare(func);
     if (r < 0) {
         ctx->Release();
@@ -169,13 +152,6 @@ void ScriptEngine::GarbageCollect() {
     }
 }
 
-
-void ScriptEngine::AddFileBreakPoint(const std::string &file, int line) {
-    if (debugger) debugger->AddFileBreakPoint(file, line);
-}
-void ScriptEngine::AddFuncBreakPoint(const std::string &func) {
-    if (debugger) debugger->AddFuncBreakPoint(func);
-}
 void ScriptEngine::MessageCallback(const asSMessageInfo* msg, void*) {
     // Map AngelScript message types to log levels
     if (msg->type == asMSGTYPE_ERROR) {

src/log/log.c

@@ -21,6 +21,7 @@
  */
 
 #include "log.h"
+#include <string.h> // for memcpy
 
 #define MAX_CALLBACKS 32
 
@@ -187,6 +188,14 @@ static void init_event(log_Event *ev, void *udata)
 }
 
 void log_log(int level, const char *file, int line, const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    log_vlog(level, file, line, fmt, ap);
+    va_end(ap);
+}
+
+void log_vlog(int level, const char *file, int line, const char *fmt, va_list ap)
 {
     log_Event ev = {
         .fmt = fmt,
@@ -200,9 +209,11 @@ void log_log(int level, const char *file, int line, const char *fmt, ...)
     if (!L.quiet && level >= L.level)
     {
         init_event(&ev, stderr);
-        va_start(ev.ap, fmt);
+        va_list ap_copy;
+        va_copy(ap_copy, ap);
+        memcpy(&ev.ap, &ap_copy, sizeof(va_list));
         stdout_callback(&ev);
-        va_end(ev.ap);
+        va_end(ap_copy);
     }
 
     for (int i = 0; i < MAX_CALLBACKS && L.callbacks[i].fn; i++)
@@ -211,9 +222,11 @@ void log_log(int level, const char *file, int line, const char *fmt, ...)
         if (level >= cb->level)
         {
             init_event(&ev, cb->udata);
-            va_start(ev.ap, fmt);
+            va_list ap_copy;
+            va_copy(ap_copy, ap);
+            memcpy(&ev.ap, &ap_copy, sizeof(va_list));
             cb->fn(&ev);
-            va_end(ev.ap);
+            va_end(ap_copy);
         }
     }
 
@@ -222,5 +235,5 @@ void log_log(int level, const char *file, int line, const char *fmt, ...)
 
 void raylib_log(int msgType, const char *text, va_list args)
 {
-    log_log(msgType, NULL, 0, text, args);
+    log_vlog(msgType, NULL, 0, text, args);
 }

src/log/log.h

@@ -48,6 +48,8 @@ int log_add_callback(log_LogFn fn, void *udata, int level);
 int log_add_fp(FILE *fp, int level);
 
 void log_log(int level, const char *file, int line, const char *fmt, ...);
+// Variant that accepts a va_list for backends that already receive va_list
+void log_vlog(int level, const char *file, int line, const char *fmt, va_list ap);
 
 
 void raylib_log(int msgType, const char *text, va_list args);