<sys/time.h> is needed for gettimeofday.

[movit] / main.cpp

diff --git a/main.cpp b/main.cpp
index d82369447b69ac8986bb4c55e34d69e9352a57cc..8389cad581768dea43cea63d865797332c5161f0 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <math.h>
 #include <time.h>
+#include <sys/time.h>
 #include <assert.h>
 
 #include <string>
@@ -34,7 +35,10 @@ float gamma_theta = 0.0f, gamma_rad = 0.0f, gamma_v = 0.5f;
 float gain_theta = 0.0f, gain_rad = 0.0f, gain_v = 0.25f;
 float saturation = 1.0f;
 
-void update_hsv(Effect *lift_gamma_gain_effect)
+float radius = 0.3f;
+float inner_radius = 0.3f;
+
+void update_hsv(Effect *lift_gamma_gain_effect, Effect *saturation_effect)
 {
        RGBTriplet lift(0.0f, 0.0f, 0.0f);
        RGBTriplet gamma(1.0f, 1.0f, 1.0f);
@@ -52,6 +56,8 @@ void update_hsv(Effect *lift_gamma_gain_effect)
        if (saturation < 0.0) {
                saturation = 0.0;
        }
+       ok = saturation_effect->set_float("saturation", saturation);
+       assert(ok);
 }
 
 void mouse(int x, int y)
@@ -67,6 +73,10 @@ void mouse(int x, int y)
                read_colorwheel(xf, yf - 0.4f, &gain_rad, &gain_theta, &gain_v);
        } else if (yf >= 0.6f && yf < 0.62f && xf < 0.2f) {
                saturation = (xf / 0.2f) * 4.0f;
+       } else if (yf >= 0.65f && yf < 0.67f && xf < 0.2f) {
+               radius = (xf / 0.2f);
+       } else if (yf >= 0.70f && yf < 0.72f && xf < 0.2f) {
+               inner_radius = (xf / 0.2f);
        }
 }
 
@@ -83,7 +93,7 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
        SDL_LockSurface(img);
        unsigned char *src_pixels = (unsigned char *)img->pixels;
        unsigned char *dst_pixels = (unsigned char *)malloc(img->w * img->h * 3);
-       for (unsigned i = 0; i < img->w * img->h; ++i) {
+       for (int i = 0; i < img->w * img->h; ++i) {
                unsigned char r, g, b;
                unsigned int temp;
                unsigned int pixel = *(unsigned int *)(src_pixels + i * fmt->BytesPerPixel);
@@ -117,24 +127,6 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
        return dst_pixels;
 }
 
-void load_texture(const char *filename)
-{
-       unsigned w, h;
-       unsigned char *pixels = load_image(filename, &w, &h);
-
-#if 1
-       // we will convert to sRGB in the shader
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
-       check_error();
-#else
-       // implicit sRGB conversion in hardware
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
-       check_error();
-#endif
-
-       free(pixels);
-}
-
 void write_ppm(const char *filename, unsigned char *screenbuf)
 {
        FILE *fp = fopen(filename, "w");
@@ -181,7 +173,9 @@ int main(int argc, char **argv)
        inout_format.gamma_curve = GAMMA_sRGB;
 
        chain.add_input(inout_format);
-       Effect *lift_gamma_gain_effect = chain.add_effect(LIFT_GAMMA_GAIN);
+       Effect *lift_gamma_gain_effect = chain.add_effect(EFFECT_LIFT_GAMMA_GAIN);
+       Effect *saturation_effect = chain.add_effect(EFFECT_SATURATION);
+       Effect *vignette_effect = chain.add_effect(EFFECT_VIGNETTE);
        chain.add_output(inout_format);
        chain.finalize();
 
@@ -189,10 +183,6 @@ int main(int argc, char **argv)
        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 4);
        //check_error();
 
-       //load_texture("maserati_gts_wallpaper_1280x720_01.jpg");
-       //load_texture("90630d1295075297-console-games-wallpapers-wallpaper_need_for_speed_prostreet_09_1920x1080.jpg");
-       //load_texture("glacier-lake-1280-720-4087.jpg");
-
 #if 0
        // sRGB reverse LUT
        glBindTexture(GL_TEXTURE_1D, SRGB_REVERSE_LUT);
@@ -238,26 +228,14 @@ int main(int argc, char **argv)
 
        make_hsv_wheel_texture();
 
-       int prog = glCreateProgram();
-       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);
-       check_error();
-       glLinkProgram(prog);
-       check_error();
-
-       GLchar info_log[4096];
-       GLsizei log_length = sizeof(info_log) - 1;
-       log_length = sizeof(info_log) - 1;
-       glGetProgramInfoLog(prog, log_length, &log_length, info_log);
-       info_log[log_length] = 0; 
-       printf("link: %s\n", info_log);
-
-       struct timespec start, now;
        int frame = 0, screenshot = 0;
+#if _POSIX_C_SOURCE >= 199309L
+       struct timespec start, now;
        clock_gettime(CLOCK_MONOTONIC, &start);
+#else
+       struct timeval start, now;
+       gettimeofday(&start, NULL);
+#endif
 
        while (!quit) {
                SDL_Event event;
@@ -277,7 +255,9 @@ int main(int argc, char **argv)
 
                ++frame;
 
-               update_hsv(lift_gamma_gain_effect);
+               update_hsv(lift_gamma_gain_effect, saturation_effect);
+               vignette_effect->set_float("radius", radius);
+               vignette_effect->set_float("inner_radius", inner_radius);
                chain.render_to_screen(src_img);
                
                glReadPixels(0, 0, WIDTH, HEIGHT, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER_OFFSET(0));
@@ -286,7 +266,9 @@ int main(int argc, char **argv)
                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);
+               draw_saturation_bar(0.6f, saturation / 4.0f);
+               draw_saturation_bar(0.65f, radius);
+               draw_saturation_bar(0.70f, inner_radius);
 
                SDL_GL_SwapBuffers();
                check_error();
@@ -304,9 +286,15 @@ int main(int argc, char **argv)
                check_error();
 
 #if 1
+#if _POSIX_C_SOURCE >= 199309L
                clock_gettime(CLOCK_MONOTONIC, &now);
                double elapsed = now.tv_sec - start.tv_sec +
                        1e-9 * (now.tv_nsec - start.tv_nsec);
+#else
+               gettimeofday(&now, NULL);
+               double elapsed = now.tv_sec - start.tv_sec +
+                       1e-6 * (now.tv_usec - start.tv_usec);
+#endif
                printf("%d frames in %.3f seconds = %.1f fps (%.1f ms/frame)\n",
                        frame, elapsed, frame / elapsed,
                        1e3 * elapsed / frame);