summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Shcherbina <o.shcherbina@samsung.com>2015-07-14 11:19:35 +0100
committerTom Hacohen <tom@stosb.com>2015-08-04 10:57:14 +0100
commit60b16be772bfa5d799dd405deb66c4dd85bd76ab (patch)
tree8078c46a13f94befeb29f2a4b94f10033420682c
parent086a501be6d5f25c4e91d3de143984d78b4b83a0 (diff)
Evas canvas3d: Move evas 3d types to evas_types.eot
Summary: Move evas_canvas3d types from Evas_Eo.h to evas_types.eot Change enum constatnt for vertex_arrtib, material_attrib, blend_func Correct namespace for Evas.Real type Reviewers: cedric, tasn Reviewed By: tasn Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2734
-rw-r--r--src/bin/edje/edje_cc_handlers.c10
-rw-r--r--src/examples/evas/evas-3d-aabb.c18
-rw-r--r--src/examples/evas/evas-3d-blending.c74
-rw-r--r--src/examples/evas/evas-3d-colorpick.c16
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c12
-rw-r--r--src/examples/evas/evas-3d-cube.c20
-rw-r--r--src/examples/evas/evas-3d-cube2.c38
-rw-r--r--src/examples/evas/evas-3d-eet.c14
-rw-r--r--src/examples/evas/evas-3d-fog.c12
-rw-r--r--src/examples/evas/evas-3d-frustum.c30
-rw-r--r--src/examples/evas/evas-3d-md2.c16
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c14
-rw-r--r--src/examples/evas/evas-3d-obj.c16
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c48
-rw-r--r--src/examples/evas/evas-3d-pick.c14
-rw-r--r--src/examples/evas/evas-3d-ply.c16
-rw-r--r--src/examples/evas/evas-3d-proxy.c14
-rw-r--r--src/examples/evas/evas-3d-shadows.c48
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-header.c6
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-macros.h27
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c48
-rw-r--r--src/lib/edje/edje_calc.c18
-rw-r--r--src/lib/evas/Evas_Eo.h391
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.eo38
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.eo102
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.eo18
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c32
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.eo20
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.eo82
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.eo8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.eo34
-rw-r--r--src/lib/evas/canvas/evas_types.eot280
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.h18
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d.c136
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c30
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d_shader.c92
-rw-r--r--src/modules/evas/model_loaders/eet/evas_model_load_eet.c38
-rw-r--r--src/modules/evas/model_loaders/md2/evas_model_load_md2.c24
-rw-r--r--src/modules/evas/model_loaders/obj/evas_model_load_obj.c24
-rw-r--r--src/modules/evas/model_loaders/ply/evas_model_load_ply.c32
-rw-r--r--src/modules/evas/model_savers/eet/evas_model_save_eet.c6
-rw-r--r--src/modules/evas/model_savers/obj/evas_model_save_obj.c30
-rw-r--r--src/modules/evas/model_savers/ply/evas_model_save_ply.c8
-rw-r--r--src/tests/evas/evas_test_mesh.c8
48 files changed, 950 insertions, 1048 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 9f2e21b50b..e002d19aa4 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -10018,11 +10018,11 @@ st_collections_group_parts_part_description_properties_material(void)
10018 check_arg_count(1); 10018 check_arg_count(1);
10019 10019
10020 material_attrib = parse_enum(0, 10020 material_attrib = parse_enum(0,
10021 "AMBIENT", EVAS_CANVAS3D_MATERIAL_AMBIENT, 10021 "AMBIENT", EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
10022 "DIFFUSE", EVAS_CANVAS3D_MATERIAL_DIFFUSE, 10022 "DIFFUSE", EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
10023 "SPECULAR", EVAS_CANVAS3D_MATERIAL_SPECULAR, 10023 "SPECULAR", EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
10024 "EMISSION", EVAS_CANVAS3D_MATERIAL_EMISSION, 10024 "EMISSION", EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION,
10025 "NORMAL", EVAS_CANVAS3D_MATERIAL_NORMAL, 10025 "NORMAL", EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL,
10026 NULL); 10026 NULL);
10027 10027
10028 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 10028 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index c9aa61b936..c8d906c881 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -196,16 +196,16 @@ main(void)
196 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, 196 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
197 EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 197 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
198 eo_do(material, 198 eo_do(material,
199 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture), 199 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture),
200 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 200 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
201 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 201 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
202 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 202 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
203 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 203 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
204 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 204 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
205 0.01, 0.01, 0.01, 1.0), 205 0.01, 0.01, 0.01, 1.0),
206 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 206 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
207 1.0, 1.0, 1.0, 1.0), 207 1.0, 1.0, 1.0, 1.0),
208 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 208 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
209 1.0, 1.0, 1.0, 1.0), 209 1.0, 1.0, 1.0, 1.0),
210 evas_canvas3d_material_shininess_set(50.0)); 210 evas_canvas3d_material_shininess_set(50.0));
211 211
@@ -215,7 +215,7 @@ main(void)
215 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); 215 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
216 216
217 material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 217 material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
218 eo_do(material_box, evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE)); 218 eo_do(material_box, evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE));
219 219
220 cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 220 cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
221 eo_do(cube, 221 eo_do(cube,
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index b2ea64812c..98bd74afb5 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -22,35 +22,35 @@
22static const char *blend_func_names[] = 22static const char *blend_func_names[] =
23{ 23{
24 /**< The scale factors for color components is (0, 0, 0, 0)*/ 24 /**< The scale factors for color components is (0, 0, 0, 0)*/
25 "EVAS_CANVAS3D_BLEND_ZERO", 25 "EVAS_CANVAS3D_BLEND_FUNC_ZERO",
26 /**< The scale factors for color components is (1, 1, 1, 1)*/ 26 /**< The scale factors for color components is (1, 1, 1, 1)*/
27 "EVAS_CANVAS3D_BLEND_ONE", 27 "EVAS_CANVAS3D_BLEND_FUNC_ONE",
28 /**< The scale factors for color components is (Rs/kR, Gs/kG, Bs/kB, As/kA)*/ 28 /**< The scale factors for color components is (Rs/kR, Gs/kG, Bs/kB, As/kA)*/
29 "EVAS_CANVAS3D_BLEND_SRC_COLOR", 29 "EVAS_CANVAS3D_BLEND_FUNC_SRC_COLOR",
30 /**< The scale factors for color components is (1, 1, 1, 1) - (Rs/kR, Gs/kG, Bs/kB, As/kA)*/ 30 /**< The scale factors for color components is (1, 1, 1, 1) - (Rs/kR, Gs/kG, Bs/kB, As/kA)*/
31 "EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_COLOR", 31 "EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_COLOR",
32 /**< The scale factors for color components is (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/ 32 /**< The scale factors for color components is (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/
33 "EVAS_CANVAS3D_BLEND_DST_COLOR", 33 "EVAS_CANVAS3D_BLEND_FUNC_DST_COLOR",
34 /**< The scale factors for color components is (1, 1, 1, 1) - (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/ 34 /**< The scale factors for color components is (1, 1, 1, 1) - (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/
35 "EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_COLOR", 35 "EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_DST_COLOR",
36 /**< The scale factors for color components is (As/kA, As/kA, As/kA, As/kA)*/ 36 /**< The scale factors for color components is (As/kA, As/kA, As/kA, As/kA)*/
37 "EVAS_CANVAS3D_BLEND_SRC_ALPHA", 37 "EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA",
38 /**< The scale factors for color components is (1, 1, 1, 1) - (As/kA, As/kA, As/kA, As/kA)*/ 38 /**< The scale factors for color components is (1, 1, 1, 1) - (As/kA, As/kA, As/kA, As/kA)*/
39 "EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA", 39 "EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA",
40 /**< The scale factors for color components is (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/ 40 /**< The scale factors for color components is (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/
41 "EVAS_CANVAS3D_BLEND_DST_ALPHA", 41 "EVAS_CANVAS3D_BLEND_FUNC_DST_ALPHA",
42 /**< The scale factors for color components is (1, 1, 1, 1) - (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/ 42 /**< The scale factors for color components is (1, 1, 1, 1) - (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/
43 "EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_ALPHA", 43 "EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_DST_ALPHA",
44 /**< The scale factors for color components is (Rc, Gc, Bc, Ac)*/ 44 /**< The scale factors for color components is (Rc, Gc, Bc, Ac)*/
45 "EVAS_CANVAS3D_BLEND_CONSTANT_COLOR", 45 "EVAS_CANVAS3D_BLEND_FUNC_CONSTANT_COLOR",
46 /**< The scale factors for color components is (1, 1, 1, 1) - (Rc, Gc, Bc, Ac)*/ 46 /**< The scale factors for color components is (1, 1, 1, 1) - (Rc, Gc, Bc, Ac)*/
47 "EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_COLOR", 47 "EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_CONSTANT_COLOR",
48 /**< The scale factors for color components is (Ac, Ac, Ac, Ac)*/ 48 /**< The scale factors for color components is (Ac, Ac, Ac, Ac)*/
49 "EVAS_CANVAS3D_BLEND_CONSTANT_ALPHA", 49 "EVAS_CANVAS3D_BLEND_FUNC_CONSTANT_ALPHA",
50 /**< The scale factors for color components is (1, 1, 1, 1) - (Ac, Ac, Ac, Ac)*/ 50 /**< The scale factors for color components is (1, 1, 1, 1) - (Ac, Ac, Ac, Ac)*/
51 "EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_ALPHA", 51 "EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_CONSTANT_ALPHA",
52 /**< The scale factors for color components is (i, i, i, 1) where i = min(As, kA, Ad)/kA*/ 52 /**< The scale factors for color components is (i, i, i, 1) where i = min(As, kA, Ad)/kA*/
53 "EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE", 53 "EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE",
54}; 54};
55 55
56typedef struct _Scene_Data 56typedef struct _Scene_Data
@@ -75,8 +75,8 @@ Evas *evas = NULL;
75Eo *background = NULL; 75Eo *background = NULL;
76Eo *image = NULL; 76Eo *image = NULL;
77 77
78int func1 = EVAS_CANVAS3D_BLEND_SRC_ALPHA; 78int func1 = EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA;
79int func2 = EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA; 79int func2 = EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA;
80 80
81static void 81static void
82_on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info) 82_on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info)
@@ -93,15 +93,15 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
93 if (!strcmp("Right", ev->key)) 93 if (!strcmp("Right", ev->key))
94 func2--; 94 func2--;
95 95
96 if(func1 < EVAS_CANVAS3D_BLEND_ZERO) 96 if(func1 < EVAS_CANVAS3D_BLEND_FUNC_ZERO)
97 func1 = EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE; 97 func1 = EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE;
98 if(func1 > EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE) 98 if(func1 > EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE)
99 func1 = EVAS_CANVAS3D_BLEND_ZERO; 99 func1 = EVAS_CANVAS3D_BLEND_FUNC_ZERO;
100 100
101 if(func2 < EVAS_CANVAS3D_BLEND_ZERO) 101 if(func2 < EVAS_CANVAS3D_BLEND_FUNC_ZERO)
102 func2 = EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE; 102 func2 = EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE;
103 if(func2 > EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE) 103 if(func2 > EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE)
104 func2 = EVAS_CANVAS3D_BLEND_ZERO; 104 func2 = EVAS_CANVAS3D_BLEND_FUNC_ZERO;
105 eo_do(scene->mesh1, evas_canvas3d_mesh_blending_func_set(func1, func2)); 105 eo_do(scene->mesh1, evas_canvas3d_mesh_blending_func_set(func1, func2));
106 printf("sfactor = %s, dfactor = %s\n", blend_func_names[func1], blend_func_names[func2]); 106 printf("sfactor = %s, dfactor = %s\n", blend_func_names[func1], blend_func_names[func2]);
107} 107}
@@ -197,25 +197,25 @@ _mesh_setup(Scene_Data *data)
197 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 197 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
198 198
199 eo_do(data->material, 199 eo_do(data->material,
200 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 200 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
201 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 201 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
202 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 202 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
203 203
204 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 1.0, 0.2, 0.2, 0.2), 204 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 0.2, 0.2, 0.2),
205 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 0.0, 0.0, 0.2), 205 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 0.0, 0.0, 0.2),
206 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2), 206 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2),
207 evas_canvas3d_material_shininess_set(100.0)); 207 evas_canvas3d_material_shininess_set(100.0));
208 208
209 data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 209 data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
210 210
211 eo_do(data->material1, 211 eo_do(data->material1,
212 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 212 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
213 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 213 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
214 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 214 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
215 215
216 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 0.2, 0.2, 0.2), 216 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 0.2, 0.2, 0.2),
217 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.0, 0.0, 1.0, 0.2), 217 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.0, 0.0, 1.0, 0.2),
218 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2), 218 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2),
219 evas_canvas3d_material_shininess_set(100.0)); 219 evas_canvas3d_material_shininess_set(100.0));
220 220
221 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 221 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 0691fb2ea8..f0a6444d77 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -263,16 +263,16 @@ _init_sphere(void *this, const char *texture)
263 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, 263 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
264 EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 264 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
265 eo_do(sphere->material, 265 eo_do(sphere->material,
266 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, sphere->texture), 266 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, sphere->texture),
267 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 267 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
268 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 268 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
269 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 269 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
270 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 270 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
271 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 271 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
272 0.01, 0.01, 0.01, 1.0), 272 0.01, 0.01, 0.01, 1.0),
273 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 273 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
274 1.0, 1.0, 1.0, 1.0), 274 1.0, 1.0, 1.0, 1.0),
275 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 275 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
276 1.0, 1.0, 1.0, 1.0), 276 1.0, 1.0, 1.0, 1.0),
277 evas_canvas3d_material_shininess_set(50.0)); 277 evas_canvas3d_material_shininess_set(50.0));
278 return EINA_TRUE; 278 return EINA_TRUE;
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index b78ed03228..eec0234960 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -191,12 +191,12 @@ _mesh_setup(Scene_Data *data)
191 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 191 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
192 192
193 eo_do(data->material, 193 eo_do(data->material,
194 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 194 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
195 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 195 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
196 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 196 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
197 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 197 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
198 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 198 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
199 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 199 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
200 evas_canvas3d_material_shininess_set(100.0)); 200 evas_canvas3d_material_shininess_set(100.0));
201 201
202 /* Setup primitive */ 202 /* Setup primitive */
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index 1ed4a07525..d3bcbbe6b5 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -176,13 +176,13 @@ _mesh_setup(Scene_Data *data)
176 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 176 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
177 177
178 eo_do(data->material, 178 eo_do(data->material,
179 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 179 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
180 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 180 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
181 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 181 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
182 182
183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
184 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 184 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
185 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 185 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
186 evas_canvas3d_material_shininess_set(100.0)); 186 evas_canvas3d_material_shininess_set(100.0));
187 187
188 /* Setup mesh. */ 188 /* Setup mesh. */
@@ -191,13 +191,13 @@ _mesh_setup(Scene_Data *data)
191 evas_canvas3d_mesh_vertex_count_set(24), 191 evas_canvas3d_mesh_vertex_count_set(24),
192 evas_canvas3d_mesh_frame_add(0), 192 evas_canvas3d_mesh_frame_add(0),
193 193
194 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION, 194 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
195 12 * sizeof(float), &cube_vertices[ 0]), 195 12 * sizeof(float), &cube_vertices[ 0]),
196 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL, 196 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
197 12 * sizeof(float), &cube_vertices[ 3]), 197 12 * sizeof(float), &cube_vertices[ 3]),
198 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR, 198 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
199 12 * sizeof(float), &cube_vertices[ 6]), 199 12 * sizeof(float), &cube_vertices[ 6]),
200 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD, 200 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
201 12 * sizeof(float), &cube_vertices[10]), 201 12 * sizeof(float), &cube_vertices[10]),
202 202
203 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 203 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index c053867107..a2dd1febf5 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -156,25 +156,25 @@ _mesh_setup(Scene_Data *data)
156 data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 156 data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
157 157
158 eo_do(data->material0, 158 eo_do(data->material0,
159 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 159 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
160 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 160 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
161 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 161 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
162 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 162 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
163 163
164 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 164 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
165 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 165 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
166 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 166 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
167 evas_canvas3d_material_shininess_set(100.0)); 167 evas_canvas3d_material_shininess_set(100.0));
168 168
169 eo_do(data->material1, 169 eo_do(data->material1,
170 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 170 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
171 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 171 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
172 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 172 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
173 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 173 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
174 174
175 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 175 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
176 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 176 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
177 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 177 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
178 evas_canvas3d_material_shininess_set(100.0)); 178 evas_canvas3d_material_shininess_set(100.0));
179 179
180 data->texture0 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 180 data->texture0 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
@@ -189,11 +189,11 @@ _mesh_setup(Scene_Data *data)
189 evas_canvas3d_texture_file_set(normal_map_path, NULL)); 189 evas_canvas3d_texture_file_set(normal_map_path, NULL));
190 190
191 eo_do(data->material0, 191 eo_do(data->material0,
192 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture0)); 192 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture0));
193 eo_do(data->material1, 193 eo_do(data->material1,
194 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture1)); 194 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture1));
195 eo_do(data->material1, 195 eo_do(data->material1,
196 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, data->texture_normal)); 196 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_normal));
197 197
198 /* Set data of primitive */ 198 /* Set data of primitive */
199 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 199 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index 370351656d..9067825e00 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -166,15 +166,15 @@ main(void)
166 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); 166 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
167 167
168 eo_do(material, 168 eo_do(material,
169 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 169 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
170 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 170 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
171 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 171 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
172 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 172 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
173 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 173 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
174 0.50, 0.50, 0.00, 0.30), 174 0.50, 0.50, 0.00, 0.30),
175 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 175 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
176 0.00, 0.50, 0.50, 0.30), 176 0.00, 0.50, 0.50, 0.30),
177 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 177 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
178 0.50, 0.00, 0.50, 0.30), 178 0.50, 0.00, 0.50, 0.30),
179 evas_canvas3d_material_shininess_set(50.0)); 179 evas_canvas3d_material_shininess_set(50.0));
180 180
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index a767c2d1d8..5d191e800f 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -136,13 +136,13 @@ _mesh_setup(Scene_Data *data)
136 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 136 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
137 137
138 eo_do(data->material, 138 eo_do(data->material,
139 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 139 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
140 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 140 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
141 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 141 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
142 142
143 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 143 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
144 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 144 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
145 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 145 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
146 evas_canvas3d_material_shininess_set(100.0)); 146 evas_canvas3d_material_shininess_set(100.0));
147 147
148 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 148 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 15e5e3ca6b..e6a54f63a3 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -334,13 +334,13 @@ _mesh_setup(Scene_Data *data)
334 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 334 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
335 335
336 eo_do(data->material, 336 eo_do(data->material,
337 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 337 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
338 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 338 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
339 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 339 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
340 340
341 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 341 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
342 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 342 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
343 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 343 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
344 evas_canvas3d_material_shininess_set(100.0)); 344 evas_canvas3d_material_shininess_set(100.0));
345 345
346 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 346 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
@@ -385,15 +385,15 @@ _mesh_setup_model(Scene_Data *data)
385 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 385 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT));
386 386
387 eo_do(data->material_model, 387 eo_do(data->material_model,
388 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 388 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
389 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 389 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
390 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 390 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
391 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE); 391 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
392 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 392 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
393 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 1.0), 393 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0),
394 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 394 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
395 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 395 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
396 evas_canvas3d_material_texture_set( EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture_model), 396 evas_canvas3d_material_texture_set( EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_model),
397 evas_canvas3d_material_shininess_set(100.0)); 397 evas_canvas3d_material_shininess_set(100.0));
398 398
399 eo_do(data->mesh_model, 399 eo_do(data->mesh_model,
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 282727497e..9409efc5b7 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -149,16 +149,16 @@ main(void)
149 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, 149 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
150 EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 150 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
151 eo_do(material, 151 eo_do(material,
152 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture), 152 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture),
153 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 153 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
154 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 154 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
155 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 155 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
156 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 156 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
157 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 157 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
158 0.01, 0.01, 0.01, 1.0), 158 0.01, 0.01, 0.01, 1.0),
159 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 159 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
160 1.0, 1.0, 1.0, 1.0), 160 1.0, 1.0, 1.0, 1.0),
161 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 161 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
162 1.0, 1.0, 1.0, 1.0), 162 1.0, 1.0, 1.0, 1.0),
163 evas_canvas3d_material_shininess_set(50.0)); 163 evas_canvas3d_material_shininess_set(50.0));
164 164
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 6ff754a515..39f6d34a6b 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -231,15 +231,15 @@ main(void)
231 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 231 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
232 232
233 eo_do(material, 233 eo_do(material,
234 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 234 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
235 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 235 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
236 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 236 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
237 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 237 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
238 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 238 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
239 0.01, 0.01, 0.01, 1.0), 239 0.01, 0.01, 0.01, 1.0),
240 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 240 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
241 1.0, 1.0, 0.0, 1.0), 241 1.0, 1.0, 0.0, 1.0),
242 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 242 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
243 0.5, 0.0, 1.0, 1.0), 243 0.5, 0.0, 1.0, 1.0),
244 evas_canvas3d_material_shininess_set(50.0)); 244 evas_canvas3d_material_shininess_set(50.0));
245 245
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 2f998754ab..0d40a4125a 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -78,15 +78,15 @@
78#define ADD_MATERIAL(name) \ 78#define ADD_MATERIAL(name) \
79 name = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); \ 79 name = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); \
80 eo_do(name, \ 80 eo_do(name, \
81 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), \ 81 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), \
82 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), \ 82 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), \
83 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),\ 83 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),\
84 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), \ 84 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), \
85 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, \ 85 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \
86 COL_RED, 0.5), \ 86 COL_RED, 0.5), \
87 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, \ 87 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \
88 COL_GREEN, 0.5), \ 88 COL_GREEN, 0.5), \
89 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, \ 89 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, \
90 COL_BLUE, 0.5), \ 90 COL_BLUE, 0.5), \
91 evas_canvas3d_material_shininess_set(100.0)); 91 evas_canvas3d_material_shininess_set(100.0));
92 92
@@ -211,7 +211,7 @@ main(void)
211 211
212 ADD_MATERIAL(material_with_tex) 212 ADD_MATERIAL(material_with_tex)
213 eo_do(material_with_tex, 213 eo_do(material_with_tex,
214 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture)); 214 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture));
215 215
216 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES)) 216 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES))
217 fprintf(stderr, "Failed to create folder %s\n\n", 217 fprintf(stderr, "Failed to create folder %s\n\n",
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index 70d24b311e..fd1e8ce18b 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -155,18 +155,18 @@ _mesh_setup(Scene_Data *data)
155 EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 155 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
156 156
157 eo_do(data->material_rocks, 157 eo_do(data->material_rocks,
158 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, data->texture_rocks_n), 158 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_rocks_n),
159 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture_rocks), 159 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_rocks),
160 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, data->texture_rocks), 160 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, data->texture_rocks),
161 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, data->texture_rocks), 161 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, data->texture_rocks),
162 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 162 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
163 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 163 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
164 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 164 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
165 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 165 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
166 166
167 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0), 167 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0),
168 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 168 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
169 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 169 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
170 evas_canvas3d_material_shininess_set(100.0)); 170 evas_canvas3d_material_shininess_set(100.0));
171 171
172 data->material_wood = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 172 data->material_wood = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
@@ -181,18 +181,18 @@ _mesh_setup(Scene_Data *data)
181 EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 181 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
182 182
183 eo_do(data->material_wood, 183 eo_do(data->material_wood,
184 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, data->texture_four_n), 184 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_four_n),
185 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture_wood), 185 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture_wood),
186 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, data->texture_wood), 186 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, data->texture_wood),
187 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, data->texture_wood), 187 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, data->texture_wood),
188 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 188 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
189 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 189 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
190 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 190 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
191 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 191 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
192 192
193 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0), 193 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0),
194 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 194 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
195 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 195 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
196 evas_canvas3d_material_shininess_set(100.0)); 196 evas_canvas3d_material_shininess_set(100.0));
197 197
198 /* Set data of primitive */ 198 /* Set data of primitive */
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 261acc49d4..db8389ae36 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -170,17 +170,17 @@ main(void)
170 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, 170 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
171 EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR)); 171 EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR));
172 eo_do(material, 172 eo_do(material,
173 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 173 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
174 texture_diffuse), 174 texture_diffuse),
175 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 175 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
176 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 176 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
177 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 177 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
178 178
179 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 179 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01,
180 1.0), 180 1.0),
181 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 181 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0,
182 1.0), 182 1.0),
183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0,
184 1.0), 184 1.0),
185 evas_canvas3d_material_shininess_set(50.0)); 185 evas_canvas3d_material_shininess_set(50.0));
186 186
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 341011a55a..10881aa731 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -171,16 +171,16 @@ main(void)
171 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, 171 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
172 EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 172 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
173 eo_do(material, 173 eo_do(material,
174 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture), 174 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture),
175 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 175 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
176 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 176 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
177 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 177 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
178 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 178 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
179 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 179 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
180 0.01, 0.01, 0.01, 1.0), 180 0.01, 0.01, 0.01, 1.0),
181 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 181 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
182 1.0, 1.0, 1.0, 1.0), 182 1.0, 1.0, 1.0, 1.0),
183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
184 1.0, 1.0, 1.0, 1.0), 184 1.0, 1.0, 1.0, 1.0),
185 evas_canvas3d_material_shininess_set(50.0)); 185 evas_canvas3d_material_shininess_set(50.0));
186 186
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 14bb7a3491..48d85e474d 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -148,16 +148,16 @@ _mesh_setup(Scene_Data *data)
148 evas_canvas3d_texture_source_visible_set(EINA_TRUE)); 148 evas_canvas3d_texture_source_visible_set(EINA_TRUE));
149 149
150 eo_do(data->material, 150 eo_do(data->material,
151 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 151 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
152 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 152 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
153 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 153 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
154 154
155 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 155 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
156 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 156 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
157 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 157 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
158 evas_canvas3d_material_shininess_set(100.0), 158 evas_canvas3d_material_shininess_set(100.0),
159 159
160 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture)); 160 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture));
161 161
162 /* Set data of primitive */ 162 /* Set data of primitive */
163 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 163 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 91d5a75186..179d1825cd 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -182,13 +182,13 @@ _body_material_set(Body_3D *body, float r, float g, float b)
182 body->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 182 body->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
183 183
184 eo_do(body->material, 184 eo_do(body->material,
185 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 185 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
186 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 186 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
187 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 187 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
188 188
189 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, r, g, b, 1.0), 189 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, r, g, b, 1.0),
190 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, r, g, b, 1.0), 190 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, r, g, b, 1.0),
191 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 191 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
192 evas_canvas3d_material_shininess_set(100.0)); 192 evas_canvas3d_material_shininess_set(100.0));
193 193
194 eo_do(body->mesh, 194 eo_do(body->mesh,
@@ -283,16 +283,16 @@ _fence_setup(Body_3D *fence)
283 fence->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 283 fence->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
284 284
285 eo_do(fence->material, 285 eo_do(fence->material,
286 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture), 286 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture),
287 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, texture), 287 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, texture),
288 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 288 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
289 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 289 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
290 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 290 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
291 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 291 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
292 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, texture1), 292 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, texture1),
293 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 1.0, 1.0, 1.0, 1.0), 293 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 1.0, 1.0, 1.0),
294 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 294 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
295 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 295 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
296 evas_canvas3d_material_shininess_set(100.0)); 296 evas_canvas3d_material_shininess_set(100.0));
297 297
298 fence->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 298 fence->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
@@ -374,11 +374,11 @@ _model_setup(Body_3D *model)
374 model->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 374 model->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
375 375
376 eo_do(model->material, 376 eo_do(model->material,
377 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, model->texture), 377 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, model->texture),
378 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, model->texture), 378 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, model->texture),
379 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 379 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
380 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 380 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
381 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 381 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
382 evas_canvas3d_material_shininess_set(100.0)); 382 evas_canvas3d_material_shininess_set(100.0));
383 383
384 384
@@ -418,7 +418,7 @@ _billboard_setup(Scene_Data *data)
418 _body_material_set(&(data->billboard), 1.0, 1.0, 1.0); 418 _body_material_set(&(data->billboard), 1.0, 1.0, 1.0);
419 419
420 eo_do(data->billboard.material, 420 eo_do(data->billboard.material,
421 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->billboard.texture)); 421 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->billboard.texture));
422 422
423 eo_do(data->billboard.mesh, 423 eo_do(data->billboard.mesh,
424 evas_canvas3d_mesh_frame_material_set(0, data->billboard.material), 424 evas_canvas3d_mesh_frame_material_set(0, data->billboard.material),
@@ -426,8 +426,8 @@ _billboard_setup(Scene_Data *data)
426 evas_canvas3d_mesh_alpha_test_enable_set(EINA_TRUE), 426 evas_canvas3d_mesh_alpha_test_enable_set(EINA_TRUE),
427 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE), 427 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE),
428 evas_canvas3d_mesh_blending_enable_set(EINA_TRUE), 428 evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
429 evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_SRC_ALPHA, 429 evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA,
430 EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA)); 430 EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA));
431 431
432 data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, 432 data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
433 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); 433 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.c b/src/examples/evas/shooter/evas-3d-shooter-header.c
index 988f85dc8e..894df546f0 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-header.c
+++ b/src/examples/evas/shooter/evas-3d-shooter-header.c
@@ -153,7 +153,7 @@ Eina_Bool _mesh_aabb(Evas_Canvas3D_Mesh **mesh, Scene_Data *scene, int index)
153 { 153 {
154 eo_do(*mesh, 154 eo_do(*mesh,
155 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES), 155 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES),
156 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION, 6 * sizeof(float), &vertixes[ 0]), 156 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 6 * sizeof(float), &vertixes[ 0]),
157 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 48, &indixes[0])); 157 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 48, &indixes[0]));
158 158
159 return EINA_TRUE; 159 return EINA_TRUE;
@@ -366,9 +366,9 @@ _set_ball(Eo *mesh, int p)
366 366
367 eo_do(mesh, evas_canvas3d_mesh_vertex_count_set(vcount), 367 eo_do(mesh, evas_canvas3d_mesh_vertex_count_set(vcount),
368 evas_canvas3d_mesh_frame_add(0); 368 evas_canvas3d_mesh_frame_add(0);
369 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION, 369 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
370 sizeof(vec3), &vertices[0]); 370 sizeof(vec3), &vertices[0]);
371 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL, 371 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
372 sizeof(vec3), &normals[0]); 372 sizeof(vec3), &normals[0]);
373 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 373 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
374 icount , &indices[0])); 374 icount , &indices[0]));
diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h
index bf3964a561..e19a507f17 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-macros.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h
@@ -130,13 +130,13 @@ typedef struct _vec2
130 data->material_##Object = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); \ 130 data->material_##Object = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); \
131 \ 131 \
132 eo_do(data->material_##Object, \ 132 eo_do(data->material_##Object, \
133 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), \ 133 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), \
134 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), \ 134 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), \
135 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), \ 135 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), \
136 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), \ 136 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), \
137 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, a, a, a, 1.0), \ 137 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, a, a, a, 1.0), \
138 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, d, d, d, 1.0), \ 138 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, d, d, d, 1.0), \
139 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, s, s, s, 1.0), \ 139 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, s, s, s, 1.0), \
140 evas_canvas3d_material_shininess_set(50.0)); \ 140 evas_canvas3d_material_shininess_set(50.0)); \
141 \ 141 \
142 data->mesh_##Name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 142 data->mesh_##Name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
@@ -171,18 +171,17 @@ typedef struct _vec2
171 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \ 171 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \
172 \ 172 \
173 eo_do(data->material_##Object, \ 173 eo_do(data->material_##Object, \
174 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, \ 174 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \
175 data->texture_diffuse_##Object), \ 175 data->texture_diffuse_##Object), \
176 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, \ 176 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \
177 data->texture_diffuse_##Object)); 177 data->texture_diffuse_##Object));
178 178
179 179
180#define CUBE_TEXTURE_SET(Object, Name, vertex, image) \ 180#define CUBE_TEXTURE_SET(Object, Name, vertex, image) \
181 eo_do(data->mesh_##Name, \ 181 eo_do(data->mesh_##Name, \
182 evas_canvas3d_mesh_from_primitive_set(0, data->cube_primitive), \ 182 evas_canvas3d_mesh_from_primitive_set(0, data->cube_primitive), \
183 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD, \ 183 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, \
184 2 * sizeof(float), vertex)); \ 184 2 * sizeof(float), vertex)); \
185 \
186 SETUP_DEFAULT_MESH(Object, Name, NORMAL_MAP) \ 185 SETUP_DEFAULT_MESH(Object, Name, NORMAL_MAP) \
187 data->texture_diffuse_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \ 186 data->texture_diffuse_##Object = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \
188 \ 187 \
@@ -194,9 +193,9 @@ typedef struct _vec2
194 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \ 193 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \
195 \ 194 \
196 eo_do(data->material_##Object, \ 195 eo_do(data->material_##Object, \
197 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, \ 196 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, \
198 data->texture_diffuse_##Object), \ 197 data->texture_diffuse_##Object), \
199 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, \ 198 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, \
200 data->texture_diffuse_##Object)); 199 data->texture_diffuse_##Object));
201 200
202 201
@@ -211,7 +210,7 @@ typedef struct _vec2
211 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \ 210 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); \
212 \ 211 \
213 eo_do(data->material_##Object, \ 212 eo_do(data->material_##Object, \
214 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, \ 213 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, \
215 data->texture_normal_##Object)); \ 214 data->texture_normal_##Object)); \
216 \ 215 \
217 eo_do(data->mesh_##Name, \ 216 eo_do(data->mesh_##Name, \
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 2e53ef8232..fac65a3412 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -138,7 +138,7 @@ _key_down(void *data,
138 evas_canvas3d_texture_file_set(gazebo_t_trans_path, NULL)); 138 evas_canvas3d_texture_file_set(gazebo_t_trans_path, NULL));
139 eo_do(scene->mesh_carpet, 139 eo_do(scene->mesh_carpet,
140 evas_canvas3d_mesh_blending_enable_set(EINA_TRUE), 140 evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
141 evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_SRC_ALPHA, EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA)); 141 evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA));
142 } 142 }
143 else 143 else
144 { 144 {
@@ -537,9 +537,9 @@ _animate_scene_gun(void *data)
537 { 537 {
538 _scale(scene->mesh_node_rocket[i], 0.4); 538 _scale(scene->mesh_node_rocket[i], 0.4);
539 eo_do(scene->material_rocket[i], 539 eo_do(scene->material_rocket[i],
540 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.8, 0.8, 0.8, 1.0), 540 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.8, 0.8, 0.8, 1.0),
541 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.2, 0.2, 0.0, 1.0), 541 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.2, 0.2, 0.0, 1.0),
542 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0.5, 0.5, 0.5, 1.0)); 542 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.5, 0.5, 0.5, 1.0));
543 543
544 rocket_indicator[i] = 2; 544 rocket_indicator[i] = 2;
545 545
@@ -576,9 +576,9 @@ _animate_scene_gun(void *data)
576 ((z * cosinus - x * sinus + z1) >= boxy.p0.z) && ((z * cosinus - x * sinus + z1) <= boxy.p1.z)) 576 ((z * cosinus - x * sinus + z1) >= boxy.p0.z) && ((z * cosinus - x * sinus + z1) <= boxy.p1.z))
577 { 577 {
578 eo_do(scene->material_rocket[i], 578 eo_do(scene->material_rocket[i],
579 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.8, 0.8, 0.8, 1.0), 579 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.8, 0.8, 0.8, 1.0),
580 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.9, 0.1, 0.1, 1.0), 580 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.9, 0.1, 0.1, 1.0),
581 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0.5, 0.5, 0.5, 1.0)); 581 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.5, 0.5, 0.5, 1.0));
582 582
583 _scale(scene->mesh_node_rocket[i], 4.5); 583 _scale(scene->mesh_node_rocket[i], 4.5);
584 rocket_indicator[i] = 3; 584 rocket_indicator[i] = 3;
@@ -773,7 +773,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
773 773
774 ADD_MESH(world, world, 0.5, 0.5, 1.0); 774 ADD_MESH(world, world, 0.5, 0.5, 1.0);
775 eo_do(data->mesh_world, 775 eo_do(data->mesh_world,
776 evas_canvas3d_mesh_from_primitive_set(0, data->sphere_primitive)); 776 evas_canvas3d_mesh_from_primitive_set(0, data->sphere_primitive));
777 SETUP_DEFAULT_MESH(world, world, DIFFUSE); 777 SETUP_DEFAULT_MESH(world, world, DIFFUSE);
778 SETUP_MESH_NODE(world); 778 SETUP_MESH_NODE(world);
779 779
@@ -842,7 +842,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
842 evas_canvas3d_texture_file_set(gazebo_t_trans_path, NULL)); 842 evas_canvas3d_texture_file_set(gazebo_t_trans_path, NULL));
843 eo_do(data->mesh_carpet, 843 eo_do(data->mesh_carpet,
844 evas_canvas3d_mesh_blending_enable_set(EINA_TRUE), 844 evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
845 evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_SRC_ALPHA, EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA)); 845 evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA));
846 } 846 }
847 847
848 eo_do(data->mesh_node_carpet, 848 eo_do(data->mesh_node_carpet,
@@ -886,12 +886,12 @@ _mesh_setup_gun_planet(Scene_Data *data)
886 /* Setup mesh for bounding sphere */ 886 /* Setup mesh for bounding sphere */
887 data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 887 data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
888 eo_do(data->material_ball, 888 eo_do(data->material_ball,
889 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 889 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
890 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 890 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
891 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 891 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
892 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 1.0, 1.0, 1.0, 1.0), 892 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 1.0, 1.0, 1.0),
893 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.0, 5.0, 1.0, 1.0), 893 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.0, 5.0, 1.0, 1.0),
894 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 894 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
895 evas_canvas3d_material_shininess_set(50.0)); 895 evas_canvas3d_material_shininess_set(50.0));
896 896
897 data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 897 data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
@@ -952,13 +952,13 @@ _mesh_setup_column(Scene_Data *data, int index)
952 data->material_column = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 952 data->material_column = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
953 953
954 eo_do(data->material_column, 954 eo_do(data->material_column,
955 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 955 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
956 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 956 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
957 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 957 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
958 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), 958 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
959 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.4, 0.4, 0.4, 1.0), 959 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.4, 0.4, 0.4, 1.0),
960 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.6, 0.6, 0.6, 1.0), 960 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.6, 0.6, 0.6, 1.0),
961 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 961 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
962 evas_canvas3d_material_shininess_set(50.0)); 962 evas_canvas3d_material_shininess_set(50.0));
963 963
964 data->mesh_column[index] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 964 data->mesh_column[index] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
@@ -982,9 +982,9 @@ _mesh_setup_column(Scene_Data *data, int index)
982 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT)); 982 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT));
983 983
984 eo_do(data->material_column, 984 eo_do(data->material_column,
985 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 985 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
986 data->texture_diffuse_column), 986 data->texture_diffuse_column),
987 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 987 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
988 data->texture_diffuse_column)); 988 data->texture_diffuse_column));
989 989
990 NORMAL_SET(column, column[index], red_brick_n_path) 990 NORMAL_SET(column, column[index], red_brick_n_path)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index bf0e182c5a..16d0c1ad77 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -4459,26 +4459,26 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4459 EINA_LIST_FOREACH(meshes, list, mesh) 4459 EINA_LIST_FOREACH(meshes, list, mesh)
4460 { 4460 {
4461 eo_do(mesh, material = evas_canvas3d_mesh_frame_material_get(0)); 4461 eo_do(mesh, material = evas_canvas3d_mesh_frame_material_get(0));
4462 eo_do(material, texture = evas_canvas3d_material_texture_get(EVAS_CANVAS3D_MATERIAL_DIFFUSE)); 4462 eo_do(material, texture = evas_canvas3d_material_texture_get(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE));
4463 4463
4464 pd_mesh_node = (Edje_Part_Description_Mesh_Node*) ep->chosen_description; 4464 pd_mesh_node = (Edje_Part_Description_Mesh_Node*) ep->chosen_description;
4465 4465
4466 eo_do(material, 4466 eo_do(material,
4467 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), 4467 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
4468 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), 4468 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
4469 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), 4469 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
4470 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, pd_mesh_node->mesh_node.properties.normal), 4470 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, pd_mesh_node->mesh_node.properties.normal),
4471 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 4471 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
4472 pd_mesh_node->mesh_node.properties.ambient.r / 255, 4472 pd_mesh_node->mesh_node.properties.ambient.r / 255,
4473 pd_mesh_node->mesh_node.properties.ambient.g / 255, 4473 pd_mesh_node->mesh_node.properties.ambient.g / 255,
4474 pd_mesh_node->mesh_node.properties.ambient.b / 255, 4474 pd_mesh_node->mesh_node.properties.ambient.b / 255,
4475 pd_mesh_node->mesh_node.properties.ambient.a / 255), 4475 pd_mesh_node->mesh_node.properties.ambient.a / 255),
4476 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 4476 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
4477 pd_mesh_node->mesh_node.properties.diffuse.r / 255, 4477 pd_mesh_node->mesh_node.properties.diffuse.r / 255,
4478 pd_mesh_node->mesh_node.properties.diffuse.g / 255, 4478 pd_mesh_node->mesh_node.properties.diffuse.g / 255,
4479 pd_mesh_node->mesh_node.properties.diffuse.b / 255, 4479 pd_mesh_node->mesh_node.properties.diffuse.b / 255,
4480 pd_mesh_node->mesh_node.properties.diffuse.a / 255), 4480 pd_mesh_node->mesh_node.properties.diffuse.a / 255),
4481 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 4481 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
4482 pd_mesh_node->mesh_node.properties.specular.r / 255, 4482 pd_mesh_node->mesh_node.properties.specular.r / 255,
4483 pd_mesh_node->mesh_node.properties.specular.g / 255, 4483 pd_mesh_node->mesh_node.properties.specular.g / 255,
4484 pd_mesh_node->mesh_node.properties.specular.b / 255, 4484 pd_mesh_node->mesh_node.properties.specular.b / 255,
@@ -4519,7 +4519,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4519 proxy = NULL; 4519 proxy = NULL;
4520 4520
4521 eo_do(material, 4521 eo_do(material,
4522 texture = evas_canvas3d_material_texture_get(EVAS_CANVAS3D_MATERIAL_DIFFUSE)); 4522 texture = evas_canvas3d_material_texture_get(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE));
4523 4523
4524 //proxy = _edje_image_name_find(ed, pd_mesh_node->mesh_node.texture.id); 4524 //proxy = _edje_image_name_find(ed, pd_mesh_node->mesh_node.texture.id);
4525 /*FIXME Conflict with function _edje_image_name_find (two places in edje_utils and edje_edit.c, 4525 /*FIXME Conflict with function _edje_image_name_find (two places in edje_utils and edje_edit.c,
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 453d85e616..17466bca02 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -470,397 +470,6 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
470 Evas_Real a, 470 Evas_Real a,
471 Evas_Real b); 471 Evas_Real b);
472 472
473/**
474 * Type of 3D Object
475 *
476 * @since 1.10
477 * @ingroup Evas_Canvas3D_Type
478 */
479typedef enum _Evas_Canvas3D_Object_Type
480{
481 EVAS_CANVAS3D_OBJECT_TYPE_INVALID = 0,
482 EVAS_CANVAS3D_OBJECT_TYPE_SCENE,
483 EVAS_CANVAS3D_OBJECT_TYPE_NODE,
484 EVAS_CANVAS3D_OBJECT_TYPE_CAMERA,
485 EVAS_CANVAS3D_OBJECT_TYPE_LIGHT,
486 EVAS_CANVAS3D_OBJECT_TYPE_MODEL,
487 EVAS_CANVAS3D_OBJECT_TYPE_MESH,
488 EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE,
489 EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL,
490 EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE,
491} Evas_Canvas3D_Object_Type;
492
493/**
494 * State of the Evas 3D
495 *
496 * @since 1.10
497 * @ingroup Evas_Canvas3D_Type
498 */
499typedef enum _Evas_Canvas3D_State
500{
501 EVAS_CANVAS3D_STATE_MAX = 16,
502
503 EVAS_CANVAS3D_STATE_ANY = 0,
504
505 EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE = 1,
506 EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE,
507 EVAS_CANVAS3D_STATE_SCENE_BACKGROUND_COLOR,
508 EVAS_CANVAS3D_STATE_SCENE_SIZE,
509 EVAS_CANVAS3D_STATE_SCENE_SHADOWS_ENABLED,
510 EVAS_CANVAS3D_STATE_SCENE_UPDATED,
511
512 EVAS_CANVAS3D_STATE_TEXTURE_DATA = 1,
513 EVAS_CANVAS3D_STATE_TEXTURE_WRAP,
514 EVAS_CANVAS3D_STATE_TEXTURE_FILTER,
515
516 EVAS_CANVAS3D_STATE_MATERIAL_ID = 1,
517 EVAS_CANVAS3D_STATE_MATERIAL_COLOR,
518 EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE,
519
520 EVAS_CANVAS3D_STATE_MESH_VERTEX_COUNT = 1,
521 EVAS_CANVAS3D_STATE_MESH_FRAME,
522 EVAS_CANVAS3D_STATE_MESH_MATERIAL,
523 EVAS_CANVAS3D_STATE_MESH_TRANSFORM,
524 EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA,
525 EVAS_CANVAS3D_STATE_MESH_INDEX_DATA,
526 EVAS_CANVAS3D_STATE_MESH_VERTEX_ASSEMBLY,
527 EVAS_CANVAS3D_STATE_MESH_SHADE_MODE,
528 EVAS_CANVAS3D_STATE_MESH_FOG,
529 EVAS_CANVAS3D_STATE_MESH_BLENDING,
530 EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST,
531 EVAS_CANVAS3D_STATE_MESH_COLOR_PICK,
532
533 EVAS_CANVAS3D_STATE_CAMERA_PROJECTION = 1,
534
535 EVAS_CANVAS3D_STATE_LIGHT_AMBIENT = 1,
536 EVAS_CANVAS3D_STATE_LIGHT_DIFFUSE,
537 EVAS_CANVAS3D_STATE_LIGHT_SPECULAR,
538 EVAS_CANVAS3D_STATE_LIGHT_SPOT_DIR,
539 EVAS_CANVAS3D_STATE_LIGHT_SPOT_EXP,
540 EVAS_CANVAS3D_STATE_LIGHT_SPOT_CUTOFF,
541 EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION,
542 EVAS_CANVAS3D_STATE_LIGHT_PROJECTION,
543
544 EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION = 1,
545 EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION,
546 EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE,
547 EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY,
548 EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL,
549 EVAS_CANVAS3D_STATE_NODE_MESH_FRAME,
550 EVAS_CANVAS3D_STATE_NODE_MESH_SHADE_MODE,
551 EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL_ID,
552 EVAS_CANVAS3D_STATE_NODE_LIGHT,
553 EVAS_CANVAS3D_STATE_NODE_CAMERA,
554 EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION,
555 EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION,
556 EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE,
557 EVAS_CANVAS3D_STATE_NODE_MEMBER,
558 EVAS_CANVAS3D_STATE_NODE_PARENT_BILLBOARD,
559} Evas_Canvas3D_State;
560
561/**
562 * Transform space
563 *
564 * @since 1.10
565 * @ingroup Evas_Canvas3D_Types
566 */
567typedef enum _Evas_Canvas3D_Space
568{
569 EVAS_CANVAS3D_SPACE_LOCAL = 0, /**< Local coordinate space */
570 EVAS_CANVAS3D_SPACE_PARENT, /**< Parent coordinate space */
571 EVAS_CANVAS3D_SPACE_WORLD, /**< World coordinate space */
572} Evas_Canvas3D_Space;
573
574/**
575 * Types of a node
576 *
577 * @since 1.10
578 * @ingroup Evas_Canvas3D_Types
579 */
580typedef enum _Evas_Canvas3D_Node_Type
581{
582 EVAS_CANVAS3D_NODE_TYPE_NODE = 0, /**< Node with no items */
583 EVAS_CANVAS3D_NODE_TYPE_CAMERA, /**< Node which can contain camera object */
584 EVAS_CANVAS3D_NODE_TYPE_LIGHT, /**< Node which can contain light object */
585 EVAS_CANVAS3D_NODE_TYPE_MESH, /**< Node which can contain mesh objects */
586} Evas_Canvas3D_Node_Type;
587
588/**
589 * Types of node orientation
590 *
591 * @since 1.13
592 * @ingroup Evas_Canvas3D_Types
593 */
594typedef enum _Evas_Canvas3D_Node_Orientation_Type
595{
596 /**< Node with no orientation properties */
597 EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_NONE = 0,
598 /**< Node orientation is given as a point to look at and a vector
599 that indicates the angle at which the subject is looking at the point */
600 EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT,
601 /**< Node orientation is given as id of another part to look at and a vector
602 that indicates the angle at which the subject is looking at the part */
603 EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_TO,
604 /**< Node orientation is given as an angle and an axis to rotate around */
605 EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS,
606 /**< Node orientation is given as a quaternion */
607 EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_QUATERNION,
608} Evas_Canvas3D_Node_Orientation_Type;
609
610/**
611 * Vertex attribute IDs
612 *
613 * @since 1.10
614 * @ingroup Evas_Canvas3D_Types
615 */
616typedef enum _Evas_Canvas3D_Vertex_Attrib
617{
618 EVAS_CANVAS3D_VERTEX_POSITION = 0, /**< Vertex position */
619 EVAS_CANVAS3D_VERTEX_NORMAL, /**< Vertex normal */
620 EVAS_CANVAS3D_VERTEX_TANGENT, /**< Vertex tangent (for normal mapping) */
621 EVAS_CANVAS3D_VERTEX_COLOR, /**< Vertex color */
622 EVAS_CANVAS3D_VERTEX_TEXCOORD, /**< Vertex texture coordinate */
623} Evas_Canvas3D_Vertex_Attrib;
624
625/**
626 * Index formats
627 *
628 * @since 1.10
629 * @ingroup Evas_Canvas3D_Types
630 */
631typedef enum _Evas_Canvas3D_Index_Format
632{
633 EVAS_CANVAS3D_INDEX_FORMAT_NONE = 0, /**< Indexing is not used */
634 EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_BYTE, /**< Index is of type unsigned byte */
635 EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT /**< Index is of type unsigned short */
636} Evas_Canvas3D_Index_Format;
637
638/**
639 * Frustum modes
640 *
641 * @since 1.12
642 * @ingroup Evas_Canvas3D_Types
643 */
644typedef enum _Evas_Canvas3D_Frustum_Mode
645{
646 EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE,
647 EVAS_CANVAS3D_FRUSTUM_MODE_AABB,
648 EVAS_CANVAS3D_FRUSTUM_MODE_CENTRAL_POINT
649} Evas_Canvas3D_Frustum_Mode;
650
651
652/**
653 * Vertex assembly modes
654 *
655 * Vertex assembly represents how the vertices are organized into geometric
656 * primitives.
657 *
658 * @since 1.10
659 * @ingroup Evas_Canvas3D_Types
660 */
661typedef enum _Evas_Canvas3D_Vertex_Assembly
662{
663 /**< A vertex is rendered as a point */
664 EVAS_CANVAS3D_VERTEX_ASSEMBLY_POINTS = 0,
665 /**< Two vertices are organized as a line */
666 EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES,
667 /**< Vertices are organized as a connected line path */
668 EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_STRIP,
669 /**< Vertices are organized as a closed line path */
670 EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_LOOP,
671 /**< Three vertices are organized as a triangle */
672 EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES,
673 /**< Vertices are organized as connected triangles */
674 EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_STRIP,
675 /**< Vertices are organized as a triangle fan */
676 EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_FAN,
677} Evas_Canvas3D_Vertex_Assembly;
678
679typedef enum _Evas_Canvas3D_Blend_Func
680{
681 /**< The scale factors for color components is (0, 0, 0, 0)*/
682 EVAS_CANVAS3D_BLEND_ZERO = 0,
683 /**< The scale factors for color components is (1, 1, 1, 1)*/
684 EVAS_CANVAS3D_BLEND_ONE,
685 /**< The scale factors for color components is (Rs/kR, Gs/kG, Bs/kB, As/kA)*/
686 EVAS_CANVAS3D_BLEND_SRC_COLOR,
687 /**< The scale factors for color components is (1, 1, 1, 1) - (Rs/kR, Gs/kG, Bs/kB, As/kA)*/
688 EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_COLOR,
689 /**< The scale factors for color components is (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/
690 EVAS_CANVAS3D_BLEND_DST_COLOR,
691 /**< The scale factors for color components is (1, 1, 1, 1) - (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/
692 EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_COLOR,
693 /**< The scale factors for color components is (As/kA, As/kA, As/kA, As/kA)*/
694 EVAS_CANVAS3D_BLEND_SRC_ALPHA,
695 /**< The scale factors for color components is (1, 1, 1, 1) - (As/kA, As/kA, As/kA, As/kA)*/
696 EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA,
697 /**< The scale factors for color components is (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/
698 EVAS_CANVAS3D_BLEND_DST_ALPHA,
699 /**< The scale factors for color components is (1, 1, 1, 1) - (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/
700 EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_ALPHA,
701 /**< The scale factors for color components is (Rc, Gc, Bc, Ac)*/
702 EVAS_CANVAS3D_BLEND_CONSTANT_COLOR,
703 /**< The scale factors for color components is (1, 1, 1, 1) - (Rc, Gc, Bc, Ac)*/
704 EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_COLOR,
705 /**< The scale factors for color components is (Ac, Ac, Ac, Ac)*/
706 EVAS_CANVAS3D_BLEND_CONSTANT_ALPHA,
707 /**< The scale factors for color components is (1, 1, 1, 1) - (Ac, Ac, Ac, Ac)*/
708 EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_ALPHA,
709 /**< The scale factors for color components is (i, i, i, 1) where i = min(As, kA, Ad)/kA*/
710 EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE,
711} Evas_Canvas3D_Blend_Func;
712
713/**
714 * Comparsion functions for testing(alpha, depth, stencil) in fragment shader.
715 *
716 * @since 1.14
717 * @ingroup Evas_Canvas3D_Types
718 */
719typedef enum _Evas_Canvas3D_Comparison
720{
721 /**< Never passes.*/
722 EVAS_CANVAS3D_COMPARISON_NEVER,
723 /**< Passes if the incoming value is less than the reference value.*/
724 EVAS_CANVAS3D_COMPARISON_LESS,
725 /**< Passes if the incoming value is equal to the reference value.*/
726 EVAS_CANVAS3D_COMPARISON_EQUAL,
727 /**< Passes if the incoming value is less than or equal to the reference value.*/
728 EVAS_CANVAS3D_COMPARISON_LEQUAL,
729 /**< Passes if the incoming value is greater than the reference value.*/
730 EVAS_CANVAS3D_COMPARISON_GREATER,
731 /**< Passes if the incoming value is not equal to the reference value.*/
732 EVAS_CANVAS3D_COMPARISON_NOTEQUAL,
733 /**< Passes if the incoming value is greater than or equal to the reference value.*/
734 EVAS_CANVAS3D_COMPARISON_GEQUAL,
735 /**< Always passes (initial value).*/
736 EVAS_CANVAS3D_COMPARISON_ALWAYS,
737} Evas_Canvas3D_Comparison;
738
739/**
740 * Wrap modes
741 *
742 * @since 1.10
743 * @ingroup Evas_Canvas3D_Types
744 */
745typedef enum _Evas_Canvas3D_Wrap_Mode
746{
747 /**< Values will be clamped to be in range [min, max] */
748 EVAS_CANVAS3D_WRAP_MODE_CLAMP = 0,
749 /**< Values will be repeated */
750 EVAS_CANVAS3D_WRAP_MODE_REPEAT,
751 /**< Values will be repeated in a reflected manner */
752 EVAS_CANVAS3D_WRAP_MODE_REFLECT
753} Evas_Canvas3D_Wrap_Mode;
754
755/**
756 * Mesh primitive
757 *
758 * @since 1.12
759 * @ingroup Evas_Canvas3D_Types
760 */
761typedef enum _Evas_Canvas3D_Mesh_Primitive
762{
763 /**< An empty space */
764 EVAS_CANVAS3D_MESH_PRIMITIVE_NONE = 0,
765 /**< One sided square */
766 EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE,
767 /**< Cube */
768 EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE,
769 /**< Cylinder (can use precision and texture scale) */
770 EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER,
771 /**< Cone (can use precision and texture scale) */
772 EVAS_CANVAS3D_MESH_PRIMITIVE_CONE,
773 /**< Sphere (can use precision and texture scale) */
774 EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE,
775 /**< Torus (can use ratio, precision and texture scale) */
776 EVAS_CANVAS3D_MESH_PRIMITIVE_TORUS,
777 /**< Custom surface (can use pointer to users function, precision and texture scale) */
778 EVAS_CANVAS3D_MESH_PRIMITIVE_SURFACE,
779 /**< Terrain as surface with pointer to Perlin's noise function */
780 EVAS_CANVAS3D_MESH_PRIMITIVE_TERRAIN,
781 /**< Count of supported primitives */
782 EVAS_CANVAS3D_MESH_PRIMITIVE_COUNT
783} Evas_Canvas3D_Mesh_Primitive;
784
785/**
786 * Mode of mesh primitive
787 *
788 * @since 1.15
789 * @ingroup Evas_Canvas3D_Types
790 */
791typedef enum _Evas_Canvas3D_Primitive_Mode
792{
793 /**< Default mode of primitive */
794 EVAS_CANVAS3D_PRIMITIVE_MODE_DEFAULT = 0,
795 /**< Primitive without base (supported for cylinder and cone) */
796 EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE,
797 /**< Ptimitive with alternative UV (supported for sphere)*/
798 EVAS_CANVAS3D_PRIMITIVE_MODE_ALTERNATIVE_UV
799} Evas_Canvas3D_Primitive_Mode;
800
801/**
802 * Texture filters
803 *
804 * @since 1.10
805 * @ingroup Evas_Canvas3D_Types
806 */
807typedef enum _Evas_Canvas3D_Texture_Filter
808{
809 /**< Samples nearest texel */
810 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST = 0,
811 /**< Lineary interpolate nearby texels */
812 EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
813 /**< Nearest sampling mipmap */
814 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST,
815 /**< Nearest sampling mipmap and interpolate */
816 EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST,
817 /**< Linear sampling in nearest mipmap */
818 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR,
819 /**< Linear sampling in mipmap and interpolate */
820 EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR
821} Evas_Canvas3D_Texture_Filter;
822
823/**
824 * Shade modes
825 *
826 * @since 1.10
827 * @ingroup Evas_Canvas3D_Types
828 */
829typedef enum _Evas_Canvas3D_Shade_Mode
830{
831 /**< Shaded using vertex color attribute */
832 EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR = 0,
833 /**< Shaded using material diffuse term */
834 EVAS_CANVAS3D_SHADE_MODE_DIFFUSE,
835 /**< Per-vertex flat lighting */
836 EVAS_CANVAS3D_SHADE_MODE_FLAT,
837 /**< Per-pixel phong shading */
838 EVAS_CANVAS3D_SHADE_MODE_PHONG,
839 /**< Per-pixel normal map shading */
840 EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP,
841 /**< fragment color is defined by its z-coord*/
842 EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER,
843 /**< rendering to additional frame bufer*/
844 EVAS_CANVAS3D_SHADE_MODE_COLOR_PICK,
845 /**< Per-pixel parallax occlusion map shading */
846 EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION,
847} Evas_Canvas3D_Shade_Mode;
848
849/**
850 * Material attributes
851 *
852 * @since 1.10
853 * @ingroup Evas_Canvas3D_Types
854 */
855typedef enum _Evas_Canvas3D_Material_Attrib
856{
857 EVAS_CANVAS3D_MATERIAL_AMBIENT = 0, /**< Ambient term */
858 EVAS_CANVAS3D_MATERIAL_DIFFUSE, /**< Diffuse term */
859 EVAS_CANVAS3D_MATERIAL_SPECULAR, /**< Specular term */
860 EVAS_CANVAS3D_MATERIAL_EMISSION, /**< Emission term */
861 EVAS_CANVAS3D_MATERIAL_NORMAL, /**< Normal map term */
862} Evas_Canvas3D_Material_Attrib;
863
864#include "canvas/evas_image.eo.h" 473#include "canvas/evas_image.eo.h"
865 474
866#include "canvas/evas_canvas3d_camera.eo.h" 475#include "canvas/evas_canvas3d_camera.eo.h"
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo b/src/lib/evas/canvas/evas_canvas3d_camera.eo
index 4a46bae12b..80c5fa4143 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo
@@ -1,3 +1,5 @@
1import evas_types;
2
1class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface) 3class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface)
2{ 4{
3 legacy_prefix: null; 5 legacy_prefix: null;
@@ -10,7 +12,7 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface)
10 12
11 See also @.projection_perspective_set, @.projection_ortho_set and @.projection_frustum_set.]] 13 See also @.projection_perspective_set, @.projection_ortho_set and @.projection_frustum_set.]]
12 params { 14 params {
13 @in matrix: const(Evas_Real)*; [[Projection Matrix]] 15 @in matrix: const(Evas.Real)*; [[Projection Matrix]]
14 } 16 }
15 } 17 }
16 18
@@ -19,7 +21,7 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface)
19 21
20 See also @.projection_matrix_set.]] 22 See also @.projection_matrix_set.]]
21 params { 23 params {
22 @out matrix: Evas_Real; [[Projection Matrix]] 24 @out matrix: Evas.Real; [[Projection Matrix]]
23 } 25 }
24 } 26 }
25 27
@@ -29,10 +31,10 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface)
29 See also @.projection_matrix_set.]] 31 See also @.projection_matrix_set.]]
30 32
31 params { 33 params {
32 fovy: Evas_Real; [[Field of view angle in Y direction.]] 34 fovy: Evas.Real; [[Field of view angle in Y direction.]]
33 aspect: Evas_Real; [[Aspect ratio.]] 35 aspect: Evas.Real; [[Aspect ratio.]]
34 dnear: Evas_Real; [[Distance to near clipping plane.]] 36 dnear: Evas.Real; [[Distance to near clipping plane.]]
35 dfar: Evas_Real; [[Distance to far clipping plane.]] 37 dfar: Evas.Real; [[Distance to far clipping plane.]]
36 } 38 }
37 } 39 }
38 40
@@ -41,12 +43,12 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface)
41 43
42 See also @.projection_matrix_set.]] 44 See also @.projection_matrix_set.]]
43 params { 45 params {
44 left: Evas_Real; [[Left X coordinate of the near clipping plane.]] 46 left: Evas.Real; [[Left X coordinate of the near clipping plane.]]
45 right: Evas_Real; [[Right X coordinate of the near clipping plane..]] 47 right: Evas.Real; [[Right X coordinate of the near clipping plane..]]
46 bottom: Evas_Real; [[Bottom Y coordinate of the near clipping plane.]] 48 bottom: Evas.Real; [[Bottom Y coordinate of the near clipping plane.]]
47 top: Evas_Real; [[Top Y coordinate of the near clipping plane]] 49 top: Evas.Real; [[Top Y coordinate of the near clipping plane]]
48 dnear: Evas_Real; [[Distance to near clipping plane.]] 50 dnear: Evas.Real; [[Distance to near clipping plane.]]
49 dfar: Evas_Real; [[Distance to far clipping plane.]] 51 dfar: Evas.Real; [[Distance to far clipping plane.]]
50 } 52 }
51 } 53 }
52 projection_ortho_set { 54 projection_ortho_set {
@@ -54,12 +56,12 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object, Evas.Common_Interface)
54 56
55 See also @.projection_matrix_set.]] 57 See also @.projection_matrix_set.]]
56 params { 58 params {
57 left: Evas_Real; [[Left X coordinate of the near clipping plane.]] 59 left: Evas.Real; [[Left X coordinate of the near clipping plane.]]
58 right: Evas_Real; [[Right X coordinate of the near clipping plane..]] 60 right: Evas.Real; [[Right X coordinate of the near clipping plane..]]
59 bottom: Evas_Real; [[Bottom Y coordinate of the near clipping plane.]] 61 bottom: Evas.Real; [[Bottom Y coordinate of the near clipping plane.]]
60 top: Evas_Real; [[Top Y coordinate of the near clipping plane]] 62 top: Evas.Real; [[Top Y coordinate of the near clipping plane]]
61 dnear: Evas_Real; [[Distance to near clipping plane.]] 63 dnear: Evas.Real; [[Distance to near clipping plane.]]
62 dfar: Evas_Real; [[Distance to far clipping plane.]] 64 dfar: Evas.Real; [[Distance to far clipping plane.]]
63 } 65 }
64 } 66 }
65 node_visible_get { 67 node_visible_get {
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo b/src/lib/evas/canvas/evas_canvas3d_light.eo
index 91a286eeb3..ce7d033ae2 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_light.eo
@@ -1,3 +1,5 @@
1import evas_types;
2
1class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface) 3class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
2{ 4{
3 legacy_prefix: null; 5 legacy_prefix: null;
@@ -45,7 +47,7 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
45 See also @.spot_exponent.set]] 47 See also @.spot_exponent.set]]
46 } 48 }
47 values { 49 values {
48 exponent: Evas_Real; [[Spot exponent value.]] 50 exponent: Evas.Real; [[Spot exponent value.]]
49 } 51 }
50 } 52 }
51 53
@@ -64,7 +66,7 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
64 See also @.spot_cutoff.set]] 66 See also @.spot_cutoff.set]]
65 } 67 }
66 values { 68 values {
67 cutoff: Evas_Real; [[Cutoff angle in degree..]] 69 cutoff: Evas.Real; [[Cutoff angle in degree..]]
68 } 70 }
69 } 71 }
70 72
@@ -91,10 +93,10 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
91 93
92 Default ambient color is (0.0, 0.0, 0.0, 1.0).]] 94 Default ambient color is (0.0, 0.0, 0.0, 1.0).]]
93 params { 95 params {
94 @in r: Evas_Real; [[Red component of the ambient color between [0.0, 1.0].]] 96 @in r: Evas.Real; [[Red component of the ambient color between [0.0, 1.0].]]
95 @in g: Evas_Real; [[Green component of the ambient color between [0.0, 1.0].]] 97 @in g: Evas.Real; [[Green component of the ambient color between [0.0, 1.0].]]
96 @in b: Evas_Real; [[Blue component of the ambient color between [0.0, 1.0].]] 98 @in b: Evas.Real; [[Blue component of the ambient color between [0.0, 1.0].]]
97 @in a: Evas_Real; [[Alpha component of the ambient color between [0.0, 1.0].]] 99 @in a: Evas.Real; [[Alpha component of the ambient color between [0.0, 1.0].]]
98 } 100 }
99 } 101 }
100 ambient_get @const { 102 ambient_get @const {
@@ -102,10 +104,10 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
102 104
103 See also @.ambient_set]] 105 See also @.ambient_set]]
104 params { 106 params {
105 @out r: Evas_Real; [[Red component of the ambient color between [0.0, 1.0].]] 107 @out r: Evas.Real; [[Red component of the ambient color between [0.0, 1.0].]]
106 @out g: Evas_Real; [[Green component of the ambient color between [0.0, 1.0].]] 108 @out g: Evas.Real; [[Green component of the ambient color between [0.0, 1.0].]]
107 @out b: Evas_Real; [[Blue component of the ambient color between [0.0, 1.0].]] 109 @out b: Evas.Real; [[Blue component of the ambient color between [0.0, 1.0].]]
108 @out a: Evas_Real; [[Alpha component of the ambient color between [0.0, 1.0].]] 110 @out a: Evas.Real; [[Alpha component of the ambient color between [0.0, 1.0].]]
109 } 111 }
110 } 112 }
111 113
@@ -114,10 +116,10 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
114 116
115 Default diffuse color is (1.0, 1.0, 1.0, 1.0).]] 117 Default diffuse color is (1.0, 1.0, 1.0, 1.0).]]
116 params { 118 params {
117 @in r: Evas_Real; [[Red component of the diffuse color between [0.0, 1.0].]] 119 @in r: Evas.Real; [[Red component of the diffuse color between [0.0, 1.0].]]
118 @in g: Evas_Real; [[Green component of the diffuse color between [0.0, 1.0].]] 120 @in g: Evas.Real; [[Green component of the diffuse color between [0.0, 1.0].]]
119 @in b: Evas_Real; [[Blue component of the diffuse color between [0.0, 1.0].]] 121 @in b: Evas.Real; [[Blue component of the diffuse color between [0.0, 1.0].]]
120 @in a: Evas_Real; [[Alpha component of the diffuse color between [0.0, 1.0].]] 122 @in a: Evas.Real; [[Alpha component of the diffuse color between [0.0, 1.0].]]
121 } 123 }
122 } 124 }
123 diffuse_get @const { 125 diffuse_get @const {
@@ -125,10 +127,10 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
125 127
126 See also @.diffuse_set]] 128 See also @.diffuse_set]]
127 params { 129 params {
128 @out r: Evas_Real; [[Red component of the diffuse color between [0.0, 1.0].]] 130 @out r: Evas.Real; [[Red component of the diffuse color between [0.0, 1.0].]]
129 @out g: Evas_Real; [[Green component of the diffuse color between [0.0, 1.0].]] 131 @out g: Evas.Real; [[Green component of the diffuse color between [0.0, 1.0].]]
130 @out b: Evas_Real; [[Blue component of the diffuse color between [0.0, 1.0].]] 132 @out b: Evas.Real; [[Blue component of the diffuse color between [0.0, 1.0].]]
131 @out a: Evas_Real; [[Alpha component of the diffuse color between [0.0, 1.0].]] 133 @out a: Evas.Real; [[Alpha component of the diffuse color between [0.0, 1.0].]]
132 } 134 }
133 } 135 }
134 136
@@ -137,10 +139,10 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
137 139
138 Default specular color is (1.0, 1.0, 1.0, 1.0).]] 140 Default specular color is (1.0, 1.0, 1.0, 1.0).]]
139 params { 141 params {
140 @in r: Evas_Real; [[Red component of the specular color between [0.0, 1.0].]] 142 @in r: Evas.Real; [[Red component of the specular color between [0.0, 1.0].]]
141 @in g: Evas_Real; [[Green component of the specular color between [0.0, 1.0].]] 143 @in g: Evas.Real; [[Green component of the specular color between [0.0, 1.0].]]
142 @in b: Evas_Real; [[Blue component of the specular color between [0.0, 1.0].]] 144 @in b: Evas.Real; [[Blue component of the specular color between [0.0, 1.0].]]
143 @in a: Evas_Real; [[Alpha component of the specular color between [0.0, 1.0].]] 145 @in a: Evas.Real; [[Alpha component of the specular color between [0.0, 1.0].]]
144 } 146 }
145 } 147 }
146 specular_get @const { 148 specular_get @const {
@@ -148,10 +150,10 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
148 150
149 See also @.specular_set]] 151 See also @.specular_set]]
150 params { 152 params {
151 @out r: Evas_Real; [[Red component of the specular color between [0.0, 1.0].]] 153 @out r: Evas.Real; [[Red component of the specular color between [0.0, 1.0].]]
152 @out g: Evas_Real; [[Green component of the specular color between [0.0, 1.0].]] 154 @out g: Evas.Real; [[Green component of the specular color between [0.0, 1.0].]]
153 @out b: Evas_Real; [[Blue component of the specular color between [0.0, 1.0].]] 155 @out b: Evas.Real; [[Blue component of the specular color between [0.0, 1.0].]]
154 @out a: Evas_Real; [[Alpha component of the specular color between [0.0, 1.0].]] 156 @out a: Evas.Real; [[Alpha component of the specular color between [0.0, 1.0].]]
155 } 157 }
156 } 158 }
157 159
@@ -168,9 +170,9 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
168 170
169 See also @.attenuation_enable.set]] 171 See also @.attenuation_enable.set]]
170 params { 172 params {
171 @in constant: Evas_Real; [[Constant attenuation term..]] 173 @in constant: Evas.Real; [[Constant attenuation term..]]
172 @in linear: Evas_Real; [[Linear attenuation term..]] 174 @in linear: Evas.Real; [[Linear attenuation term..]]
173 @in quadratic: Evas_Real; [[Quadratic attenuation term..]] 175 @in quadratic: Evas.Real; [[Quadratic attenuation term..]]
174 } 176 }
175 } 177 }
176 178
@@ -179,9 +181,9 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
179 181
180 See also @.attenuation_set]] 182 See also @.attenuation_set]]
181 params { 183 params {
182 @out constant: Evas_Real; [[Constant attenuation term..]] 184 @out constant: Evas.Real; [[Constant attenuation term..]]
183 @out linear: Evas_Real; [[Linear attenuation term..]] 185 @out linear: Evas.Real; [[Linear attenuation term..]]
184 @out quadratic: Evas_Real; [[Quadratic attenuation term..]] 186 @out quadratic: Evas.Real; [[Quadratic attenuation term..]]
185 } 187 }
186 } 188 }
187 189
@@ -192,7 +194,7 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
192 194
193 See also @.projection_perspective_set, @.projection_ortho_set and @.projection_frustum_set]] 195 See also @.projection_perspective_set, @.projection_ortho_set and @.projection_frustum_set]]
194 params { 196 params {
195 @in matrix: const(Evas_Real) *; [[Projection Matrix. Pointer to the array of 16 Evas_Real values in column major order.]] 197 @in matrix: const(Evas.Real) *; [[Projection Matrix. Pointer to the array of 16 Evas.Real values in column major order.]]
196 } 198 }
197 } 199 }
198 200
@@ -201,7 +203,7 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
201 203
202 See also @.projection_matrix_set]] 204 See also @.projection_matrix_set]]
203 params { 205 params {
204 @out matrix: Evas_Real; [[Projection Matrix]] 206 @out matrix: Evas.Real; [[Projection Matrix]]
205 } 207 }
206 } 208 }
207 209
@@ -211,10 +213,10 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
211 See also @.projection_matrix_set]] 213 See also @.projection_matrix_set]]
212 214
213 params { 215 params {
214 fovy: Evas_Real; [[Field of view angle in Y direction.]] 216 fovy: Evas.Real; [[Field of view angle in Y direction.]]
215 aspect: Evas_Real; [[Aspect ratio.]] 217 aspect: Evas.Real; [[Aspect ratio.]]
216 dnear: Evas_Real; [[Distance to near clipping plane.]] 218 dnear: Evas.Real; [[Distance to near clipping plane.]]
217 dfar: Evas_Real; [[Distance to far clipping plane.]] 219 dfar: Evas.Real; [[Distance to far clipping plane.]]
218 } 220 }
219 } 221 }
220 222
@@ -223,12 +225,12 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
223 225
224 @Evas.Canvas3D.Light.projection_matrix_set]] 226 @Evas.Canvas3D.Light.projection_matrix_set]]
225 params { 227 params {
226 left: Evas_Real; [[Left X coordinate of the near clipping plane.]] 228 left: Evas.Real; [[Left X coordinate of the near clipping plane.]]
227 right: Evas_Real; [[Right X coordinate of the near clipping plane.]] 229 right: Evas.Real; [[Right X coordinate of the near clipping plane.]]
228 bottom: Evas_Real; [[Bottom Y coordinate of the near clipping plane.]] 230 bottom: Evas.Real; [[Bottom Y coordinate of the near clipping plane.]]
229 top: Evas_Real; [[Top Y coordinate of the near clipping plane]] 231 top: Evas.Real; [[Top Y coordinate of the near clipping plane]]
230 dnear: Evas_Real; [[Distance to near clipping plane.]] 232 dnear: Evas.Real; [[Distance to near clipping plane.]]
231 dfar: Evas_Real; [[Distance to far clipping plane.]] 233 dfar: Evas.Real; [[Distance to far clipping plane.]]
232 } 234 }
233 } 235 }
234 projection_ortho_set { 236 projection_ortho_set {
@@ -236,12 +238,12 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object, Evas.Common_Interface)
236 238
237 See also @.projection_matrix_set]] 239 See also @.projection_matrix_set]]
238 params { 240 params {
239 left: Evas_Real; [[Left X coordinate of the near clipping plane.]] 241 left: Evas.Real; [[Left X coordinate of the near clipping plane.]]
240 right: Evas_Real; [[Right X coordinate of the near clipping plane.]] 242 right: Evas.Real; [[Right X coordinate of the near clipping plane.]]
241 bottom: Evas_Real; [[Bottom Y coordinate of the near clipping plane.]] 243 bottom: Evas.Real; [[Bottom Y coordinate of the near clipping plane.]]
242 top: Evas_Real; [[Top Y coordinate of the near clipping plane]] 244 top: Evas.Real; [[Top Y coordinate of the near clipping plane]]
243 dnear: Evas_Real; [[Distance to near clipping plane.]] 245 dnear: Evas.Real; [[Distance to near clipping plane.]]
244 dfar: Evas_Real; [[Distance to far clipping plane.]] 246 dfar: Evas.Real; [[Distance to far clipping plane.]]
245 } 247 }
246 } 248 }
247 } 249 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 46f5a847c0..8ce248670a 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -94,10 +94,10 @@ _evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_M
94 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 94 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
95 eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL)); 95 eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL));
96 96
97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_AMBIENT].color, 0.2, 0.2, 0.2, 1.0); 97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0);
98 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_DIFFUSE].color, 0.8, 0.8, 0.8, 1.0); 98 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].color, 0.8, 0.8, 0.8, 1.0);
99 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_SPECULAR].color, 1.0, 1.0, 1.0, 1.0); 99 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR].color, 1.0, 1.0, 1.0, 1.0);
100 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_EMISSION].color, 0.0, 0.0, 0.0, 1.0); 100 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION].color, 0.0, 0.0, 0.0, 1.0);
101 pd->shininess = 150.0; 101 pd->shininess = 150.0;
102 102
103 return obj; 103 return obj;
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo b/src/lib/evas/canvas/evas_canvas3d_material.eo
index a2f5808365..839da7e452 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_material.eo
@@ -22,10 +22,10 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
22 22
23 params { 23 params {
24 @in attrib: Evas.Canvas3D.Material_Attrib; [[Material attribute ID.]] 24 @in attrib: Evas.Canvas3D.Material_Attrib; [[Material attribute ID.]]
25 @in r: Evas_Real; [[Red component of the color.]] 25 @in r: Evas.Real; [[Red component of the color.]]
26 @in g: Evas_Real; [[Green component of the color.]] 26 @in g: Evas.Real; [[Green component of the color.]]
27 @in b: Evas_Real; [[Blue component of the color.]] 27 @in b: Evas.Real; [[Blue component of the color.]]
28 @in a: Evas_Real; [[Alpha component of the color.]] 28 @in a: Evas.Real; [[Alpha component of the color.]]
29 } 29 }
30 } 30 }
31 31
@@ -36,10 +36,10 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
36 ]] 36 ]]
37 params { 37 params {
38 @in attrib: Evas.Canvas3D.Material_Attrib; [[Material attribute ID.]] 38 @in attrib: Evas.Canvas3D.Material_Attrib; [[Material attribute ID.]]
39 @out r: Evas_Real; [[Pointer to receive red component of the color.]] 39 @out r: Evas.Real; [[Pointer to receive red component of the color.]]
40 @out g: Evas_Real; [[Pointer to receive green component of the color.]] 40 @out g: Evas.Real; [[Pointer to receive green component of the color.]]
41 @out b: Evas_Real; [[Pointer to receive blue component of the color.]] 41 @out b: Evas.Real; [[Pointer to receive blue component of the color.]]
42 @out a: Evas_Real; [[Pointer to receive alpha component of the color.]] 42 @out a: Evas.Real; [[Pointer to receive alpha component of the color.]]
43 } 43 }
44 } 44 }
45 45
@@ -88,7 +88,7 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, Evas.Common_Interface)
88 ]] 88 ]]
89 } 89 }
90 values { 90 values {
91 shininess: Evas_Real; [[Shininess value.]] 91 shininess: Evas.Real; [[Shininess value.]]
92 } 92 }
93 } 93 }
94 94
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index 1b18699768..c6082eaeff 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -70,9 +70,9 @@ evas_canvas3d_mesh_aabb_add_to_frame(Evas_Canvas3D_Mesh_Data *pd, int frame, int
70 return EINA_FALSE; 70 return EINA_FALSE;
71 } 71 }
72 72
73 step = curframe->vertices[EVAS_CANVAS3D_VERTEX_POSITION].element_count; 73 step = curframe->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION].element_count;
74 size = curframe->vertices[EVAS_CANVAS3D_VERTEX_POSITION].size; 74 size = curframe->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION].size;
75 minmaxdata = (float *)curframe->vertices[EVAS_CANVAS3D_VERTEX_POSITION].data; 75 minmaxdata = (float *)curframe->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION].data;
76 76
77 if (!minmaxdata) 77 if (!minmaxdata)
78 { 78 {
@@ -117,8 +117,8 @@ _mesh_init(Evas_Canvas3D_Mesh_Data *pd)
117 pd->assembly = EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES; 117 pd->assembly = EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES;
118 118
119 pd->nodes = NULL; 119 pd->nodes = NULL;
120 pd->blend_sfactor = EVAS_CANVAS3D_BLEND_ONE; 120 pd->blend_sfactor = EVAS_CANVAS3D_BLEND_FUNC_ONE;
121 pd->blend_dfactor = EVAS_CANVAS3D_BLEND_ZERO; 121 pd->blend_dfactor = EVAS_CANVAS3D_BLEND_FUNC_ZERO;
122 pd->blending = EINA_FALSE; 122 pd->blending = EINA_FALSE;
123 123
124 pd->alpha_comparison = EVAS_CANVAS3D_COMPARISON_ALWAYS; 124 pd->alpha_comparison = EVAS_CANVAS3D_COMPARISON_ALWAYS;
@@ -398,7 +398,7 @@ _evas_canvas3d_mesh_frame_vertex_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
398 return; 398 return;
399 } 399 }
400 400
401 if (attrib == EVAS_CANVAS3D_VERTEX_POSITION) 401 if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION)
402 { 402 {
403 int i = 0, j = 0, size = stride/sizeof(float); 403 int i = 0, j = 0, size = stride/sizeof(float);
404 float vxmin, vymin, vzmin, vxmax, vymax, vzmax; 404 float vxmin, vymin, vzmin, vxmax, vymax, vzmax;
@@ -434,19 +434,19 @@ _evas_canvas3d_mesh_frame_vertex_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
434 ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame); 434 ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame);
435 } 435 }
436 } 436 }
437 else if (attrib == EVAS_CANVAS3D_VERTEX_NORMAL) 437 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL)
438 { 438 {
439 element_count = 3; 439 element_count = 3;
440 } 440 }
441 else if (attrib == EVAS_CANVAS3D_VERTEX_TANGENT) 441 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT)
442 { 442 {
443 element_count = 3; 443 element_count = 3;
444 } 444 }
445 else if (attrib == EVAS_CANVAS3D_VERTEX_COLOR) 445 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR)
446 { 446 {
447 element_count = 4; 447 element_count = 4;
448 } 448 }
449 else if (attrib == EVAS_CANVAS3D_VERTEX_TEXCOORD) 449 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)
450 { 450 {
451 element_count = 2; 451 element_count = 2;
452 } 452 }
@@ -481,23 +481,23 @@ _evas_canvas3d_mesh_frame_vertex_data_copy_set(Eo *obj, Evas_Canvas3D_Mesh_Data
481 return; 481 return;
482 } 482 }
483 483
484 if (attrib == EVAS_CANVAS3D_VERTEX_POSITION) 484 if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION)
485 { 485 {
486 element_count = 3; 486 element_count = 3;
487 } 487 }
488 else if (attrib == EVAS_CANVAS3D_VERTEX_NORMAL) 488 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL)
489 { 489 {
490 element_count = 3; 490 element_count = 3;
491 } 491 }
492 else if (attrib == EVAS_CANVAS3D_VERTEX_TANGENT) 492 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT)
493 { 493 {
494 element_count = 3; 494 element_count = 3;
495 } 495 }
496 else if (attrib == EVAS_CANVAS3D_VERTEX_COLOR) 496 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR)
497 { 497 {
498 element_count = 4; 498 element_count = 4;
499 } 499 }
500 else if (attrib == EVAS_CANVAS3D_VERTEX_TEXCOORD) 500 else if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)
501 { 501 {
502 element_count = 2; 502 element_count = 2;
503 } 503 }
@@ -583,7 +583,7 @@ _evas_canvas3d_mesh_frame_vertex_data_copy_set(Eo *obj, Evas_Canvas3D_Mesh_Data
583 } 583 }
584 } 584 }
585 585
586 if (attrib == EVAS_CANVAS3D_VERTEX_POSITION && 586 if (attrib == EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION &&
587 !evas_canvas3d_mesh_aabb_add_to_frame(pd, frame, stride)) 587 !evas_canvas3d_mesh_aabb_add_to_frame(pd, frame, stride))
588 { 588 {
589 ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame); 589 ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame);
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index 96fddafccc..0196736138 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -1,3 +1,5 @@
1import evas_types;
2
1class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File) 3class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
2{ 4{
3 legacy_prefix: null; 5 legacy_prefix: null;
@@ -174,19 +176,19 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
174 fog_color_set { 176 fog_color_set {
175 [[Set the fog color and density for the given mesh.]] 177 [[Set the fog color and density for the given mesh.]]
176 params { 178 params {
177 @in r: Evas_Real; [[The red component of the fog color.]] 179 @in r: Evas.Real; [[The red component of the fog color.]]
178 @in g: Evas_Real; [[The green component of the fog color.]] 180 @in g: Evas.Real; [[The green component of the fog color.]]
179 @in b: Evas_Real; [[The blue component of the fog color.]] 181 @in b: Evas.Real; [[The blue component of the fog color.]]
180 @in a: Evas_Real; [[The transparency of fog.]] 182 @in a: Evas.Real; [[The transparency of fog.]]
181 } 183 }
182 } 184 }
183 fog_color_get { 185 fog_color_get {
184 [[Set the fog color and density for the given mesh.]] 186 [[Set the fog color and density for the given mesh.]]
185 params { 187 params {
186 @out r: Evas_Real; [[Pointer to receive red component of the fog color.]] 188 @out r: Evas.Real; [[Pointer to receive red component of the fog color.]]
187 @out g: Evas_Real; [[Pointer to receive green component of the fog color.]] 189 @out g: Evas.Real; [[Pointer to receive green component of the fog color.]]
188 @out b: Evas_Real; [[Pointer to receive blue component of the fog color.]] 190 @out b: Evas.Real; [[Pointer to receive blue component of the fog color.]]
189 @out a: Evas_Real; [[Pointer to receive transparency of fog.]] 191 @out a: Evas.Real; [[Pointer to receive transparency of fog.]]
190 } 192 }
191 } 193 }
192 blending_func_set { 194 blending_func_set {
@@ -306,7 +308,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
306 } 308 }
307 values { 309 values {
308 comparison_func: Evas.Canvas3D.Comparison; [[The alpha comparison function.]] 310 comparison_func: Evas.Canvas3D.Comparison; [[The alpha comparison function.]]
309 ref_value: Evas_Real; [[The reference value that incoming alpha values are compared to.]] 311 ref_value: Evas.Real; [[The reference value that incoming alpha values are compared to.]]
310 } 312 }
311 } 313 }
312 314
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 2fb2bf2d12..707625cacb 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -522,7 +522,7 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Evas_Vec3 **vertices, int *co
522 EINA_LIST_FOREACH(m, l, mesh) 522 EINA_LIST_FOREACH(m, l, mesh)
523 { 523 {
524 eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh)); 524 eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh));
525 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_POSITION, 525 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
526 &pos0, &pos1, &pos_weight); 526 &pos0, &pos1, &pos_weight);
527 if(!pos0.data) continue; 527 if(!pos0.data) continue;
528 if(!pos0.stride) 528 if(!pos0.stride)
@@ -545,7 +545,7 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Evas_Vec3 **vertices, int *co
545 EINA_LIST_FOREACH(m, l, mesh) 545 EINA_LIST_FOREACH(m, l, mesh)
546 { 546 {
547 eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh)); 547 eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh));
548 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_POSITION, 548 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
549 &pos0, &pos1, &pos_weight); 549 &pos0, &pos1, &pos_weight);
550 if(!pos0.data) continue; 550 if(!pos0.data) continue;
551 int stride = 0; 551 int stride = 0;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo b/src/lib/evas/canvas/evas_canvas3d_node.eo
index df85e696f9..d6515db5ba 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_node.eo
@@ -1,3 +1,5 @@
1import evas_types;
2
1class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface) 3class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
2{ 4{
3 legacy_prefix: null; 5 legacy_prefix: null;
@@ -60,9 +62,9 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
60 62
61 See also @Evas.Canvas3D.Node.position_inherit.set.]] 63 See also @Evas.Canvas3D.Node.position_inherit.set.]]
62 params { 64 params {
63 @in x: Evas_Real; [[X coordinate of the position.]] 65 @in x: Evas.Real; [[X coordinate of the position.]]
64 @in y: Evas_Real; [[Y coordinate of the position.]] 66 @in y: Evas.Real; [[Y coordinate of the position.]]
65 @in z: Evas_Real; [[Z coordinate of the position.]] 67 @in z: Evas.Real; [[Z coordinate of the position.]]
66 } 68 }
67 } 69 }
68 orientation_set { 70 orientation_set {
@@ -75,10 +77,10 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
75 77
76 See also @Evas.Canvas3D.Node.orientation_inherit.set.]] 78 See also @Evas.Canvas3D.Node.orientation_inherit.set.]]
77 params { 79 params {
78 @in x: Evas_Real; [[X term of the orientation quaternion (w, x, y, z.]] 80 @in x: Evas.Real; [[X term of the orientation quaternion (w, x, y, z.]]
79 @in y: Evas_Real; [[Y term of the orientation quaternion (w, x, y, z.]] 81 @in y: Evas.Real; [[Y term of the orientation quaternion (w, x, y, z.]]
80 @in z: Evas_Real; [[Z term of the orientation quaternion (w, x, y, z.]] 82 @in z: Evas.Real; [[Z term of the orientation quaternion (w, x, y, z.]]
81 @in w: Evas_Real; [[W term of the orientation quaternion (w, x, y, z.]] 83 @in w: Evas.Real; [[W term of the orientation quaternion (w, x, y, z.]]
82 } 84 }
83 } 85 }
84 86
@@ -87,10 +89,10 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
87 89
88 See also @Evas.Canvas3D.Node.orientation_set.]] 90 See also @Evas.Canvas3D.Node.orientation_set.]]
89 params { 91 params {
90 @in angle: Evas_Real; [[Rotation angle.]] 92 @in angle: Evas.Real; [[Rotation angle.]]
91 @in x: Evas_Real; [[X term of the rotation axis.]] 93 @in x: Evas.Real; [[X term of the rotation axis.]]
92 @in y: Evas_Real; [[Y term of the rotation axis.]] 94 @in y: Evas.Real; [[Y term of the rotation axis.]]
93 @in z: Evas_Real; [[Z term of the rotation axis.]] 95 @in z: Evas.Real; [[Z term of the rotation axis.]]
94 } 96 }
95 } 97 }
96 98
@@ -105,9 +107,9 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
105 107
106 See also @Evas.Canvas3D.Node.scale_inherit.set.]] 108 See also @Evas.Canvas3D.Node.scale_inherit.set.]]
107 params { 109 params {
108 @in x: Evas_Real; [[Scale factor along X-axis.]] 110 @in x: Evas.Real; [[Scale factor along X-axis.]]
109 @in y: Evas_Real; [[Scale factor along Y-axis.]] 111 @in y: Evas.Real; [[Scale factor along Y-axis.]]
110 @in z: Evas_Real; [[Scale factor along Z-axis.]] 112 @in z: Evas.Real; [[Scale factor along Z-axis.]]
111 } 113 }
112 } 114 }
113 115
@@ -117,9 +119,9 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
117 See also @Evas.Canvas3D.Node.position_set.]] 119 See also @Evas.Canvas3D.Node.position_set.]]
118 params { 120 params {
119 @in space: Evas.Canvas3D.Space; [[The given node.]] 121 @in space: Evas.Canvas3D.Space; [[The given node.]]
120 @out x: Evas_Real; [[Pointer to receive X coordinate of the position.]] 122 @out x: Evas.Real; [[Pointer to receive X coordinate of the position.]]
121 @out y: Evas_Real; [[Pointer to receive Y coordinate of the position.]] 123 @out y: Evas.Real; [[Pointer to receive Y coordinate of the position.]]
122 @out z: Evas_Real; [[Pointer to receive Z coordinate of the position.]] 124 @out z: Evas.Real; [[Pointer to receive Z coordinate of the position.]]
123 } 125 }
124 } 126 }
125 127
@@ -129,10 +131,10 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
129 See also @Evas.Canvas3D.Node.orientation_set.]] 131 See also @Evas.Canvas3D.Node.orientation_set.]]
130 params { 132 params {
131 @in space: Evas.Canvas3D.Space; [[The given node.]] 133 @in space: Evas.Canvas3D.Space; [[The given node.]]
132 @out x: Evas_Real; [[Pointer to receive X term of the orientation quaternion.]] 134 @out x: Evas.Real; [[Pointer to receive X term of the orientation quaternion.]]
133 @out y: Evas_Real; [[Pointer to receive Y term of the orientation quaternion.]] 135 @out y: Evas.Real; [[Pointer to receive Y term of the orientation quaternion.]]
134 @out z: Evas_Real; [[Pointer to receive Z term of the orientation quaternion.]] 136 @out z: Evas.Real; [[Pointer to receive Z term of the orientation quaternion.]]
135 @out w: Evas_Real; [[Pointer to receive W term of the orientation quaternion.]] 137 @out w: Evas.Real; [[Pointer to receive W term of the orientation quaternion.]]
136 } 138 }
137 } 139 }
138 140
@@ -142,9 +144,9 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
142 See also @Evas.Canvas3D.Node.scale_get.]] 144 See also @Evas.Canvas3D.Node.scale_get.]]
143 params { 145 params {
144 @in space: Evas.Canvas3D.Space; [[The given node.]] 146 @in space: Evas.Canvas3D.Space; [[The given node.]]
145 @out x: Evas_Real; [[Pointer to receive Scale factor along X-axis.]] 147 @out x: Evas.Real; [[Pointer to receive Scale factor along X-axis.]]
146 @out y: Evas_Real; [[Pointer to receive Scale factor along X-axis.]] 148 @out y: Evas.Real; [[Pointer to receive Scale factor along X-axis.]]
147 @out z: Evas_Real; [[Pointer to receive Scale factor along X-axis.]] 149 @out z: Evas.Real; [[Pointer to receive Scale factor along X-axis.]]
148 } 150 }
149 } 151 }
150 152
@@ -158,13 +160,13 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
158 See also @Evas.Canvas3D.Node.orientation_set.]] 160 See also @Evas.Canvas3D.Node.orientation_set.]]
159 params { 161 params {
160 @in target_space: Evas.Canvas3D.Space; [[Space where the target position belongs to.]] 162 @in target_space: Evas.Canvas3D.Space; [[Space where the target position belongs to.]]
161 @in x: Evas_Real; [[X coordinate of the target position.]] 163 @in x: Evas.Real; [[X coordinate of the target position.]]
162 @in y: Evas_Real; [[Y coordinate of the target position.]] 164 @in y: Evas.Real; [[Y coordinate of the target position.]]
163 @in z: Evas_Real; [[Z coordinate of the target position.]] 165 @in z: Evas.Real; [[Z coordinate of the target position.]]
164 @in up_space: Evas.Canvas3D.Space; [[Space where the up vector belongs to.]] 166 @in up_space: Evas.Canvas3D.Space; [[Space where the up vector belongs to.]]
165 @in ux: Evas_Real; [[X term of the up vector.]] 167 @in ux: Evas.Real; [[X term of the up vector.]]
166 @in uy: Evas_Real; [[Y term of the up vector.]] 168 @in uy: Evas.Real; [[Y term of the up vector.]]
167 @in uz: Evas_Real; [[Z term of the up vector.]] 169 @in uz: Evas.Real; [[Z term of the up vector.]]
168 } 170 }
169 } 171 }
170 172
@@ -206,12 +208,12 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
206 bounding_box_get{ 208 bounding_box_get{
207 [[Get axis-aligned bounding box (AABB) of the given node.]] 209 [[Get axis-aligned bounding box (AABB) of the given node.]]
208 params { 210 params {
209 @in x: Evas_Real *; [[Pointer to receive X coordinate of the first point of AABB.]] 211 @in x: Evas.Real *; [[Pointer to receive X coordinate of the first point of AABB.]]
210 @in y: Evas_Real *; [[Pointer to receive Y coordinate of the first point of AABB.]] 212 @in y: Evas.Real *; [[Pointer to receive Y coordinate of the first point of AABB.]]
211 @in z: Evas_Real *; [[Pointer to receive Z coordinate of the first point of AABB.]] 213 @in z: Evas.Real *; [[Pointer to receive Z coordinate of the first point of AABB.]]
212 @in x2: Evas_Real *; [[Pointer to receive X coordinate of the second point of AABB.]] 214 @in x2: Evas.Real *; [[Pointer to receive X coordinate of the second point of AABB.]]
213 @in y2: Evas_Real *; [[Pointer to receive Y coordinate of the second point of AABB.]] 215 @in y2: Evas.Real *; [[Pointer to receive Y coordinate of the second point of AABB.]]
214 @in z2: Evas_Real *; [[Pointer to receive Z coordinate of the second point of AABB.]] 216 @in z2: Evas.Real *; [[Pointer to receive Z coordinate of the second point of AABB.]]
215 } 217 }
216 } 218 }
217 219
@@ -219,10 +221,10 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object, Evas.Common_Interface)
219 [[Get bounding sphere of the given node.]] 221 [[Get bounding sphere of the given node.]]
220 params { 222 params {
221 223
222 @in x: Evas_Real *; [[Pointer to receive X coordinate of the center of sphere.]] 224 @in x: Evas.Real *; [[Pointer to receive X coordinate of the center of sphere.]]
223 @in y: Evas_Real *; [[Pointer to receive Y coordinate of the center of sphere.]] 225 @in y: Evas.Real *; [[Pointer to receive Y coordinate of the center of sphere.]]
224 @in z: Evas_Real *; [[Pointer to receive Z coordinate of center of sphere.]] 226 @in z: Evas.Real *; [[Pointer to receive Z coordinate of center of sphere.]]
225 @in r: Evas_Real *; [[Pointer to receive radius of center of sphere.]] 227 @in r: Evas.Real *; [[Pointer to receive radius of center of sphere.]]
226 } 228 }
227 } 229 }
228 230
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo
index 9dac3aeafb..5d2b2d5fc5 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -1,3 +1,5 @@
1import evas_types;
2
1class Evas.Canvas3D.Object (Eo.Base, Evas.Common_Interface) 3class Evas.Canvas3D.Object (Eo.Base, Evas.Common_Interface)
2{ 4{
3 legacy_prefix: null; 5 legacy_prefix: null;
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
index f56e2e7071..ba5b5e2e05 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
@@ -1,3 +1,5 @@
1import evas_types;
2
1class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object, Evas.Common_Interface) 3class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object, Evas.Common_Interface)
2{ 4{
3 legacy_prefix: null; 5 legacy_prefix: null;
@@ -67,7 +69,7 @@ class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object, Evas.Common_Interface)
67 See also @.ratio.set.]] 69 See also @.ratio.set.]]
68 } 70 }
69 values { 71 values {
70 ratio: Evas_Real; [[Ratio of primitive.]] 72 ratio: Evas.Real; [[Ratio of primitive.]]
71 } 73 }
72 } 74 }
73 @property precision { 75 @property precision {
@@ -127,8 +129,8 @@ class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object, Evas.Common_Interface)
127 See also @.tex_scale.set.]] 129 See also @.tex_scale.set.]]
128 } 130 }
129 values { 131 values {
130 tex_scale_x: Evas_Real; 132 tex_scale_x: Evas.Real;
131 tex_scale_y: Evas_Real; 133 tex_scale_y: Evas.Real;
132 } 134 }
133 } 135 }
134 } 136 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index 342bfd3638..1f039ff0f2 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -293,10 +293,10 @@ _pick_data_mesh_add(Evas_Canvas3D_Pick_Data *data, const Evas_Ray3 *ray,
293 memset(&tex0, 0x00, sizeof(Evas_Canvas3D_Vertex_Buffer)); 293 memset(&tex0, 0x00, sizeof(Evas_Canvas3D_Vertex_Buffer));
294 memset(&tex1, 0x00, sizeof(Evas_Canvas3D_Vertex_Buffer)); 294 memset(&tex1, 0x00, sizeof(Evas_Canvas3D_Vertex_Buffer));
295 295
296 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_POSITION, 296 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
297 &pos0, &pos1, &pos_weight); 297 &pos0, &pos1, &pos_weight);
298 298
299 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_TEXCOORD, 299 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
300 &tex0, &tex1, &tex_weight); 300 &tex0, &tex1, &tex_weight);
301 Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 301 Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
302 if (pdmesh->indices) 302 if (pdmesh->indices)
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo b/src/lib/evas/canvas/evas_canvas3d_scene.eo
index 46b175050f..a9e7aa02f5 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo
@@ -1,3 +1,5 @@
1import evas_types;
2
1class Evas.Canvas3D.Scene (Evas.Canvas3D.Object, Evas.Common_Interface) 3class Evas.Canvas3D.Scene (Evas.Canvas3D.Object, Evas.Common_Interface)
2{ 4{
3 legacy_prefix: null; 5 legacy_prefix: null;
@@ -35,20 +37,20 @@ class Evas.Canvas3D.Scene (Evas.Canvas3D.Object, Evas.Common_Interface)
35 Default background color is (0.0, 0.0, 0.0, 0.0). 37 Default background color is (0.0, 0.0, 0.0, 0.0).
36 ]] 38 ]]
37 params { 39 params {
38 @in r: Evas_Real; [[Red component of the background color.]] 40 @in r: Evas.Real; [[Red component of the background color.]]
39 @in g: Evas_Real; [[Green component of the background color.]] 41 @in g: Evas.Real; [[Green component of the background color.]]
40 @in b: Evas_Real; [[Blue component of the background color.]] 42 @in b: Evas.Real; [[Blue component of the background color.]]
41 @in a: Evas_Real; [[Alpha component of the background color.]] 43 @in a: Evas.Real; [[Alpha component of the background color.]]
42 } 44 }
43 } 45 }
44 46
45 background_color_get @const { 47 background_color_get @const {
46 [[Get the background color of a scene.]] 48 [[Get the background color of a scene.]]
47 params { 49 params {
48 @out r: Evas_Real; [[Pointer to receive red component of the background color.]] 50 @out r: Evas.Real; [[Pointer to receive red component of the background color.]]
49 @out g: Evas_Real; [[Pointer to receive green component of the background color.]] 51 @out g: Evas.Real; [[Pointer to receive green component of the background color.]]
50 @out b: Evas_Real; [[Pointer to receive blue component of the background color.]] 52 @out b: Evas.Real; [[Pointer to receive blue component of the background color.]]
51 @out a: Evas_Real; [[Pointer to receive alpha component of the background color.]] 53 @out a: Evas.Real; [[Pointer to receive alpha component of the background color.]]
52 } 54 }
53 } 55 }
54 56
@@ -63,12 +65,12 @@ class Evas.Canvas3D.Scene (Evas.Canvas3D.Object, Evas.Common_Interface)
63 ]] 65 ]]
64 return: bool; 66 return: bool;
65 params { 67 params {
66 @in x: Evas_Real; [[X coordinate of the picking position.]] 68 @in x: Evas.Real; [[X coordinate of the picking position.]]
67 @in y: Evas_Real; [[Y coordinate of the picking position.]] 69 @in y: Evas.Real; [[Y coordinate of the picking position.]]
68 @out node: Evas.Canvas3D.Node *; [[Pointer to receive the node contains the picked mesh.]] 70 @out node: Evas.Canvas3D.Node *; [[Pointer to receive the node contains the picked mesh.]]
69 @out mesh: Evas.Canvas3D.Mesh *; [[Pointer to receive the picked mesh.]] 71 @out mesh: Evas.Canvas3D.Mesh *; [[Pointer to receive the picked mesh.]]
70 @out s: Evas_Real; [[Pointer to receive the texture "s" coordinate.]] 72 @out s: Evas.Real; [[Pointer to receive the texture "s" coordinate.]]
71 @out t: Evas_Real; [[Pointer to receive the texture "t" coordinate.]] 73 @out t: Evas.Real; [[Pointer to receive the texture "t" coordinate.]]
72 } 74 }
73 } 75 }
74 76
@@ -76,8 +78,8 @@ class Evas.Canvas3D.Scene (Evas.Canvas3D.Object, Evas.Common_Interface)
76 [[Search given node in the given position.]] 78 [[Search given node in the given position.]]
77 return: Evas.Canvas3D.Node *; 79 return: Evas.Canvas3D.Node *;
78 params { 80 params {
79 @in x: Evas_Real; [[X coordinate of the picking position.]] 81 @in x: Evas.Real; [[X coordinate of the picking position.]]
80 @in y: Evas_Real; [[Y coordinate of the picking position.]] 82 @in y: Evas.Real; [[Y coordinate of the picking position.]]
81 @in node: Evas.Canvas3D.Node *; [[Node for search.]] 83 @in node: Evas.Canvas3D.Node *; [[Node for search.]]
82 } 84 }
83 } 85 }
@@ -86,8 +88,8 @@ class Evas.Canvas3D.Scene (Evas.Canvas3D.Object, Evas.Common_Interface)
86 [[Get list of the all root members from scene in the given position.]] 88 [[Get list of the all root members from scene in the given position.]]
87 return: list<Evas.Canvas3D.Node *> *; 89 return: list<Evas.Canvas3D.Node *> *;
88 params { 90 params {
89 @in x: Evas_Real; [[X coordinate of the picking position.]] 91 @in x: Evas.Real; [[X coordinate of the picking position.]]
90 @in y: Evas_Real; [[Y coordinate of the picking position.]] 92 @in y: Evas.Real; [[Y coordinate of the picking position.]]
91 } 93 }
92 } 94 }
93 shadows_enable_set { 95 shadows_enable_set {
diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot
index 0e7596d68b..6a6b98e795 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -229,3 +229,283 @@ struct Evas.Engine_Info; [[A generic Evas Engine information structure]]
229struct Evas.Axis; [[Details for a single device axis state 229struct Evas.Axis; [[Details for a single device axis state
230 230
231 @since 1.13]] 231 @since 1.13]]
232
233type Evas.Real: double; [[A type for floating value]]
234
235enum Evas.Canvas3D.Object_Type
236{
237 [[Type of 3D Object
238
239 @since 1.10]]
240 invalid = 0,
241 scene,
242 node,
243 camera,
244 light,
245 model,
246 mesh,
247 texture,
248 material,
249 primitive [[@since 1.15]]
250}
251
252enum Evas.Canvas3D.State
253{
254 [[State of the Evas 3D
255
256 @since 1.10]]
257 max = 16,
258
259 any = 0,
260
261 scene_root_node = 1,
262 scene_camera_node,
263 scene_background_color,
264 scene_size,
265 scene_shadows_enabled,
266 scene_updated, [[@since 1.14]]
267
268 texture_data = 1,
269 texture_wrap,
270 texture_filter,
271
272 material_id = 1,
273 material_color,
274 material_texture,
275
276 mesh_vertex_count = 1,
277 mesh_frame,
278 mesh_material,
279 mesh_transform,
280 mesh_vertex_data,
281 mesh_index_data,
282 mesh_vertex_assembly,
283 mesh_shade_mode,
284 mesh_fog,
285 mesh_blending,
286 mesh_alpha_test,
287 mesh_color_pick,
288
289 camera_projection = 1,
290
291 light_ambient = 1,
292 light_diffuse,
293 light_specular,
294 light_spot_dir,
295 light_spot_exp,
296 light_spot_cutoff,
297 light_attenuation,
298 light_projection,
299
300 node_transform_position = 1,
301 node_transform_orientation,
302 node_transform_scale,
303 node_mesh_geometry,
304 node_mesh_material,
305 node_mesh_frame,
306 node_mesh_shade_mode,
307 node_mesh_material_id,
308 node_light,
309 node_camera,
310 node_parent_position,
311 node_parent_orientation,
312 node_parent_scale,
313 node_member,
314 node_parent_billboard [[@since 1.14]]
315}
316
317enum Evas.Canvas3D.Space
318{
319 [[Transform space
320
321 @since 1.10]]
322 local = 0, [[Local coordinate space]]
323 parent, [[Parent coordinate space]]
324 world [[World coordinate space]]
325}
326
327enum Evas.Canvas3D.Node_Type
328{
329 [[Types of a node
330
331 @since 1.10]]
332 node = 0, [[Node with no items]]
333 camera, [[Node which can contain camera object]]
334 light, [[Node which can contain light object]]
335 mesh [[Node which can contain mesh objects]]
336}
337
338enum Evas.Canvas3D.Node_Orientation_Type
339{
340 [[Types of node orientation
341
342 @since 1.13]]
343 none = 0, [[Node with no orientation properties]]
344 look_at, [[Node orientation is given as a point to look at and a vector that indicates the angle at which the subject is looking at the point]]
345 look_to, [[Node orientation is given as id of another part to look at and a vector that indicates the angle at which the subject is looking at the part]]
346 angle_axis, [[Node orientation is given as an angle and an axis to rotate around]]
347 quaternion [[Node orientation is given as a quaternion]]
348}
349
350enum Evas.Canvas3D.Index_Format
351{
352 [[Index formats
353
354 @since 1.10]]
355 none = 0, [[Indexing is not used]]
356 unsigned_byte, [[Index is of type unsigned byte]]
357 unsigned_short [[Index is of type unsigned short]]
358}
359
360enum Evas.Canvas3D.Frustum_Mode
361{
362 [[Frustum modes
363
364 @since 1.12]]
365 bsphere, [[Bounding sphere]]
366 aabb, [[Axis-aligned bounding box]]
367 central_point
368}
369
370enum Evas.Canvas3D.Vertex_Assembly
371{
372 [[Vertex assembly modes. Vertex assembly represents how the vertices are organized into geometric primitives.
373
374 @since 1.10]]
375 points = 0, [[A vertex is rendered as a point]]
376 lines, [[Two vertices are organized as a line]]
377 line_strip, [[Vertices are organized as a connected line path]]
378 line_loop, [[Vertices are organized as a closed line path]]
379 triangles, [[Three vertices are organized as a triangle]]
380 triangle_strip, [[Vertices are organized as connected triangles]]
381 triangle_fan [[Vertices are organized as a triangle fan]]
382}
383
384enum Evas.Canvas3D.Comparison
385{
386 [[Comparsion functions for testing(alpha, depth, stencil) in fragment shader
387
388 @since 1.14]]
389 never, [[Never passes]]
390 less, [[Passes if the incoming value is less than the reference value]]
391 equal, [[Passes if the incoming value is equal to the reference value]]
392 lequal, [[Passes if the incoming value is less than or equal to the reference value]]
393 greater, [[Passes if the incoming value is greater than the reference value]]
394 notequal, [[Passes if the incoming value is not equal to the reference value]]
395 gequal, [[Passes if the incoming value is greater than or equal to the reference value]]
396 always [[Always passes (initial value)]]
397}
398
399enum Evas.Canvas3D.Wrap_Mode
400{
401 [[Wrap modes for texture units
402
403 @since 1.14]]
404 clamp = 0, [[Values will be clamped to be in range (min, max)]]
405 repeat, [[Values will be repeated]]
406 reflect [[Values will be repeated in a reflected manner]]
407}
408
409enum Evas.Canvas3D.Texture_Filter
410{
411 [[Filters for texture units
412
413 @since 1.14]]
414 nearest = 0, [[Samples nearest texel]]
415 linear, [[Lineary interpolate nearby texels]]
416 nearest_mipmap_nearest, [[Nearest sampling mipmap]]
417 linear_mipmap_nearest, [[Nearest sampling mipmap and interpolate]]
418 nearest_mipmap_linear, [[Linear sampling in nearest mipmap]]
419 linear_mipmap_linear [[Linear sampling in mipmap and interpolate]]
420}
421
422enum Evas.Canvas3D.Mesh_Primitive
423{
424 [[Mesh primitive
425
426 @since 1.12]]
427 none = 0, [[An empty space]]
428 square, [[One sided square]]
429 cube,
430 cylinder, [[Cylinder (can use precision and texture scale)]]
431 cone, [[Cone (can use precision and texture scale)]]
432 sphere, [[Sphere (can use precision and texture scale)]]
433 torus, [[Torus (can use ratio, precision and texture scale)]]
434 surface, [[Custom surface (can use pointer to users function, precision and texture scale)]]
435 terrain, [[Terrain as surface with pointer to perlin's noise function]]
436 count
437}
438
439enum Evas.Canvas3D.Primitive_Mode
440{
441 [[Mode of mesh primitive
442
443 @since 1.15]]
444 default = 0, [[Default mode of primitive]]
445 without_base, [[Primitive without base (supported for cylinder and cone)]]
446 alternative_uv [[Ptimitive with alternative uv (supported for sphere)]]
447}
448
449enum Evas.Canvas3D.Shade_Mode
450{
451 [[Shader shade modes
452
453 @since 1.10]]
454 vertex_color = 0, [[Shaded using vertex color attribute]]
455 diffuse, [[Shaded using material diffuse term]]
456 flat, [[Per-vertex flat lighting]]
457 phong, [[Per-pixel phong shading]]
458 normal_map, [[Per-pixel normal map shading]]
459 shadow_map_render, [[Fragment color is defined by its z-coord]]
460 color_pick, [[Rendering to additional frame bufer]]
461 parallax_occlusion [[Per-pixel parallax occlusion map shading]]
462}
463
464enum Evas.Canvas3D.Vertex_Attrib
465{
466 [[Vertex attribute IDs
467
468 @since 1.10]]
469 position = 0, [[vertex position]]
470 normal, [[vertex normal]]
471 tangent, [[vertex tangent (for normal mapping)]]
472 color, [[vertex color]]
473 texcoord [[vertex texture coordinate]]
474}
475
476enum Evas.Canvas3D.Blend_Func
477{
478 [[Blending function
479
480 @since 1.14]]
481
482 zero = 0, [[The scale factors for color components is (0, 0, 0, 0)]]
483 one, [[The scale factors for color components is (1, 1, 1, 1)]]
484 src_color, [[The scale factors for color components is (rs/kr, gs/kg, bs/kb, as/ka)]]
485 one_minus_src_color, [[The scale factors for color components is (1, 1, 1, 1) - (rs/kr, gs/kg, bs/kb, as/ka)]]
486 dst_color, [[The scale factors for color components is (rd/kr, gd/kg, bd/kb, ad/ka)]]
487 one_minus_dst_color, [[The scale factors for color components is (1, 1, 1, 1) - (rd/kr, gd/kg, bd/kb, ad/ka)]]
488 src_alpha, [[The scale factors for color components is (as/ka, as/ka, as/ka, as/ka)]]
489 one_minus_src_alpha, [[The scale factors for color components is (1, 1, 1, 1) - (as/ka, as/ka, as/ka, as/ka)]]
490 dst_alpha, [[The scale factors for color components is (ad/ka, ad/ka, ad/ka, ad/ka)]]
491 one_minus_dst_alpha, [[The scale factors for color components is (1, 1, 1, 1) - (ad/ka, ad/ka, ad/ka, ad/ka)]]
492 constant_color, [[The scale factors for color components is (rc, gc, bc, ac)]]
493 one_minus_constant_color, [[The scale factors for color components is (1, 1, 1, 1) - (rc, gc, bc, ac)]]
494 constant_alpha, [[The scale factors for color components is (ac, ac, ac, ac)]]
495 one_minus_constant_alpha, [[The scale factors for color components is (1, 1, 1, 1) - (ac, ac, ac, ac)]]
496 src_alpha_saturate [[The scale factors for color components is (i, i, i, 1) where i = min(as, ka, ad)/ka]]
497}
498
499enum Evas.Canvas3D.Material_Attrib
500{
501 [[Material attributes
502
503 @since 1.10]]
504 ambient = 0, [[ambient term]]
505 diffuse, [[diffuse term]]
506 specular, [[specular term]]
507 emission, [[emission term]]
508 normal [[Normal map term]]
509}
510
511type Evas.Canvas3D.Surface_Func: __undefined_type;
diff --git a/src/lib/evas/common3d/primitives/primitive_common.h b/src/lib/evas/common3d/primitives/primitive_common.h
index fa05b6f649..7f4e39d292 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.h
+++ b/src/lib/evas/common3d/primitives/primitive_common.h
@@ -22,10 +22,10 @@
22 evas_canvas3d_mesh_frame_add(frame), \ 22 evas_canvas3d_mesh_frame_add(frame), \
23 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 23 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
24 icount, &indices[0])); \ 24 icount, &indices[0])); \
25 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_POSITION); \ 25 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); \
26 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_NORMAL); \ 26 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); \
27 _set_vec2_vertex_data(mesh, frame, vcount, tex_coord, EVAS_CANVAS3D_VERTEX_TEXCOORD); \ 27 _set_vec2_vertex_data(mesh, frame, vcount, tex_coord, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); \
28 _set_vec3_vertex_data(mesh, frame, vcount, tangents, EVAS_CANVAS3D_VERTEX_TANGENT); \ 28 _set_vec3_vertex_data(mesh, frame, vcount, tangents, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT); \
29 free(indices); 29 free(indices);
30 30
31#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \ 31#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \
@@ -34,15 +34,15 @@
34 evas_canvas3d_mesh_frame_add(frame), \ 34 evas_canvas3d_mesh_frame_add(frame), \
35 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 35 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
36 icount, &indices[0])); \ 36 icount, &indices[0])); \
37 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_POSITION, \ 37 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \
38 0, 3, 15, vcount); \ 38 0, 3, 15, vcount); \
39 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_NORMAL, \ 39 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, \
40 3, 3, 15, vcount); \ 40 3, 3, 15, vcount); \
41 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_COLOR, \ 41 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, \
42 6, 4, 15, vcount); \ 42 6, 4, 15, vcount); \
43 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_TEXCOORD, \ 43 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, \
44 10, 2, 15, vcount); \ 44 10, 2, 15, vcount); \
45 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_TANGENT, \ 45 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, \
46 12, 3, 15, vcount); 46 12, 3, 15, vcount);
47 47
48void _generate_indices(unsigned short *indices, int count, int width); 48void _generate_indices(unsigned short *indices, int count, int width);
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c b/src/modules/evas/engines/gl_common/evas_gl_3d.c
index 94b944a50d..6264f807cf 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c
@@ -558,31 +558,31 @@ _vertex_attrib_flag_add(E3D_Draw_Data *data,
558{ 558{
559 switch (attrib) 559 switch (attrib)
560 { 560 {
561 case EVAS_CANVAS3D_VERTEX_POSITION: 561 case EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION:
562 data->flags |= E3D_SHADER_FLAG_VERTEX_POSITION; 562 data->flags |= E3D_SHADER_FLAG_VERTEX_POSITION;
563 563
564 if (blend) 564 if (blend)
565 data->flags |= E3D_SHADER_FLAG_VERTEX_POSITION_BLEND; 565 data->flags |= E3D_SHADER_FLAG_VERTEX_POSITION_BLEND;
566 break; 566 break;
567 case EVAS_CANVAS3D_VERTEX_NORMAL: 567 case EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL:
568 data->flags |= E3D_SHADER_FLAG_VERTEX_NORMAL; 568 data->flags |= E3D_SHADER_FLAG_VERTEX_NORMAL;
569 569
570 if (blend) 570 if (blend)
571 data->flags |= E3D_SHADER_FLAG_VERTEX_NORMAL_BLEND; 571 data->flags |= E3D_SHADER_FLAG_VERTEX_NORMAL_BLEND;
572 break; 572 break;
573 case EVAS_CANVAS3D_VERTEX_TANGENT: 573 case EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT:
574 data->flags |= E3D_SHADER_FLAG_VERTEX_TANGENT; 574 data->flags |= E3D_SHADER_FLAG_VERTEX_TANGENT;
575 575
576 if (blend) 576 if (blend)
577 data->flags |= E3D_SHADER_FLAG_VERTEX_TANGENT_BLEND; 577 data->flags |= E3D_SHADER_FLAG_VERTEX_TANGENT_BLEND;
578 break; 578 break;
579 case EVAS_CANVAS3D_VERTEX_COLOR: 579 case EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR:
580 data->flags |= E3D_SHADER_FLAG_VERTEX_COLOR; 580 data->flags |= E3D_SHADER_FLAG_VERTEX_COLOR;
581 581
582 if (blend) 582 if (blend)
583 data->flags |= E3D_SHADER_FLAG_VERTEX_COLOR_BLEND; 583 data->flags |= E3D_SHADER_FLAG_VERTEX_COLOR_BLEND;
584 break; 584 break;
585 case EVAS_CANVAS3D_VERTEX_TEXCOORD: 585 case EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD:
586 data->flags |= E3D_SHADER_FLAG_VERTEX_TEXCOORD; 586 data->flags |= E3D_SHADER_FLAG_VERTEX_TEXCOORD;
587 587
588 if (blend) 588 if (blend)
@@ -599,19 +599,19 @@ _material_color_flag_add(E3D_Draw_Data *data, Evas_Canvas3D_Material_Attrib attr
599{ 599{
600 switch (attrib) 600 switch (attrib)
601 { 601 {
602 case EVAS_CANVAS3D_MATERIAL_AMBIENT: 602 case EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT:
603 data->flags |= E3D_SHADER_FLAG_AMBIENT; 603 data->flags |= E3D_SHADER_FLAG_AMBIENT;
604 break; 604 break;
605 case EVAS_CANVAS3D_MATERIAL_DIFFUSE: 605 case EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE:
606 data->flags |= E3D_SHADER_FLAG_DIFFUSE; 606 data->flags |= E3D_SHADER_FLAG_DIFFUSE;
607 break; 607 break;
608 case EVAS_CANVAS3D_MATERIAL_SPECULAR: 608 case EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR:
609 data->flags |= E3D_SHADER_FLAG_SPECULAR; 609 data->flags |= E3D_SHADER_FLAG_SPECULAR;
610 break; 610 break;
611 case EVAS_CANVAS3D_MATERIAL_EMISSION: 611 case EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION:
612 data->flags |= E3D_SHADER_FLAG_EMISSION; 612 data->flags |= E3D_SHADER_FLAG_EMISSION;
613 break; 613 break;
614 case EVAS_CANVAS3D_MATERIAL_NORMAL: 614 case EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL:
615 ERR("Material attribute normal should not be used with color values."); 615 ERR("Material attribute normal should not be used with color values.");
616 break; 616 break;
617 default: 617 default:
@@ -625,35 +625,35 @@ _material_texture_flag_add(E3D_Draw_Data *data, Evas_Canvas3D_Material_Attrib at
625{ 625{
626 switch (attrib) 626 switch (attrib)
627 { 627 {
628 case EVAS_CANVAS3D_MATERIAL_AMBIENT: 628 case EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT:
629 data->flags |= E3D_SHADER_FLAG_AMBIENT; 629 data->flags |= E3D_SHADER_FLAG_AMBIENT;
630 data->flags |= E3D_SHADER_FLAG_AMBIENT_TEXTURE; 630 data->flags |= E3D_SHADER_FLAG_AMBIENT_TEXTURE;
631 631
632 if (blend) 632 if (blend)
633 data->flags |= E3D_SHADER_FLAG_AMBIENT_TEXTURE_BLEND; 633 data->flags |= E3D_SHADER_FLAG_AMBIENT_TEXTURE_BLEND;
634 break; 634 break;
635 case EVAS_CANVAS3D_MATERIAL_DIFFUSE: 635 case EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE:
636 data->flags |= E3D_SHADER_FLAG_DIFFUSE; 636 data->flags |= E3D_SHADER_FLAG_DIFFUSE;
637 data->flags |= E3D_SHADER_FLAG_DIFFUSE_TEXTURE; 637 data->flags |= E3D_SHADER_FLAG_DIFFUSE_TEXTURE;
638 638
639 if (blend) 639 if (blend)
640 data->flags |= E3D_SHADER_FLAG_DIFFUSE_TEXTURE_BLEND; 640 data->flags |= E3D_SHADER_FLAG_DIFFUSE_TEXTURE_BLEND;
641 break; 641 break;
642 case EVAS_CANVAS3D_MATERIAL_SPECULAR: 642 case EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR:
643 data->flags |= E3D_SHADER_FLAG_SPECULAR; 643 data->flags |= E3D_SHADER_FLAG_SPECULAR;
644 data->flags |= E3D_SHADER_FLAG_SPECULAR_TEXTURE; 644 data->flags |= E3D_SHADER_FLAG_SPECULAR_TEXTURE;
645 645
646 if (blend) 646 if (blend)
647 data->flags |= E3D_SHADER_FLAG_SPECULAR_TEXTURE_BLEND; 647 data->flags |= E3D_SHADER_FLAG_SPECULAR_TEXTURE_BLEND;
648 break; 648 break;
649 case EVAS_CANVAS3D_MATERIAL_EMISSION: 649 case EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION:
650 data->flags |= E3D_SHADER_FLAG_EMISSION; 650 data->flags |= E3D_SHADER_FLAG_EMISSION;
651 data->flags |= E3D_SHADER_FLAG_EMISSION_TEXTURE; 651 data->flags |= E3D_SHADER_FLAG_EMISSION_TEXTURE;
652 652
653 if (blend) 653 if (blend)
654 data->flags |= E3D_SHADER_FLAG_EMISSION_TEXTURE_BLEND; 654 data->flags |= E3D_SHADER_FLAG_EMISSION_TEXTURE_BLEND;
655 break; 655 break;
656 case EVAS_CANVAS3D_MATERIAL_NORMAL: 656 case EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL:
657 data->flags |= E3D_SHADER_FLAG_NORMAL_TEXTURE; 657 data->flags |= E3D_SHADER_FLAG_NORMAL_TEXTURE;
658 658
659 if (blend) 659 if (blend)
@@ -795,7 +795,7 @@ _material_color_build(E3D_Draw_Data *data, int frame,
795 { 795 {
796 data->materials[attrib].color = pdmf0->attribs[attrib].color; 796 data->materials[attrib].color = pdmf0->attribs[attrib].color;
797 797
798 if (attrib == EVAS_CANVAS3D_MATERIAL_SPECULAR) 798 if (attrib == EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR)
799 data->shininess = pdmf0->shininess; 799 data->shininess = pdmf0->shininess;
800 } 800 }
801 else 801 else
@@ -809,7 +809,7 @@ _material_color_build(E3D_Draw_Data *data, int frame,
809 &pdmf0->attribs[attrib].color, 809 &pdmf0->attribs[attrib].color,
810 weight); 810 weight);
811 811
812 if (attrib == EVAS_CANVAS3D_MATERIAL_SPECULAR) 812 if (attrib == EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR)
813 { 813 {
814 data->shininess = pdmf0->shininess * weight + 814 data->shininess = pdmf0->shininess * weight +
815 pdmf1->shininess * (1.0 - weight); 815 pdmf1->shininess * (1.0 - weight);
@@ -894,7 +894,7 @@ _material_texture_build(E3D_Draw_Data *data, int frame,
894 894
895 data->materials[attrib].texture_weight = weight; 895 data->materials[attrib].texture_weight = weight;
896 896
897 if (attrib == EVAS_CANVAS3D_MATERIAL_SPECULAR) 897 if (attrib == EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR)
898 { 898 {
899 data->shininess = pdmf0->shininess * weight + 899 data->shininess = pdmf0->shininess * weight +
900 pdmf1->shininess * (1.0 - weight); 900 pdmf1->shininess * (1.0 - weight);
@@ -904,7 +904,7 @@ _material_texture_build(E3D_Draw_Data *data, int frame,
904 } 904 }
905 else 905 else
906 { 906 {
907 if (attrib == EVAS_CANVAS3D_MATERIAL_SPECULAR) 907 if (attrib == EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR)
908 data->shininess = pdmf0->shininess; 908 data->shininess = pdmf0->shininess;
909 909
910 _material_texture_flag_add(data, attrib, EINA_FALSE); 910 _material_texture_flag_add(data, attrib, EINA_FALSE);
@@ -1043,98 +1043,98 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
1043 1043
1044 if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR) 1044 if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR)
1045 { 1045 {
1046 BUILD(vertex_attrib, VERTEX_POSITION, EINA_TRUE); 1046 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1047 BUILD(vertex_attrib, VERTEX_COLOR, EINA_TRUE); 1047 BUILD(vertex_attrib, VERTEX_ATTRIB_COLOR, EINA_TRUE);
1048 } 1048 }
1049 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER) 1049 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER)
1050 { 1050 {
1051 BUILD(vertex_attrib, VERTEX_POSITION, EINA_TRUE); 1051 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1052 if (pdmesh->alpha_test_enabled) 1052 if (pdmesh->alpha_test_enabled)
1053 { 1053 {
1054 BUILD(material_texture, MATERIAL_DIFFUSE, EINA_FALSE); 1054 BUILD(material_texture, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1055 1055
1056 if (_flags_need_tex_coord(data->flags)) 1056 if (_flags_need_tex_coord(data->flags))
1057 BUILD(vertex_attrib, VERTEX_TEXCOORD, EINA_FALSE); 1057 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1058 } 1058 }
1059 } 1059 }
1060 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_COLOR_PICK) 1060 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_COLOR_PICK)
1061 { 1061 {
1062 BUILD(vertex_attrib, VERTEX_POSITION, EINA_TRUE); 1062 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1063 } 1063 }
1064 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_DIFFUSE) 1064 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_DIFFUSE)
1065 { 1065 {
1066 BUILD(vertex_attrib, VERTEX_POSITION, EINA_TRUE); 1066 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1067 BUILD(material_color, MATERIAL_DIFFUSE, EINA_TRUE); 1067 BUILD(material_color, MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
1068 BUILD(material_texture, MATERIAL_DIFFUSE, EINA_FALSE); 1068 BUILD(material_texture, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1069 1069
1070 if (_flags_need_tex_coord(data->flags)) 1070 if (_flags_need_tex_coord(data->flags))
1071 BUILD(vertex_attrib, VERTEX_TEXCOORD, EINA_FALSE); 1071 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1072 } 1072 }
1073 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_FLAT) 1073 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_FLAT)
1074 { 1074 {
1075 BUILD(vertex_attrib, VERTEX_POSITION, EINA_TRUE); 1075 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1076 BUILD(vertex_attrib, VERTEX_NORMAL, EINA_TRUE); 1076 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE);
1077 1077
1078 BUILD(material_color, MATERIAL_AMBIENT, EINA_FALSE); 1078 BUILD(material_color, MATERIAL_ATTRIB_AMBIENT, EINA_FALSE);
1079 BUILD(material_color, MATERIAL_DIFFUSE, EINA_FALSE); 1079 BUILD(material_color, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1080 BUILD(material_color, MATERIAL_SPECULAR, EINA_FALSE); 1080 BUILD(material_color, MATERIAL_ATTRIB_SPECULAR, EINA_FALSE);
1081 BUILD(material_color, MATERIAL_EMISSION, EINA_FALSE); 1081 BUILD(material_color, MATERIAL_ATTRIB_EMISSION, EINA_FALSE);
1082 1082
1083 BUILD(material_texture, MATERIAL_AMBIENT, EINA_FALSE); 1083 BUILD(material_texture, MATERIAL_ATTRIB_AMBIENT, EINA_FALSE);
1084 BUILD(material_texture, MATERIAL_DIFFUSE, EINA_FALSE); 1084 BUILD(material_texture, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1085 BUILD(material_texture, MATERIAL_SPECULAR, EINA_FALSE); 1085 BUILD(material_texture, MATERIAL_ATTRIB_SPECULAR, EINA_FALSE);
1086 BUILD(material_texture, MATERIAL_EMISSION, EINA_FALSE); 1086 BUILD(material_texture, MATERIAL_ATTRIB_EMISSION, EINA_FALSE);
1087 1087
1088 _light_build(data, light, matrix_eye); 1088 _light_build(data, light, matrix_eye);
1089 evas_normal_matrix_get(&data->matrix_normal, matrix_mv); 1089 evas_normal_matrix_get(&data->matrix_normal, matrix_mv);
1090 1090
1091 if (_flags_need_tex_coord(data->flags)) 1091 if (_flags_need_tex_coord(data->flags))
1092 BUILD(vertex_attrib, VERTEX_TEXCOORD, EINA_FALSE); 1092 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1093 } 1093 }
1094 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PHONG) 1094 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PHONG)
1095 { 1095 {
1096 BUILD(vertex_attrib, VERTEX_POSITION, EINA_TRUE); 1096 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1097 BUILD(vertex_attrib, VERTEX_NORMAL, EINA_TRUE); 1097 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE);
1098 1098
1099 BUILD(material_color, MATERIAL_AMBIENT, EINA_FALSE); 1099 BUILD(material_color, MATERIAL_ATTRIB_AMBIENT, EINA_FALSE);
1100 BUILD(material_color, MATERIAL_DIFFUSE, EINA_FALSE); 1100 BUILD(material_color, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1101 BUILD(material_color, MATERIAL_SPECULAR, EINA_FALSE); 1101 BUILD(material_color, MATERIAL_ATTRIB_SPECULAR, EINA_FALSE);
1102 BUILD(material_color, MATERIAL_EMISSION, EINA_FALSE); 1102 BUILD(material_color, MATERIAL_ATTRIB_EMISSION, EINA_FALSE);
1103 1103
1104 BUILD(material_texture, MATERIAL_AMBIENT, EINA_FALSE); 1104 BUILD(material_texture, MATERIAL_ATTRIB_AMBIENT, EINA_FALSE);
1105 BUILD(material_texture, MATERIAL_DIFFUSE, EINA_FALSE); 1105 BUILD(material_texture, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1106 BUILD(material_texture, MATERIAL_SPECULAR, EINA_FALSE); 1106 BUILD(material_texture, MATERIAL_ATTRIB_SPECULAR, EINA_FALSE);
1107 BUILD(material_texture, MATERIAL_EMISSION, EINA_FALSE); 1107 BUILD(material_texture, MATERIAL_ATTRIB_EMISSION, EINA_FALSE);
1108 1108
1109 _light_build(data, light, matrix_eye); 1109 _light_build(data, light, matrix_eye);
1110 evas_normal_matrix_get(&data->matrix_normal, matrix_mv); 1110 evas_normal_matrix_get(&data->matrix_normal, matrix_mv);
1111 1111
1112 if (_flags_need_tex_coord(data->flags)) 1112 if (_flags_need_tex_coord(data->flags))
1113 BUILD(vertex_attrib, VERTEX_TEXCOORD, EINA_FALSE); 1113 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1114 } 1114 }
1115 else if ((pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) || 1115 else if ((pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) ||
1116 (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION)) 1116 (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION))
1117 { 1117 {
1118 BUILD(vertex_attrib, VERTEX_POSITION, EINA_TRUE); 1118 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1119 BUILD(vertex_attrib, VERTEX_NORMAL, EINA_TRUE); 1119 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE);
1120 BUILD(vertex_attrib, VERTEX_TEXCOORD, EINA_TRUE); 1120 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_TRUE);
1121 BUILD(material_texture, MATERIAL_NORMAL, EINA_TRUE); 1121 BUILD(material_texture, MATERIAL_ATTRIB_NORMAL, EINA_TRUE);
1122 BUILD(vertex_attrib, VERTEX_TANGENT, EINA_FALSE); 1122 BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_FALSE);
1123 1123
1124 1124
1125 if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) 1125 if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP)
1126 BUILD(vertex_attrib, VERTEX_TANGENT, EINA_FALSE); 1126 BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_FALSE);
1127 else BUILD(vertex_attrib, VERTEX_TANGENT, EINA_TRUE); 1127 else BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_TRUE);
1128 1128
1129 BUILD(material_color, MATERIAL_AMBIENT, EINA_FALSE); 1129 BUILD(material_color, MATERIAL_ATTRIB_AMBIENT, EINA_FALSE);
1130 BUILD(material_color, MATERIAL_DIFFUSE, EINA_FALSE); 1130 BUILD(material_color, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1131 BUILD(material_color, MATERIAL_SPECULAR, EINA_FALSE); 1131 BUILD(material_color, MATERIAL_ATTRIB_SPECULAR, EINA_FALSE);
1132 BUILD(material_color, MATERIAL_EMISSION, EINA_FALSE); 1132 BUILD(material_color, MATERIAL_ATTRIB_EMISSION, EINA_FALSE);
1133 1133
1134 BUILD(material_texture, MATERIAL_AMBIENT, EINA_FALSE); 1134 BUILD(material_texture, MATERIAL_ATTRIB_AMBIENT, EINA_FALSE);
1135 BUILD(material_texture, MATERIAL_DIFFUSE, EINA_FALSE); 1135 BUILD(material_texture, MATERIAL_ATTRIB_DIFFUSE, EINA_FALSE);
1136 BUILD(material_texture, MATERIAL_SPECULAR, EINA_FALSE); 1136 BUILD(material_texture, MATERIAL_ATTRIB_SPECULAR, EINA_FALSE);
1137 BUILD(material_texture, MATERIAL_EMISSION, EINA_FALSE); 1137 BUILD(material_texture, MATERIAL_ATTRIB_EMISSION, EINA_FALSE);
1138 1138
1139 _light_build(data, light, matrix_eye); 1139 _light_build(data, light, matrix_eye);
1140 evas_normal_matrix_get(&data->matrix_normal, matrix_mv); 1140 evas_normal_matrix_get(&data->matrix_normal, matrix_mv);
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c b/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c
index 0710ab580d..2b0e7aed3f 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c
@@ -47,35 +47,35 @@ _gl_blend_func_get(Evas_Canvas3D_Blend_Func blend_func)
47{ 47{
48 switch (blend_func) 48 switch (blend_func)
49 { 49 {
50 case EVAS_CANVAS3D_BLEND_ZERO: 50 case EVAS_CANVAS3D_BLEND_FUNC_ZERO:
51 return GL_ZERO; 51 return GL_ZERO;
52 case EVAS_CANVAS3D_BLEND_ONE: 52 case EVAS_CANVAS3D_BLEND_FUNC_ONE:
53 return GL_ONE; 53 return GL_ONE;
54 case EVAS_CANVAS3D_BLEND_SRC_COLOR: 54 case EVAS_CANVAS3D_BLEND_FUNC_SRC_COLOR:
55 return GL_SRC_COLOR; 55 return GL_SRC_COLOR;
56 case EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_COLOR: 56 case EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_COLOR:
57 return GL_ONE_MINUS_SRC_COLOR; 57 return GL_ONE_MINUS_SRC_COLOR;
58 case EVAS_CANVAS3D_BLEND_DST_COLOR: 58 case EVAS_CANVAS3D_BLEND_FUNC_DST_COLOR:
59 return GL_DST_COLOR; 59 return GL_DST_COLOR;
60 case EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_COLOR: 60 case EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_DST_COLOR:
61 return GL_ONE_MINUS_DST_COLOR; 61 return GL_ONE_MINUS_DST_COLOR;
62 case EVAS_CANVAS3D_BLEND_SRC_ALPHA: 62 case EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA:
63 return GL_SRC_ALPHA; 63 return GL_SRC_ALPHA;
64 case EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA: 64 case EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA:
65 return GL_ONE_MINUS_SRC_ALPHA; 65 return GL_ONE_MINUS_SRC_ALPHA;
66 case EVAS_CANVAS3D_BLEND_DST_ALPHA: 66 case EVAS_CANVAS3D_BLEND_FUNC_DST_ALPHA:
67 return GL_DST_ALPHA; 67 return GL_DST_ALPHA;
68 case EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_ALPHA: 68 case EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_DST_ALPHA:
69 return GL_ONE_MINUS_DST_ALPHA; 69 return GL_ONE_MINUS_DST_ALPHA;
70 case EVAS_CANVAS3D_BLEND_CONSTANT_COLOR: 70 case EVAS_CANVAS3D_BLEND_FUNC_CONSTANT_COLOR:
71 return GL_CONSTANT_COLOR; 71 return GL_CONSTANT_COLOR;
72 case EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_COLOR: 72 case EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_CONSTANT_COLOR:
73 return GL_ONE_MINUS_CONSTANT_COLOR; 73 return GL_ONE_MINUS_CONSTANT_COLOR;
74 case EVAS_CANVAS3D_BLEND_CONSTANT_ALPHA: 74 case EVAS_CANVAS3D_BLEND_FUNC_CONSTANT_ALPHA:
75 return GL_CONSTANT_ALPHA; 75 return GL_CONSTANT_ALPHA;
76 case EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_ALPHA: 76 case EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_CONSTANT_ALPHA:
77 return GL_ONE_MINUS_CONSTANT_ALPHA; 77 return GL_ONE_MINUS_CONSTANT_ALPHA;
78 case EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE: 78 case EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA_SATURATE:
79 return GL_SRC_ALPHA_SATURATE; 79 return GL_SRC_ALPHA_SATURATE;
80 default: 80 default:
81 return GL_ZERO; 81 return GL_ZERO;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c b/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
index 22fcced761..0046508a4d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
@@ -410,103 +410,103 @@ _uniform_upload(E3D_Uniform u, GLint loc, const E3D_Draw_Data *data)
410 break; 410 break;
411 } 411 }
412 case E3D_UNIFORM_POSITION_WEIGHT: 412 case E3D_UNIFORM_POSITION_WEIGHT:
413 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_POSITION].weight); 413 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION].weight);
414 break; 414 break;
415 case E3D_UNIFORM_NORMAL_WEIGHT: 415 case E3D_UNIFORM_NORMAL_WEIGHT:
416 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_NORMAL].weight); 416 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL].weight);
417 break; 417 break;
418 case E3D_UNIFORM_TANGENT_WEIGHT: 418 case E3D_UNIFORM_TANGENT_WEIGHT:
419 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_TANGENT].weight); 419 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT].weight);
420 break; 420 break;
421 case E3D_UNIFORM_COLOR_WEIGHT: 421 case E3D_UNIFORM_COLOR_WEIGHT:
422 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_COLOR].weight); 422 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR].weight);
423 break; 423 break;
424 case E3D_UNIFORM_TEXCOORD_WEIGHT: 424 case E3D_UNIFORM_TEXCOORD_WEIGHT:
425 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_TEXCOORD].weight); 425 glUniform1f(loc, data->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD].weight);
426 break; 426 break;
427 case E3D_UNIFORM_TEXTURE_WEIGHT_AMBIENT: 427 case E3D_UNIFORM_TEXTURE_WEIGHT_AMBIENT:
428 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_AMBIENT].texture_weight); 428 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].texture_weight);
429 break; 429 break;
430 case E3D_UNIFORM_TEXTURE_WEIGHT_DIFFUSE: 430 case E3D_UNIFORM_TEXTURE_WEIGHT_DIFFUSE:
431 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_DIFFUSE].texture_weight); 431 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].texture_weight);
432 break; 432 break;
433 case E3D_UNIFORM_TEXTURE_WEIGHT_SPECULAR: 433 case E3D_UNIFORM_TEXTURE_WEIGHT_SPECULAR:
434 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_SPECULAR].texture_weight); 434 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR].texture_weight);
435 break; 435 break;
436 case E3D_UNIFORM_TEXTURE_WEIGHT_EMISSION: 436 case E3D_UNIFORM_TEXTURE_WEIGHT_EMISSION:
437 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_EMISSION].texture_weight); 437 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION].texture_weight);
438 break; 438 break;
439 case E3D_UNIFORM_TEXTURE_WEIGHT_NORMAL: 439 case E3D_UNIFORM_TEXTURE_WEIGHT_NORMAL:
440 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_NORMAL].texture_weight); 440 glUniform1f(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL].texture_weight);
441 break; 441 break;
442 case E3D_UNIFORM_TEXTURE_AMBIENT0: 442 case E3D_UNIFORM_TEXTURE_AMBIENT0:
443 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_AMBIENT].sampler0); 443 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].sampler0);
444 break; 444 break;
445 case E3D_UNIFORM_TEXTURE_DIFFUSE0: 445 case E3D_UNIFORM_TEXTURE_DIFFUSE0:
446 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_DIFFUSE].sampler0); 446 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].sampler0);
447 break; 447 break;
448 case E3D_UNIFORM_TEXTURE_SPECULAR0: 448 case E3D_UNIFORM_TEXTURE_SPECULAR0:
449 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_SPECULAR].sampler0); 449 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR].sampler0);
450 break; 450 break;
451 case E3D_UNIFORM_TEXTURE_EMISSION0: 451 case E3D_UNIFORM_TEXTURE_EMISSION0:
452 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_EMISSION].sampler0); 452 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION].sampler0);
453 break; 453 break;
454 case E3D_UNIFORM_TEXTURE_NORMAL0: 454 case E3D_UNIFORM_TEXTURE_NORMAL0:
455 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_NORMAL].sampler0); 455 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL].sampler0);
456 break; 456 break;
457 case E3D_UNIFORM_TEXTURE_AMBIENT1: 457 case E3D_UNIFORM_TEXTURE_AMBIENT1:
458 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_AMBIENT].sampler1); 458 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].sampler1);
459 break; 459 break;
460 case E3D_UNIFORM_TEXTURE_DIFFUSE1: 460 case E3D_UNIFORM_TEXTURE_DIFFUSE1:
461 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_DIFFUSE].sampler1); 461 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].sampler1);
462 break; 462 break;
463 case E3D_UNIFORM_TEXTURE_SPECULAR1: 463 case E3D_UNIFORM_TEXTURE_SPECULAR1:
464 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_SPECULAR].sampler1); 464 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR].sampler1);
465 break; 465 break;
466 case E3D_UNIFORM_TEXTURE_EMISSION1: 466 case E3D_UNIFORM_TEXTURE_EMISSION1:
467 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_EMISSION].sampler1); 467 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION].sampler1);
468 break; 468 break;
469 case E3D_UNIFORM_TEXTURE_NORMAL1: 469 case E3D_UNIFORM_TEXTURE_NORMAL1:
470 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_NORMAL].sampler1); 470 glUniform1i(loc, data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL].sampler1);
471 break; 471 break;
472 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_AMBIENT0: { 472 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_AMBIENT0: {
473 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0) 473 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0)
474 break; 474 break;
475 } 475 }
476 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_DIFFUSE0: { 476 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_DIFFUSE0: {
477 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0) 477 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0)
478 break; 478 break;
479 } 479 }
480 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_SPECULAR0: { 480 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_SPECULAR0: {
481 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0) 481 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0)
482 break; 482 break;
483 } 483 }
484 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_EMISSION0: { 484 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_EMISSION0: {
485 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_EMISSION, 0) 485 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION, 0)
486 break; 486 break;
487 } 487 }
488 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_NORMAL0: { 488 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_NORMAL0: {
489 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_NORMAL, 0) 489 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, 0)
490 break; 490 break;
491 } 491 }
492 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_AMBIENT1: { 492 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_AMBIENT1: {
493 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_AMBIENT, 1) 493 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1)
494 break; 494 break;
495 } 495 }
496 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_DIFFUSE1: { 496 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_DIFFUSE1: {
497 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1) 497 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1)
498 break; 498 break;
499 } 499 }
500 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_SPECULAR1: { 500 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_SPECULAR1: {
501 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1) 501 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1)
502 break; 502 break;
503 } 503 }
504 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_EMISSION1: { 504 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_EMISSION1: {
505 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_EMISSION, 1) 505 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION, 1)
506 break; 506 break;
507 } 507 }
508 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_NORMAL1: { 508 case E3D_UNIFORM_TEXTURE_MATRIX_TRANSFORM_NORMAL1: {
509 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_NORMAL, 1) 509 SET_TEX_COORD_TRANSFORM_MATRIX(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, 1)
510 break; 510 break;
511 } 511 }
512 case E3D_UNIFORM_SHADOWMAP: 512 case E3D_UNIFORM_SHADOWMAP:
@@ -545,31 +545,31 @@ _uniform_upload(E3D_Uniform u, GLint loc, const E3D_Draw_Data *data)
545 break; 545 break;
546 case E3D_UNIFORM_MATERIAL_AMBIENT: 546 case E3D_UNIFORM_MATERIAL_AMBIENT:
547 glUniform4f(loc, 547 glUniform4f(loc,
548 data->materials[EVAS_CANVAS3D_MATERIAL_AMBIENT].color.r, 548 data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color.r,
549 data->materials[EVAS_CANVAS3D_MATERIAL_AMBIENT].color.g, 549 data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color.g,
550 data->materials[EVAS_CANVAS3D_MATERIAL_AMBIENT].color.b, 550 data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color.b,
551 data->materials[EVAS_CANVAS3D_MATERIAL_AMBIENT].color.a); 551 data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color.a);
552 break; 552 break;
553 case E3D_UNIFORM_MATERIAL_DIFFUSE: 553 case E3D_UNIFORM_MATERIAL_DIFFUSE:
554 glUniform4f(loc, 554 glUniform4f(loc,
555 data->materials[EVAS_CANVAS3D_MATERIAL_DIFFUSE].color.r, 555 data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].color.r,
556 data->materials[EVAS_CANVAS3D_MATERIAL_DIFFUSE].color.g, 556 data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].color.g,
557 data->materials[EVAS_CANVAS3D_MATERIAL_DIFFUSE].color.b, 557 data->materials[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].color.b,
558 data->materials[EVAS_CANVAS3D_MATERIAL_DIFFUSE].color.a); 558 data->materials[EVAS_CANVAS3D_M