EntityRegistry Lua bindings

Author: eduardodoria

CMakeLists.txt

@@ -458,6 +458,9 @@ include_directories (${SUPERNOVA_ROOT}/engine/core/object/audio)
 include_directories (${SUPERNOVA_ROOT}/engine/core/object/ui)
 include_directories (${SUPERNOVA_ROOT}/engine/core/object/environment)
 include_directories (${SUPERNOVA_ROOT}/engine/core/object/physics)
+include_directories (${SUPERNOVA_ROOT}/engine/core/pool)
+include_directories (${SUPERNOVA_ROOT}/engine/core/registry)
+include_directories (${SUPERNOVA_ROOT}/engine/core/render)
 include_directories (${SUPERNOVA_ROOT}/engine/core/script)
 include_directories (${SUPERNOVA_ROOT}/engine/core/shader)
 include_directories (${SUPERNOVA_ROOT}/engine/core/subsystem)

engine/core/Supernova.h

@@ -142,6 +142,8 @@
 #include "pool/TextureDataPool.h"
 #include "pool/TexturePool.h"
 
+#include "registry/EntityRegistry.h"
+
 #include "render/BufferRender.h"
 #include "render/CameraRender.h"
 #include "render/FramebufferRender.h"
@@ -177,7 +179,6 @@
 //#include "util/Box2DAux.h"
 #include "util/Color.h"
 //#include "util/DefaultFont.h"
-#include "util/EntityRegistry.h"
 #include "util/SpriteFrameData.h"
 #include "util/FunctionSubscribe.h"
 //#include "util/JoltPhysicsAux.h"

engine/core/util/EntityRegistry.cpp engine/core/registry/EntityRegistry.cppengine/core/util/EntityRegistry.cpp renamed to engine/core/registry/EntityRegistry.cpp

@@ -161,14 +161,14 @@ Entity EntityRegistry::createEntity() {
     return entityManager.createEntity();
 }
 
-bool EntityRegistry::recreateEntity(Entity entity) {
-    return entityManager.recreateEntity(entity);
-}
-
 bool EntityRegistry::isEntityCreated(Entity entity) const {
     return entityManager.isCreated(entity);
 }
 
+bool EntityRegistry::recreateEntity(Entity entity) {
+    return entityManager.recreateEntity(entity);
+}
+
 void EntityRegistry::destroyEntity(Entity entity) {
     onEntityDestroyed(entity, entityManager.getSignature(entity));
 

engine/core/util/EntityRegistry.h engine/core/registry/EntityRegistry.hengine/core/util/EntityRegistry.h renamed to engine/core/registry/EntityRegistry.h

@@ -73,9 +73,8 @@ namespace Supernova {
 
         //Entity methods
 
-        bool recreateEntity(Entity entity); // for internal editor use only
-
         Entity createEntity();
+        bool recreateEntity(Entity entity); // for internal editor use only
 
         bool isEntityCreated(Entity entity) const;
 

engine/core/script/binding/CoreClassesLua.cpp

@@ -467,7 +467,31 @@ void LuaBinding::registerCoreClasses(lua_State *L){
         .endClass();
 
     luabridge::getGlobalNamespace(L)
-        .beginClass<Scene>("Scene")
+        .beginClass<EntityRegistry>("EntityRegistry")
+        .addConstructor <void (*) (void)> ()
+        .addFunction("createEntity", &EntityRegistry::createEntity)
+        //.addFunction("recreateEntity", &EntityRegistry::recreateEntity)
+        .addFunction("isEntityCreated", &EntityRegistry::isEntityCreated)
+        .addFunction("destroyEntity", &EntityRegistry::destroyEntity)
+        .addFunction("addEntityChild", &EntityRegistry::addEntityChild)
+        //.addFunction("moveChildToIndex", &EntityRegistry::moveChildToIndex)
+        .addFunction("moveChildToTop", &EntityRegistry::moveChildToTop)
+        .addFunction("moveChildUp", &EntityRegistry::moveChildUp)
+        .addFunction("moveChildDown", &EntityRegistry::moveChildDown)
+        .addFunction("moveChildToBottom", &EntityRegistry::moveChildToBottom)
+        .addFunction("getSignature", &EntityRegistry::getSignature)
+        .addFunction("getEntityName", &EntityRegistry::getEntityName)
+        .addFunction("setEntityName", &EntityRegistry::setEntityName)
+        .addFunction("findOldestParent", &EntityRegistry::findOldestParent)
+        .addFunction("isParentOf", &EntityRegistry::isParentOf)
+        .addFunction("findBranchLastIndex", &EntityRegistry::findBranchLastIndex)
+        .addFunction("getLastEntity", &EntityRegistry::getLastEntity)
+        .addFunction("getEntityList", &EntityRegistry::getEntityList)
+        .addFunction("clear", &EntityRegistry::clear)
+        .endClass();
+
+    luabridge::getGlobalNamespace(L)
+        .deriveClass<Scene, EntityRegistry>("Scene")
         .addConstructor <void (*) (void)> ()
         .addFunction("load", &Scene::load)
         .addFunction("destroy", &Scene::destroy)
@@ -489,19 +513,6 @@ void LuaBinding::registerCoreClasses(lua_State *L){
         .addFunction("setGlobalIllumination", (void (Scene::*)(float, Vector3))&Scene::setGlobalIllumination)
         .addFunction("canReceiveUIEvents", &Scene::canReceiveUIEvents)
         .addProperty("enableUIEvents", &Scene::isEnableUIEvents, &Scene::setEnableUIEvents)
-        .addFunction("findOldestParent", &Scene::findOldestParent)
-        .addFunction("isParentOf", &Scene::isParentOf)
-        .addFunction("findBranchLastIndex", &Scene::findBranchLastIndex)
-        .addFunction("createEntity", &Scene::createEntity)
-        .addFunction("destroyEntity", &Scene::destroyEntity)
-        .addFunction("addEntityChild", &Scene::addEntityChild)
-        .addFunction("moveChildToTop", &Scene::moveChildToTop)
-        .addFunction("moveChildUp", &Scene::moveChildUp)
-        .addFunction("moveChildDown", &Scene::moveChildDown)
-        .addFunction("moveChildToBottom", &Scene::moveChildToBottom)
-        .addFunction("getSignature", &Scene::getSignature)
-        .addFunction("getEntityName", &Scene::getEntityName)
-        .addFunction("setEntityName", &Scene::setEntityName)
         .addFunction("getActionSystem", [] (Scene* self, lua_State* L) { return self->getSystem<ActionSystem>().get(); })
         .addFunction("getAudioSystem", [] (Scene* self, lua_State* L) { return self->getSystem<AudioSystem>().get(); })
         .addFunction("getMeshSystem", [] (Scene* self, lua_State* L) { return self->getSystem<MeshSystem>().get(); })