X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=abc0a384b2c13ef00170232a6b559a3306742c76;hp=a5890a3504a11c49771b4572397a7af47d32a68b;hb=eb66e8ed648c485ae211e2ed179ca116b7fa65d7;hpb=f25eed80a570ae049f03b098757a070188efbc39 diff --git a/main.cpp b/main.cpp index a5890a3..abc0a38 100644 --- a/main.cpp +++ b/main.cpp @@ -77,7 +77,7 @@ void mouse(int x, int y) } 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) * 10.0f; + blur_radius = (xf / 0.2f) * 100.0f; } } @@ -89,44 +89,34 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h) exit(1); } - // Convert to RGB. - SDL_PixelFormat *fmt = img->format; - SDL_LockSurface(img); - unsigned char *src_pixels = (unsigned char *)img->pixels; - unsigned char *dst_pixels = (unsigned char *)malloc(img->w * img->h * 4); - 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); - - temp = pixel & fmt->Rmask; - temp = temp >> fmt->Rshift; - temp = temp << fmt->Rloss; - r = temp; - - temp = pixel & fmt->Gmask; - temp = temp >> fmt->Gshift; - temp = temp << fmt->Gloss; - g = temp; - - temp = pixel & fmt->Bmask; - temp = temp >> fmt->Bshift; - temp = temp << fmt->Bloss; - b = temp; - - dst_pixels[i * 4 + 0] = b; - dst_pixels[i * 4 + 1] = g; - dst_pixels[i * 4 + 2] = r; - dst_pixels[i * 4 + 3] = 255; - } - SDL_UnlockSurface(img); + SDL_PixelFormat rgba_fmt; + rgba_fmt.palette = NULL; + rgba_fmt.BitsPerPixel = 32; + rgba_fmt.BytesPerPixel = 8; + rgba_fmt.Rloss = rgba_fmt.Gloss = rgba_fmt.Bloss = rgba_fmt.Aloss = 0; + + // NOTE: Assumes little endian. + rgba_fmt.Rmask = 0x00ff0000; + rgba_fmt.Gmask = 0x0000ff00; + rgba_fmt.Bmask = 0x000000ff; + rgba_fmt.Amask = 0xff000000; + + rgba_fmt.Rshift = 16; + rgba_fmt.Gshift = 8; + rgba_fmt.Bshift = 0; + rgba_fmt.Ashift = 24; + + rgba_fmt.colorkey = 0; + rgba_fmt.alpha = 255; + + SDL_Surface *converted = SDL_ConvertSurface(img, &rgba_fmt, SDL_SWSURFACE); *w = img->w; *h = img->h; SDL_FreeSurface(img); - return dst_pixels; + return (unsigned char *)converted->pixels; } void write_ppm(const char *filename, unsigned char *screenbuf) @@ -172,9 +162,10 @@ 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 *blur_effect = chain.add_effect(EFFECT_BLUR); Effect *vignette_effect = chain.add_effect(EFFECT_VIGNETTE); + //Effect *sandbox_effect = chain.add_effect(EFFECT_SANDBOX); + //sandbox_effect->set_float("parm", 42.0f); //chain.add_effect(EFFECT_MIRROR); chain.add_output(inout_format); chain.finalize(); @@ -218,11 +209,7 @@ int main(int argc, char **argv) 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); + blur_effect->set_float("radius", blur_radius); chain.render_to_screen(src_img); @@ -240,7 +227,7 @@ int main(int argc, char **argv) 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 / 10.0f); + draw_saturation_bar(0.75f, blur_radius / 100.0f); SDL_GL_SwapBuffers(); check_error();