Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/buffer Modified Files: evas_engine.c Log Message: joses's gradient work - gradient look nice. one problem jose.. USE BRACKETS! do NOT depend on order operation precedence. it broke scaling. laos other completely bizarre mmx things were going wrong with mm7 ending up not 0 so i've had to force it to be 0. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/buffer/evas_engine.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- evas_engine.c 6 Nov 2005 05:44:10 -0000 1.20 +++ evas_engine.c 3 Dec 2005 09:27:51 -0000 1.21 @@ -42,14 +42,25 @@ static int evas_engine_buffer_context_multiplier_get(void *data, void *context, int *r, int *g, int *b, int *a); static void evas_engine_buffer_context_cutout_add(void *data, void *context, int x, int y, int w, int h); static void evas_engine_buffer_context_cutout_clear(void *data, void *context); -static void evas_engine_buffer_draw_rectangle(void *data, void *context, void *surface, int x, int y, int w, int h); +static void evas_engine_buffer_context_anti_alias_set(void *data, void *context, unsigned char aa); +static unsigned char evas_engine_buffer_context_anti_alias_get(void *data, void *context); +static void evas_engine_buffer_context_color_interpolation_set(void *data, void *context, int color_space); +static int evas_engine_buffer_context_color_interpolation_get(void *data, void *context); +static void evas_engine_buffer_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h); static void evas_engine_buffer_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2); static void *evas_engine_buffer_polygon_point_add(void *data, void *context, void *polygon, int x, int y); static void *evas_engine_buffer_polygon_points_clear(void *data, void *context, void *polygon); static void evas_engine_buffer_polygon_draw(void *data, void *context, void *surface, void *polygon); static void *evas_engine_buffer_gradient_color_add(void *data, void *context, void *gradient, int r, int g, int b, int a, int distance); static void *evas_engine_buffer_gradient_colors_clear(void *data, void *context, void *gradient); -static void evas_engine_buffer_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle); +static void evas_engine_buffer_gradient_free(void *data, void *gradient); +static void evas_engine_buffer_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h); +static void evas_engine_buffer_gradient_type_set(void *data, void *gradient, char *name); +static void evas_engine_buffer_gradient_type_params_set(void *data, void *gradient, char *params); +static void *evas_engine_buffer_gradient_geometry_init(void *data, void *gradient, int spread); +static int evas_engine_buffer_gradient_alpha_get(void *data, void *gradient, int spread); +static void evas_engine_buffer_gradient_map(void *data, void *context, void *gradient, int spread); +static void evas_engine_buffer_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle, int spread); static void *evas_engine_buffer_image_load(void *data, char *file, char *key, int *error); static void *evas_engine_buffer_image_new_from_data(void *data, int w, int h, DATA32 *image_data); static void *evas_engine_buffer_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data); @@ -126,14 +137,28 @@ evas_engine_buffer_context_multiplier_get, evas_engine_buffer_context_cutout_add, evas_engine_buffer_context_cutout_clear, - /* rectangle draw funcs */ - evas_engine_buffer_draw_rectangle, + evas_engine_buffer_context_anti_alias_set, + evas_engine_buffer_context_anti_alias_get, + evas_engine_buffer_context_color_interpolation_set, + evas_engine_buffer_context_color_interpolation_get, + /* rect draw funcs */ + evas_engine_buffer_rectangle_draw, + /* line draw funcs */ evas_engine_buffer_line_draw, + /* polygon draw funcs */ evas_engine_buffer_polygon_point_add, evas_engine_buffer_polygon_points_clear, evas_engine_buffer_polygon_draw, + /* gradient draw funcs */ evas_engine_buffer_gradient_color_add, evas_engine_buffer_gradient_colors_clear, + evas_engine_buffer_gradient_free, + evas_engine_buffer_gradient_fill_set, + evas_engine_buffer_gradient_type_set, + evas_engine_buffer_gradient_type_params_set, + evas_engine_buffer_gradient_geometry_init, + evas_engine_buffer_gradient_alpha_get, + evas_engine_buffer_gradient_map, evas_engine_buffer_gradient_draw, /* image draw funcs */ evas_engine_buffer_image_load, @@ -576,7 +601,45 @@ } static void -evas_engine_buffer_draw_rectangle(void *data, void *context, void *surface, int x, int y, int w, int h) +evas_engine_buffer_context_anti_alias_set(void *data, void *context, unsigned char aa) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + evas_common_draw_context_set_anti_alias(context, aa); +} + +static unsigned char +evas_engine_buffer_context_anti_alias_get(void *data, void *context) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + return ((RGBA_Draw_Context *)context)->anti_alias; +} + +static void +evas_engine_buffer_context_color_interpolation_set(void *data, void *context, int color_space) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + evas_common_draw_context_set_color_interpolation(context, color_space); +} + +static int +evas_engine_buffer_context_color_interpolation_get(void *data, void *context) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + return ((RGBA_Draw_Context *)context)->interpolation.color_space; +} + + + +static void +evas_engine_buffer_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h) { Render_Engine *re; @@ -644,18 +707,83 @@ Render_Engine *re; re = (Render_Engine *)data; - if (gradient) evas_common_gradient_free(gradient); - return NULL; - context = 0; + evas_common_gradient_colors_clear(gradient); + return gradient; + context = NULL; +} + +static void +evas_engine_buffer_gradient_free(void *data, void *gradient) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + evas_common_gradient_free(gradient); +} + +static void +evas_engine_buffer_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + evas_common_gradient_fill_set(gradient, x, y, w, h); +} + +static void +evas_engine_buffer_gradient_type_set(void *data, void *gradient, char *name) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + evas_common_gradient_type_set(gradient, name); +} + +static void +evas_engine_buffer_gradient_type_params_set(void *data, void *gradient, char *params) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + evas_common_gradient_type_params_set(gradient, params); +} + +static void * +evas_engine_buffer_gradient_geometry_init(void *data, void *gradient, int spread) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + gradient = evas_common_gradient_geometry_init(gradient, spread); + return gradient; +} + +static int +evas_engine_buffer_gradient_alpha_get(void *data, void *gradient, int spread) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + return evas_common_gradient_has_alpha(gradient, spread); +} + +static void +evas_engine_buffer_gradient_map(void *data, void *context, void *gradient, int spread) +{ + Render_Engine *re; + + re = (Render_Engine *)data; + evas_common_gradient_map(context, gradient, spread); + evas_common_cpu_end_opt(); } static void -evas_engine_buffer_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle) +evas_engine_buffer_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle, int spread) { Render_Engine *re; re = (Render_Engine *)data; - evas_common_gradient_draw(surface, context, x, y, w, h, gradient, angle); + evas_common_gradient_draw(surface, context, x, y, w, h, gradient, angle, spread); evas_common_cpu_end_opt(); } ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs