X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=f860cad283e7983b543beb2e4cfbb93501e5f4cb;hp=5c1ba69e64a71ad65fe34ad3d7c53d76f4471fd9;hb=bc31a9072da1d9bfe417fd850e92cabe049fd593;hpb=17c083aad45a10df14c38cfe879a87220dfd4fb9

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 5c1ba69..f860cad 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -14,6 +14,7 @@
 #include "lift_gamma_gain_effect.h"
 #include "colorspace_conversion_effect.h"
 #include "saturation_effect.h"
+#include "mirror_effect.h"
 #include "vignette_effect.h"
 #include "texture_enum.h"
 
@@ -45,6 +46,8 @@ Effect *instantiate_effect(EffectId effect)
 		return new LiftGammaGainEffect();
 	case EFFECT_SATURATION:
 		return new SaturationEffect();
+	case EFFECT_MIRROR:
+		return new MirrorEffect();
 	case EFFECT_VIGNETTE:
 		return new VignetteEffect();
 	}
@@ -155,9 +158,26 @@ void EffectChain::finalize()
 		effects.push_back(gamma_conversion);
 		current_gamma_curve = output_format.gamma_curve;
 	}
+	
+	std::string vert_shader = read_file("header.vert");
+	for (unsigned i = 0; i < effects.size(); ++i) {
+		char effect_id[256];
+		sprintf(effect_id, "eff%d", i);
+	
+		vert_shader += "\n";
+		vert_shader += std::string("#define FUNCNAME ") + effect_id + "\n";
+		vert_shader += replace_prefix(effects[i]->output_convenience_uniforms(), effect_id);
+		vert_shader += replace_prefix(effects[i]->output_vertex_shader(), effect_id);
+		vert_shader += "#undef PREFIX\n";
+		vert_shader += "#undef FUNCNAME\n";
+		vert_shader += "#undef LAST_INPUT\n";
+		vert_shader += std::string("#define LAST_INPUT ") + effect_id + "\n";
+		vert_shader += "\n";
+	}
+	vert_shader.append(read_file("footer.vert"));
+	printf("%s\n", vert_shader.c_str());
 
-	std::string frag_shader = read_file("header.glsl");
-
+	std::string frag_shader = read_file("header.frag");
 	for (unsigned i = 0; i < effects.size(); ++i) {
 		char effect_id[256];
 		sprintf(effect_id, "eff%d", i);
@@ -172,11 +192,11 @@ void EffectChain::finalize()
 		frag_shader += std::string("#define LAST_INPUT ") + effect_id + "\n";
 		frag_shader += "\n";
 	}
-	frag_shader.append(read_file("footer.glsl"));
+	frag_shader.append(read_file("footer.frag"));
 	printf("%s\n", frag_shader.c_str());
 	
 	glsl_program_num = glCreateProgram();
-	GLuint vs_obj = compile_shader(read_file("vs.glsl"), GL_VERTEX_SHADER);
+	GLuint vs_obj = compile_shader(vert_shader, GL_VERTEX_SHADER);
 	GLuint fs_obj = compile_shader(frag_shader, GL_FRAGMENT_SHADER);
 	glAttachShader(glsl_program_num, vs_obj);
 	check_error();