From d7a53b11f620568a1f374f34a4c24db6a57f6afa Mon Sep 17 00:00:00 2001 From: "perepelits.m" Date: Tue, 19 May 2015 12:39:05 +0200 Subject: [PATCH] edje: switch Evas_3D color to use Edje_Color. Summary: Changes float on uchar as we do in other place for color component Reviewers: raster, Hermet, cedric Reviewed By: cedric Subscribers: cedric, artem.popov Differential Revision: https://phab.enlightenment.org/D2528 Signed-off-by: Cedric BAIL --- src/bin/edje/edje_cc_handlers.c | 32 ++++++++++++++++---------------- src/lib/edje/edje_private.h | 18 ++++++------------ 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 21751d30ba..5b5d233a8d 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -9561,10 +9561,10 @@ st_collections_group_parts_part_description_properties_ambient(void) ed = (Edje_Part_Description_Light*) current_desc; - ed->light.properties.ambient.r = parse_float_range(0, 0.0, 1.0); - ed->light.properties.ambient.g = parse_float_range(1, 0.0, 1.0); - ed->light.properties.ambient.b = parse_float_range(2, 0.0, 1.0); - ed->light.properties.ambient.a = parse_float_range(3, 0.0, 1.0); + ed->light.properties.ambient.r = parse_int_range(0, 0, 255); + ed->light.properties.ambient.g = parse_int_range(1, 0, 255); + ed->light.properties.ambient.b = parse_int_range(2, 0, 255); + ed->light.properties.ambient.a = parse_int_range(3, 0, 255); break; } case EDJE_PART_TYPE_MESH_NODE: @@ -9573,10 +9573,10 @@ st_collections_group_parts_part_description_properties_ambient(void) ed = (Edje_Part_Description_Mesh_Node*) current_desc; - ed->mesh_node.properties.ambient.r = parse_float_range(0, 0.0, 1.0); - ed->mesh_node.properties.ambient.g = parse_float_range(1, 0.0, 1.0); - ed->mesh_node.properties.ambient.b = parse_float_range(2, 0.0, 1.0); - ed->mesh_node.properties.ambient.a = parse_float_range(3, 0.0, 1.0); + ed->mesh_node.properties.ambient.r = parse_int_range(0, 0, 255); + ed->mesh_node.properties.ambient.g = parse_int_range(1, 0, 255); + ed->mesh_node.properties.ambient.b = parse_int_range(2, 0, 255); + ed->mesh_node.properties.ambient.a = parse_int_range(3, 0, 255); break; } default: @@ -9611,10 +9611,10 @@ st_collections_group_parts_part_description_properties_diffuse(void) ed = (Edje_Part_Description_Light*) current_desc; - ed->light.properties.diffuse.r = parse_float_range(0, 0.0, 1.0); - ed->light.properties.diffuse.g = parse_float_range(1, 0.0, 1.0); - ed->light.properties.diffuse.b = parse_float_range(2, 0.0, 1.0); - ed->light.properties.diffuse.a = parse_float_range(3, 0.0, 1.0); + ed->light.properties.diffuse.r = parse_int_range(0, 0, 255); + ed->light.properties.diffuse.g = parse_int_range(1, 0, 255); + ed->light.properties.diffuse.b = parse_int_range(2, 0, 255); + ed->light.properties.diffuse.a = parse_int_range(3, 0, 255); break; } case EDJE_PART_TYPE_MESH_NODE: @@ -9623,10 +9623,10 @@ st_collections_group_parts_part_description_properties_diffuse(void) ed = (Edje_Part_Description_Mesh_Node*) current_desc; - ed->mesh_node.properties.diffuse.r = parse_float_range(0, 0.0, 1.0); - ed->mesh_node.properties.diffuse.g = parse_float_range(1, 0.0, 1.0); - ed->mesh_node.properties.diffuse.b = parse_float_range(2, 0.0, 1.0); - ed->mesh_node.properties.diffuse.a = parse_float_range(3, 0.0, 1.0); + ed->mesh_node.properties.diffuse.r = parse_int_range(0, 0, 255); + ed->mesh_node.properties.diffuse.g = parse_int_range(1, 0, 255); + ed->mesh_node.properties.diffuse.b = parse_int_range(2, 0, 255); + ed->mesh_node.properties.diffuse.a = parse_int_range(3, 0, 255); break; } default: diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index d3e120c22d..e5507e44fb 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -253,11 +253,6 @@ struct _Edje_Color unsigned char r, g, b, a; }; -struct _Edje_Float_Color -{ - FLOAT_T r, g, b, a; -}; - struct _Edje_Map_Color { int idx; @@ -304,7 +299,6 @@ typedef struct _Edje_Position Edje_Position; typedef struct _Edje_Size Edje_Size; typedef struct _Edje_Rectangle Edje_Rectangle; typedef struct _Edje_Color Edje_Color; -typedef struct _Edje_Float_Color Edje_Float_Color; typedef struct _Edje_Map_Color Edje_Map_Color; typedef struct _Edje_Aspect_Prefer Edje_Aspect_Prefer; typedef struct _Edje_Aspect Edje_Aspect; @@ -1386,9 +1380,9 @@ struct _Edje_Part_Description_Spec_Mesh_Node } texture; struct { - Edje_Float_Color ambient; - Edje_Float_Color diffuse; - Edje_Float_Color specular; + Edje_Color ambient; + Edje_Color diffuse; + Edje_Color specular; Eina_Bool normal; FLOAT_T shininess; Evas_3D_Shade_Mode shade; @@ -1415,9 +1409,9 @@ struct _Edje_Part_Description_Spec_Mesh_Node struct _Edje_Part_Description_Spec_Light { struct { - Edje_Float_Color ambient; - Edje_Float_Color diffuse; - Edje_Float_Color specular; + Edje_Color ambient; + Edje_Color diffuse; + Edje_Color specular; } properties; struct {