summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Shcherbina <o.shcherbina@samsung.com>2016-04-14 20:28:20 +0900
committerHermet Park <hermet@hermet.pe.kr>2016-04-14 20:28:20 +0900
commit172cfa0f0496f95cc78752c0c498a87711347df3 (patch)
tree40cb2a2c81823ec4a1bdfe93f32db827b213f122
parent35941c4ad18b4a320b56e2c6596132a7eca0d482 (diff)
evas.canvas3d: Change shade_mode to shader_mode
Summary: enum Evas.Canvas3D.Shade_Mode are using for choose relevant shader source code. So renaming have a sence. Rename evas_canvas3d_shade_mode_set/get property to evas_canvas3d_shader_mode_set/get Rename internal fields and functions Reviewers: cedric, Hermet, raster Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D3882
-rw-r--r--src/bin/edje/edje_cc_handlers.c14
-rw-r--r--src/examples/elementary/evas3d_map_example.c4
-rw-r--r--src/examples/elementary/evas3d_object_on_button_example.c2
-rw-r--r--src/examples/elementary/evas3d_scene_on_button_example.c2
-rw-r--r--src/examples/elementary/performance/graphical.c10
-rw-r--r--src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c6
-rw-r--r--src/examples/evas/evas-3d-aabb.c4
-rw-r--r--src/examples/evas/evas-3d-blending.c2
-rw-r--r--src/examples/evas/evas-3d-colorpick.c2
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c2
-rw-r--r--src/examples/evas/evas-3d-cube.c2
-rw-r--r--src/examples/evas/evas-3d-cube2.c2
-rw-r--r--src/examples/evas/evas-3d-eet.c4
-rw-r--r--src/examples/evas/evas-3d-fog.c2
-rw-r--r--src/examples/evas/evas-3d-frustum.c6
-rw-r--r--src/examples/evas/evas-3d-hull.c10
-rw-r--r--src/examples/evas/evas-3d-md2.c2
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c2
-rw-r--r--src/examples/evas/evas-3d-obj.c10
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c6
-rw-r--r--src/examples/evas/evas-3d-pick.c2
-rw-r--r--src/examples/evas/evas-3d-ply.c20
-rw-r--r--src/examples/evas/evas-3d-proxy.c2
-rw-r--r--src/examples/evas/evas-3d-shadows.c24
-rw-r--r--src/examples/evas/evas-3d-static-lod.c4
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-macros.h8
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c8
-rw-r--r--src/lib/edje/edje_calc.c2
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_scene3d.c2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c14
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.eo10
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c2
-rw-r--r--src/lib/evas/canvas/evas_types.eot6
-rw-r--r--src/lib/evas/include/evas_private.h4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d.c36
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d_private.h6
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d_shader.c8
40 files changed, 130 insertions, 130 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 382f4bc5e1..f6bc18bc5a 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -1626,7 +1626,7 @@ _edje_part_description_alloc(unsigned char type, const char *collection, const c
1626 ed->mesh_node.texture.filter1 = 0; 1626 ed->mesh_node.texture.filter1 = 0;
1627 ed->mesh_node.texture.filter2 = 0; 1627 ed->mesh_node.texture.filter2 = 0;
1628 1628
1629 ed->mesh_node.properties.shade = EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR; 1629 ed->mesh_node.properties.shade = EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR;
1630 ed->mesh_node.properties.ambient.r = 50; 1630 ed->mesh_node.properties.ambient.r = 50;
1631 ed->mesh_node.properties.ambient.g = 50; 1631 ed->mesh_node.properties.ambient.g = 50;
1632 ed->mesh_node.properties.ambient.b = 50; 1632 ed->mesh_node.properties.ambient.b = 50;
@@ -11088,12 +11088,12 @@ st_collections_group_parts_part_description_properties_shade(void)
11088 check_arg_count(1); 11088 check_arg_count(1);
11089 11089
11090 shade = parse_enum(0, 11090 shade = parse_enum(0,
11091 "VERTEX_COLOR", EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR, 11091 "VERTEX_COLOR", EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
11092 "PARENT", EVAS_CANVAS3D_SHADE_MODE_DIFFUSE, 11092 "PARENT", EVAS_CANVAS3D_SHADER_MODE_DIFFUSE,
11093 "WORLD", EVAS_CANVAS3D_SHADE_MODE_FLAT, 11093 "WORLD", EVAS_CANVAS3D_SHADER_MODE_FLAT,
11094 "PHONG", EVAS_CANVAS3D_SHADE_MODE_PHONG, 11094 "PHONG", EVAS_CANVAS3D_SHADER_MODE_PHONG,
11095 "NORMAL_MAP", EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP, 11095 "NORMAL_MAP", EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP,
11096 "RENDER", EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER, 11096 "RENDER", EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
11097 NULL); 11097 NULL);
11098 11098
11099 if (current_part->type == EDJE_PART_TYPE_MESH_NODE) 11099 if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c
index 5cfb0103bb..9393a09954 100644
--- a/src/examples/elementary/evas3d_map_example.c
+++ b/src/examples/elementary/evas3d_map_example.c
@@ -884,7 +884,7 @@ skybox_setup(void)
884 skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 884 skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
885 evas_canvas3d_node_member_add(root_node, skybox_mesh_node); 885 evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
886 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh); 886 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
887 evas_canvas3d_mesh_shade_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 887 evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
888} 888}
889 889
890static void 890static void
@@ -1004,7 +1004,7 @@ mesh_setup(void)
1004 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 1004 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
1005 evas_canvas3d_node_member_add(root_node, mesh_node); 1005 evas_canvas3d_node_member_add(root_node, mesh_node);
1006 evas_canvas3d_node_mesh_add(mesh_node, mesh); 1006 evas_canvas3d_node_mesh_add(mesh_node, mesh);
1007 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 1007 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
1008} 1008}
1009 1009
1010static void 1010static void
diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index 842cdfd3a2..92c7a64cfe 100644
--- a/src/examples/elementary/evas3d_object_on_button_example.c
+++ b/src/examples/elementary/evas3d_object_on_button_example.c
@@ -215,7 +215,7 @@ _mesh_setup(Scene_Data *data)
215 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]); 215 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
216 evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); 216 evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
217 evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 217 evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
218 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 218 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
219 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 219 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE); 220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
221 221
diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index 2aa8a2f79a..cda38fee07 100644
--- a/src/examples/elementary/evas3d_scene_on_button_example.c
+++ b/src/examples/elementary/evas3d_scene_on_button_example.c
@@ -171,7 +171,7 @@ _mesh_setup(Scene_Data *data)
171 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]); 171 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
172 evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); 172 evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
173 evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 173 evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
174 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 174 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
175 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 175 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
176 176
177 data->mesh_node = 177 data->mesh_node =
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 7ca4d4cca7..239655e0ef 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -268,7 +268,7 @@ void _init_bounding()
268 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]); 268 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
269 evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh_box, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); 269 evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh_box, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
270 evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 270 evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
271 evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh_box, EVAS_CANVAS3D_SHADE_MODE_PHONG); 271 evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh_box, EVAS_CANVAS3D_SHADER_MODE_PHONG);
272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box); 272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
273 273
274 globalGraphical.mesh_nodebox = 274 globalGraphical.mesh_nodebox =
@@ -319,13 +319,13 @@ _change_scene_setup()
319 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord); 319 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord);
320 evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]); 320 evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]);
321 evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 321 evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
322 evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 322 evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
323 } 323 }
324 else 324 else
325 { 325 {
326 efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL); 326 efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
327 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material); 327 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
328 evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 328 evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
329 } 329 }
330 330
331 if (globalGraphical.flags.fog_enable) 331 if (globalGraphical.flags.fog_enable)
@@ -456,13 +456,13 @@ _init_scene(Evas_Object *img)
456 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord); 456 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord);
457 evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]); 457 evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]);
458 evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 458 evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
459 evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 459 evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
460 } 460 }
461 else 461 else
462 { 462 {
463 efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL); 463 efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
464 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material); 464 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
465 evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 465 evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
466 } 466 }
467 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material); 467 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
468 globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh); 468 globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh);
diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
index 44b5dee155..917ce6abf1 100644
--- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
@@ -495,7 +495,7 @@ _mesh_cube_setup(Scene_Data *data)
495 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_cube, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]); 495 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_cube, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
496 evas_canvas3d_mesh_index_data_set(data->mesh_cube, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); 496 evas_canvas3d_mesh_index_data_set(data->mesh_cube, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
497 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 497 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
498 evas_canvas3d_mesh_shade_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADE_MODE_PHONG); 498 evas_canvas3d_mesh_shader_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADER_MODE_PHONG);
499 evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material_cube); 499 evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material_cube);
500 500
501} 501}
@@ -531,7 +531,7 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
531 evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]); 531 evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
532 evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); 532 evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
533 evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 533 evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
534 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 534 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
535 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 535 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
536 536
537 evas_canvas3d_node_member_add(data->root_node, node); 537 evas_canvas3d_node_member_add(data->root_node, node);
@@ -596,7 +596,7 @@ _mesh_ball_setup(Scene_Data *data)
596 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &vertices[0].texcoord); 596 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &vertices[0].texcoord);
597 evas_canvas3d_mesh_index_data_set(data->mesh_ball, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]); 597 evas_canvas3d_mesh_index_data_set(data->mesh_ball, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]);
598 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 598 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
599 evas_canvas3d_mesh_shade_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADE_MODE_PHONG); 599 evas_canvas3d_mesh_shader_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADER_MODE_PHONG);
600 evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball); 600 evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball);
601 601
602 evas_canvas3d_node_member_add(data->root_node, data->mesh_node_ball); 602 evas_canvas3d_node_member_add(data->root_node, data->mesh_node_ball);
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index 0ee6dbb9f4..d1dbcb6dd2 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -173,7 +173,7 @@ main(void)
173 173
174 efl_file_set(mesh, model_path, NULL); 174 efl_file_set(mesh, model_path, NULL);
175 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 175 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
176 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 176 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
177 177
178 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 178 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
179 evas_canvas3d_texture_file_set(texture, image_path, NULL); 179 evas_canvas3d_texture_file_set(texture, image_path, NULL);
@@ -201,7 +201,7 @@ main(void)
201 mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 201 mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
202 evas_canvas3d_mesh_from_primitive_set(mesh_box, 0, cube); 202 evas_canvas3d_mesh_from_primitive_set(mesh_box, 0, cube);
203 evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); 203 evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
204 evas_canvas3d_mesh_shade_mode_set(mesh_box, EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR); 204 evas_canvas3d_mesh_shader_mode_set(mesh_box, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR);
205 evas_canvas3d_mesh_frame_material_set(mesh_box, 0, material_box); 205 evas_canvas3d_mesh_frame_material_set(mesh_box, 0, material_box);
206 _redraw_aabb(); 206 _redraw_aabb();
207 207
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 55eabffa89..8348e22796 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -178,7 +178,7 @@ _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
178{ 178{
179 evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere); 179 evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere);
180 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 180 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
181 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 181 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
182} 182}
183 183
184static void 184static void
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index e13f4cca3d..dd3e4c8cff 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -244,7 +244,7 @@ _init_sphere(void *this, const char *texture)
244 evas_canvas3d_primitive_precision_set(sphere->primitive, 50); 244 evas_canvas3d_primitive_precision_set(sphere->primitive, 50);
245 evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive); 245 evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive);
246 evas_canvas3d_mesh_frame_material_set(sphere->mesh, 0, sphere->material); 246 evas_canvas3d_mesh_frame_material_set(sphere->mesh, 0, sphere->material);
247 evas_canvas3d_mesh_shade_mode_set(sphere->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 247 evas_canvas3d_mesh_shader_mode_set(sphere->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
248 248
249 evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE); 249 evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE);
250 250
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index a59851e319..1d8338a207 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -198,7 +198,7 @@ _mesh_setup(Scene_Data *data)
198 /* Setup mesh. */ 198 /* Setup mesh. */
199 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 199 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
200 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); 200 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
201 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 201 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
202 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 202 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
203 203
204 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 204 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index 50508ab916..a2c1365b79 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -184,7 +184,7 @@ _mesh_setup(Scene_Data *data)
184 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]); 184 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
185 evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]); 185 evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
186 evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 186 evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
187 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 187 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
188 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 188 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
189 189
190 data->mesh_node = 190 data->mesh_node =
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 34ed28eea1..451d4d28a2 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -185,7 +185,7 @@ _mesh_setup(Scene_Data *data)
185 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material0); 185 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material0);
186 evas_canvas3d_mesh_frame_add(data->mesh, 20); 186 evas_canvas3d_mesh_frame_add(data->mesh, 20);
187 evas_canvas3d_mesh_frame_material_set(data->mesh, 20, data->material1); 187 evas_canvas3d_mesh_frame_material_set(data->mesh, 20, data->material1);
188 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 188 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
189 189
190 data->mesh_node = 190 data->mesh_node =
191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index bae330ccdb..8bf69b46dd 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -149,7 +149,7 @@ main(void)
149 149
150 efl_file_set(mesh, input_model_path, NULL); 150 efl_file_set(mesh, input_model_path, NULL);
151 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 151 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
152 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 152 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
153 153
154 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 154 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
155 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 155 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -167,7 +167,7 @@ main(void)
167 efl_file_save(mesh, output_model_path, NULL, NULL); 167 efl_file_save(mesh, output_model_path, NULL, NULL);
168 168
169 efl_file_set(mesh2, output_model_path, NULL); 169 efl_file_set(mesh2, output_model_path, NULL);
170 evas_canvas3d_mesh_shade_mode_set(mesh2, EVAS_CANVAS3D_SHADE_MODE_PHONG); 170 evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG);
171 171
172 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 172 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
173 173
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index a7d17cf5a4..ec111b7597 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -115,7 +115,7 @@ static void
115_set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material) 115_set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
116{ 116{
117 evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere); 117 evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere);
118 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 118 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
119 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 119 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
120} 120}
121 121
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 062a8cd6e9..e642806094 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -329,13 +329,13 @@ _mesh_setup(Scene_Data *data)
329 data->mesh_aabb = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 329 data->mesh_aabb = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
330 evas_canvas3d_mesh_from_primitive_set(data->mesh_aabb, 0, data->cube); 330 evas_canvas3d_mesh_from_primitive_set(data->mesh_aabb, 0, data->cube);
331 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_aabb, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); 331 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_aabb, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
332 evas_canvas3d_mesh_shade_mode_set(data->mesh_aabb, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 332 evas_canvas3d_mesh_shader_mode_set(data->mesh_aabb, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
333 evas_canvas3d_mesh_frame_material_set(data->mesh_aabb, 0, data->material); 333 evas_canvas3d_mesh_frame_material_set(data->mesh_aabb, 0, data->material);
334 334
335 data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 335 data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
336 evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, data->sphere); 336 evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, data->sphere);
337 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); 337 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
338 evas_canvas3d_mesh_shade_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 338 evas_canvas3d_mesh_shader_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
339 evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material); 339 evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
340 340
341 data->mesh_node = 341 data->mesh_node =
@@ -368,7 +368,7 @@ _mesh_setup_model(Scene_Data *data)
368 368
369 efl_file_set(data->mesh_model, mesh_path, NULL); 369 efl_file_set(data->mesh_model, mesh_path, NULL);
370 evas_canvas3d_mesh_frame_material_set(data->mesh_model, 0, data->material_model); 370 evas_canvas3d_mesh_frame_material_set(data->mesh_model, 0, data->material_model);
371 evas_canvas3d_mesh_shade_mode_set(data->mesh_model, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 371 evas_canvas3d_mesh_shader_mode_set(data->mesh_model, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
372} 372}
373 373
374static void 374static void
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index ba4bbe0019..b7f0c2450b 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -87,7 +87,7 @@ int rr;
87 data->mesh_##name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ 87 data->mesh_##name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \
88 efl_file_set(data->mesh_##name, model, NULL); \ 88 efl_file_set(data->mesh_##name, model, NULL); \
89 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \ 89 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
90 evas_canvas3d_mesh_shade_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADE_MODE_##shade); \ 90 evas_canvas3d_mesh_shader_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADER_MODE_##shade); \
91 evas_canvas3d_mesh_frame_material_set(data->mesh_##name, 0, data->material); 91 evas_canvas3d_mesh_frame_material_set(data->mesh_##name, 0, data->material);
92 92
93#define CONVEX_HULL_MESH_INIT(name) \ 93#define CONVEX_HULL_MESH_INIT(name) \
@@ -108,7 +108,7 @@ int rr;
108 evas_canvas3d_mesh_index_data_copy_set(data->mesh_##name##_ch, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 108 evas_canvas3d_mesh_index_data_copy_set(data->mesh_##name##_ch, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
109 ind->len, &index[0]); \ 109 ind->len, &index[0]); \
110 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name##_ch, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \ 110 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name##_ch, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
111 evas_canvas3d_mesh_shade_mode_set(data->mesh_##name##_ch, EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR); \ 111 evas_canvas3d_mesh_shader_mode_set(data->mesh_##name##_ch, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR); \
112 evas_canvas3d_mesh_frame_material_set(data->mesh_##name##_ch, 0, data->material); \ 112 evas_canvas3d_mesh_frame_material_set(data->mesh_##name##_ch, 0, data->material); \
113 free(vert); \ 113 free(vert); \
114 free(ind); 114 free(ind);
@@ -308,7 +308,7 @@ _mesh_setup(Scene_Data *data)
308 data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 308 data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
309 evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, primitive); 309 evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, primitive);
310 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 310 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
311 evas_canvas3d_mesh_shade_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADE_MODE_PHONG); 311 evas_canvas3d_mesh_shader_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADER_MODE_PHONG);
312 evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material); 312 evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
313 313
314 /* Setup mesh torus */ 314 /* Setup mesh torus */
@@ -317,7 +317,7 @@ _mesh_setup(Scene_Data *data)
317 evas_canvas3d_primitive_precision_set(primitive, 50); 317 evas_canvas3d_primitive_precision_set(primitive, 50);
318 evas_canvas3d_mesh_from_primitive_set(data->mesh_torus, 0, primitive); 318 evas_canvas3d_mesh_from_primitive_set(data->mesh_torus, 0, primitive);
319 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_torus, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 319 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_torus, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
320 evas_canvas3d_mesh_shade_mode_set(data->mesh_torus, EVAS_CANVAS3D_SHADE_MODE_PHONG); 320 evas_canvas3d_mesh_shader_mode_set(data->mesh_torus, EVAS_CANVAS3D_SHADER_MODE_PHONG);
321 evas_canvas3d_mesh_frame_material_set(data->mesh_torus, 0, data->material); 321 evas_canvas3d_mesh_frame_material_set(data->mesh_torus, 0, data->material);
322 322
323 /* Setup mesh cube */ 323 /* Setup mesh cube */
@@ -326,7 +326,7 @@ _mesh_setup(Scene_Data *data)
326 evas_canvas3d_primitive_precision_set(primitive, 50); 326 evas_canvas3d_primitive_precision_set(primitive, 50);
327 evas_canvas3d_mesh_from_primitive_set(data->mesh_cube, 0, primitive); 327 evas_canvas3d_mesh_from_primitive_set(data->mesh_cube, 0, primitive);
328 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 328 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
329 evas_canvas3d_mesh_shade_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADE_MODE_PHONG); 329 evas_canvas3d_mesh_shader_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADER_MODE_PHONG);
330 evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material); 330 evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material);
331 331
332 MODEL_MESH_INIT(plain, plain, PHONG) 332 MODEL_MESH_INIT(plain, plain, PHONG)
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index a57decae6a..7f4998f7df 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -126,7 +126,7 @@ main(void)
126 126
127 efl_file_set(mesh, model_path, NULL); 127 efl_file_set(mesh, model_path, NULL);
128 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 128 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
129 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 129 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
130 130
131 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 131 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
132 evas_canvas3d_texture_file_set(texture, image_path, NULL); 132 evas_canvas3d_texture_file_set(texture, image_path, NULL);
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index d51b1f9b15..91c4e33ca3 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -35,7 +35,7 @@
35 mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ 35 mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \
36 efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \ 36 efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \
37 evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \ 37 evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \
38 evas_canvas3d_mesh_shade_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADE_MODE_PHONG); \ 38 evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG); \
39 node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 39 node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
40 evas_canvas3d_node_member_add(root_node, node_##extention); \ 40 evas_canvas3d_node_member_add(root_node, node_##extention); \
41 evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \ 41 evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 1b68ff9fcf..ca645c865a 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -48,7 +48,7 @@
48 snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj"); \ 48 snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj"); \
49 efl_file_set(mesh[num], full_file_path, NULL); \ 49 efl_file_set(mesh[num], full_file_path, NULL); \
50 evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \ 50 evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \
51 evas_canvas3d_mesh_shade_mode_set(mesh[num], shade_mode); \ 51 evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode); \
52 mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 52 mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
53 evas_canvas3d_node_member_add(root_node, mesh_node[num]); \ 53 evas_canvas3d_node_member_add(root_node, mesh_node[num]); \
54 evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \ 54 evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \
@@ -198,13 +198,13 @@ main(void)
198 PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES); 198 PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES);
199 199
200 ADD_OBJ_MESH_AND_SAVED_COPY(home, -GRID_SIZE, -GRID_SIZE, 0, 200 ADD_OBJ_MESH_AND_SAVED_COPY(home, -GRID_SIZE, -GRID_SIZE, 0,
201 EVAS_CANVAS3D_SHADE_MODE_PHONG, material_with_tex) 201 EVAS_CANVAS3D_SHADER_MODE_PHONG, material_with_tex)
202 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_normals, -GRID_SIZE, GRID_SIZE, 1, 202 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_normals, -GRID_SIZE, GRID_SIZE, 1,
203 EVAS_CANVAS3D_SHADE_MODE_DIFFUSE, material_with_tex) 203 EVAS_CANVAS3D_SHADER_MODE_DIFFUSE, material_with_tex)
204 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_tex_coords, GRID_SIZE, -GRID_SIZE, 2, 204 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_tex_coords, GRID_SIZE, -GRID_SIZE, 2,
205 EVAS_CANVAS3D_SHADE_MODE_PHONG, material) 205 EVAS_CANVAS3D_SHADER_MODE_PHONG, material)
206 ADD_OBJ_MESH_AND_SAVED_COPY(home_only_vertex_coords, GRID_SIZE, GRID_SIZE, 3, 206 ADD_OBJ_MESH_AND_SAVED_COPY(home_only_vertex_coords, GRID_SIZE, GRID_SIZE, 3,
207 EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER, NULL) 207 EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER, NULL)
208 208
209 /* Set up scene. */ 209 /* Set up scene. */
210 evas_canvas3d_scene_root_node_set(scene, root_node); 210 evas_canvas3d_scene_root_node_set(scene, root_node);
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index 061e8527cf..d2c902c587 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -62,10 +62,10 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
62 Evas_Event_Key_Down *ev = event_info; 62 Evas_Event_Key_Down *ev = event_info;
63 63
64 if (!strcmp("n", ev->key)) 64 if (!strcmp("n", ev->key))
65 evas_canvas3d_mesh_shade_mode_set(scene->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 65 evas_canvas3d_mesh_shader_mode_set(scene->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
66 66
67 if (!strcmp("p", ev->key)) 67 if (!strcmp("p", ev->key))
68 evas_canvas3d_mesh_shade_mode_set(scene->mesh, EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION); 68 evas_canvas3d_mesh_shader_mode_set(scene->mesh, EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION);
69} 69}
70 70
71static void 71static void
@@ -186,7 +186,7 @@ _mesh_setup(Scene_Data *data)
186 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 186 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
187 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); 187 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
188 evas_canvas3d_mesh_from_primitive_set(data->mesh, 100, data->cube); 188 evas_canvas3d_mesh_from_primitive_set(data->mesh, 100, data->cube);
189 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION); 189 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION);
190 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material_rocks); 190 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material_rocks);
191 191
192 evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood); 192 evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood);
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 9a65813dda..201771fb78 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -158,7 +158,7 @@ main(void)
158 158
159 evas_canvas3d_node_member_add(root_node, mesh_node); 159 evas_canvas3d_node_member_add(root_node, mesh_node);
160 evas_canvas3d_node_mesh_add(mesh_node, mesh); 160 evas_canvas3d_node_mesh_add(mesh_node, mesh);
161 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 161 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
162 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 162 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
163 163
164 /* Set up scene. */ 164 /* Set up scene. */
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 8ec3233680..6c542c3e63 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -43,14 +43,14 @@ static const char *file_name[8] = {"Normal_UVs_Colors.ply",
43 "NoNormal_NoUVs_Colors.ply", 43 "NoNormal_NoUVs_Colors.ply",
44 "NoNormal_NoUVs_NoColors.ply"}; 44 "NoNormal_NoUVs_NoColors.ply"};
45 45
46int draw_mode[8] = {EVAS_CANVAS3D_SHADE_MODE_PHONG, 46int draw_mode[8] = {EVAS_CANVAS3D_SHADER_MODE_PHONG,
47 EVAS_CANVAS3D_SHADE_MODE_PHONG, 47 EVAS_CANVAS3D_SHADER_MODE_PHONG,
48 EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR, 48 EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
49 EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER, 49 EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
50 EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR, 50 EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
51 EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER, 51 EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
52 EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR, 52 EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
53 EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER}; 53 EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER};
54 54
55Ecore_Evas *ecore_evas = NULL; 55Ecore_Evas *ecore_evas = NULL;
56Evas *evas = NULL; 56Evas *evas = NULL;
@@ -184,7 +184,7 @@ main(void)
184 snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]); 184 snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]);
185 efl_file_set(mesh[i], buffer, NULL); 185 efl_file_set(mesh[i], buffer, NULL);
186 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material); 186 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material);
187 evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]); 187 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
188 188
189 snprintf(buffer, PATH_MAX, "%s%s", output_template, file_name[i % 8]); 189 snprintf(buffer, PATH_MAX, "%s%s", output_template, file_name[i % 8]);
190 efl_file_save(mesh[i], buffer, NULL, NULL); 190 efl_file_save(mesh[i], buffer, NULL, NULL);
@@ -193,7 +193,7 @@ main(void)
193 { 193 {
194 efl_file_set(mesh[i], buffer, NULL); 194 efl_file_set(mesh[i], buffer, NULL);
195 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material); 195 evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material);
196 evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]); 196 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
197 } 197 }
198 198
199 mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 199 mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index b63458988a..67088c6550 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -165,7 +165,7 @@ _mesh_setup(Scene_Data *data)
165 /* Setup mesh. */ 165 /* Setup mesh. */
166 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 166 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
167 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); 167 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
168 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_FLAT); 168 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_FLAT);
169 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 169 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
170 170
171 data->mesh_node = 171 data->mesh_node =
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 5d0034b098..7c48122ed1 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -87,7 +87,7 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
87 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info); 87 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
88 EINA_LIST_FOREACH(meshes, l, m) 88 EINA_LIST_FOREACH(meshes, l, m)
89 { 89 {
90 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 90 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
91 } 91 }
92 if (choosed_node != (Evas_Canvas3D_Node *)event->info) 92 if (choosed_node != (Evas_Canvas3D_Node *)event->info)
93 { 93 {
@@ -97,7 +97,7 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
97 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(choosed_node); 97 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(choosed_node);
98 EINA_LIST_FOREACH(meshes, l, m) 98 EINA_LIST_FOREACH(meshes, l, m)
99 { 99 {
100 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); 100 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
101 } 101 }
102 } 102 }
103 choosed_node = (Evas_Canvas3D_Node *)event->info; 103 choosed_node = (Evas_Canvas3D_Node *)event->info;
@@ -114,7 +114,7 @@ _cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
114 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info); 114 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
115 EINA_LIST_FOREACH(meshes, l, m) 115 EINA_LIST_FOREACH(meshes, l, m)
116 { 116 {
117 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 117 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
118 } 118 }
119 119
120 return EINA_TRUE; 120 return EINA_TRUE;
@@ -184,7 +184,7 @@ _body_material_set(Body_3D *body, float r, float g, float b)
184 evas_canvas3d_material_color_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); 184 evas_canvas3d_material_color_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
185 evas_canvas3d_material_shininess_set(body->material, 100.0); 185 evas_canvas3d_material_shininess_set(body->material, 100.0);
186 186
187 evas_canvas3d_mesh_shade_mode_set(body->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 187 evas_canvas3d_mesh_shader_mode_set(body->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
188 evas_canvas3d_mesh_frame_material_set(body->mesh, 0, body->material); 188 evas_canvas3d_mesh_frame_material_set(body->mesh, 0, body->material);
189} 189}
190 190
@@ -282,7 +282,7 @@ _fence_setup(Body_3D *fence)
282 evas_canvas3d_mesh_frame_material_set(fence->mesh, 0, fence->material); 282 evas_canvas3d_mesh_frame_material_set(fence->mesh, 0, fence->material);
283 evas_canvas3d_mesh_alpha_func_set(fence->mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0); 283 evas_canvas3d_mesh_alpha_func_set(fence->mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0);
284 evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE); 284 evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE);
285 evas_canvas3d_mesh_shade_mode_set(fence->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 285 evas_canvas3d_mesh_shader_mode_set(fence->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
286 fence->node = 286 fence->node =
287 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 287 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
288 evas_canvas3d_node_mesh_add(fence->node, fence->mesh); 288 evas_canvas3d_node_mesh_add(fence->node, fence->mesh);
@@ -346,7 +346,7 @@ _model_setup(Body_3D *model)
346 model->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 346 model->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
347 efl_file_set(model->mesh, model_path, NULL); 347 efl_file_set(model->mesh, model_path, NULL);
348 evas_canvas3d_mesh_frame_material_set(model->mesh, 0, model->material); 348 evas_canvas3d_mesh_frame_material_set(model->mesh, 0, model->material);
349 evas_canvas3d_mesh_shade_mode_set(model->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 349 evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
350 350
351 model->node = 351 model->node =
352 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 352 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
@@ -376,7 +376,7 @@ _billboard_setup(Scene_Data *data)
376 evas_canvas3d_mesh_frame_material_set(data->billboard.mesh, 0, data->billboard.material); 376 evas_canvas3d_mesh_frame_material_set(data->billboard.mesh, 0, data->billboard.material);
377 evas_canvas3d_mesh_alpha_func_set(data->billboard.mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0); 377 evas_canvas3d_mesh_alpha_func_set(data->billboard.mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0);
378 evas_canvas3d_mesh_alpha_test_enable_set(data->billboard.mesh, EINA_TRUE); 378 evas_canvas3d_mesh_alpha_test_enable_set(data->billboard.mesh, EINA_TRUE);
379 evas_canvas3d_mesh_shade_mode_set(data->billboard.mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 379 evas_canvas3d_mesh_shader_mode_set(data->billboard.mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
380 evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE); 380 evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE);
381 evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); 381 evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
382 382
@@ -548,27 +548,27 @@ static void _init(Scene_Data *data)
548 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->sphere.node); 548 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->sphere.node);
549 EINA_LIST_FOREACH(meshes, l, m) 549 EINA_LIST_FOREACH(meshes, l, m)
550 { 550 {
551 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); 551 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
552 } 552 }
553 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cube.node); 553 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cube.node);
554 EINA_LIST_FOREACH(meshes, l, m) 554 EINA_LIST_FOREACH(meshes, l, m)
555 { 555 {
556 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); 556 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
557 } 557 }
558 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cylinder.node); 558 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cylinder.node);
559 EINA_LIST_FOREACH(meshes, l, m) 559 EINA_LIST_FOREACH(meshes, l, m)
560 { 560 {
561 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); 561 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
562 } 562 }
563 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->model.node); 563 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->model.node);
564 EINA_LIST_FOREACH(meshes, l, m) 564 EINA_LIST_FOREACH(meshes, l, m)
565 { 565 {
566 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); 566 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
567 } 567 }
568 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cone.node); 568 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cone.node);
569 EINA_LIST_FOREACH(meshes, l, m) 569 EINA_LIST_FOREACH(meshes, l, m)
570 { 570 {
571 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); 571 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
572 } 572 }
573} 573}
574 574
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index bb25228469..6d42ad48a3 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -180,14 +180,14 @@ _mesh_setup(Scene_Data *data)
180 i, ".obj"); 180 i, ".obj");
181 efl_file_set(mesh, str, NULL); 181 efl_file_set(mesh, str, NULL);
182 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material); 182 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material);
183 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 183 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
184 evas_canvas3d_mesh_lod_boundary_set(mesh, distances[i], distances[i + 1]); 184 evas_canvas3d_mesh_lod_boundary_set(mesh, distances[i], distances[i + 1]);
185 evas_canvas3d_node_mesh_add(data->lod_mesh_node1, mesh); 185 evas_canvas3d_node_mesh_add(data->lod_mesh_node1, mesh);
186 186
187 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 187 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
188 efl_file_set(mesh, str, NULL); 188 efl_file_set(mesh, str, NULL);
189 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material); 189 evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material);
190 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 190 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
191 evas_canvas3d_mesh_lod_boundary_set(mesh, m_distances[i], m_distances[i + 1]); 191 evas_canvas3d_mesh_lod_boundary_set(mesh, m_distances[i], m_distances[i + 1]);
192 192
193 evas_canvas3d_node_mesh_add(data->lod_mesh_node2, mesh); 193 evas_canvas3d_node_mesh_add(data->lod_mesh_node2, mesh);
diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h
index ca8521720a..ce23acf851 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-macros.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h
@@ -119,11 +119,11 @@ typedef struct _vec2
119 119
120 120
121#define ENABLE_NORMAL(mesh) \ 121#define ENABLE_NORMAL(mesh) \
122 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 122 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
123 123
124 124
125#define DISABLE_NORMAL(mesh) \ 125#define DISABLE_NORMAL(mesh) \
126 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 126 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
127 127
128 128
129#define ADD_MESH(Object, Name, a, d, s) \ 129#define ADD_MESH(Object, Name, a, d, s) \
@@ -141,7 +141,7 @@ typedef struct _vec2
141 data->mesh_##Name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 141 data->mesh_##Name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
142 142
143#define SETUP_DEFAULT_MESH(Object, Name, Shade_Mode) \ 143#define SETUP_DEFAULT_MESH(Object, Name, Shade_Mode) \
144 evas_canvas3d_mesh_shade_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADE_MODE_##Shade_Mode); \ 144 evas_canvas3d_mesh_shader_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADER_MODE_##Shade_Mode); \
145 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##Name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \ 145 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##Name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
146 evas_canvas3d_mesh_frame_material_set(data->mesh_##Name, 0, data->material_##Object); 146 evas_canvas3d_mesh_frame_material_set(data->mesh_##Name, 0, data->material_##Object);
147 147
@@ -201,7 +201,7 @@ typedef struct _vec2
201 evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, \ 201 evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, \
202 data->texture_normal_##Object); \ 202 data->texture_normal_##Object); \
203 \ 203 \
204 evas_canvas3d_mesh_shade_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 204 evas_canvas3d_mesh_shader_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
205 205
206#define TEXTCOORDS_SET(Name, fb1, fb2, lr1, lr2, tb1, tb2) \ 206#define TEXTCOORDS_SET(Name, fb1, fb2, lr1, lr2, tb1, tb2) \
207 static float Name##_textcoords[] = \ 207 static float Name##_textcoords[] = \
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index c7f549c77b..9dbf01e069 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -735,7 +735,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
735 SETUP_MESH_NODE(tommy) 735 SETUP_MESH_NODE(tommy)
736 efl_file_set(data->mesh_tommy, gun_path, NULL); 736 efl_file_set(data->mesh_tommy, gun_path, NULL);
737 efl_file_save(data->mesh_tommy, "try.obj", NULL, NULL); 737 efl_file_save(data->mesh_tommy, "try.obj", NULL, NULL);
738 evas_canvas3d_mesh_shade_mode_set(data->mesh_tommy, EVAS_CANVAS3D_SHADE_MODE_PHONG); 738 evas_canvas3d_mesh_shader_mode_set(data->mesh_tommy, EVAS_CANVAS3D_SHADER_MODE_PHONG);
739 evas_canvas3d_mesh_frame_material_set(data->mesh_tommy, 0, data->material_tommy); 739 evas_canvas3d_mesh_frame_material_set(data->mesh_tommy, 0, data->material_tommy);
740 740
741 evas_canvas3d_node_scale_set(data->mesh_node_tommy, 1.5, 1.5, 1.5); 741 evas_canvas3d_node_scale_set(data->mesh_node_tommy, 1.5, 1.5, 1.5);
@@ -815,7 +815,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
815 815
816 _set_ball(data->mesh_ball, 10); 816 _set_ball(data->mesh_ball, 10);
817 817
818 evas_canvas3d_mesh_shade_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 818 evas_canvas3d_mesh_shader_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
819 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); 819 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
820 evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball); 820 evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball);
821 821
@@ -881,9 +881,9 @@ _mesh_setup_column(Scene_Data *data, int index)
881 SETUP_MESH_NODE(column[index]) 881 SETUP_MESH_NODE(column[index])
882 882
883 evas_canvas3d_mesh_from_primitive_set(data->mesh_column[index], 0, data->cylinder_primitive); 883 evas_canvas3d_mesh_from_primitive_set(data->mesh_column[index], 0, data->cylinder_primitive);
884 evas_canvas3d_mesh_shade_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 884 evas_canvas3d_mesh_shader_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
885 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_column[index], EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 885 evas_canvas3d_mesh_vertex_assembly_set(data->mesh_column[index], EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
886 evas_canvas3d_mesh_shade_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADE_MODE_PHONG); 886 evas_canvas3d_mesh_shader_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADER_MODE_PHONG);
887 evas_canvas3d_mesh_frame_material_set(data->mesh_column[index], 0, data->material_column); 887 evas_canvas3d_mesh_frame_material_set(data->mesh_column[index], 0, data->material_column);
888 888
889 data->texture_diffuse_column = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 889 data->texture_diffuse_column = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index f73c00d87f..3af82de724 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -4810,7 +4810,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
4810 evas_canvas3d_mesh_frame_add(mesh, pf->type.node.frame); 4810 evas_canvas3d_mesh_frame_add(mesh, pf->type.node.frame);
4811 evas_canvas3d_mesh_frame_material_set(mesh, pf->type.node.frame, material); 4811 evas_canvas3d_mesh_frame_material_set(mesh, pf->type.node.frame, material);
4812 } 4812 }
4813 evas_canvas3d_mesh_shade_mode_set(mesh, pd_mesh_node->mesh_node.properties.shade); 4813 evas_canvas3d_mesh_shader_mode_set(mesh, pd_mesh_node->mesh_node.properties.shade);
4814 evas_canvas3d_mesh_vertex_assembly_set(mesh, pd_mesh_node->mesh_node.mesh.assembly); 4814 evas_canvas3d_mesh_vertex_assembly_set(mesh, pd_mesh_node->mesh_node.mesh.assembly);
4815 evas_canvas3d_node_mesh_frame_set(ep->node, mesh, pf->type.node.frame); 4815 evas_canvas3d_node_mesh_frame_set(ep->node, mesh, pf->type.node.frame);
4816 evas_canvas3d_node_scale_set(ep->node, pf->type.node.scale_3d.x, pf->type.node.scale_3d.y, pf->type.node.scale_3d.z); 4816 evas_canvas3d_node_scale_set(ep->node, pf->type.node.scale_3d.x, pf->type.node.scale_3d.y, pf->type.node.scale_3d.z);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 517a2ca475..eeafeaf449 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1453,7 +1453,7 @@ struct _Edje_Part_Description_Spec_Mesh_Node
1453 Edje_Color specular; 1453 Edje_Color specular;
1454 Eina_Bool normal; 1454 Eina_Bool normal;
1455 FLOAT_T shininess; 1455 FLOAT_T shininess;
1456 Evas_Canvas3D_Shade_Mode shade; 1456 Evas_Canvas3D_Shader_Mode shade;
1457 1457
1458 Evas_Canvas3D_Material_Attrib material_attrib; 1458 Evas_Canvas3D_Material_Attrib material_attrib;
1459 } properties; 1459 } properties;
diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.c b/src/lib/evas/canvas/efl_canvas_scene3d.c
index 81d6375878..d0623fefdc 100644
--- a/src/lib/evas/canvas/efl_canvas_scene3d.c
+++ b/src/lib/evas/canvas/efl_canvas_scene3d.c
@@ -113,7 +113,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
113 scene_data.post_processing = EINA_TRUE; 113 scene_data.post_processing = EINA_TRUE;
114 scene_data.color_pick_enabled = EINA_FALSE; 114 scene_data.color_pick_enabled = EINA_FALSE;
115 scene_data.render_to_texture = EINA_TRUE; 115 scene_data.render_to_texture = EINA_TRUE;
116 scene_data.post_processing_type = EVAS_CANVAS3D_SHADE_MODE_POST_PROCESSING_FXAA; 116 scene_data.post_processing_type = EVAS_CANVAS3D_SHADER_MODE_POST_PROCESSING_FXAA;
117 } 117 }
118 /* Phase 1 - Update scene graph tree. */ 118 /* Phase 1 - Update scene graph tree. */
119 evas_canvas3d_object_update(scene); 119 evas_canvas3d_object_update(scene);
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index 091a8bf742..9cfc637e17 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -278,19 +278,19 @@ _evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
278} 278}
279 279
280EOLIAN static void 280EOLIAN static void
281_evas_canvas3d_mesh_shade_mode_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Shade_Mode mode) 281_evas_canvas3d_mesh_shader_mode_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Shader_Mode mode)
282{ 282{
283 if (pd->shade_mode != mode) 283 if (pd->shader_mode != mode)
284 { 284 {
285 pd->shade_mode = mode; 285 pd->shader_mode = mode;
286 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL); 286 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADER_MODE, NULL);
287 } 287 }
288} 288}
289 289
290EOLIAN static Evas_Canvas3D_Shade_Mode 290EOLIAN static Evas_Canvas3D_Shader_Mode
291_evas_canvas3d_mesh_shade_mode_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd) 291_evas_canvas3d_mesh_shader_mode_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
292{ 292{
293 return pd->shade_mode; 293 return pd->shader_mode;
294} 294}
295 295
296EOLIAN static void 296EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index b39e2dc705..2c1875090c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -236,18 +236,18 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
236 @in primitive: Evas.Canvas3D.Primitive *; [[Specifies which data will be set.]] 236 @in primitive: Evas.Canvas3D.Primitive *; [[Specifies which data will be set.]]
237 } 237 }
238 } 238 }
239 @property shade_mode { 239 @property shader_mode {
240 set { 240 set {
241 [[Set the shade mode of the given mesh. 241 [[Set the shader mode of the given mesh.
242 242
243 Default shade mode is EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR. 243 Default shader mode is EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR.
244 ]] 244 ]]
245 } 245 }
246 get { 246 get {
247 [[Get the shade mode of the given mesh.]] 247 [[Get the shader mode of the given mesh.]]
248 } 248 }
249 values { 249 values {
250 mode: Evas.Canvas3D.Shade_Mode; [[The shade mode.]] 250 mode: Evas.Canvas3D.Shader_Mode; [[The shader mode.]]
251 } 251 }
252 } 252 }
253 @property color_pick_enable { 253 @property color_pick_enable {
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 4f3bda9601..5d786c2c7b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -911,8 +911,8 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
911 } 911 }
912 912
913 float *tangent_data = (float *)f->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT].data; 913 float *tangent_data = (float *)f->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT].data;
914 if (!tangent_data && ((mesh_pd->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) || 914 if (!tangent_data && ((mesh_pd->shader_mode == EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP) ||
915 (mesh_pd->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION))) 915 (mesh_pd->shader_mode == EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION)))
916 { 916 {
917 index = (unsigned short int *)mesh_pd->indices; 917 index = (unsigned short int *)mesh_pd->indices;
918 tangent_data = (float*) malloc((3 * mesh_pd->vertex_count) * sizeof(float)); 918 tangent_data = (float*) malloc((3 * mesh_pd->vertex_count) * sizeof(float));
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index 8a7d08ecfd..5800bce609 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -14,7 +14,7 @@ evas_canvas3d_scene_data_init(Evas_Canvas3D_Scene_Public_Data *data)
14 data->render_to_texture = EINA_FALSE; 14 data->render_to_texture = EINA_FALSE;
15 data->lod_distance = 0; 15 data->lod_distance = 0;
16 data->post_processing = EINA_FALSE; 16 data->post_processing = EINA_FALSE;
17 data->post_processing_type = EVAS_CANVAS3D_SHADE_MODE_POST_PROCESSING_FXAA; 17 data->post_processing_type = EVAS_CANVAS3D_SHADER_MODE_POST_PROCESSING_FXAA;
18} 18}
19 19
20void 20void
diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot
index 7d1a24e6fd..ab582ceaa6 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -314,7 +314,7 @@ enum Evas.Canvas3D.State
314 mesh_vertex_data, 314 mesh_vertex_data,
315 mesh_index_data, 315 mesh_index_data,
316 mesh_vertex_assembly, 316 mesh_vertex_assembly,
317 mesh_shade_mode, 317 mesh_shader_mode,
318 mesh_fog, 318 mesh_fog,
319 mesh_blending, 319 mesh_blending,
320 mesh_alpha_test, 320 mesh_alpha_test,
@@ -339,7 +339,7 @@ enum Evas.Canvas3D.State
339 node_mesh_geometry, 339 node_mesh_geometry,
340 node_mesh_material, 340 node_mesh_material,
341 node_mesh_frame, 341 node_mesh_frame,
342 node_mesh_shade_mode, 342 node_mesh_shader_mode,
343 node_mesh_material_id, 343 node_mesh_material_id,
344 node_light, 344 node_light,
345 node_camera, 345 node_camera,
@@ -483,7 +483,7 @@ enum Evas.Canvas3D.Primitive_Mode
483 alternative_uv [[Ptimitive with alternative uv (supported for sphere)]] 483 alternative_uv [[Ptimitive with alternative uv (supported for sphere)]]
484} 484}
485 485
486enum Evas.Canvas3D.Shade_Mode 486enum Evas.Canvas3D.Shader_Mode
487{ 487{
488 [[Shader shade modes 488 [[Shader shade modes
489 489
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 2b2c174b63..438bfb8b1a 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -363,7 +363,7 @@ struct _Evas_Canvas3D_Mesh_Frame
363 363
364struct _Evas_Canvas3D_Mesh 364struct _Evas_Canvas3D_Mesh
365{ 365{
366 Evas_Canvas3D_Shade_Mode shade_mode; 366 Evas_Canvas3D_Shader_Mode shader_mode;
367 367
368 int vertex_count; 368 int vertex_count;
369 int frame_count; 369 int frame_count;
@@ -460,7 +460,7 @@ struct _Evas_Canvas3D_Scene_Public_Data
460 unsigned int lod_distance; 460 unsigned int lod_distance;
461 461
462 Eina_Bool post_processing :1; 462 Eina_Bool post_processing :1;
463 Evas_Canvas3D_Shade_Mode post_processing_type; 463 Evas_Canvas3D_Shader_Mode post_processing_type;
464}; 464};
465 465
466struct _Evas_Canvas3D_Pick_Data 466struct _Evas_Canvas3D_Pick_Data
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 f4f7b00cee..b3beb5ca16 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c
@@ -994,7 +994,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
994 data->blending = pdmesh->blending; 994 data->blending = pdmesh->blending;
995 data->blend_sfactor = pdmesh->blend_sfactor; 995 data->blend_sfactor = pdmesh->blend_sfactor;
996 data->blend_dfactor = pdmesh->blend_dfactor; 996 data->blend_dfactor = pdmesh->blend_dfactor;
997 data->mode = pdmesh->shade_mode; 997 data->mode = pdmesh->shader_mode;
998 data->assembly = pdmesh->assembly; 998 data->assembly = pdmesh->assembly;
999 data->vertex_count = pdmesh->vertex_count; 999 data->vertex_count = pdmesh->vertex_count;
1000 data->index_count = pdmesh->index_count; 1000 data->index_count = pdmesh->index_count;
@@ -1018,12 +1018,12 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
1018 } \ 1018 } \
1019 } while (0) 1019 } while (0)
1020 1020
1021 if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR) 1021 if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR)
1022 { 1022 {
1023 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE); 1023 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1024 BUILD(vertex_attrib, VERTEX_ATTRIB_COLOR, EINA_TRUE); 1024 BUILD(vertex_attrib, VERTEX_ATTRIB_COLOR, EINA_TRUE);
1025 } 1025 }
1026 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER) 1026 else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER)
1027 { 1027 {
1028 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE); 1028 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1029 if (pdmesh->alpha_test_enabled) 1029 if (pdmesh->alpha_test_enabled)
@@ -1034,11 +1034,11 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
1034 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE); 1034 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1035 } 1035 }
1036 } 1036 }
1037 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_COLOR_PICK) 1037 else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_COLOR_PICK)
1038 { 1038 {
1039 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE); 1039 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1040 } 1040 }
1041 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_DIFFUSE) 1041 else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_DIFFUSE)
1042 { 1042 {
1043 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE); 1043 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1044 BUILD(material_color, MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 1044 BUILD(material_color, MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -1047,7 +1047,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
1047 if (_flags_need_tex_coord(data->flags)) 1047 if (_flags_need_tex_coord(data->flags))
1048 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE); 1048 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1049 } 1049 }
1050 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_FLAT) 1050 else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_FLAT)
1051 { 1051 {
1052 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE); 1052 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1053 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE); 1053 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE);
@@ -1068,7 +1068,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
1068 if (_flags_need_tex_coord(data->flags)) 1068 if (_flags_need_tex_coord(data->flags))
1069 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE); 1069 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1070 } 1070 }
1071 else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PHONG) 1071 else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_PHONG)
1072 { 1072 {
1073 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE); 1073 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1074 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE); 1074 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE);
@@ -1089,8 +1089,8 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
1089 if (_flags_need_tex_coord(data->flags)) 1089 if (_flags_need_tex_coord(data->flags))
1090 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE); 1090 BUILD(vertex_attrib, VERTEX_ATTRIB_TEXCOORD, EINA_FALSE);
1091 } 1091 }
1092 else if ((pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) || 1092 else if ((pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP) ||
1093 (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION)) 1093 (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION))
1094 { 1094 {
1095 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE); 1095 BUILD(vertex_attrib, VERTEX_ATTRIB_POSITION, EINA_TRUE);
1096 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE); 1096 BUILD(vertex_attrib, VERTEX_ATTRIB_NORMAL, EINA_TRUE);
@@ -1099,7 +1099,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
1099 BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_FALSE); 1099 BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_FALSE);
1100 1100
1101 1101
1102 if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) 1102 if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP)
1103 BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_FALSE); 1103 BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_FALSE);
1104 else BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_TRUE); 1104 else BUILD(vertex_attrib, VERTEX_ATTRIB_TANGENT, EINA_TRUE);
1105 1105
@@ -1156,7 +1156,7 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer,
1156{ 1156{
1157 Eina_List *l; 1157 Eina_List *l;
1158 Evas_Canvas3D_Node *n; 1158 Evas_Canvas3D_Node *n;
1159 Evas_Canvas3D_Shade_Mode shade_mode; 1159 Evas_Canvas3D_Shader_Mode shader_mode;
1160 Eina_Bool blend_enabled; 1160 Eina_Bool blend_enabled;
1161 Evas_Color c = {1.0, 1.0, 1.0, 1.0}; 1161 Evas_Color c = {1.0, 1.0, 1.0, 1.0};
1162 Eina_Matrix4 matrix_vp; 1162 Eina_Matrix4 matrix_vp;
@@ -1185,13 +1185,13 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer,
1185 { 1185 {
1186 RENDER_MESH_NODE_ITERATE_BEGIN(light_eye) 1186 RENDER_MESH_NODE_ITERATE_BEGIN(light_eye)
1187 { 1187 {
1188 shade_mode = pdmesh->shade_mode; 1188 shader_mode = pdmesh->shader_mode;
1189 blend_enabled = pdmesh->blending; 1189 blend_enabled = pdmesh->blending;
1190 pdmesh->blending = EINA_FALSE; 1190 pdmesh->blending = EINA_FALSE;
1191 pdmesh->shade_mode = EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER; 1191 pdmesh->shader_mode = EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER;
1192 _mesh_draw(renderer, nm->mesh, nm->frame, light, matrix_light_eye, 1192 _mesh_draw(renderer, nm->mesh, nm->frame, light, matrix_light_eye,
1193 &matrix_mv, &matrix_mvp, &matrix_mvp); 1193 &matrix_mv, &matrix_mvp, &matrix_mvp);
1194 pdmesh->shade_mode = shade_mode; 1194 pdmesh->shader_mode = shader_mode;
1195 pdmesh->blending = blend_enabled; 1195 pdmesh->blending = blend_enabled;
1196 } 1196 }
1197 RENDER_MESH_NODE_ITERATE_END 1197 RENDER_MESH_NODE_ITERATE_END
@@ -1351,7 +1351,7 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende
1351 Evas_Canvas3D_Scene_Public_Data *data) 1351 Evas_Canvas3D_Scene_Public_Data *data)
1352{ 1352{
1353 const Eina_Matrix4 *matrix_eye; 1353 const Eina_Matrix4 *matrix_eye;
1354 Evas_Canvas3D_Shade_Mode shade_mode; 1354 Evas_Canvas3D_Shader_Mode shader_mode;
1355 Eina_Stringshare *tmp; 1355 Eina_Stringshare *tmp;
1356 Eina_Iterator *itmn; 1356 Eina_Iterator *itmn;
1357 void *ptrmn; 1357 void *ptrmn;
@@ -1398,11 +1398,11 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende
1398 pdmesh->color_pick_key.r = unic_color->r; 1398 pdmesh->color_pick_key.r = unic_color->r;
1399 pdmesh->color_pick_key.g = unic_color->g; 1399 pdmesh->color_pick_key.g = unic_color->g;
1400 pdmesh->color_pick_key.b = unic_color->b; 1400 pdmesh->color_pick_key.b = unic_color->b;
1401 shade_mode = pdmesh->shade_mode; 1401 shader_mode = pdmesh->shader_mode;
1402 pdmesh->shade_mode = EVAS_CANVAS3D_SHADE_MODE_COLOR_PICK; 1402 pdmesh->shader_mode = EVAS_CANVAS3D_SHADER_MODE_COLOR_PICK;
1403 _mesh_draw(renderer, nm->mesh, nm->frame, NULL, matrix_eye, &matrix_mv, 1403 _mesh_draw(renderer, nm->mesh, nm->frame, NULL, matrix_eye, &matrix_mv,
1404 &matrix_mvp, NULL); 1404 &matrix_mvp, NULL);
1405 pdmesh->shade_mode = shade_mode; 1405 pdmesh->shader_mode = shader_mode;
1406 } 1406 }
1407 eina_stringshare_del(tmp); 1407 eina_stringshare_del(tmp);
1408 } 1408 }
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_private.h b/src/modules/evas/engines/gl_common/evas_gl_3d_private.h
index cbdb0f7711..1c4d2adfac 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d_private.h
@@ -54,7 +54,7 @@ _flags_need_tex_coord(E3D_Shader_Flag flags)
54struct _E3D_Draw_Data 54struct _E3D_Draw_Data
55{ 55{
56 E3D_Shader_Flag flags; 56 E3D_Shader_Flag flags;
57 Evas_Canvas3D_Shade_Mode mode; 57 Evas_Canvas3D_Shader_Mode mode;
58 58
59 Eina_Matrix4 matrix_mvp; 59 Eina_Matrix4 matrix_mvp;
60 Eina_Matrix4 matrix_mv; 60 Eina_Matrix4 matrix_mv;
@@ -163,10 +163,10 @@ struct _E3D_Drawable
163void e3d_texture_param_update(E3D_Texture *texture); 163void e3d_texture_param_update(E3D_Texture *texture);
164 164
165/* Program */ 165/* Program */
166E3D_Program *e3d_program_new(Evas_Canvas3D_Shade_Mode mode, E3D_Shader_Flag flags); 166E3D_Program *e3d_program_new(Evas_Canvas3D_Shader_Mode mode, E3D_Shader_Flag flags);
167void e3d_program_free(E3D_Program *program); 167void e3d_program_free(E3D_Program *program);
168GLuint e3d_program_id_get(const E3D_Program *program); 168GLuint e3d_program_id_get(const E3D_Program *program);
169Evas_Canvas3D_Shade_Mode e3d_program_shade_mode_get(const E3D_Program *program); 169Evas_Canvas3D_Shader_Mode e3d_program_shader_mode_get(const E3D_Program *program);
170E3D_Shader_Flag e3d_program_shader_flags_get(const E3D_Program *program); 170E3D_Shader_Flag e3d_program_shader_flags_get(const E3D_Program *program);
171void e3d_program_uniform_upload(E3D_Program *program, const E3D_Draw_Data *data); 171void e3d_program_uniform_upload(E3D_Program *program, const E3D_Draw_Data *data);
172 172
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 0fc0f896d2..2e4f885b77 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
@@ -327,7 +327,7 @@ e3d_renderer_draw(E3D_Renderer *renderer, E3D_Draw_Data *data)
327 327
328 EINA_LIST_FOREACH(renderer->programs, l, p) 328 EINA_LIST_FOREACH(renderer->programs, l, p)
329 { 329 {
330 if (e3d_program_shade_mode_get(p) == data->mode && 330 if (e3d_program_shader_mode_get(p) == data->mode &&
331 e3d_program_shader_flags_get(p) == data->flags) 331 e3d_program_shader_flags_get(p) == data->flags)
332 { 332 {
333 program = p; 333 program = p;
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 5f5c0a60ce..7fef49092b 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
@@ -123,7 +123,7 @@ struct _E3D_Program
123 GLuint prog; 123 GLuint prog;
124 124
125 E3D_Shader_Flag flags; 125 E3D_Shader_Flag flags;
126 Evas_Canvas3D_Shade_Mode mode; 126 Evas_Canvas3D_Shader_Mode mode;
127 127
128 GLint uniform_locations[E3D_UNIFORM_COUNT]; 128 GLint uniform_locations[E3D_UNIFORM_COUNT];
129}; 129};
@@ -665,7 +665,7 @@ e3d_program_uniform_upload(E3D_Program *program, const E3D_Draw_Data *data)
665} 665}
666 666
667E3D_Program * 667E3D_Program *
668e3d_program_new(Evas_Canvas3D_Shade_Mode mode, E3D_Shader_Flag flags) 668e3d_program_new(Evas_Canvas3D_Shader_Mode mode, E3D_Shader_Flag flags)
669{ 669{
670 E3D_Shader_String vert, frag; 670 E3D_Shader_String vert, frag;
671 E3D_Program *program = NULL; 671 E3D_Program *program = NULL;
@@ -737,8 +737,8 @@ e3d_program_id_get(const E3D_Program *program)
737 return program->prog; 737 return program->prog;
738} 738}
739 739
740Evas_Canvas3D_Shade_Mode 740Evas_Canvas3D_Shader_Mode
741e3d_program_shade_mode_get(const E3D_Program *program) 741e3d_program_shader_mode_get(const E3D_Program *program)
742{ 742{
743 return program->mode; 743 return program->mode;
744} 744}