kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <cedric@osg.samsung.com>
This commit is contained in:
perepelits.m 2015-05-19 12:39:05 +02:00 committed by Cedric BAIL
parent fb2e000028
commit d7a53b11f6
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bin/edje/edje_cc_handlers.c
View File

@ -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:

18
src/lib/edje/edje_private.h
View File

@ -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 {