Skip to content

Commit ba6105c

Browse files
committed
[Script/LuaWrapper] Added debug logs for Lua wrapping classes
1 parent c73022e commit ba6105c

File tree

3 files changed

+48
-4
lines changed

3 files changed

+48
-4
lines changed

src/RaZ/Script/LuaEnvironment.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,35 @@ bool LuaEnvironment::execute(const std::string& code) const {
1717
if (code.empty())
1818
return false;
1919

20+
Logger::debug("[LuaEnvironment] Executing code...");
21+
2022
try {
2123
LuaWrapper::getState().script(code, *m_environment);
2224
} catch (const sol::error& err) {
23-
Logger::error("[LuaEnvironment] Error running code: '" + std::string(err.what()) + "'.");
25+
Logger::error("[LuaEnvironment] Error executing code: '" + std::string(err.what()) + "'.");
2426
return false;
2527
}
2628

29+
Logger::debug("[LuaEnvironment] Executed code");
30+
2731
return true;
2832
}
2933

3034
bool LuaEnvironment::executeFromFile(const FilePath& filePath) const {
3135
if (filePath.isEmpty())
3236
return false;
3337

38+
Logger::debug("[LuaEnvironment] Executing code from file ('" + filePath + "')...");
39+
3440
try {
3541
LuaWrapper::getState().script_file(filePath.toUtf8(), *m_environment);
3642
} catch (const sol::error& err) {
37-
Logger::error("[LuaEnvironment] Error running file: '" + std::string(err.what()) + "'.");
43+
Logger::error("[LuaEnvironment] Error executing code from file: '" + std::string(err.what()) + "'.");
3844
return false;
3945
}
4046

47+
Logger::debug("[LuaEnvironment] Executed code from file");
48+
4149
return true;
4250
}
4351

@@ -46,13 +54,17 @@ bool LuaEnvironment::exists(const char* name) const {
4654
}
4755

4856
void LuaEnvironment::clear() {
57+
Logger::debug("[LuaEnvironment] Clearing environment...");
4958
m_environment->clear();
59+
Logger::debug("[LuaEnvironment] Cleared environment");
5060
}
5161

5262
LuaEnvironment::~LuaEnvironment() = default;
5363

5464
void LuaEnvironment::registerEntity(const Entity& entity, const std::string& name) {
65+
Logger::debug("[LuaEnvironment] Registering entity (ID: " + std::to_string(entity.getId()) + ") as '" + name + "'...");
5566
m_environment->operator[](name) = &entity;
67+
Logger::debug("[LuaEnvironment] Registered entity");
5668
}
5769

5870
sol::reference LuaEnvironment::get(const char* name) const {

src/RaZ/Script/LuaScript.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
#include "RaZ/Application.hpp"
22
#include "RaZ/Script/LuaScript.hpp"
33
#include "RaZ/Script/LuaWrapper.hpp"
4+
#include "RaZ/Utils/FilePath.hpp"
45
#include "RaZ/Utils/FileUtils.hpp"
6+
#include "RaZ/Utils/Logger.hpp"
57

68
#define SOL_SAFE_GETTER 0 // Allowing implicit conversion to bool
79
#include "sol/sol.hpp"
810

911
namespace Raz {
1012

1113
LuaScript::LuaScript(const std::string& code) {
14+
Logger::debug("[LuaScript] Creating script...");
15+
1216
Raz::LuaWrapper::registerTypes();
1317
loadCode(code);
18+
19+
Logger::debug("[LuaScript] Created script");
1420
}
1521

1622
void LuaScript::loadCode(const std::string& code) {
23+
Logger::debug("[LuaScript] Loading code...");
24+
1725
const sol::object owningEntity = m_environment.get("this");
1826

1927
m_environment.clear();
@@ -28,10 +36,14 @@ void LuaScript::loadCode(const std::string& code) {
2836
m_environment.registerEntity(owningEntity.as<Entity>(), "this");
2937
setup();
3038
}
39+
40+
Logger::debug("[LuaScript] Loaded code");
3141
}
3242

3343
void LuaScript::loadCodeFromFile(const FilePath& filePath) {
44+
Logger::debug("[LuaScript] Loading code from file ('" + filePath + "')...");
3445
loadCode(FileUtils::readFile(filePath));
46+
Logger::debug("[LuaScript] Loaded code from file");
3547
}
3648

3749
bool LuaScript::update(const FrameTimeInfo& timeInfo) const {
@@ -49,10 +61,14 @@ void LuaScript::setup() const {
4961
if (setupRef.get_type() != sol::type::function)
5062
return;
5163

64+
Logger::debug("[LuaScript] Running script setup...");
65+
5266
const sol::unsafe_function setupFunc = setupRef;
5367

5468
if (!setupFunc().valid())
5569
throw std::runtime_error("Error: The Lua script failed to be setup");
70+
71+
Logger::debug("[LuaScript] Ran script setup");
5672
}
5773

5874
} // namespace Raz

src/RaZ/Script/LuaWrapper.cpp

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace Raz {
1010

1111
void LuaWrapper::registerTypes() {
1212
[[maybe_unused]] static const bool _ = [] () {
13+
Logger::debug("[LuaWrapper] Registering types...");
14+
1315
registerAnimationTypes();
1416
#if defined(RAZ_USE_AUDIO)
1517
registerAudioTypes();
@@ -39,6 +41,8 @@ void LuaWrapper::registerTypes() {
3941
registerVectorTypes();
4042
registerWindowTypes();
4143

44+
Logger::debug("[LuaWrapper] Registered types");
45+
4246
return true;
4347
}();
4448
}
@@ -47,35 +51,47 @@ bool LuaWrapper::execute(const std::string& code) {
4751
if (code.empty())
4852
return false;
4953

54+
Logger::debug("[LuaWrapper] Executing code...");
55+
5056
try {
5157
getState().script(code);
5258
} catch (const sol::error& err) {
53-
Logger::error("[LuaWrapper] Error running code: '" + std::string(err.what()) + "'.");
59+
Logger::error("[LuaWrapper] Error executing code: '" + std::string(err.what()) + "'.");
5460
return false;
5561
}
5662

63+
Logger::debug("[LuaWrapper] Executed code");
64+
5765
return true;
5866
}
5967

6068
bool LuaWrapper::executeFromFile(const FilePath& filePath) {
6169
if (filePath.isEmpty())
6270
return false;
6371

72+
Logger::debug("[LuaWrapper] Executing code from file ('" + filePath + "')...");
73+
6474
try {
6575
getState().script_file(filePath.toUtf8());
6676
} catch (const sol::error& err) {
67-
Logger::error("[LuaWrapper] Error running file: '" + std::string(err.what()) + "'.");
77+
Logger::error("[LuaWrapper] Error executing code from file: '" + std::string(err.what()) + "'.");
6878
return false;
6979
}
7080

81+
Logger::debug("[LuaWrapper] Executed code from file");
82+
7183
return true;
7284
}
7385

7486
sol::state& LuaWrapper::getState() {
7587
static sol::state state = [] () {
88+
Logger::debug("[LuaWrapper] Initializing state...");
89+
7690
sol::state luaState;
7791
luaState.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
7892

93+
Logger::debug("[LuaWrapper] Initialized state");
94+
7995
return luaState;
8096
}();
8197

0 commit comments

Comments
 (0)