add script arguments

NeilKleistGao · Jul 8, 2021 · 569a843 · 569a843
1 parent 69c328a
commit 569a843
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 25 deletions.
diff --git a/kernel/components/state_machine.cc b/kernel/components/state_machine.cc
@@ -68,10 +68,10 @@ void StateMachine::init(const typename resources::ConfigResource::JsonObject& da
         }
     }
 
-    if (data.HasMember("properties")) {
-        auto properties = data["properties"].GetArray();
-        for (const auto& p : properties) {
-            initProperty(p);
+    if (data.HasMember("args")) {
+        auto args = data["args"].GetArray();
+        for (const auto& arg : args) {
+            initArgument(arg);
         }
     }
 }
@@ -141,8 +141,43 @@ void StateMachine::notifyAll(const luabridge::LuaRef& sender, const std::string&
     ob->notifyAll(sender, name, data);
 }
 
-void StateMachine::initProperty(const typename resources::ConfigResource::JsonObject& data) {
-    // TODO:
+void StateMachine::initArgument(const typename resources::ConfigResource::JsonObject &data) {
+    std::string name = data["name"].GetString();
+    auto ref = _instance.rawget(name);
+
+    initArgument(ref, data);
+    _instance[name] = ref;
+}
+
+void StateMachine::initArgument(luabridge::LuaRef& ref, const typename resources::ConfigResource::JsonObject& data) {
+    if (ref.isNil()) {
+        return;
+    }
+
+    if (data["value"].IsInt()) {
+        ref = data["value"].GetInt();
+    }
+    else if (data["value"].IsFloat()) {
+        ref = data["value"].GetFloat();
+    }
+    else if (data["value"].IsBool()) {
+        ref = data["value"].GetBool();
+    }
+    else if (data["value"].IsString()) {
+        ref = data["value"].GetString();
+    }
+    else if (data["value"].IsArray()) {
+        auto table = data["value"].GetArray();
+        for (const auto& item : table) {
+            std::string name = item["name"].GetString();
+            auto next = ref.rawget(name);
+            initArgument(next, item);
+            ref[name] = next;
+        }
+    }
+    else {
+        ref = luabridge::LuaRef(script::LuaState::getInstance()->getState());
+    }
 }
 
 } // namespace ngind::components
diff --git a/kernel/components/state_machine.h b/kernel/components/state_machine.h
@@ -141,7 +141,9 @@ class StateMachine : public Component {
      */
     std::map<std::string, std::unordered_set<std::string>> _subscribe;
 
-    void initProperty(const typename resources::ConfigResource::JsonObject& data);
+    void initArgument(const typename resources::ConfigResource::JsonObject& data);
+
+    void initArgument(luabridge::LuaRef& ref, const typename resources::ConfigResource::JsonObject& data);
 };
 
 NGIND_LUA_BRIDGE_REGISTRATION(StateMachine) {

diff --git a/kernel/objects/entity_object.h b/kernel/objects/entity_object.h
@@ -31,6 +31,8 @@
 #include "script/lua_registration.h"
 
 namespace ngind::objects {
+class ObjectFactory;
+
 /**
  * This class is a special kind of object that you can specify its position, rotation and scale.
  */
@@ -288,6 +290,8 @@ class EntityObject : public Object {
     }
 
     static EntityObject* create(const typename resources::ConfigResource::JsonObject& data);
+
+    friend class ObjectFactory;
 private:
     /**
      * The position of this object

diff --git a/kernel/objects/object_factory.cc b/kernel/objects/object_factory.cc
@@ -26,28 +26,36 @@
 #include "object_factory.h"
 
 #include "components/component_factory.h"
+#include "prefab_factory.h"
 
 namespace ngind::objects {
 
 EntityObject* ObjectFactory::createEntityObject(const typename resources::ConfigResource::JsonObject& data) {
-    auto* entity = EntityObject::create(data);
+    if (data.HasMember("prefab")) {
+        auto* entity = PrefabFactory::getInstance()->loadPrefab(data["prefab"].GetString());
+        entity->init(data);
+        return entity;
+    }
+    else {
+        auto* entity = EntityObject::create(data);
 
-    if (data.HasMember("components")) {
-        auto components = data["components"].GetArray();
-        for (const auto& com : components) {
-            components::Component* next = createComponent(com);
-            entity->addComponent(com["name"].GetString(), next);
+        if (data.HasMember("components")) {
+            auto components = data["components"].GetArray();
+            for (const auto& com : components) {
+                components::Component* next = createComponent(com);
+                entity->addComponent(com["name"].GetString(), next);
+            }
         }
-    }
-    if (data.HasMember("children")) {
-        auto children = data["children"].GetArray();
-        for (const auto& child : children) {
-            EntityObject* next = createEntityObject(child);
-            entity->addChild(child["name"].GetString(), next);
+        if (data.HasMember("children")) {
+            auto children = data["children"].GetArray();
+            for (const auto& child : children) {
+                EntityObject* next = createEntityObject(child);
+                entity->addChild(child["name"].GetString(), next);
+            }
         }
-    }
 
-    return entity;
+        return entity;
+    }
 }
 
 components::Component* ObjectFactory::createComponent(const typename resources::ConfigResource::JsonObject& data) {

diff --git a/resources/config/prefabs/spin.json b/resources/config/prefabs/spin.json
@@ -34,6 +34,12 @@
       "driver-script": "spin.lua",
       "classname": "Spin",
       "subscription": [
+      ],
+      "args": [
+        {
+          "name": "direction",
+          "value": -1
+        }
       ]
     }
   ]

diff --git a/resources/config/worlds/world-prefab.json b/resources/config/worlds/world-prefab.json
@@ -34,6 +34,21 @@
           "alignment": 2
         }
       ]
+    },
+    {
+      "id": 2,
+      "name": "spin",
+      "prefab": "spin",
+      "position": {
+        "x": 824,
+        "y": 384
+      },
+      "scale": {
+        "x": 2,
+        "y": 2
+      },
+      "rotate": 0,
+      "z-order": 0
     }
   ],
   "components": [

diff --git a/resources/script/prefab_loader.lua b/resources/script/prefab_loader.lua
@@ -33,11 +33,11 @@ end
 
 function PrefabLoader:updateCreate(delta)
     local spin1 = PrefabFactory.loadPrefab("spin")
-    local spin2 = PrefabFactory.loadPrefab("spin")
+    --local spin2 = PrefabFactory.loadPrefab("spin")
     spin1:setPosition(engine.vec2(200, 384))
-    spin2:setPosition(engine.vec2(824, 384))
+    --spin2:setPosition(engine.vec2(824, 384))
     self.game_object:addChild("spin1", spin1)
-    self.game_object:addChild("spin2", spin2)
+    --self.game_object:addChild("spin2", spin2)
     self.move("Idle")
 end
 

diff --git a/resources/script/spin.lua b/resources/script/spin.lua
@@ -25,11 +25,11 @@
 Spin = class("Spin")
 
 function Spin:ctor()
+    self.direction = 1
 end
 
 function Spin:enter()
     self.r = 0
-    self.direction = 1
     self.move("Idle")
 end