Added basic lua wrapper, currently can't retrieve from registry

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "third_party/nugget"]
 	path = third_party/nugget
-	url = https://github.com/pcsx-redux/nugget.git
+	url = https://github.com/pcsx-redux/nugget

Makefile

@@ -8,9 +8,11 @@ src/splashpack.cpp \
 src/camera.cpp \
 src/gtemath.cpp \
 src/navmesh.cpp \
+src/lua.cpp \
 output.o
 
 include third_party/nugget/psyqo/psyqo.mk
+include third_party/nugget/psyqo-lua/psyqo-lua.mk
 
 %.o: %.bin
 	$(PREFIX)-objcopy -I binary --set-section-alignment .data=4 --rename-section .data=.rodata,alloc,load,readonly,data,contents -O $(FORMAT) -B mips $< $@

src/lua.cpp

@@ -0,0 +1,191 @@
+#include "lua.h"
+
+#include <psyqo/xprintf.h>
+
+#include "gameobject.hh"
+#include "psyqo-lua/lua.hh"
+
+constexpr const char METATABLE_SCRIPT[] = R"(
+    print("test")
+    metatableForAllGameObjects = {
+        __index = function(self, key)
+            if key == "position" then
+                local pos = rawget(self, key)
+                if pos == nil then
+                    pos = get_position(self.__cpp_ptr)
+                    rawset(self, key, pos)
+                end
+                return pos
+            end
+            return rawget(self, key)
+        end,
+
+        __newindex = function(self, key, value)
+            if key == "position" then
+                -- Option 1: Directly update C++
+                set_position(self.__cpp_ptr, value)
+                -- Option 2: Also update local cache:
+                rawset(self, key, value)
+                return
+            end
+            rawset(self, key, value)
+        end
+    }
+)";
+
+// Lua helpers
+
+int luaPrint(psyqo::Lua L) {
+    int n = L.getTop();  // Get the number of arguments
+
+    for (int i = 1; i <= n; i++) {
+        if (i > 1) {
+            printf("\t");  // Tab between arguments
+        }
+
+        // Check the type of the argument
+        if (L.isString(i)) {
+            printf("%s", L.toString(i));  // If it's a string, print it
+        } else if (L.isNumber(i)) {
+            printf("%g", L.toNumber(i));  // If it's a number, print it
+        } else {
+            // For other types, just print their type (you can expand this if needed)
+            printf("[%s]", L.typeName(i));
+        }
+    }
+    printf("\n");
+
+    return 0;  // No return value
+}
+
+static int gameobjectSetPosition(lua_State* L) {
+    psxsplash::GameObject* go = (psxsplash::GameObject*)lua_touserdata(L, 1);
+    lua_newtable(L);
+    lua_pushnumber(L, go->position.x.raw());
+    lua_setfield(L, -2, "x");
+    lua_pushnumber(L, go->position.y.raw());
+    lua_setfield(L, -2, "y");
+    lua_pushnumber(L, go->position.z.raw());
+    lua_setfield(L, -2, "z");
+    return 1;
+}
+
+static int gameobjectGetPosition(lua_State* L) {
+    psxsplash::GameObject* go = (psxsplash::GameObject*)lua_touserdata(L, 1);
+
+    lua_getfield(L, 2, "x");
+    psyqo::FixedPoint<> x(lua_tonumber(L, -1), psyqo::FixedPoint<>::RAW);
+    go->position.x = x;
+    lua_pop(L, 1);
+    lua_getfield(L, 2, "y");
+    psyqo::FixedPoint<> y(lua_tonumber(L, -1), psyqo::FixedPoint<>::RAW);
+    go->position.x = x;
+    lua_pop(L, 1);
+    lua_getfield(L, 2, "z");
+    psyqo::FixedPoint<> z(lua_tonumber(L, -1), psyqo::FixedPoint<>::RAW);
+    go->position.x = x;
+    lua_pop(L, 1);
+
+    return 0;
+}
+
+void psxsplash::Lua::Init() {
+    L.push(luaPrint);
+    L.setGlobal("print");
+
+    L.push(gameobjectGetPosition);
+    L.setGlobal("get_position");
+
+    L.push(gameobjectSetPosition);
+    L.setGlobal("set_position");
+
+    // Load and run the metatable script
+    if (L.loadBuffer(METATABLE_SCRIPT, "metatableForAllGameObjects") == 0) {
+        if (L.pcall(0, 0) == 0) {
+            // Script executed successfully
+            printf("Lua script 'metatableForAllGameObjects' loaded successfully\n");
+        } else {
+            // Print Lua error if script execution fails
+            printf("Error executing Lua script: %s\n", L.isString(-1) ? L.toString(-1) : "Unknown error");
+            L.pop();
+        }
+    } else {
+        // Print Lua error if script loading fails
+        printf("Error loading Lua script: %s\n", L.isString(-1) ? L.toString(-1) : "Unknown error");
+        L.pop();
+    }
+
+    // Check if the metatable was set as a global
+    L.getGlobal("metatableForAllGameObjects");
+    if (L.isTable(-1)) {
+        printf("metatableForAllGameObjects successfully set as a global\n");
+    } else {
+        printf("Warning: metatableForAllGameObjects not found after init\n");
+    }
+    L.pop(); // Pop the global check
+}
+
+void psxsplash::Lua::LoadLuaFile(const char* code, size_t len) {
+    if (L.loadBuffer(code, len) != LUA_OK) {
+        printf("Lua error: %s\n", L.toString(-1));
+        L.pop();
+    }
+    if (L.pcall(0, 0)) {
+        printf("Lua error: %s\n", L.toString(-1));
+        L.pop();
+    }
+}
+
+void psxsplash::Lua::RegisterGameObject(GameObject* go) {
+    // Create a new Lua table for the GameObject
+    L.newTable();
+
+    // Set the __cpp_ptr field to store the C++ pointer
+    L.push(go);                   
+    L.setField(-2, "__cpp_ptr");  
+
+    // Set the metatable for the table
+    L.getGlobal("metatableForAllGameObjects");
+    if (L.isTable(-1)) {
+        L.setMetatable(-2);  // Set the metatable for the table
+    } else {
+        printf("Warning: metatableForAllGameObjects not found\n");
+        L.pop();  // Pop the invalid metatable
+    }
+
+    L.push(go);                   
+    L.push(-2);
+    L.rawSet(LUA_REGISTRYINDEX); 
+
+    // Debugging: Confirm the GameObject was registered
+    printf("GameObject registered in Lua registry: %p\n", go);
+
+    L.pop();
+}
+
+void psxsplash::Lua::CallOnCollide(GameObject* self, GameObject* other) {
+    L.getGlobal("onCollision");
+    if (!L.isFunction(-1)) {
+        printf("Lua function 'onCollide' not found\n");
+        L.pop();
+        return;
+    }
+
+    PushGameObject(self);
+    PushGameObject(other);
+
+    if (L.pcall(2, 0)) {
+        printf("Lua error: %s\n", L.toString(-1));
+        L.pop();
+    }
+}
+
+void psxsplash::Lua::PushGameObject(GameObject* go) {
+    L.push(go);         
+    L.rawGet(LUA_REGISTRYINDEX);  
+
+    if (!L.isTable(-1)) {         
+        printf("Warning: GameObject not found in Lua registry\n");
+        L.pop();                 
+    }
+}

