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

diff --git a/main.cpp b/main.cpp
index 974fe53..4054636 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,11 +5,14 @@
 #define HEIGHT 720
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
+#include <string.h>
 #include <math.h>
 #include <time.h>
+#include <assert.h>
 
 #include <string>
 #include <vector>
+#include <map>
 
 #include <SDL/SDL.h>
 #include <SDL/SDL_opengl.h>
@@ -18,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"
@@ -33,87 +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;
 
-struct ImageFormat {
-	enum { FORMAT_RGB, FORMAT_RGBA } format;
-
-	// Note: sRGB and 709 use the same colorspace primaries.
-	enum { COLORSPACE_sRGB, COLORSPACE_REC_601_525, COLORSPACE_REC_601_625, COLORSPACE_REC_709 } color_space;
-
-	// Note: Rec. 601 and 709 use the same gamma curve.
-	enum { LINEAR_LIGHT, GAMMA_sRGB, GAMMA_REC_601, GAMMA_REC_709 } 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; }
-	bool set_float(const std::string& key, float value);
-	bool set_float_array(const std::string&, const float *values, size_t num_values);
-
-private:
-	bool register_float(const std::string& key, float value);
-	bool register_float_array(const std::string& key, float *values, size_t num_values);
-};      
-
-class EffectChain {
-public:
-	void set_size(unsigned width, unsigned height);
-	void add_input(const ImageFormat &format);
-	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;
-};
-
-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);
@@ -302,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();
@@ -357,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);
@@ -395,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));