X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=93f8c0cb1823d45e5ae4b8a719d6daa5d38bd73f;hp=405463643b2d11ef0b524c4940f216ca4d39308b;hb=40b66ccabf2c2f448504a41909ff2dda80212af4;hpb=a592c55caca0fb654bad4ec43b84c46abcee21c2 diff --git a/main.cpp b/main.cpp index 4054636..93f8c0c 100644 --- a/main.cpp +++ b/main.cpp @@ -34,90 +34,29 @@ 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; -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; +float radius = 0.3f; +float inner_radius = 0.3f; -void draw_picture_quad(GLint prog, int frame) +void update_hsv(Effect *lift_gamma_gain_effect, Effect *saturation_effect) { - glUseProgramObjectARB(prog); - check_error(); - - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE); - glUniform1i(glGetUniformLocation(prog, "tex"), 0); - - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_1D, SRGB_LUT); - glUniform1i(glGetUniformLocation(prog, "srgb_tex"), 1); - - glActiveTexture(GL_TEXTURE2); - glBindTexture(GL_TEXTURE_1D, SRGB_REVERSE_LUT); - glUniform1i(glGetUniformLocation(prog, "srgb_reverse_tex"), 2); - - glUniform3f(glGetUniformLocation(prog, "lift"), lift_r, lift_g, lift_b); - //glUniform3f(glGetUniformLocation(prog, "gamma"), gamma_r, gamma_g, gamma_b); - glUniform3f(glGetUniformLocation(prog, "inv_gamma_22"), - 2.2f / gamma_r, - 2.2f / gamma_g, - 2.2f / gamma_b); - glUniform3f(glGetUniformLocation(prog, "gain_pow_inv_gamma"), - pow(gain_r, 1.0f / gamma_r), - pow(gain_g, 1.0f / gamma_g), - pow(gain_b, 1.0f / gamma_b)); - glUniform1f(glGetUniformLocation(prog, "saturation"), saturation); - - glDisable(GL_BLEND); - check_error(); - glDisable(GL_DEPTH_TEST); - check_error(); - glDepthMask(GL_FALSE); - check_error(); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0); + RGBTriplet lift(0.0f, 0.0f, 0.0f); + RGBTriplet gamma(1.0f, 1.0f, 1.0f); + RGBTriplet gain(1.0f, 1.0f, 1.0f); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + hsv2rgb(lift_theta, lift_rad, lift_v, &lift.r, &lift.g, &lift.b); + hsv2rgb(gamma_theta, gamma_rad, gamma_v * 2.0f, &gamma.r, &gamma.g, &gamma.b); + hsv2rgb(gain_theta, gain_rad, gain_v * 4.0f, &gain.r, &gain.g, &gain.b); - glClearColor(1.0f, 0.0f, 0.0f, 1.0f); -// glClear(GL_COLOR_BUFFER_BIT); - check_error(); - - glBegin(GL_QUADS); - - glTexCoord2f(0.0f, 1.0f); - glVertex2f(0.0f, 0.0f); - - glTexCoord2f(1.0f, 1.0f); - glVertex2f(1.0f, 0.0f); - - glTexCoord2f(1.0f, 0.0f); - glVertex2f(1.0f, 1.0f); - - glTexCoord2f(0.0f, 0.0f); - glVertex2f(0.0f, 1.0f); - - glEnd(); - check_error(); -} - -void update_hsv() -{ - hsv2rgb(lift_theta, lift_rad, lift_v, &lift_r, &lift_g, &lift_b); - hsv2rgb(gamma_theta, gamma_rad, gamma_v * 2.0f, &gamma_r, &gamma_g, &gamma_b); - hsv2rgb(gain_theta, gain_rad, gain_v * 4.0f, &gain_r, &gain_g, &gain_b); + bool ok = lift_gamma_gain_effect->set_vec3("lift", (float *)&lift); + ok = ok && lift_gamma_gain_effect->set_vec3("gamma", (float *)&gamma); + ok = ok && lift_gamma_gain_effect->set_vec3("gain", (float *)&gain); + assert(ok); if (saturation < 0.0) { saturation = 0.0; } - - printf("lift: %f %f %f\n", lift_r, lift_g, lift_b); - printf("gamma: %f %f %f\n", gamma_r, gamma_g, gamma_b); - printf("gain: %f %f %f\n", gain_r, gain_g, gain_b); - printf("saturation: %f\n", saturation); - printf("\n"); + ok = saturation_effect->set_float("saturation", saturation); + assert(ok); } void mouse(int x, int y) @@ -133,12 +72,14 @@ 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); } - - update_hsv(); } -void load_texture(const char *filename) +unsigned char *load_image(const char *filename, unsigned *w, unsigned *h) { SDL_Surface *img = IMG_Load(filename); if (img == NULL) { @@ -151,7 +92,7 @@ void load_texture(const char *filename) 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); @@ -177,17 +118,12 @@ void load_texture(const char *filename) } SDL_UnlockSurface(img); -#if 1 - // we will convert to sRGB in the shader - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, img->w, img->h, 0, GL_RGB, GL_UNSIGNED_BYTE, dst_pixels); - check_error(); -#else - // implicit sRGB conversion in hardware - glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8, img->w, img->h, 0, GL_RGB, GL_UNSIGNED_BYTE, dst_pixels); - check_error(); -#endif - free(dst_pixels); + *w = img->w; + *h = img->h; + SDL_FreeSurface(img); + + return dst_pixels; } void write_ppm(const char *filename, unsigned char *screenbuf) @@ -225,7 +161,8 @@ int main(int argc, char **argv) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); check_error(); - load_texture("blg_wheels_woman_1.jpg"); + unsigned img_w, img_h; + unsigned char *src_img = load_image("blg_wheels_woman_1.jpg", &img_w, &img_h); EffectChain chain(WIDTH, HEIGHT); @@ -235,7 +172,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(); @@ -243,10 +182,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); @@ -291,28 +226,15 @@ int main(int argc, char **argv) glBufferData(GL_PIXEL_PACK_BUFFER_ARB, WIDTH * HEIGHT * 4, NULL, GL_STREAM_READ); make_hsv_wheel_texture(); - update_hsv(); - - 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; @@ -332,8 +254,10 @@ int main(int argc, char **argv) ++frame; - - draw_picture_quad(prog, frame); + 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)); check_error(); @@ -341,7 +265,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(); @@ -359,9 +285,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);