add shader args

kernel/components/state_machine.cc

@@ -180,4 +180,14 @@ void StateMachine::initArgument(luabridge::LuaRef& ref, const typename resources
     }
 }
 
+luabridge::LuaRef StateMachine::getComponent(Object* object, const std::string& name) {
+    auto machine = object->getComponent<StateMachine>(name);
+    if (machine == nullptr) {
+        return luabridge::LuaRef(script::LuaState::getInstance()->getState());
+    }
+    else {
+        return machine->_instance;
+    }
+}
+
 } // namespace ngind::components

kernel/components/state_machine.h

@@ -120,6 +120,8 @@ class StateMachine : public Component {
     inline luabridge::LuaRef getInstance() {
         return _instance;
     }
+
+    static luabridge::LuaRef getComponent(Object* object, const std::string& name);
 private:
     /**
      * The instance of this component in lua environment.
@@ -154,6 +156,7 @@ NGIND_LUA_BRIDGE_REGISTRATION(StateMachine) {
             .addFunction("halt", &StateMachine::halt)
             .addFunction("notify", &StateMachine::notify)
             .addFunction("notifyAll", &StateMachine::notifyAll)
+            .addStaticFunction("getComponent", &StateMachine::getComponent)
         .endClass()
     .endNamespace();
 

kernel/objects/object.h

@@ -107,6 +107,8 @@ class Object : public memory::AutoCollectionObject, public UpdatableObject {
             _components[name] = component;
             component->addReference();
             component->setParent(this);
+        } else {
+            // TODO:
         }
     }
 

kernel/objects/world.cc

@@ -37,7 +37,7 @@
 namespace ngind::objects {
 
 World::World(std::string name) : Object(), _name(std::move(name)), _config(nullptr), _background_color() {
-    _config = resources::ResourcesManager::getInstance()->load<resources::ConfigResource>("worlds/world-" + _name + ".json");
+    _config = resources::ResourcesManager::getInstance()->load<resources::ConfigResource>("worlds/" + _name + ".json");
     _background_color = rendering::Color(_config->getDocument()["background-color"].GetString());
 
     ui::EventSystem::getInstance()->init();

kernel/rendering/program.cc

@@ -30,8 +30,11 @@
 namespace ngind::rendering {
 
 Program::Program(const std::string& program_name) {
-    _vs = resources::ResourcesManager::getInstance()->load<resources::ShaderResource>(program_name + ".vs");
-    _fs = resources::ResourcesManager::getInstance()->load<resources::ShaderResource>(program_name + ".frag");
+    auto manager = resources::ResourcesManager::getInstance();
+    _program_config = manager->load<resources::ConfigResource>("programs/" + program_name + ".json");
+
+    _vs = manager->load<resources::ShaderResource>(std::string{_program_config->getDocument()["vertex"].GetString()} + ".vs");
+    _fs = manager->load<resources::ShaderResource>(std::string{_program_config->getDocument()["fragment"].GetString()} + ".frag");
 
     this->_program = glCreateProgram();
     glAttachShader(this->_program, _vs->getShader());
@@ -47,6 +50,11 @@ Program::Program(const std::string& program_name) {
 
 Program::~Program() {
     glDeleteProgram(this->_program);
+
+    auto manager = resources::ResourcesManager::getInstance();
+    manager->release(_vs);
+    manager->release(_fs);
+    manager->release(_program_config);
 }
 
 GLint Program::getUniform(const std::string& name) const {
@@ -58,4 +66,88 @@ GLint Program::getUniform(const std::string& name) const {
     return res;
 }
 
+void Program::prepare() {
+    auto args = _program_config->getDocument()["args"].GetArray();
+    for (const auto& arg : args) {
+        std::string name = arg["name"].GetString();
+        std::string type = arg["type"].GetString();
+
+        if (type == "float") {
+            this->setFloat(name, arg["value"].GetFloat());
+        }
+        else if (type == "float2") {
+            // TODO:
+        }
+        else if (type == "float3") {
+
+        }
+        else if (type == "float4") {
+
+        }
+        else if (type == "int") {
+
+        }
+        else if (type == "int2") {
+
+        }
+        else if (type == "int3") {
+
+        }
+        else if (type == "int4") {
+
+        }
+        else if (type == "int") {
+
+        }
+        else if (type == "int2") {
+
+        }
+        else if (type == "int3") {
+
+        }
+        else if (type == "int4") {
+
+        }
+        else if (type == "unsigned") {
+
+        }
+        else if (type == "unsigned2") {
+
+        }
+        else if (type == "unsigned3") {
+
+        }
+        else if (type == "unsigned4") {
+
+        }
+        else if (type == "matrix2") {
+
+        }
+        else if (type == "matrix3") {
+
+        }
+        else if (type == "matrix4") {
+
+        }
+        else if (type == "matrix23") {
+
+        }
+        else if (type == "matrix24") {
+
+        }
+        else if (type == "matrix32") {
+
+        }
+        else if (type == "matrix34") {
+
+        }
+        else if (type == "matrix42") {
+
+        }
+        else if (type == "matrix43") {
+
+        }
+    }
+}
+
 } // namespace ngind::rendering

kernel/rendering/program.h

@@ -29,6 +29,7 @@
 #include <string>
 
 #include "resources/shader_resource.h"
+#include "resources/config_resource.h"
 #include "glm/glm.hpp"
 #include "glm/gtc/type_ptr.hpp"
 
@@ -43,7 +44,7 @@ class Program {
     /**
      * @param name: program's name
      */
-    explicit Program(const std::string& name);
+    explicit Program(const std::string& program_name);
 
     ~Program();
 
@@ -168,6 +169,8 @@ class Program {
         glUniformMatrix4x3fv(getUniform(name), 1, GL_FALSE, glm::value_ptr(m));
     }
 
+    void prepare();
+
 private:
     /**
      * The index of program
@@ -183,6 +186,8 @@ class Program {
      * Reference of segment shader
      */
     resources::ShaderResource* _fs;
+
+    resources::ConfigResource* _program_config;
 };
 
 } // namespace ngind::rendering

