diff --git a/main.cpp b/main.cpp index ba8ba92..f4ff9d4 100644 --- a/main.cpp +++ b/main.cpp @@ -1,11 +1,11 @@ #include "Application.h" -#include +#include "src/log/log.h" int main() { Application app; if (!app.Initialize()) { - std::cerr << "Failed to initialize application\n"; + log_error("Failed to initialize application"); return -1; } diff --git a/scripts/test.as b/scripts/test.as index 803459e..f207f86 100644 --- a/scripts/test.as +++ b/scripts/test.as @@ -7,6 +7,5 @@ void Update(float dt) { } void Draw() { - Print("Drawing stuff"); DrawText("Hello from AngelScript - Working perfectly!", int(x), int(y), 20, 0xFF0000FF); } diff --git a/src/Application.cpp b/src/Application.cpp index b31c408..7763b7e 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -1,6 +1,5 @@ #include "Application.h" #include "raylib.h" -#include #include #include #include "log/log.h" @@ -25,7 +24,7 @@ bool Application::Initialize() { // Initialize AngelScript if (!scriptEngine.Initialize()) { - std::cerr << "Failed to initialize script engine\n"; + log_error("Failed to initialize script engine"); return false; } @@ -56,7 +55,7 @@ void Application::Update(float deltaTime) { bool success = scriptEngine.CompileScript(SCRIPT_FILE); scriptCompilationError = !success; if (!success) { - std::cout << "Script compilation failed - keeping previous version\n"; + log_warn("Script compilation failed - keeping previous version"); } } diff --git a/src/ScriptEngine.cpp b/src/ScriptEngine.cpp index 19d671a..cf02f6a 100644 --- a/src/ScriptEngine.cpp +++ b/src/ScriptEngine.cpp @@ -1,10 +1,10 @@ #include "ScriptEngine.h" #include "ScriptBindings.h" #include "scriptstdstring.h" -#include #include #include #include +#include "log/log.h" ScriptEngine::ScriptEngine() : engine(nullptr), updateFunc(nullptr), drawFunc(nullptr), currentModule(nullptr), hasValidScript(false) { } @@ -16,7 +16,7 @@ ScriptEngine::~ScriptEngine() { bool ScriptEngine::Initialize() { engine = asCreateScriptEngine(); if (!engine) { - std::cerr << "Failed to create AngelScript engine\n"; + log_error("Failed to create AngelScript engine"); return false; } @@ -29,7 +29,7 @@ bool ScriptEngine::Initialize() { // Set message callback int r = engine->SetMessageCallback(asFUNCTION(MessageCallback), nullptr, asCALL_CDECL); if (r < 0) { - std::cerr << "Failed to set message callback\n"; + log_error("Failed to set message callback"); return false; } @@ -51,7 +51,7 @@ bool ScriptEngine::CompileScript(const std::string& filename) { std::string code = ReadFile(filename); if (code.empty()) { - std::cerr << "Failed to read script file: " << filename << "\n"; + log_error("Failed to read script file: %s", filename.c_str()); return false; } @@ -60,14 +60,14 @@ bool ScriptEngine::CompileScript(const std::string& filename) { int r = tempMod->AddScriptSection(filename.c_str(), code.c_str()); if (r < 0) { - std::cerr << "Failed to add script section for: " << filename << "\n"; + log_error("Failed to add script section for: %s", filename.c_str()); engine->DiscardModule("temp"); return false; } r = tempMod->Build(); if (r < 0) { - std::cerr << "Failed to build script: " << filename << "\n"; + log_error("Failed to build script: %s", filename.c_str()); engine->DiscardModule("temp"); return false; } @@ -90,7 +90,7 @@ bool ScriptEngine::CompileScript(const std::string& filename) { if (r < 0) { // This shouldn't happen since we already tested compilation - std::cerr << "Unexpected error when creating main module\n"; + log_error("Unexpected error when creating main module"); ClearCachedFunctions(); return false; } @@ -99,8 +99,7 @@ bool ScriptEngine::CompileScript(const std::string& filename) { updateFunc = currentModule->GetFunctionByName("Update"); drawFunc = currentModule->GetFunctionByName("Draw"); hasValidScript = true; - - std::cout << "Script compiled and cached: " << filename << "\n"; + log_info("Script compiled and cached: %s", filename.c_str()); return true; } @@ -123,7 +122,7 @@ void ScriptEngine::CallScriptFunction(asIScriptFunction* func, float dt) { r = ctx->Execute(); if (r != asEXECUTION_FINISHED) { if (r == asEXECUTION_EXCEPTION) { - std::cerr << "Script exception: " << ctx->GetExceptionString() << "\n"; + log_error("Script exception: %s", ctx->GetExceptionString()); } } @@ -143,7 +142,14 @@ void ScriptEngine::GarbageCollect() { } void ScriptEngine::MessageCallback(const asSMessageInfo* msg, void*) { - std::cout << msg->section << " (" << msg->row << "): " << msg->message << std::endl; + // Map AngelScript message types to log levels + if (msg->type == asMSGTYPE_ERROR) { + log_error("%s (%d): %s", msg->section, msg->row, msg->message); + } else if (msg->type == asMSGTYPE_WARNING) { + log_warn("%s (%d): %s", msg->section, msg->row, msg->message); + } else { + log_info("%s (%d): %s", msg->section, msg->row, msg->message); + } } std::string ScriptEngine::ReadFile(const std::string& filename) {