X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=937043f7ca72e96ad60bf7a4611857091bf13730;hp=a88c6f61c70034bcf1c104804852b1e5364aaeca;hb=6e5ded9f44606841fb5e905394cca803c7d7abdf;hpb=78f47afa331cb41639533a2340817eed0f18137a

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index a88c6f6..937043f 100644
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -6,6 +6,7 @@
 #include <stdarg.h>
 #include <lauxlib.h>
 #include <lua.hpp>
+#include <movit/blur_effect.h>
 #include <movit/deinterlace_effect.h>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
@@ -19,6 +20,7 @@
 #include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
 #include <movit/util.h>
+#include <movit/unsharp_mask_effect.h>
 #include <movit/white_balance_effect.h>
 #include <movit/ycbcr.h>
 #include <movit/ycbcr_input.h>
@@ -140,6 +142,10 @@ Effect *instantiate_effect(EffectChain *chain, EffectType effect_type)
 		return new MixEffect;
 	case LIFT_GAMMA_GAIN_EFFECT:
 		return new LiftGammaGainEffect;
+	case BLUR_EFFECT:
+		return new BlurEffect;
+	case UNSHARP_MASK_EFFECT:
+		return new UnsharpMaskEffect;
 	default:
 		fprintf(stderr, "Unhandled effect type %d\n", effect_type);
 		abort();
@@ -622,6 +628,18 @@ int LiftGammaGainEffect_new(lua_State* L)
 	return wrap_lua_object_nonowned<EffectBlueprint>(L, "EffectBlueprint", LIFT_GAMMA_GAIN_EFFECT);
 }
 
+int BlurEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	return wrap_lua_object_nonowned<EffectBlueprint>(L, "EffectBlueprint", BLUR_EFFECT);
+}
+
+int UnsharpMaskEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	return wrap_lua_object_nonowned<EffectBlueprint>(L, "EffectBlueprint", UNSHARP_MASK_EFFECT);
+}
+
 int InputStateInfo_get_width(lua_State* L)
 {
 	assert(lua_gettop(L) == 2);
@@ -997,6 +1015,16 @@ const luaL_Reg LiftGammaGainEffect_funcs[] = {
 	{ NULL, NULL }
 };
 
+const luaL_Reg BlurEffect_funcs[] = {
+	{ "new", BlurEffect_new },
+	{ NULL, NULL }
+};
+
+const luaL_Reg UnsharpMaskEffect_funcs[] = {
+	{ "new", UnsharpMaskEffect_new },
+	{ NULL, NULL }
+};
+
 // End of effects.
 
 const luaL_Reg InputStateInfo_funcs[] = {
@@ -1558,6 +1586,8 @@ Theme::Theme(const string &filename, const vector<string> &search_dirs, Resource
 	register_class("ResizeEffect", ResizeEffect_funcs, RESIZE_EFFECT);
 	register_class("MultiplyEffect", MultiplyEffect_funcs, MULTIPLY_EFFECT);
 	register_class("MixEffect", MixEffect_funcs, MIX_EFFECT);
+	register_class("BlurEffect", BlurEffect_funcs, BLUR_EFFECT);
+	register_class("UnsharpMaskEffect", UnsharpMaskEffect_funcs, UNSHARP_MASK_EFFECT);
 	register_class("LiftGammaGainEffect", LiftGammaGainEffect_funcs, LIFT_GAMMA_GAIN_EFFECT);
 	register_class("InputStateInfo", InputStateInfo_funcs);
 	register_class("ThemeMenu", ThemeMenu_funcs);