Lua can access attached components on objects

Mormert · Jul 20, 2023 · 5786344 · 5786344
1 parent 1468e13
commit 5786344
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/engine/cLight.cpp b/engine/cLight.cpp
@@ -38,7 +38,7 @@ cLight::editorGizmosRender(bool selected)
 }
 
 void
-cLight::registerLua(sol::state& lua, sol::table &table)
+cLight::registerLua(sol::state &lua, sol::table &table)
 {
-    lua.new_usertype<cLight>("cLight", "color", &cLight::_color);
+    lua.new_usertype<cLight>("cLight", sol::base_classes, sol::bases<jleComponent>(), "color", &cLight::_color);
 }
diff --git a/engine/cLightDirectional.cpp b/engine/cLightDirectional.cpp
@@ -27,3 +27,9 @@ cLightDirectional::editorGizmosRender(bool selected)
     gEngine->rendering().rendering3d().sendMesh(mesh, material, getTransform().getWorldMatrix(), _attachedToObject->instanceID(), false);
 #endif // BUILD_EDITOR
 }
+
+void
+cLightDirectional::registerLua(sol::state &lua, sol::table &table)
+{
+
+}
diff --git a/engine/cLightDirectional.h b/engine/cLightDirectional.h
@@ -17,6 +17,8 @@ class cLightDirectional : public cLight
         ar(cereal::base_class<cLight>(this));
     }
 
+    void registerLua(sol::state& lua, sol::table &table) override;
+
     void update(float dt) override;
 
     void editorGizmosRender(bool selected) override;

diff --git a/engine/jleComponent.h b/engine/jleComponent.h
@@ -32,6 +32,8 @@ class jleComponent
 
     [[nodiscard]] virtual std::shared_ptr<jleComponent> clone() const = 0;
 
+    virtual void registerSelfLua(sol::table &self) = 0;
+
     template <class Archive>
     void
     serialize(Archive &archive)
@@ -64,7 +66,7 @@ class jleComponent
     }
 
     virtual void
-    registerLua(sol::state& lua, sol::table &table)
+    registerLua(sol::state &lua, sol::table &table)
     {
     }
 

diff --git a/engine/jleLuaScript.cpp b/engine/jleLuaScript.cpp
@@ -40,6 +40,9 @@ jleLuaScript::setupLua(sol::table &self, jleObject *ownerObject)
         if (result.valid()) {
             self = result;
             self["object"] = ownerObject;
+            for (auto &c : ownerObject->customComponents()) {
+                c->registerSelfLua(self);
+            }
         } else {
             sol::error err = result;
             LOGE << "Failed starting script: " << err.what();

diff --git a/engine/jleTypeReflectionUtils.h b/engine/jleTypeReflectionUtils.h
@@ -26,6 +26,7 @@ public:
                                                                                                                        \
 public:                                                                                                                \
     std::shared_ptr<jleComponent> clone() const override { return std::make_shared<component_name>(*this); }           \
+    void registerSelfLua(sol::table &self) override { self[componentName()] = this; }                                  \
                                                                                                                        \
 private: