From 4365160e95b68241124909b76895a7bd20d131be Mon Sep 17 00:00:00 2001 From: Riyyi Date: Wed, 27 Jan 2021 23:14:10 +0100 Subject: [PATCH] Rename Lua to LuaScriptg --- inferno/src/inferno/scene/components.h | 4 ++-- .../inferno/script/{lua.cpp => luascript.cpp} | 18 +++++++++--------- .../src/inferno/script/{lua.h => luascript.h} | 8 ++++---- inferno/src/inferno/systems/script.cpp | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) rename inferno/src/inferno/script/{lua.cpp => luascript.cpp} (79%) rename inferno/src/inferno/script/{lua.h => luascript.h} (93%) diff --git a/inferno/src/inferno/scene/components.h b/inferno/src/inferno/scene/components.h index 229ed0c..3577091 100644 --- a/inferno/src/inferno/scene/components.h +++ b/inferno/src/inferno/scene/components.h @@ -15,7 +15,7 @@ namespace Inferno { - class Lua; + class LuaScript; struct TagComponent { std::string tag; @@ -83,7 +83,7 @@ namespace Inferno { }; struct LuaScriptComponent { - Lua* instance = nullptr; + LuaScript* instance = nullptr; std::string path; // Dont allow manually setting instance during construction diff --git a/inferno/src/inferno/script/lua.cpp b/inferno/src/inferno/script/luascript.cpp similarity index 79% rename from inferno/src/inferno/script/lua.cpp rename to inferno/src/inferno/script/luascript.cpp index 0ccbc9b..1a04ed3 100644 --- a/inferno/src/inferno/script/lua.cpp +++ b/inferno/src/inferno/script/luascript.cpp @@ -4,12 +4,12 @@ #include "inferno/file.h" #include "inferno/scene/components.h" #include "inferno/scene/scene.h" -#include "inferno/script/lua.h" +#include "inferno/script/luascript.h" #include "inferno/script/registration.h" namespace Inferno { - void Lua::initialize() + void LuaScript::initialize() { // Type registration // --------------------------------- @@ -32,7 +32,7 @@ namespace Inferno { return &m_scene->getComponent(m_entity); }); - // (*m_state).set_function("GetComponent", &Lua::getComponentSol); + // (*m_state).set_function("GetComponent", &LuaScript::getComponentSol); m_state.set_function("getCameraComponent", [this]() -> CameraComponent* { return &m_scene->getComponent(m_entity); }); @@ -49,29 +49,29 @@ namespace Inferno { callFunction("LuaScript", "initialize"); } - void Lua::destroy() + void LuaScript::destroy() { callFunction("LuaScript", "destroy"); } - void Lua::update(float deltaTime) + void LuaScript::update(float deltaTime) { m_state["LuaScript"]["transform"] = &m_scene->getComponent(m_entity); callFunction("LuaScript", "update", deltaTime); } - void Lua::loadScript() + void LuaScript::loadScript() { std::string script = File::read(m_path); auto result = m_state.script(script.c_str(), [](lua_State*, sol::protected_function_result pfr) { return pfr; }); - ASSERT(result.valid(), "Lua script {}", ((sol::error)result).what()); + ASSERT(result.valid(), "LuaScript {}", ((sol::error)result).what()); } - sol::table Lua::getTable(const char* name) + sol::table LuaScript::getTable(const char* name) { sol::table table = m_state[name]; - ASSERT(table.valid(), "Lua table does not exist"); + ASSERT(table.valid(), "LuaScript table does not exist"); return table; } diff --git a/inferno/src/inferno/script/lua.h b/inferno/src/inferno/script/luascript.h similarity index 93% rename from inferno/src/inferno/script/lua.h rename to inferno/src/inferno/script/luascript.h index acf16d3..188c0cf 100644 --- a/inferno/src/inferno/script/lua.h +++ b/inferno/src/inferno/script/luascript.h @@ -1,5 +1,5 @@ -#ifndef LUA_H -#define LUA_H +#ifndef LUA_SCRIPT_H +#define LUA_SCRIPT_H #include // uint32_t #include // std::string @@ -18,7 +18,7 @@ namespace Inferno { class Scene; - class Lua { + class LuaScript { public: void initialize(); void destroy(); @@ -54,4 +54,4 @@ namespace Inferno { } -#endif // LUA_H +#endif // LUA_SCRIPT_H diff --git a/inferno/src/inferno/systems/script.cpp b/inferno/src/inferno/systems/script.cpp index dd9e803..5247f1b 100644 --- a/inferno/src/inferno/systems/script.cpp +++ b/inferno/src/inferno/systems/script.cpp @@ -3,7 +3,7 @@ #include "inferno/assertions.h" #include "inferno/scene/components.h" #include "inferno/scene/scene.h" -#include "inferno/script/lua.h" +#include "inferno/script/luascript.h" #include "inferno/script/nativescript.h" #include "inferno/systems/script.h" @@ -63,7 +63,7 @@ namespace Inferno { // Create Lua script if not initialized if (!luaScript.instance) { - luaScript.instance = new Lua(); + luaScript.instance = new LuaScript(); luaScript.instance->transform = &transform; luaScript.instance->m_scene = m_scene; luaScript.instance->m_entity = static_cast(entity);