src/lua.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <psyqo-lua/lua.hh>
+
+#include "gameobject.hh"
+
+namespace psxsplash {
+class Lua {
+  public:
+    void Init();
+    
+    void LoadLuaFile(const char* code, size_t len);
+    void RegisterGameObject(GameObject* go);
+    void CallOnCollide(GameObject* self, GameObject* other);
+
+  private:
+    void PushGameObject(GameObject* go);
+    psyqo::Lua L;
+};
+}  // namespace psxsplash

src/main.cpp

@@ -1,5 +1,7 @@
 #include <stdint.h>
 
+#include <cmath>
+#include <cstdint>
 #include <psyqo/advancedpad.hh>
 #include <psyqo/application.hh>
 #include <psyqo/fixed-point.hh>
@@ -10,6 +12,7 @@
 
 #include "EASTL/algorithm.h"
 #include "camera.hh"
+#include "lua.h"
 #include "navmesh.hh"
 #include "psyqo/vector.hh"
 #include "renderer.hh"
@@ -28,6 +31,7 @@ class PSXSplash final : public psyqo::Application {
     void createScene() override;
 
   public:
+    psxsplash::Lua m_lua;
     psxsplash::SplashPackLoader m_loader;
 
     psyqo::Font<> m_font;
@@ -73,6 +77,8 @@ void PSXSplash::prepare() {
 
     // Initialize the Renderer singleton
     psxsplash::Renderer::Init(gpu());
+
+    m_lua.Init();
 }
 
 void PSXSplash::createScene() {
@@ -82,7 +88,8 @@ void PSXSplash::createScene() {
 }
 
 void MainScene::start(StartReason reason) {
-    app.m_loader.LoadSplashpack(_binary_output_bin_start);
+    app.m_loader.LoadSplashpack(_binary_output_bin_start, app.m_lua);
+    app.m_lua.CallOnCollide(app.m_loader.gameObjects[0], app.m_loader.gameObjects[1]);
     psxsplash::Renderer::GetInstance().SetCamera(m_mainCamera);
 
     m_mainCamera.SetPosition(static_cast<psyqo::FixedPoint<12>>(app.m_loader.playerStartPos.x),
@@ -182,6 +189,7 @@ void MainScene::frame() {
         psxsplash::Renderer::GetInstance().RenderNavmeshPreview(*app.m_loader.navmeshes[0], true);
     }
     
+
     app.m_font.chainprintf(gpu(), {{.x = 2, .y = 2}}, {{.r = 0xff, .g = 0xff, .b = 0xff}}, "FPS: %i",
                                  gpu().getRefreshRate() / deltaTime);
 

src/renderer.cpp

@@ -3,6 +3,7 @@
 #include <EASTL/array.h>
 #include <EASTL/vector.h>
 
+#include <cstdint>
 #include <psyqo/fixed-point.hh>
 #include <psyqo/gte-kernels.hh>
 #include <psyqo/gte-registers.hh>

src/renderer.hh

@@ -3,6 +3,7 @@
 #include <EASTL/array.h>
 #include <EASTL/vector.h>
 
+#include <cstdint>
 #include <psyqo/bump-allocator.hh>
 #include <psyqo/fragments.hh>
 #include <psyqo/gpu.hh>

src/splashpack.cpp

@@ -1,9 +1,11 @@
 #include "splashpack.hh"
 
+#include <cstdint>
 #include <cstring>
 #include <psyqo/primitives/common.hh>
 
 #include "gameobject.hh"
+#include "lua.h"
 #include "mesh.hh"
 #include "psyqo/fixed-point.hh"
 #include "psyqo/gte-registers.hh"
@@ -14,6 +16,7 @@ namespace psxsplash {
 struct SPLASHPACKFileHeader {
     char magic[2];
     uint16_t version;
+    uint16_t luaFileCount;
     uint16_t gameObjectCount;
     uint16_t navmeshCount;
     uint16_t textureAtlasCount;
@@ -21,7 +24,15 @@ struct SPLASHPACKFileHeader {
     psyqo::GTE::PackedVec3 playerStartPos;
     psyqo::GTE::PackedVec3 playerStartRot;
     psyqo::FixedPoint<12, uint16_t> playerHeight;
-    uint16_t pad[1];
+    uint16_t pad[2];
+};
+
+struct SPLASHPACKLuaFile {
+    union {
+        uint32_t luaCodeOffset;
+        const char* luaCode;
+    };
+    uint32_t length;
 };
 
 struct SPLASHPACKTextureAtlas {
@@ -38,7 +49,7 @@ struct SPLASHPACKClut {
     uint16_t pad;
 };
 
-void SplashPackLoader::LoadSplashpack(uint8_t *data) {
+void SplashPackLoader::LoadSplashpack(uint8_t *data, psxsplash::Lua &lua) {
     psyqo::Kernel::assert(data != nullptr, "Splashpack loading data pointer is null");
     psxsplash::SPLASHPACKFileHeader *header = reinterpret_cast<psxsplash::SPLASHPACKFileHeader *>(data);
     psyqo::Kernel::assert(memcmp(header->magic, "SP", 2) == 0, "Splashpack has incorrect magic");
@@ -52,9 +63,17 @@ void SplashPackLoader::LoadSplashpack(uint8_t *data) {
 
     uint8_t *curentPointer = data + sizeof(psxsplash::SPLASHPACKFileHeader);
 
+    for (uint16_t i = 0; i < header->luaFileCount; i++) {
+        psxsplash::SPLASHPACKLuaFile *luaHeader = reinterpret_cast<psxsplash::SPLASHPACKLuaFile *>(curentPointer);
+        luaHeader->luaCode = reinterpret_cast<const char*>(data + luaHeader->luaCodeOffset);
+        lua.LoadLuaFile(luaHeader->luaCode, luaHeader->length);
+        curentPointer += sizeof(psxsplash::SPLASHPACKLuaFile);
+    }
+
     for (uint16_t i = 0; i < header->gameObjectCount; i++) {
         psxsplash::GameObject *go = reinterpret_cast<psxsplash::GameObject *>(curentPointer);
         go->polygons = reinterpret_cast<psxsplash::Tri *>(data + go->polygonsOffset);
+        lua.RegisterGameObject(go);
         gameObjects.push_back(go);
         curentPointer += sizeof(psxsplash::GameObject);
     }

src/splashpack.hh

@@ -2,12 +2,16 @@
 
 #include <EASTL/vector.h>
 
+#include <cstdint>
+
 #include "gameobject.hh"
+#include "lua.h"
 #include "navmesh.hh"
 #include "psyqo/fixed-point.hh"
 
 namespace psxsplash {
 
+  
 class SplashPackLoader {
   public:
     eastl::vector<GameObject *> gameObjects;
@@ -16,7 +20,7 @@ class SplashPackLoader {
     psyqo::GTE::PackedVec3 playerStartPos, playerStartRot;
     psyqo::FixedPoint<12, uint16_t> playerHeight;
 
-    void LoadSplashpack(uint8_t *data);
+    void LoadSplashpack(uint8_t *data, Lua &lua);
 };
 
 };  // namespace psxsplash