X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=demo.cpp;h=6e5f18c58ef229578f2e673bc7723d67d7755d61;hp=2243f2dd702b90419ef491963636c6508c76b669;hb=835f017dbbf6bdda89270a461e21e94c3bcb7928;hpb=34f5f331bd3b643949ccbb0c3488af2823634d59

diff --git a/demo.cpp b/demo.cpp
index 2243f2d..6e5f18c 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -14,15 +14,17 @@
 #include <vector>
 #include <map>
 
+#include <GL/glew.h>
+
 #include <SDL/SDL.h>
 #include <SDL/SDL_opengl.h>
 #include <SDL/SDL_image.h>
+#include <png.h>
 
 #include "init.h"
 #include "effect.h"
 #include "effect_chain.h"
 #include "util.h"
-#include "opengl.h"
 #include "widgets.h"
 
 #include "flat_input.h"
@@ -128,38 +130,55 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
 	return (unsigned char *)converted->pixels;
 }
 
-void write_ppm(const char *filename, unsigned char *screenbuf)
+void write_png(const char *filename, unsigned char *screenbuf)
 {
-	FILE *fp = fopen(filename, "w");
-	fprintf(fp, "P6\n%d %d\n255\n", WIDTH, HEIGHT);
+	FILE *fp = fopen(filename, "wb");
+	png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	png_infop info_ptr = png_create_info_struct(png_ptr);
+	
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		fclose(fp);
+		fprintf(stderr, "Write to %s failed; exiting.\n", filename);
+		exit(1);
+	}
+
+	png_set_IHDR(png_ptr, info_ptr, WIDTH, HEIGHT, 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
+	png_bytep *row_pointers = new png_bytep[HEIGHT];
 	for (unsigned y = 0; y < HEIGHT; ++y) {
-		unsigned char *srcptr = screenbuf + ((HEIGHT - y - 1) * WIDTH) * 4;
-		for (unsigned x = 0; x < WIDTH; ++x) {
-			fputc(srcptr[x * 4 + 2], fp);
-			fputc(srcptr[x * 4 + 1], fp);
-			fputc(srcptr[x * 4 + 0], fp);
-		}
+		row_pointers[y] = screenbuf + ((HEIGHT - y - 1) * WIDTH) * 4;
 	}
+
+	png_init_io(png_ptr, fp);
+	png_set_rows(png_ptr, info_ptr, row_pointers);
+	png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR, NULL);
+	png_destroy_write_struct(&png_ptr, &info_ptr);
 	fclose(fp);
+
+	delete[] row_pointers;
 }
 
 int main(int argc, char **argv)
 {
 	bool quit = false;
 
-	SDL_Init(SDL_INIT_EVERYTHING);
+	if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
+		fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
+		exit(1);
+	}
+	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
 	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 	SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL);
 	SDL_WM_SetCaption("OpenGL window", NULL);
 
-	init_movit();
+	init_movit(".", MOVIT_DEBUG_ON);
 	printf("GPU texture subpixel precision: about %.1f bits\n",
 		log2(1.0f / movit_texel_subpixel_precision));
 	
 	unsigned img_w, img_h;
-	unsigned char *src_img = load_image("blg_wheels_woman_1.jpg", &img_w, &img_h);
+	unsigned char *src_img = load_image(argc > 1 ? argv[1] : "blg_wheels_woman_1.jpg", &img_w, &img_h);
 
 	EffectChain chain(WIDTH, HEIGHT);
 	glViewport(0, 0, WIDTH, HEIGHT);
@@ -168,7 +187,7 @@ int main(int argc, char **argv)
 	inout_format.color_space = COLORSPACE_sRGB;
 	inout_format.gamma_curve = GAMMA_sRGB;
 
-	FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA, GL_UNSIGNED_BYTE, img_w, img_h);
+	FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, img_w, img_h);
 	chain.add_input(input);
 	Effect *lift_gamma_gain_effect = chain.add_effect(new LiftGammaGainEffect());
 	Effect *saturation_effect = chain.add_effect(new SaturationEffect());
@@ -177,7 +196,8 @@ int main(int argc, char **argv)
 	//Effect *sandbox_effect = chain.add_effect(new SandboxEffect());
 	//sandbox_effect->set_float("parm", 42.0f);
 	//chain.add_effect(new MirrorEffect());
-	chain.add_output(inout_format);
+	chain.add_output(inout_format, OUTPUT_ALPHA_POSTMULTIPLIED);
+	chain.set_dither_bits(8);
 	chain.finalize();
 
 	// generate a PBO to hold the data we read back with glReadPixels()
@@ -222,8 +242,8 @@ int main(int argc, char **argv)
 		//vignette_effect->set_float("inner_radius", inner_radius);
 		//vignette_effect->set_vec2("center", (float[]){ 0.7f, 0.5f });
 
-		diffusion_effect->set_float("radius", blur_radius);
-		diffusion_effect->set_float("blurred_mix_amount", blurred_mix_amount);
+		CHECK(diffusion_effect->set_float("radius", blur_radius));
+		CHECK(diffusion_effect->set_float("blurred_mix_amount", blurred_mix_amount));
 
 		input->set_pixel_data(src_img);
 		chain.render_to_screen();
@@ -256,8 +276,8 @@ int main(int argc, char **argv)
 		check_error();
 		if (screenshot) {
 			char filename[256];
-			sprintf(filename, "frame%05d.ppm", frame);
-			write_ppm(filename, screenbuf);
+			sprintf(filename, "frame%05d.png", frame);
+			write_png(filename, screenbuf);
 			printf("Screenshot: %s\n", filename);
 			screenshot = false;
 		}