git/SDL3CPlusPlus
1
0
Fork 0
mirror of https://github.com/johndoe6345789/SDL3CPlusPlus.git synced 2026-04-26 14:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Enhance ScriptEngine with Shader and Scene Management

Browse Source 
- Added ShaderManager to handle shader paths loading from Lua.
- Integrated SceneManager for managing scene objects within ScriptEngine.
- Updated ScriptEngine to utilize ShaderManager and SceneManager.
- Refactored audio command handling to use AudioManager.
- Improved error handling and Lua integration for shader and scene loading.
- Cleaned up code structure and dependencies in script_engine.hpp.
This commit is contained in:
johndoe6345789
2026-01-04 00:05:05 +00:00
parent 9719c46a39
commit e9b944680c
20 changed files with 1790 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/script/lua_bindings.cpp
View File

@@ -4,35 +4,10 @@
#include "script/mesh_loader.hpp"
#include <btBulletDynamicsCommon.h>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/quaternion.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <lua.hpp>
namespace sdl3cpp::script {
namespace {
glm::vec3 ToVec3(const std::array<float, 3>& value) {
return glm::vec3(value[0], value[1], value[2]);
}
glm::quat ToQuat(const std::array<float, 4>& value) {
return glm::quat(value[3], value[0], value[1], value[2]);
}
void PushMatrix(lua_State* L, const glm::mat4& matrix) {
lua_newtable(L);
const float* ptr = glm::value_ptr(matrix);
for (int i = 0; i < 16; ++i) {
lua_pushnumber(L, ptr[i]);
lua_rawseti(L, -2, i + 1);
}
}
} // namespace
void LuaBindings::RegisterBindings(lua_State* L, ScriptEngine* engine) {
lua_pushlightuserdata(L, engine);
lua_pushcclosure(L, &LoadMeshFromFile, 1);
@@ -169,7 +144,7 @@ int LuaBindings::AudioPlayBackground(lua_State* L) {
}
std::string error;
if (!engine->QueueAudioCommand(ScriptEngine::AudioCommandType::Background, path, loop, error)) {
if (!engine->QueueAudioCommand(AudioManager::AudioCommandType::Background, path, loop, error)) {
lua_pushnil(L);
lua_pushstring(L, error.c_str());
return 2;
@@ -188,7 +163,7 @@ int LuaBindings::AudioPlaySound(lua_State* L) {
}
std::string error;
if (!engine->QueueAudioCommand(ScriptEngine::AudioCommandType::Effect, path, loop, error)) {
if (!engine->QueueAudioCommand(AudioManager::AudioCommandType::Effect, path, loop, error)) {
lua_pushnil(L);
lua_pushstring(L, error.c_str());
return 2;
@@ -199,13 +174,7 @@ int LuaBindings::AudioPlaySound(lua_State* L) {
}
int LuaBindings::GlmMatrixFromTransform(lua_State* L) {
std::array<float, 3> translation = ReadVector3(L, 1);
std::array<float, 4> rotation = ReadQuaternion(L, 2);
glm::vec3 pos = ToVec3(translation);
glm::quat quat = ToQuat(rotation);
glm::mat4 matrix = glm::translate(glm::mat4(1.0f), pos) * glm::mat4_cast(quat);
PushMatrix(L, matrix);
return 1;
return LuaGlmMatrixFromTransform(L);
}
} // namespace sdl3cpp::script