X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=5e02d703844bf83687a02a0c0b9bded56afd8ab4;hp=666a1edc779e1e1faf439afbff1c2f4725bc9c21;hb=7f9e6de676f22a95396f91079030b039ace2245f;hpb=2ced784c6599cb0b21427481ee17f4c8f6afdada

diff --git a/main.cpp b/main.cpp
index 666a1ed..5e02d70 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,6 +35,7 @@ float saturation = 1.0f;
 
 float radius = 0.3f;
 float inner_radius = 0.3f;
+float blur_radius = 3.0f;
 	
 void update_hsv(Effect *lift_gamma_gain_effect, Effect *saturation_effect)
 {
@@ -75,6 +76,8 @@ void mouse(int x, int y)
 		radius = (xf / 0.2f);
 	} else if (yf >= 0.70f && yf < 0.72f && xf < 0.2f) {
 		inner_radius = (xf / 0.2f);
+	} else if (yf >= 0.75f && yf < 0.77f && xf < 0.2f) {
+		blur_radius = (xf / 0.2f) * 100.0f;
 	}
 }
 
@@ -169,15 +172,13 @@ int main(int argc, char **argv)
 	chain.add_input(inout_format);
 	Effect *lift_gamma_gain_effect = chain.add_effect(EFFECT_LIFT_GAMMA_GAIN);
 	Effect *saturation_effect = chain.add_effect(EFFECT_SATURATION);
+	Effect *hblur_effect = chain.add_effect(EFFECT_BLUR);
+	Effect *vblur_effect = chain.add_effect(EFFECT_BLUR);
 	Effect *vignette_effect = chain.add_effect(EFFECT_VIGNETTE);
 	//chain.add_effect(EFFECT_MIRROR);
 	chain.add_output(inout_format);
 	chain.finalize();
 
-	//glGenerateMipmap(GL_TEXTURE_2D);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 4);
-	//check_error();
-
 	// generate a PDO to hold the data we read back with glReadPixels()
 	// (Intel/DRI goes into a slow path if we don't read to PDO)
 	glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 1);
@@ -216,6 +217,13 @@ int main(int argc, char **argv)
 		vignette_effect->set_float("radius", radius);
 		vignette_effect->set_float("inner_radius", inner_radius);
 		//vignette_effect->set_vec2("center", (float[]){ 0.7f, 0.5f });
+
+		hblur_effect->set_int("direction", 0);
+		hblur_effect->set_float("radius", blur_radius);
+
+		vblur_effect->set_int("direction", 1);
+		vblur_effect->set_float("radius", blur_radius);
+
 		chain.render_to_screen(src_img);
 		
 		glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 1);
@@ -225,12 +233,14 @@ int main(int argc, char **argv)
 		glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 0);
 		check_error();
 
+		glLoadIdentity();
 		draw_hsv_wheel(0.0f, lift_rad, lift_theta, lift_v);
 		draw_hsv_wheel(0.2f, gamma_rad, gamma_theta, gamma_v);
 		draw_hsv_wheel(0.4f, gain_rad, gain_theta, gain_v);
 		draw_saturation_bar(0.6f, saturation / 4.0f);
 		draw_saturation_bar(0.65f, radius);
 		draw_saturation_bar(0.70f, inner_radius);
+		draw_saturation_bar(0.75f, blur_radius / 100.0f);
 
 		SDL_GL_SwapBuffers();
 		check_error();