Add set_vec4, and yet more fixes for add_effect in Lua.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index cdbe9c8035887e3ca981f8adcafe96d6e63f0df9..ceccdcf93eb997eb38e198abb99f2cfb4d749284 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -10,6 +10,7 @@
 #include <movit/white_balance_effect.h>
 #include <movit/resample_effect.h>
 #include <movit/padding_effect.h>
+#include <movit/overlay_effect.h>
 
 #include "theme.h"
 
@@ -47,7 +48,9 @@ Effect *get_effect(lua_State *L, int idx)
 {
        if (luaL_testudata(L, idx, "WhiteBalanceEffect") ||
            luaL_testudata(L, idx, "ResampleEffect") ||
-           luaL_testudata(L, idx, "PaddingEffect")) {
+           luaL_testudata(L, idx, "PaddingEffect") ||
+           luaL_testudata(L, idx, "IntegralPaddingEffect") ||
+           luaL_testudata(L, idx, "OverlayEffect")) {
                return (Effect *)lua_touserdata(L, idx);
        }
        fprintf(stderr, "Error: Index #%d was not an Effect type\n", idx);
@@ -79,20 +82,27 @@ int EffectChain_add_live_input(lua_State* L)
 
 int EffectChain_add_effect(lua_State* L)
 {
-       assert(lua_gettop(L) == 3);
+       assert(lua_gettop(L) >= 2);
        EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
 
        // TODO: Better error reporting.
-       Effect *effect1 = get_effect(L, 2);
-       if (luaL_testudata(L, 3, "LiveInputWrapper")) {
-               LiveInputWrapper *effect2 = (LiveInputWrapper *)lua_touserdata(L, 3);
-               chain->add_effect(effect1, effect2->get_input());
+       Effect *effect = get_effect(L, 2);
+       if (lua_gettop(L) == 2) {
+               chain->add_effect(effect);
        } else {
-               Effect *effect2 = get_effect(L, 3);
-               chain->add_effect(effect1, effect2);
+               vector<Effect *> inputs;
+               for (int idx = 3; idx <= lua_gettop(L); ++idx) {
+                       if (luaL_testudata(L, idx, "LiveInputWrapper")) {
+                               LiveInputWrapper *input = (LiveInputWrapper *)lua_touserdata(L, idx);
+                               inputs.push_back(input->get_input());
+                       } else {
+                               inputs.push_back(get_effect(L, idx));
+                       }
+               }
+               chain->add_effect(effect, inputs);
        }
 
-       lua_settop(L, 2);       
+       lua_settop(L, 2);  // Return the effect itself.
        return 1;
 }
 
@@ -150,6 +160,18 @@ int PaddingEffect_new(lua_State* L)
        return wrap_lua_object<PaddingEffect>(L, "PaddingEffect");
 }
 
+int IntegralPaddingEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object<IntegralPaddingEffect>(L, "IntegralPaddingEffect");
+}
+
+int OverlayEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object<OverlayEffect>(L, "OverlayEffect");
+}
+
 int Effect_set_float(lua_State *L)
 {
        assert(lua_gettop(L) == 3);
@@ -174,6 +196,22 @@ int Effect_set_int(lua_State *L)
        return 0;
 }
 
+int Effect_set_vec4(lua_State *L)
+{
+       assert(lua_gettop(L) == 6);
+       Effect *effect = (Effect *)get_effect(L, 1);
+       size_t len;
+       const char* cstr = lua_tolstring(L, 2, &len);
+       std::string key(cstr, len);
+       float v[4];
+       v[0] = luaL_checknumber(L, 3);
+       v[1] = luaL_checknumber(L, 4);
+       v[2] = luaL_checknumber(L, 5);
+       v[3] = luaL_checknumber(L, 6);
+       (void)effect->set_vec4(key, v);
+       return 0;
+}
+
 const luaL_Reg EffectChain_funcs[] = {
        { "new", EffectChain_new },
        { "add_live_input", EffectChain_add_live_input },
@@ -191,6 +229,7 @@ const luaL_Reg WhiteBalanceEffect_funcs[] = {
        { "new", WhiteBalanceEffect_new },
        { "set_float", Effect_set_float },
        { "set_int", Effect_set_int },
+       { "set_vec4", Effect_set_vec4 },
        { NULL, NULL }
 };
 
@@ -198,6 +237,7 @@ const luaL_Reg ResampleEffect_funcs[] = {
        { "new", ResampleEffect_new },
        { "set_float", Effect_set_float },
        { "set_int", Effect_set_int },
+       { "set_vec4", Effect_set_vec4 },
        { NULL, NULL }
 };
 
@@ -205,6 +245,23 @@ const luaL_Reg PaddingEffect_funcs[] = {
        { "new", PaddingEffect_new },
        { "set_float", Effect_set_float },
        { "set_int", Effect_set_int },
+       { "set_vec4", Effect_set_vec4 },
+       { NULL, NULL }
+};
+
+const luaL_Reg IntegralPaddingEffect_funcs[] = {
+       { "new", IntegralPaddingEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { "set_vec4", Effect_set_vec4 },
+       { NULL, NULL }
+};
+
+const luaL_Reg OverlayEffect_funcs[] = {
+       { "new", OverlayEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { "set_vec4", Effect_set_vec4 },
        { NULL, NULL }
 };
 
@@ -249,6 +306,8 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
        register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs);
        register_class("ResampleEffect", ResampleEffect_funcs);
        register_class("PaddingEffect", PaddingEffect_funcs);
+       register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs);
+       register_class("OverlayEffect", OverlayEffect_funcs);
 
        // Run script.
        lua_settop(L, 0);