X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=405463643b2d11ef0b524c4940f216ca4d39308b;hp=f81eaa8af6c129acf20317d2d6e0a96bbd1920cb;hb=a592c55caca0fb654bad4ec43b84c46abcee21c2;hpb=06e169be17d6298bb443271c7defa8b1abf52b8d

diff --git a/main.cpp b/main.cpp
index f81eaa8..4054636 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,6 +21,8 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 
+#include "effect.h"
+#include "effect_chain.h"
 #include "util.h"
 #include "widgets.h"
 #include "texture_enum.h"
@@ -36,267 +38,6 @@ float lift_r = 0.0f, lift_g = 0.0f, lift_b = 0.0f;
 float gamma_r = 1.0f, gamma_g = 1.0f, gamma_b = 1.0f;
 float gain_r = 1.0f, gain_g = 1.0f, gain_b = 1.0f;
 
-enum PixelFormat { FORMAT_RGB, FORMAT_RGBA };
-
-enum ColorSpace {
-	COLORSPACE_sRGB = 0,
-	COLORSPACE_REC_709 = 0,  // Same as sRGB.
-	COLORSPACE_REC_601_525 = 1,
-	COLORSPACE_REC_601_625 = 2,
-};
-
-enum GammaCurve {
-	GAMMA_LINEAR = 0,
-	GAMMA_sRGB = 1,
-	GAMMA_REC_601 = 2,
-	GAMMA_REC_709 = 2,  // Same as Rec. 601.
-};
-
-struct ImageFormat {
-	PixelFormat pixel_format;
-	ColorSpace color_space;
-	GammaCurve gamma_curve;
-};
-
-enum EffectId {
-	// Mostly for internal use.
-	GAMMA_CONVERSION = 0,
-	RGB_PRIMARIES_CONVERSION,
-
-	// Color.
-	LIFT_GAMMA_GAIN,
-};
-
-class Effect {
-public: 
-	virtual bool needs_linear_light() { return true; }
-	virtual bool needs_srgb_primaries() { return true; }
-	virtual bool needs_many_samples() { return false; }
-	virtual bool needs_mipmaps() { return false; }
-
-	// Neither of these take ownership.
-	bool set_int(const std::string&, int value);
-	bool set_float(const std::string &key, float value);
-	bool set_vec3(const std::string &key, const float *values);
-
-protected:
-	// Neither of these take ownership.
-	void register_int(const std::string &key, int *value);
-	void register_float(const std::string &key, float *value);
-	void register_vec3(const std::string &key, float *values);
-	
-private:
-	std::map<std::string, int *> params_int;
-	std::map<std::string, float *> params_float;
-	std::map<std::string, float *> params_vec3;
-};
-
-bool Effect::set_int(const std::string &key, int value)
-{
-	if (params_int.count(key) == 0) {
-		return false;
-	}
-	*params_int[key] = value;
-	return true;
-}
-
-bool Effect::set_float(const std::string &key, float value)
-{
-	if (params_float.count(key) == 0) {
-		return false;
-	}
-	*params_float[key] = value;
-	return true;
-}
-
-bool Effect::set_vec3(const std::string &key, const float *values)
-{
-	if (params_vec3.count(key) == 0) {
-		return false;
-	}
-	memcpy(params_vec3[key], values, sizeof(float) * 3);
-	return true;
-}
-
-void Effect::register_int(const std::string &key, int *value)
-{
-	assert(params_int.count(key) == 0);
-	params_int[key] = value;
-}
-
-void Effect::register_float(const std::string &key, float *value)
-{
-	assert(params_float.count(key) == 0);
-	params_float[key] = value;
-}
-
-void Effect::register_vec3(const std::string &key, float *values)
-{
-	assert(params_vec3.count(key) == 0);
-	params_vec3[key] = values;
-}
-
-// Can alias on a float[3].
-struct RGBTriplet {
-	RGBTriplet(float r, float g, float b)
-		: r(r), g(g), b(b) {}
-
-	float r, g, b;
-};
-
-class GammaExpansionEffect : public Effect {
-public:
-	GammaExpansionEffect()
-		: source_curve(GAMMA_LINEAR)
-	{
-		register_int("source_curve", (int *)&source_curve);
-	}
-
-private:
-	GammaCurve source_curve;
-};
-
-class ColorSpaceConversionEffect : public Effect {
-public:
-	ColorSpaceConversionEffect()
-		: source_space(COLORSPACE_sRGB),
-		  destination_space(COLORSPACE_sRGB)
-	{
-		register_int("source_space", (int *)&source_space);
-		register_int("destination_space", (int *)&destination_space);
-	}
-
-private:
-	ColorSpace source_space, destination_space;
-};
-
-class ColorSpaceConversionEffect;
-
-class LiftGammaGainEffect : public Effect {
-public:
-	LiftGammaGainEffect()
-		: lift(0.0f, 0.0f, 0.0f),
-		  gamma(1.0f, 1.0f, 1.0f),
-		  gain(1.0f, 1.0f, 1.0f),
-		  saturation(1.0f)
-	{
-		register_vec3("lift", (float *)&lift);
-		register_vec3("gamma", (float *)&gamma);
-		register_vec3("gain", (float *)&gain);
-		register_float("saturation", &saturation);
-	}
-
-private:
-	RGBTriplet lift, gamma, gain;
-	float saturation;
-};
-
-class EffectChain {
-public:
-	EffectChain(unsigned width, unsigned height);
-	void add_input(const ImageFormat &format);
-
-	// The pointer is owned by EffectChain.
-	Effect *add_effect(EffectId effect);
-
-	void add_output(const ImageFormat &format);
-
-	void render(unsigned char *src, unsigned char *dst);
-
-private:
-	unsigned width, height;
-	ImageFormat input_format, output_format;
-	std::vector<Effect *> effects;
-
-	ColorSpace current_color_space;
-	GammaCurve current_gamma_curve;	
-};
-
-EffectChain::EffectChain(unsigned width, unsigned height)
-	: width(width), height(height) {}
-
-void EffectChain::add_input(const ImageFormat &format)
-{
-	input_format = format;
-	current_color_space = format.color_space;
-	current_gamma_curve = format.gamma_curve;
-}
-
-void EffectChain::add_output(const ImageFormat &format)
-{
-	output_format = format;
-}
-	
-Effect *instantiate_effect(EffectId effect)
-{
-	switch (effect) {
-	case GAMMA_CONVERSION:
-		return new GammaExpansionEffect();
-	case RGB_PRIMARIES_CONVERSION:
-		return new GammaExpansionEffect();
-	case LIFT_GAMMA_GAIN:
-		return new LiftGammaGainEffect();
-	}
-	assert(false);
-}
-
-Effect *EffectChain::add_effect(EffectId effect_id)
-{
-	Effect *effect = instantiate_effect(effect_id);
-
-	if (effect->needs_linear_light() && current_gamma_curve != GAMMA_LINEAR) {
-		GammaExpansionEffect *gamma_conversion = new GammaExpansionEffect();
-		gamma_conversion->set_int("source_curve", current_gamma_curve);
-		effects.push_back(gamma_conversion);
-		current_gamma_curve = GAMMA_LINEAR;
-	}
-
-	if (effect->needs_srgb_primaries() && current_color_space != COLORSPACE_sRGB) {
-		assert(current_gamma_curve == GAMMA_LINEAR);
-		ColorSpaceConversionEffect *colorspace_conversion = new ColorSpaceConversionEffect();
-		colorspace_conversion->set_int("source_space", current_color_space);
-		colorspace_conversion->set_int("destination_space", COLORSPACE_sRGB);
-		effects.push_back(colorspace_conversion);
-		current_color_space = COLORSPACE_sRGB;
-	}
-
-	effects.push_back(effect);
-	return effect;
-}
-
-GLhandleARB read_shader(const char* filename, GLenum type)
-{
-	static char buf[131072];
-	FILE *fp = fopen(filename, "r");
-	if (fp == NULL) {
-		perror(filename);
-		exit(1);
-	}
-
-	int len = fread(buf, 1, sizeof(buf), fp);
-	fclose(fp);
-
-	GLhandleARB obj = glCreateShaderObjectARB(type);
-	const GLchar* source[] = { buf };
-	const GLint length[] = { len };
-	glShaderSource(obj, 1, source, length);
-	glCompileShader(obj);
-
-	GLchar info_log[4096];
-	GLsizei log_length = sizeof(info_log) - 1;
-	glGetShaderInfoLog(obj, log_length, &log_length, info_log);
-	info_log[log_length] = 0; 
-	printf("shader compile log: %s\n", info_log);
-
-	GLint status;
-	glGetShaderiv(obj, GL_COMPILE_STATUS, &status);
-	if (status == GL_FALSE) {
-		exit(1);
-	}
-
-	return obj;
-}
-
 void draw_picture_quad(GLint prog, int frame)
 {
 	glUseProgramObjectARB(prog);
@@ -485,6 +226,19 @@ int main(int argc, char **argv)
 	check_error();
 
 	load_texture("blg_wheels_woman_1.jpg");
+
+	EffectChain chain(WIDTH, HEIGHT);
+
+	ImageFormat inout_format;
+	inout_format.pixel_format = FORMAT_RGB;
+	inout_format.color_space = COLORSPACE_sRGB;
+	inout_format.gamma_curve = GAMMA_sRGB;
+
+	chain.add_input(inout_format);
+	Effect *lift_gamma_gain_effect = chain.add_effect(LIFT_GAMMA_GAIN);
+	chain.add_output(inout_format);
+	chain.finalize();
+
 	//glGenerateMipmap(GL_TEXTURE_2D);
 	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 4);
 	//check_error();
@@ -540,8 +294,8 @@ int main(int argc, char **argv)
 	update_hsv();
 
 	int prog = glCreateProgram();
-	GLhandleARB vs_obj = read_shader("vs.glsl", GL_VERTEX_SHADER);
-	GLhandleARB fs_obj = read_shader("fs.glsl", GL_FRAGMENT_SHADER);
+	GLhandleARB vs_obj = compile_shader(read_file("vs.glsl"), GL_VERTEX_SHADER);
+	GLhandleARB fs_obj = compile_shader(read_file("fs.glsl"), GL_FRAGMENT_SHADER);
 	glAttachObjectARB(prog, vs_obj);
 	check_error();
 	glAttachObjectARB(prog, fs_obj);
@@ -578,6 +332,7 @@ int main(int argc, char **argv)
 
 		++frame;
 
+		
 		draw_picture_quad(prog, frame);
 		
 		glReadPixels(0, 0, WIDTH, HEIGHT, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER_OFFSET(0));