X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=demo.cpp;h=845a776d20859b67f829ed69e5070d59cf509132;hp=298b5361ff1f8aaba212273e8720ab51cbfe2924;hb=cbb75714cc61421ec9730bb0eb6cf2875636b3de;hpb=5d4c0425579de66b3e2dd7d0095e890278f8efcf

diff --git a/demo.cpp b/demo.cpp
index 298b536..845a776 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -4,33 +4,38 @@
 #define WIDTH 1280
 #define HEIGHT 720
 
-#include <string.h>
-#include <math.h>
-#include <time.h>
-#include <sys/time.h>
-#include <assert.h>
-
-#include <string>
-#include <vector>
-#include <map>
-
 #include <GL/glew.h>
-
 #include <SDL/SDL.h>
-#include <SDL/SDL_opengl.h>
+#include <SDL/SDL_error.h>
+#include <SDL/SDL_events.h>
 #include <SDL/SDL_image.h>
+#include <SDL/SDL_keyboard.h>
+#include <SDL/SDL_keysym.h>
+#include <SDL/SDL_mouse.h>
+#include <SDL/SDL_video.h>
+#include <assert.h>
+#include <features.h>
+#include <math.h>
 #include <png.h>
+#include <pngconf.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <time.h>
 
-#include "init.h"
+#include "diffusion_effect.h"
 #include "effect.h"
 #include "effect_chain.h"
-#include "util.h"
-#include "widgets.h"
-
 #include "flat_input.h"
+#include "image_format.h"
+#include "init.h"
 #include "lift_gamma_gain_effect.h"
 #include "saturation_effect.h"
-#include "diffusion_effect.h"
+#include "util.h"
+#include "widgets.h"
+
+using namespace movit;
 
 unsigned char result[WIDTH * HEIGHT * 4];
 
@@ -173,9 +178,18 @@ int main(int argc, char **argv)
 	SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL);
 	SDL_WM_SetCaption("OpenGL window", NULL);
 
-	init_movit(".", MOVIT_DEBUG_ON);
+	CHECK(init_movit(".", MOVIT_DEBUG_ON));
 	printf("GPU texture subpixel precision: about %.1f bits\n",
 		log2(1.0f / movit_texel_subpixel_precision));
+	printf("Wrongly rounded x+0.48 or x+0.52 values: %d/510\n",
+		movit_num_wrongly_rounded);
+	if (movit_num_wrongly_rounded > 0) {
+		if (movit_shader_rounding_supported) {
+			printf("Rounding off in the shader to compensate.\n");
+		} else {
+			printf("No shader roundoff available; cannot compensate.\n");
+		}
+	}
 	
 	unsigned img_w, img_h;
 	unsigned char *src_img = load_image(argc > 1 ? argv[1] : "blg_wheels_woman_1.jpg", &img_w, &img_h);
@@ -183,6 +197,13 @@ int main(int argc, char **argv)
 	EffectChain chain(WIDTH, HEIGHT);
 	glViewport(0, 0, WIDTH, HEIGHT);
 
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0);
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
 	ImageFormat inout_format;
 	inout_format.color_space = COLORSPACE_sRGB;
 	inout_format.gamma_curve = GAMMA_sRGB;
@@ -196,7 +217,7 @@ 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, OUTPUT_POSTMULTIPLIED_ALPHA);
+	chain.add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
 	chain.set_dither_bits(8);
 	chain.finalize();
 
@@ -299,6 +320,15 @@ int main(int argc, char **argv)
 		printf("%d frames in %.3f seconds = %.1f fps (%.1f ms/frame)\n",
 			frame, elapsed, frame / elapsed,
 			1e3 * elapsed / frame);
+
+		// Reset every 100 frames, so that local variations in frame times
+		// (especially for the first few frames, when the shaders are
+		// compiled etc.) don't make it hard to measure for the entire
+		// remaining duration of the program.
+		if (frame == 100) {
+			frame = 0;
+			start = now;
+		}
 #endif
 	}
 	return 0;