kernel/rendering/rendering_command.h

@@ -116,6 +116,8 @@ class RenderingCommand : public memory::AutoCollectionObject {
                                      color.b / 255.0f, color.a / 255.0f);
         this->getProgram()->setMatrix4("projection", Camera::getInstance()->getProjection());
         this->getProgram()->setMatrix4("model", this->getModel());
+
+        this->getProgram()->prepare();
     }
 private:
     /**

resources/config/programs/opaque.json

@@ -0,0 +1,11 @@
+{
+  "vertex": "sprite",
+  "fragment": "opaque",
+  "args": [
+    {
+      "name": "opaque",
+      "type": "float",
+      "value": 0.6
+    }
+  ]
+}

resources/config/programs/sprite.json

@@ -0,0 +1,5 @@
+{
+  "vertex": "sprite",
+  "fragment": "sprite",
+  "args": []
+}

resources/config/programs/text.json

@@ -0,0 +1,5 @@
+{
+  "vertex": "text",
+  "fragment": "text",
+  "args": []
+}

resources/config/worlds/shader.json

@@ -0,0 +1,82 @@
+{
+  "world-name": "shader",
+  "background-color": "#000000FF",
+  "size": {
+    "width": 1024,
+    "height": 768
+  },
+  "camera": {
+    "x": 512,
+    "y": 384
+  },
+  "children": [
+    {
+      "id": 1,
+      "name": "title",
+      "position": {
+        "x": 512,
+        "y": 700
+      },
+      "scale": {
+        "x": 1,
+        "y": 1
+      },
+      "rotate": 0,
+      "z-order": 0,
+      "components": [
+        {
+          "type": "Label",
+          "name": "Label",
+          "font": "manaspc.ttf",
+          "size": 36,
+          "text": "Shader Parameters Test",
+          "color": "#FFFFFFFF",
+          "alignment": 2
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "name": "icon",
+      "position": {
+        "x": 512,
+        "y": 384
+      },
+      "scale": {
+        "x": 2,
+        "y": 2
+      },
+      "rotate": 0,
+      "z-order": 0,
+      "components": [
+        {
+          "type": "Sprite",
+          "name": "Sprite",
+          "filename": "dice.png",
+          "shader": "opaque",
+          "boundary": {
+            "left-bottom": {
+              "x": 0,
+              "y": 0
+            },
+            "right-up": {
+              "x": 80,
+              "y": 64
+            }
+          },
+          "color": "#FFFFFFFF"
+        }
+      ]
+    }
+  ],
+  "components": [
+    {
+      "type": "StateMachine",
+      "name": "WorldSwitch",
+      "driver-script": "world_switch.lua",
+      "classname": "WorldSwitch",
+      "subscription": [
+      ]
+    }
+  ]
+}

resources/script/kernel/components.lua

@@ -30,4 +30,9 @@ end
 Label = {}
 Label.getComponent = function(object)
     return engine.Label.getComponent(object)
+end
+
+StateMachine = {}
+StateMachine.getComponent = function(object, name)
+    return engine.StateMachine.getComponent(object, name)
 end

resources/script/prefab_loader.lua

@@ -33,11 +33,10 @@ end
 
 function PrefabLoader:updateCreate(delta)
     local spin1 = PrefabFactory.loadPrefab("spin")
-    --local spin2 = PrefabFactory.loadPrefab("spin")
     spin1:setPosition(engine.vec2(200, 384))
-    --spin2:setPosition(engine.vec2(824, 384))
+    local script = StateMachine.getComponent(spin1, "Spin")
+    script.direction = 1
     self.game_object:addChild("spin1", spin1)
-    --self.game_object:addChild("spin2", spin2)
     self.move("Idle")
 end
 

resources/script/world_switch.lua

@@ -49,7 +49,7 @@ end
 WORLD_SWITCH_TABLE = {}
 WORLD_SWITCH_TABLE["welcome"] = {}
 WORLD_SWITCH_TABLE["welcome"]["next"] = "colorful-labels"
-WORLD_SWITCH_TABLE["welcome"]["prev"] = "prefab"
+WORLD_SWITCH_TABLE["welcome"]["prev"] = "shader"
 WORLD_SWITCH_TABLE["colorful-labels"] = {}
 WORLD_SWITCH_TABLE["colorful-labels"]["next"] = "audio"
 WORLD_SWITCH_TABLE["colorful-labels"]["prev"] = "welcome"
@@ -81,5 +81,8 @@ WORLD_SWITCH_TABLE["archive"] = {}
 WORLD_SWITCH_TABLE["archive"]["next"] = "prefab"
 WORLD_SWITCH_TABLE["archive"]["prev"] = "camera"
 WORLD_SWITCH_TABLE["prefab"] = {}
-WORLD_SWITCH_TABLE["prefab"]["next"] = "welcome"
-WORLD_SWITCH_TABLE["prefab"]["prev"] = "archive"
+WORLD_SWITCH_TABLE["prefab"]["next"] = "shader"
+WORLD_SWITCH_TABLE["prefab"]["prev"] = "archive"
+WORLD_SWITCH_TABLE["shader"] = {}
+WORLD_SWITCH_TABLE["shader"]["next"] = "welcome"
+WORLD_SWITCH_TABLE["shader"]["prev"] = "prefab"

resources/shaders/opaque.frag

@@ -0,0 +1,12 @@
+#version 330 core
+in vec2 TexCoord;
+
+out vec4 color;
+
+uniform sampler2D image;
+uniform vec4 my_color;
+uniform float opaque;
+
+void main() {
+    color = opaque * my_color * texture(image, TexCoord);
+}