From d9d9ca82d1e460ca9c3cdd88777c77465d4c7231 Mon Sep 17 00:00:00 2001 From: Brett Nash Date: Sun, 1 May 2011 06:39:31 +0000 Subject: [PATCH] Add brightness tests. SVN revision: 59069 --- src/bin/Makefile.am | 2 + src/bin/filter_object_brightness.c | 109 ++++++++++++++++++++++ src/bin/filter_object_brightness_solid.c | 111 +++++++++++++++++++++++ src/bin/tests.h | 2 + src/bin/ui.c | 14 +-- 5 files changed, 232 insertions(+), 6 deletions(-) create mode 100644 src/bin/filter_object_brightness.c create mode 100644 src/bin/filter_object_brightness_solid.c diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index d849743..5c76775 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -136,6 +136,8 @@ filter_object_greyscale.c \ filter_object_greyscale_solid.c \ filter_object_invert.c \ filter_object_invert_solid.c \ +filter_object_brightness.c \ +filter_object_brightness_solid.c \ filter_object_blur.c \ filter_object_blur_solid.c diff --git a/src/bin/filter_object_brightness.c b/src/bin/filter_object_brightness.c new file mode 100644 index 0000000..a1d5ef6 --- /dev/null +++ b/src/bin/filter_object_brightness.c @@ -0,0 +1,109 @@ +#undef FNAME +#undef NAME +#undef ICON + +/* metadata */ +#define FNAME filter_object_brightness +#define NAME "Filter Object Brightness" +#define ICON "blend.png" + +#ifndef PROTO +# ifndef UI +# include "main.h" + +/* standard var */ +static int done = 0; +/* private data */ +static Evas_Object *o_images[OBNUM]; + +/* setup */ +static void _setup(void) +{ + int i; + Evas_Object *o,*src; + + for (i = 0; i < OBNUM; i++) + { + o = evas_object_image_add(evas); + evas_object_image_file_set(o, build_path("logo.png"), NULL); + evas_object_image_fill_set(o, 0, 0, 120, 160); + evas_object_resize(o, 120, 160); + evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS); + evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM); + evas_object_show(o); + src = o; + o_images[i] = src; + } + + done = 0; +} + +/* cleanup */ +static void _cleanup(void) +{ + int i; + for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); +} + +/* loop - do things */ +static void _loop(double t, int f) +{ + int i; + Evas_Coord x, y, w, h; + for (i = 0; i < OBNUM; i++) + { + w = 120; + h = 160; + x = (win_w / 2) - (w / 2); + x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); + y = (win_h / 2) - (h / 2); + y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); + evas_object_move(o_images[i], x, y); + evas_object_filter_param_float_set(o_images[i], "adjust", + ((i + f) % OBNUM) / (2.0 * OBNUM) - 1); + } + FPS_STD(NAME); +} + +/* prepend special key handlers if interactive (before STD) */ +static void _key(char *key) +{ + KEY_STD; +} + + + + + + + + + + + + +/* template stuff - ignore */ +# endif +#endif + +#ifdef UI +_ui_menu_item_add(ICON, NAME, FNAME); +#endif + +#ifdef PROTO +void FNAME(void); +#endif + +#ifndef PROTO +# ifndef UI +void FNAME(void) +{ + ui_func_set(_key, _loop); + _setup(); +} +# endif +#endif +#undef FNAME +#undef NAME +#undef ICON + diff --git a/src/bin/filter_object_brightness_solid.c b/src/bin/filter_object_brightness_solid.c new file mode 100644 index 0000000..849482e --- /dev/null +++ b/src/bin/filter_object_brightness_solid.c @@ -0,0 +1,111 @@ +#undef FNAME +#undef NAME +#undef ICON + +/* metadata */ +#define FNAME filter_object_brightness_solid +#define NAME "Filter Object Brightness Solid" +#define ICON "blend.png" + +#ifndef PROTO +# ifndef UI +# include "main.h" + +/* standard var */ +static int done = 0; +/* private data */ +static Evas_Object *o_images[OBNUM]; + +/* setup */ +static void _setup(void) +{ + int i; + Evas_Object *o,*src; + + for (i = 0; i < OBNUM; i++) + { + o = evas_object_image_add(evas); + evas_object_image_file_set(o, build_path("image.png"), NULL); + evas_object_image_fill_set(o, 0, 0, 120, 160); + evas_object_resize(o, 120, 160); + evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS); + evas_object_filter_param_float_set(o, "adjust", + i / (2.0 * OBNUM) - 1.0); + evas_object_layer_set(o,1); + evas_object_show(o); + src = o; + o_images[i] = src; + } + + done = 0; +} + +/* cleanup */ +static void _cleanup(void) +{ + int i; + for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]); +} + +/* loop - do things */ +static void _loop(double t, int f) +{ + int i; + Evas_Coord x, y, w, h; + for (i = 0; i < OBNUM; i++) + { + w = 120; + h = 160; + x = (win_w / 2) - (w / 2); + x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); + y = (win_h / 2) - (h / 2); + y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); + evas_object_move(o_images[i], x, y); + evas_object_filter_param_float_set(o_images[i], "adjust", + (((i + f) % OBNUM) * 2.0) / (OBNUM) - 1.0); + } + FPS_STD(NAME); +} + +/* prepend special key handlers if interactive (before STD) */ +static void _key(char *key) +{ + KEY_STD; +} + + + + + + + + + + + + +/* template stuff - ignore */ +# endif +#endif + +#ifdef UI +_ui_menu_item_add(ICON, NAME, FNAME); +#endif + +#ifdef PROTO +void FNAME(void); +#endif + +#ifndef PROTO +# ifndef UI +void FNAME(void) +{ + ui_func_set(_key, _loop); + _setup(); +} +# endif +#endif +#undef FNAME +#undef NAME +#undef ICON + diff --git a/src/bin/tests.h b/src/bin/tests.h index c500640..706f44c 100644 --- a/src/bin/tests.h +++ b/src/bin/tests.h @@ -110,6 +110,8 @@ #include "filter_object_invert_solid.c" #include "filter_object_greyscale.c" #include "filter_object_greyscale_solid.c" +#include "filter_object_brightness.c" +#include "filter_object_brightness_solid.c" #include "filter_object_sepia.c" #include "filter_object_sepia_solid.c" #include "filter_object_blur.c" diff --git a/src/bin/ui.c b/src/bin/ui.c index 91904ca..7b2eef2 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -182,15 +182,17 @@ static double weights[] = 1.000, 2.000, 1.000, - 2.000, - + 2.000, + 1.000, // test 111 2.000, - 1.000, + 1.000, 2.000, - 10.000, - - 10.000, // test 116 + 1.000, + + 2.000, // test 116 + 10.000, + 10.000, 0.0, // Exit