summaryrefslogtreecommitdiff
path: root/src/examples
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 /src/examples
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
Diffstat (limited to 'src/examples')
-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
20 files changed, 250 insertions, 251 deletions
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)