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

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 382f4bc5e15924ed96bcf635af8a723804a81a61..f6bc18bc5aad128c3135b989082665d9989edaf6 100644 (file)
--- 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
            ed->mesh_node.texture.filter1 = 0;
            ed->mesh_node.texture.filter2 = 0;
 
-           ed->mesh_node.properties.shade = EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR;
+           ed->mesh_node.properties.shade = EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR;
            ed->mesh_node.properties.ambient.r = 50;
            ed->mesh_node.properties.ambient.g = 50;
            ed->mesh_node.properties.ambient.b = 50;
@@ -11088,12 +11088,12 @@ st_collections_group_parts_part_description_properties_shade(void)
    check_arg_count(1);
 
    shade = parse_enum(0,
-                     "VERTEX_COLOR", EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR,
-                     "PARENT", EVAS_CANVAS3D_SHADE_MODE_DIFFUSE,
-                     "WORLD", EVAS_CANVAS3D_SHADE_MODE_FLAT,
-                     "PHONG", EVAS_CANVAS3D_SHADE_MODE_PHONG,
-                     "NORMAL_MAP", EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP,
-                     "RENDER", EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER,
+                     "VERTEX_COLOR", EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
+                     "PARENT", EVAS_CANVAS3D_SHADER_MODE_DIFFUSE,
+                     "WORLD", EVAS_CANVAS3D_SHADER_MODE_FLAT,
+                     "PHONG", EVAS_CANVAS3D_SHADER_MODE_PHONG,
+                     "NORMAL_MAP", EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP,
+                     "RENDER", EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
                      NULL);
 
    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 5cfb0103bb7032d3796e40555ea5ada84a732175..9393a09954c74df273333d579931724a3f25426a 100644 (file)
--- a/src/examples/elementary/evas3d_map_example.c
+++ b/src/examples/elementary/evas3d_map_example.c
@@ -884,7 +884,7 @@ skybox_setup(void)
    skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
    evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
-   evas_canvas3d_mesh_shade_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
 }
 
 static void
@@ -1004,7 +1004,7 @@ mesh_setup(void)
    mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_member_add(root_node, mesh_node);
    evas_canvas3d_node_mesh_add(mesh_node, mesh);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
 }
 
 static void

diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index 842cdfd3a2cbdf7c9b7da0fb9ee1259530d1195c..92c7a64cfe730438b8e5bd30420d2220e1a1ce3c 100644 (file)
--- 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)
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
    evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
    evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
 

diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index 2aa8a2f79a67d11dd8c842ce465aaf604a4b019e..cda38fee07a30c9b42f600e2dba6baee89302489 100644 (file)
--- 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)
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
    evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    data->mesh_node =

diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 7ca4d4cca7687ae430ccd3a99db98edecce78d9e..239655e0ef315cbfc09c19b4ee33e19082fd41ce 100644 (file)
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -268,7 +268,7 @@ void _init_bounding()
    evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
    evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh_box, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh_box, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh_box, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
 
    globalGraphical.mesh_nodebox =
@@ -319,13 +319,13 @@ _change_scene_setup()
               evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord);
               evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]);
               evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+              evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
            }
          else
            {
               efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
               evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
-              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+              evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
            }
 
          if (globalGraphical.flags.fog_enable)
@@ -456,13 +456,13 @@ _init_scene(Evas_Object *img)
               evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord);
               evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]);
               evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+              evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
            }
          else
            {
               efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
               evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
-              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+              evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
            }
          evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
          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 44b5dee1550f038cc18bb0f28ebe82d21e4e3321..917ce6abf1d4e8daa92d8403b7467e769c39c54b 100644 (file)
--- 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)
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_cube, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
    evas_canvas3d_mesh_index_data_set(data->mesh_cube, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material_cube);
 
 }
@@ -531,7 +531,7 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
    evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
    evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
 
    evas_canvas3d_node_member_add(data->root_node, node);
@@ -596,7 +596,7 @@ _mesh_ball_setup(Scene_Data *data)
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &vertices[0].texcoord);
    evas_canvas3d_mesh_index_data_set(data->mesh_ball, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball);
 
    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 0ee6dbb9f4f8d9c3c6841fe72ff3125d977f22d9..d1dbcb6dd2f2d2ea13ec93f2cc4fe0f946b4ce42 100644 (file)
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -173,7 +173,7 @@ main(void)
 
    efl_file_set(mesh, model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
    texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    evas_canvas3d_texture_file_set(texture, image_path, NULL);
@@ -201,7 +201,7 @@ main(void)
    mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(mesh_box, 0, cube);
    evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
-   evas_canvas3d_mesh_shade_mode_set(mesh_box, EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR);
+   evas_canvas3d_mesh_shader_mode_set(mesh_box, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR);
    evas_canvas3d_mesh_frame_material_set(mesh_box, 0, material_box);
     _redraw_aabb();
 

diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 55eabffa89a0585e8de4fd1f422629a3a5dfadc7..8348e2279681dc5364b6cea3654e4a72843643b0 100644 (file)
--- 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)
 {
    evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 }
 
 static void

diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index e13f4cca3d106c7677a69e48bf9ef0b8b7460b38..dd3e4c8cff41dd329fcf567e49fb0b06836a0845 100644 (file)
--- 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)
    evas_canvas3d_primitive_precision_set(sphere->primitive, 50);
    evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive);
    evas_canvas3d_mesh_frame_material_set(sphere->mesh, 0, sphere->material);
-   evas_canvas3d_mesh_shade_mode_set(sphere->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(sphere->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
    evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE);
 

diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index a59851e3190b640ebd598bf27b959e413939e571..1d8338a207f3e478e4e3264ea792ed2b1aea30ed 100644 (file)
--- 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)
    /* Setup mesh. */
    data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    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 50508ab916ef253773e0e71e878871ae85334144..a2c1365b798136e6afa2c162df744e4bbba1d214 100644 (file)
--- 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)
    evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
    evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    data->mesh_node =

diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 34ed28eea16f2bac074303a470bb922d8f64acdc..451d4d28a20af61d8e82268d81075ab3f2717257 100644 (file)
--- 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)
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material0);
    evas_canvas3d_mesh_frame_add(data->mesh, 20);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 20, data->material1);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
 
    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-eet.c b/src/examples/evas/evas-3d-eet.c
index bae330ccdb5a2d53a7c61fff9f8561262e8de244..8bf69b46dded4fce213332cc51a23d76c2bb7e48 100644 (file)
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -149,7 +149,7 @@ main(void)
 
    efl_file_set(mesh, input_model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
    evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -167,7 +167,7 @@ main(void)
    efl_file_save(mesh, output_model_path, NULL, NULL);
 
    efl_file_set(mesh2, output_model_path, NULL);
-   evas_canvas3d_mesh_shade_mode_set(mesh2, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
    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-fog.c b/src/examples/evas/evas-3d-fog.c
index a7d17cf5a4ac7224494126e15e16245ae0e66491..ec111b7597875938e01fa6f43d052f5485d5d8f8 100644 (file)
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -115,7 +115,7 @@ static void
 _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
 {
    evas_canvas3d_mesh_from_primitive_set(mesh, 0, sphere);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
 }
 

diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 062a8cd6e97d27669d72847283fc61e6925b625a..e6428060947e3f1af9bbade6dd21e19d52fc9299 100644 (file)
--- 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)
    data->mesh_aabb = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_aabb, 0, data->cube);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_aabb, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_aabb, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_aabb, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_frame_material_set(data->mesh_aabb, 0, data->material);
 
    data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, data->sphere);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
 
    data->mesh_node =
@@ -368,7 +368,7 @@ _mesh_setup_model(Scene_Data *data)
 
    efl_file_set(data->mesh_model, mesh_path, NULL);
    evas_canvas3d_mesh_frame_material_set(data->mesh_model, 0, data->material_model);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_model, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_model, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
 }
 
 static void

diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index ba4bbe001990afebcf45197a7b2da4cfeb017afd..b7f0c2450bec467f2ee114eeaf21fa4757b0b235 100644 (file)
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -87,7 +87,7 @@ int rr;
    data->mesh_##name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                          \
    efl_file_set(data->mesh_##name, model, NULL); \
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADE_MODE_##shade); \
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_##name, EVAS_CANVAS3D_SHADER_MODE_##shade); \
    evas_canvas3d_mesh_frame_material_set(data->mesh_##name, 0, data->material);
 
 #define CONVEX_HULL_MESH_INIT(name)                                                              \
@@ -108,7 +108,7 @@ int rr;
    evas_canvas3d_mesh_index_data_copy_set(data->mesh_##name##_ch, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
                                      ind->len, &index[0]); \
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##name##_ch, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_##name##_ch, EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR); \
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_##name##_ch, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR); \
    evas_canvas3d_mesh_frame_material_set(data->mesh_##name##_ch, 0, data->material);                                    \
          free(vert);                                                                             \
          free(ind);
@@ -308,7 +308,7 @@ _mesh_setup(Scene_Data *data)
    data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_sphere, 0, primitive);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_sphere, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_sphere, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
 
    /* Setup mesh torus */
@@ -317,7 +317,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_primitive_precision_set(primitive, 50);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_torus, 0, primitive);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_torus, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_torus, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_torus, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_torus, 0, data->material);
 
    /* Setup mesh cube */
@@ -326,7 +326,7 @@ _mesh_setup(Scene_Data *data)
    evas_canvas3d_primitive_precision_set(primitive, 50);
    evas_canvas3d_mesh_from_primitive_set(data->mesh_cube, 0, primitive);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material);
 
    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 a57decae6a44e35e157299be96967a67d43ced4b..7f4998f7df18f185404bbb41050d12fbedf6bc36 100644 (file)
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -126,7 +126,7 @@ main(void)
 
    efl_file_set(mesh, model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
    texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    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 d51b1f9b15a75d857dad00e45b70b3bc86f744f5..91c4e33ca3eb35a1156a52adb0951bcc2df3e45d 100644 (file)
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -35,7 +35,7 @@
    mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                               \
    efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \
    evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \
-   evas_canvas3d_mesh_shade_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADE_MODE_PHONG);                      \
+   evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG);                      \
    node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));          \
    evas_canvas3d_node_member_add(root_node, node_##extention);                       \
    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 1b68ff9fcff7e1dc21da4778e1e8629ef209325f..ca645c865a24351452af4857b91a7dca09ad1c7f 100644 (file)
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -48,7 +48,7 @@
    snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj");                      \
    efl_file_set(mesh[num], full_file_path, NULL); \
    evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \
-   evas_canvas3d_mesh_shade_mode_set(mesh[num], shade_mode);                                \
+   evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode);                                \
    mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));   \
    evas_canvas3d_node_member_add(root_node, mesh_node[num]);                                \
    evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \
@@ -198,13 +198,13 @@ main(void)
              PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES);
 
    ADD_OBJ_MESH_AND_SAVED_COPY(home, -GRID_SIZE, -GRID_SIZE, 0,
-                               EVAS_CANVAS3D_SHADE_MODE_PHONG, material_with_tex)
+                               EVAS_CANVAS3D_SHADER_MODE_PHONG, material_with_tex)
    ADD_OBJ_MESH_AND_SAVED_COPY(home_without_normals, -GRID_SIZE, GRID_SIZE, 1,
-                               EVAS_CANVAS3D_SHADE_MODE_DIFFUSE, material_with_tex)
+                               EVAS_CANVAS3D_SHADER_MODE_DIFFUSE, material_with_tex)
    ADD_OBJ_MESH_AND_SAVED_COPY(home_without_tex_coords, GRID_SIZE, -GRID_SIZE, 2,
-                               EVAS_CANVAS3D_SHADE_MODE_PHONG, material)
+                               EVAS_CANVAS3D_SHADER_MODE_PHONG, material)
    ADD_OBJ_MESH_AND_SAVED_COPY(home_only_vertex_coords, GRID_SIZE, GRID_SIZE, 3,
-                               EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER, NULL)
+                               EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER, NULL)
 
    /* Set up scene. */
    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 061e8527cf7fb62c9c524b63fbf80238901ba198..d2c902c587a2e016a8a918e9ebb3c0acca606ce7 100644 (file)
--- 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
    Evas_Event_Key_Down *ev = event_info;
 
    if (!strcmp("n", ev->key))
-     evas_canvas3d_mesh_shade_mode_set(scene->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
+     evas_canvas3d_mesh_shader_mode_set(scene->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
 
    if (!strcmp("p", ev->key))
-     evas_canvas3d_mesh_shade_mode_set(scene->mesh, EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION);
+     evas_canvas3d_mesh_shader_mode_set(scene->mesh, EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION);
 }
 
 static void
@@ -186,7 +186,7 @@ _mesh_setup(Scene_Data *data)
    data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 100, data->cube);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material_rocks);
 
    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 9a65813dda33087848112380febc81ffa5f8b448..201771fb78e01216e42a886e46b213d2be2bde87 100644 (file)
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -158,7 +158,7 @@ main(void)
 
    evas_canvas3d_node_member_add(root_node, mesh_node);
    evas_canvas3d_node_mesh_add(mesh_node, mesh);
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
 
    /* Set up scene. */

diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 8ec32336808c5b37bfd375f217d5844135f1a286..6c542c3e635187425168c7cd17d38f213e11bf3d 100644 (file)
--- 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",
                                    "NoNormal_NoUVs_Colors.ply",
                                    "NoNormal_NoUVs_NoColors.ply"};
 
-int draw_mode[8] = {EVAS_CANVAS3D_SHADE_MODE_PHONG,
-                    EVAS_CANVAS3D_SHADE_MODE_PHONG,
-                    EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR,
-                    EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER,
-                    EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR,
-                    EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER,
-                    EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR,
-                    EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER};
+int draw_mode[8] = {EVAS_CANVAS3D_SHADER_MODE_PHONG,
+                    EVAS_CANVAS3D_SHADER_MODE_PHONG,
+                    EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
+                    EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
+                    EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
+                    EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
+                    EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
+                    EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER};
 
 Ecore_Evas *ecore_evas = NULL;
 Evas *evas = NULL;
@@ -184,7 +184,7 @@ main(void)
         snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]);
         efl_file_set(mesh[i], buffer, NULL);
         evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material);
-        evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]);
+        evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
 
         snprintf(buffer, PATH_MAX, "%s%s", output_template, file_name[i % 8]);
         efl_file_save(mesh[i], buffer, NULL, NULL);
@@ -193,7 +193,7 @@ main(void)
           {
              efl_file_set(mesh[i], buffer, NULL);
              evas_canvas3d_mesh_frame_material_set(mesh[i], 0, material);
-             evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]);
+             evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
           }
 
         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 b63458988a26c90af63ee6dcde9bf5884f608cf8..67088c6550970b3f6ba2efd8667b1919b85a30f2 100644 (file)
--- 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)
    /* Setup mesh. */
    data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_FLAT);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_FLAT);
    evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    data->mesh_node =

diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 5d0034b098602db257ab319d562eed6ef7365b23..7c48122ed169057eb7d09a353485bcbba9f45230 100644 (file)
--- 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)
    meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
    EINA_LIST_FOREACH(meshes, l, m)
      {
-        evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+        evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
      }
    if (choosed_node != (Evas_Canvas3D_Node *)event->info)
      {
@@ -97,7 +97,7 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
              meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(choosed_node);
              EINA_LIST_FOREACH(meshes, l, m)
                {
-                  evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+                  evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
                }
           }
         choosed_node = (Evas_Canvas3D_Node *)event->info;
@@ -114,7 +114,7 @@ _cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
    meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
    EINA_LIST_FOREACH(meshes, l, m)
      {
-        evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+        evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
      }
 
    return EINA_TRUE;
@@ -184,7 +184,7 @@ _body_material_set(Body_3D *body, float r, float g, float b)
    evas_canvas3d_material_color_set(body->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
    evas_canvas3d_material_shininess_set(body->material, 100.0);
 
-   evas_canvas3d_mesh_shade_mode_set(body->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(body->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(body->mesh, 0, body->material);
 }
 
@@ -282,7 +282,7 @@ _fence_setup(Body_3D *fence)
    evas_canvas3d_mesh_frame_material_set(fence->mesh, 0, fence->material);
    evas_canvas3d_mesh_alpha_func_set(fence->mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0);
    evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE);
-   evas_canvas3d_mesh_shade_mode_set(fence->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
+   evas_canvas3d_mesh_shader_mode_set(fence->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
    fence->node =
       eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
    evas_canvas3d_node_mesh_add(fence->node, fence->mesh);
@@ -346,7 +346,7 @@ _model_setup(Body_3D *model)
    model->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    efl_file_set(model->mesh, model_path, NULL);
    evas_canvas3d_mesh_frame_material_set(model->mesh, 0, model->material);
-   evas_canvas3d_mesh_shade_mode_set(model->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
    model->node =
       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)
    evas_canvas3d_mesh_frame_material_set(data->billboard.mesh, 0, data->billboard.material);
    evas_canvas3d_mesh_alpha_func_set(data->billboard.mesh, EVAS_CANVAS3D_COMPARISON_GREATER, 0);
    evas_canvas3d_mesh_alpha_test_enable_set(data->billboard.mesh, EINA_TRUE);
-   evas_canvas3d_mesh_shade_mode_set(data->billboard.mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(data->billboard.mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE);
    evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
 
@@ -548,27 +548,27 @@ static void _init(Scene_Data *data)
    meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->sphere.node);
    EINA_LIST_FOREACH(meshes, l, m)
      {
-        evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+        evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
      }
    meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cube.node);
    EINA_LIST_FOREACH(meshes, l, m)
      {
-        evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+        evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
      }
    meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cylinder.node);
    EINA_LIST_FOREACH(meshes, l, m)
      {
-        evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+        evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
      }
    meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->model.node);
    EINA_LIST_FOREACH(meshes, l, m)
      {
-        evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+        evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
      }
    meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(data->cone.node);
    EINA_LIST_FOREACH(meshes, l, m)
      {
-        evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+        evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_PHONG);
      }
 }
 

diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index bb252284698f7bd3f3de75c45d2dd867ed26c83b..6d42ad48a3c55ade4114ebd83d72863d129984cf 100644 (file)
--- 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)
                                                         i, ".obj");
         efl_file_set(mesh, str, NULL);
         evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material);
-        evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+        evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
         evas_canvas3d_mesh_lod_boundary_set(mesh, distances[i], distances[i + 1]);
         evas_canvas3d_node_mesh_add(data->lod_mesh_node1, mesh);
 
         mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
         efl_file_set(mesh, str, NULL);
         evas_canvas3d_mesh_frame_material_set(mesh, 0, data->material);
-        evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+        evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
         evas_canvas3d_mesh_lod_boundary_set(mesh, m_distances[i], m_distances[i + 1]);
 
         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 ca8521720ab4f944d44821681a02e1dc8ec0c586..ce23acf8517613f0a208fc3d470838c531603264 100644 (file)
--- 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
 
 
 #define ENABLE_NORMAL(mesh)                                                  \
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
 
 
 #define DISABLE_NORMAL(mesh)                                               \
-   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
 
 
 #define ADD_MESH(Object, Name, a, d, s)                                                   \
@@ -141,7 +141,7 @@ typedef struct _vec2
    data->mesh_##Name = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
 
 #define SETUP_DEFAULT_MESH(Object, Name, Shade_Mode)                                      \
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADE_MODE_##Shade_Mode); \
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADER_MODE_##Shade_Mode); \
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_##Name, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); \
    evas_canvas3d_mesh_frame_material_set(data->mesh_##Name, 0, data->material_##Object);
 
@@ -201,7 +201,7 @@ typedef struct _vec2
    evas_canvas3d_material_texture_set(data->material_##Object, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, \
                                       data->texture_normal_##Object);                    \
                                                                                           \
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_##Name, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
 
 #define TEXTCOORDS_SET(Name, fb1, fb2, lr1, lr2, tb1, tb2)                      \
    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 c7f549c77b727ec6880edd3e0fc1add19b2d577e..9dbf01e069e619e10833c748eb2e026cd5bd1854 100644 (file)
--- 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)
    SETUP_MESH_NODE(tommy)
    efl_file_set(data->mesh_tommy, gun_path, NULL);
    efl_file_save(data->mesh_tommy, "try.obj", NULL, NULL);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_tommy, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_tommy, EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_tommy, 0, data->material_tommy);
 
    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)
 
    _set_ball(data->mesh_ball, 10);
 
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
    evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball);
 
@@ -881,9 +881,9 @@ _mesh_setup_column(Scene_Data *data, int index)
    SETUP_MESH_NODE(column[index])
 
    evas_canvas3d_mesh_from_primitive_set(data->mesh_column[index], 0, data->cylinder_primitive);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
    evas_canvas3d_mesh_vertex_assembly_set(data->mesh_column[index], EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
-   evas_canvas3d_mesh_shade_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_shader_mode_set(data->mesh_column[index], EVAS_CANVAS3D_SHADER_MODE_PHONG);
    evas_canvas3d_mesh_frame_material_set(data->mesh_column[index], 0, data->material_column);
 
    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 f73c00d87f36e2a63a1df5e04a964b8a7d73c94f..3af82de724e005105ea2ff6a34f549b0dd115a74 100644 (file)
--- 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
                           evas_canvas3d_mesh_frame_add(mesh, pf->type.node.frame);
                           evas_canvas3d_mesh_frame_material_set(mesh, pf->type.node.frame, material);
                        }
-                     evas_canvas3d_mesh_shade_mode_set(mesh, pd_mesh_node->mesh_node.properties.shade);
+                     evas_canvas3d_mesh_shader_mode_set(mesh, pd_mesh_node->mesh_node.properties.shade);
                      evas_canvas3d_mesh_vertex_assembly_set(mesh, pd_mesh_node->mesh_node.mesh.assembly);
                      evas_canvas3d_node_mesh_frame_set(ep->node, mesh, pf->type.node.frame);
                      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 517a2ca475e074d7f939a7de97edfae923f07690..eeafeaf449a3695eeaa9e1e0ec051f3e21f54ae4 100644 (file)
--- 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
       Edje_Color            specular;
       Eina_Bool             normal;
       FLOAT_T               shininess;
-      Evas_Canvas3D_Shade_Mode    shade;
+      Evas_Canvas3D_Shader_Mode    shade;
 
       Evas_Canvas3D_Material_Attrib material_attrib;
    } properties;

diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.c b/src/lib/evas/canvas/efl_canvas_scene3d.c
index 81d637587808990862d754d73cab2dfa6d2c1168..d0623fefdc36ca57ff1fc381c5d336fdd638b090 100644 (file)
--- 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,
         scene_data.post_processing = EINA_TRUE;
         scene_data.color_pick_enabled = EINA_FALSE;
         scene_data.render_to_texture = EINA_TRUE;
-        scene_data.post_processing_type = EVAS_CANVAS3D_SHADE_MODE_POST_PROCESSING_FXAA;
+        scene_data.post_processing_type = EVAS_CANVAS3D_SHADER_MODE_POST_PROCESSING_FXAA;
      }
    /* Phase 1 - Update scene graph tree. */
    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 091a8bf742a339c1257c62209bcc14372e00b8ee..9cfc637e172b632eae77dbd42c553e8aff6afcfa 100644 (file)
--- 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)
 }
 
 EOLIAN static void
-_evas_canvas3d_mesh_shade_mode_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Shade_Mode mode)
+_evas_canvas3d_mesh_shader_mode_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Shader_Mode mode)
 {
-   if (pd->shade_mode != mode)
+   if (pd->shader_mode != mode)
      {
-        pd->shade_mode = mode;
-        evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL);
+        pd->shader_mode = mode;
+        evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADER_MODE, NULL);
      }
 }
 
-EOLIAN static Evas_Canvas3D_Shade_Mode
-_evas_canvas3d_mesh_shade_mode_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
+EOLIAN static Evas_Canvas3D_Shader_Mode
+_evas_canvas3d_mesh_shader_mode_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
 {
-   return pd->shade_mode;
+   return pd->shader_mode;
 }
 
 EOLIAN static void

diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index b39e2dc70516922b442376e98dac6c5f36880084..2c1875090cbff6d57ea641eb7fd21eadaccd947d 100644 (file)
--- 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)
             @in primitive: Evas.Canvas3D.Primitive *; [[Specifies which data will be set.]]
          }
       }
-      @property shade_mode {
+      @property shader_mode {
          set {
-            [[Set the shade mode of the given mesh.
+            [[Set the shader mode of the given mesh.
 
-              Default shade mode is EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR.
+              Default shader mode is EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR.
             ]]
          }
          get {
-            [[Get the shade mode of the given mesh.]]
+            [[Get the shader mode of the given mesh.]]
          }
          values {
-            mode: Evas.Canvas3D.Shade_Mode; [[The shade mode.]]
+            mode: Evas.Canvas3D.Shader_Mode; [[The shader mode.]]
          }
       }
       @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 4f3bda960189d9548ec13ef57919c1912c26204a..5d786c2c7b4eb9a27c9991023ec269ae30992072 100644 (file)
--- 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)
                }
 
              float *tangent_data = (float *)f->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT].data;
-             if (!tangent_data && ((mesh_pd->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) ||
-                 (mesh_pd->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION)))
+             if (!tangent_data && ((mesh_pd->shader_mode == EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP) ||
+                 (mesh_pd->shader_mode == EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION)))
                {
                   index = (unsigned short int *)mesh_pd->indices;
                   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 8a7d08ecfdd5f2a6093d0729001e62a9bc44ae93..5800bce609fa6892dbead2e529d8b0fa832d16c3 100644 (file)
--- 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)
    data->render_to_texture = EINA_FALSE;
    data->lod_distance = 0;
    data->post_processing = EINA_FALSE;
-   data->post_processing_type = EVAS_CANVAS3D_SHADE_MODE_POST_PROCESSING_FXAA;
+   data->post_processing_type = EVAS_CANVAS3D_SHADER_MODE_POST_PROCESSING_FXAA;
 }
 
 void

diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot
index 7d1a24e6fd5d3ad16ae27e0b5eae52871d38cded..ab582ceaa6639c75129dfc84a91612c1b65fab0a 100644 (file)
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_types.eot
@@ -314,7 +314,7 @@ enum Evas.Canvas3D.State
    mesh_vertex_data,
    mesh_index_data,
    mesh_vertex_assembly,
-   mesh_shade_mode,
+   mesh_shader_mode,
    mesh_fog,
    mesh_blending,
    mesh_alpha_test,
@@ -339,7 +339,7 @@ enum Evas.Canvas3D.State
    node_mesh_geometry,
    node_mesh_material,
    node_mesh_frame,
-   node_mesh_shade_mode,
+   node_mesh_shader_mode,
    node_mesh_material_id,
    node_light,
    node_camera,
@@ -483,7 +483,7 @@ enum Evas.Canvas3D.Primitive_Mode
    alternative_uv [[Ptimitive with alternative uv (supported for sphere)]]
 }
 
-enum Evas.Canvas3D.Shade_Mode
+enum Evas.Canvas3D.Shader_Mode
 {
    [[Shader shade modes
 

diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 2b2c174b6390598fafd29cc3e625fd54822d4ddf..438bfb8b1a5ab621cb24b8b192b4f4e7e279eca1 100644 (file)
--- 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
 
 struct _Evas_Canvas3D_Mesh
 {
-   Evas_Canvas3D_Shade_Mode      shade_mode;
+   Evas_Canvas3D_Shader_Mode      shader_mode;
 
    int                     vertex_count;
    int                     frame_count;
@@ -460,7 +460,7 @@ struct _Evas_Canvas3D_Scene_Public_Data
    unsigned int     lod_distance;
 
    Eina_Bool post_processing :1;
-   Evas_Canvas3D_Shade_Mode post_processing_type;
+   Evas_Canvas3D_Shader_Mode post_processing_type;
 };
 
 struct _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 f4f7b00cee771dc056e2d396d9ebdf00a1c31ae2..b3beb5ca16d4eb3da3e7f954ce4d2e637fbad357 100644 (file)
--- 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,
    data->blending = pdmesh->blending;
    data->blend_sfactor = pdmesh->blend_sfactor;
    data->blend_dfactor = pdmesh->blend_dfactor;
-   data->mode = pdmesh->shade_mode;
+   data->mode = pdmesh->shader_mode;
    data->assembly = pdmesh->assembly;
    data->vertex_count = pdmesh->vertex_count;
    data->index_count = pdmesh->index_count;
@@ -1018,12 +1018,12 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
           }                                                                   \
    } while (0)
 
-   if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR)
+   if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR)
      {
         BUILD(vertex_attrib,     VERTEX_ATTRIB_POSITION,     EINA_TRUE);
         BUILD(vertex_attrib,     VERTEX_ATTRIB_COLOR,        EINA_TRUE);
      }
-   else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER)
+   else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER)
      {
         BUILD(vertex_attrib,     VERTEX_ATTRIB_POSITION,     EINA_TRUE);
         if (pdmesh->alpha_test_enabled)
@@ -1034,11 +1034,11 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
                BUILD(vertex_attrib,     VERTEX_ATTRIB_TEXCOORD,     EINA_FALSE);
           }
      }
-   else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_COLOR_PICK)
+   else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_COLOR_PICK)
      {
         BUILD(vertex_attrib,     VERTEX_ATTRIB_POSITION,     EINA_TRUE);
      }
-   else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_DIFFUSE)
+   else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_DIFFUSE)
      {
         BUILD(vertex_attrib,     VERTEX_ATTRIB_POSITION,     EINA_TRUE);
         BUILD(material_color,    MATERIAL_ATTRIB_DIFFUSE,    EINA_TRUE);
@@ -1047,7 +1047,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
         if (_flags_need_tex_coord(data->flags))
           BUILD(vertex_attrib,     VERTEX_ATTRIB_TEXCOORD,     EINA_FALSE);
      }
-   else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_FLAT)
+   else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_FLAT)
      {
         BUILD(vertex_attrib,     VERTEX_ATTRIB_POSITION,     EINA_TRUE);
         BUILD(vertex_attrib,     VERTEX_ATTRIB_NORMAL,       EINA_TRUE);
@@ -1068,7 +1068,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
         if (_flags_need_tex_coord(data->flags))
           BUILD(vertex_attrib,     VERTEX_ATTRIB_TEXCOORD,     EINA_FALSE);
      }
-   else if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PHONG)
+   else if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_PHONG)
      {
         BUILD(vertex_attrib,     VERTEX_ATTRIB_POSITION,     EINA_TRUE);
         BUILD(vertex_attrib,     VERTEX_ATTRIB_NORMAL,       EINA_TRUE);
@@ -1089,8 +1089,8 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
         if (_flags_need_tex_coord(data->flags))
           BUILD(vertex_attrib,     VERTEX_ATTRIB_TEXCOORD,     EINA_FALSE);
      }
-   else if ((pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP) ||
-            (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION))
+   else if ((pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP) ||
+            (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_PARALLAX_OCCLUSION))
      {
         BUILD(vertex_attrib,     VERTEX_ATTRIB_POSITION,     EINA_TRUE);
         BUILD(vertex_attrib,     VERTEX_ATTRIB_NORMAL,       EINA_TRUE);
@@ -1099,7 +1099,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data,
         BUILD(vertex_attrib,     VERTEX_ATTRIB_TANGENT,      EINA_FALSE);
 
 
-        if (pdmesh->shade_mode == EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP)
+        if (pdmesh->shader_mode == EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP)
           BUILD(vertex_attrib,     VERTEX_ATTRIB_TANGENT,      EINA_FALSE);
         else BUILD(vertex_attrib,     VERTEX_ATTRIB_TANGENT,      EINA_TRUE);
 
@@ -1156,7 +1156,7 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer,
 {
    Eina_List        *l;
    Evas_Canvas3D_Node     *n;
-   Evas_Canvas3D_Shade_Mode shade_mode;
+   Evas_Canvas3D_Shader_Mode shader_mode;
    Eina_Bool       blend_enabled;
    Evas_Color      c = {1.0, 1.0, 1.0, 1.0};
    Eina_Matrix4 matrix_vp;
@@ -1185,13 +1185,13 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer,
           {
              RENDER_MESH_NODE_ITERATE_BEGIN(light_eye)
                {
-                  shade_mode = pdmesh->shade_mode;
+                  shader_mode = pdmesh->shader_mode;
                   blend_enabled = pdmesh->blending;
                   pdmesh->blending = EINA_FALSE;
-                  pdmesh->shade_mode = EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER;
+                  pdmesh->shader_mode = EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER;
                   _mesh_draw(renderer, nm->mesh, nm->frame, light, matrix_light_eye,
                              &matrix_mv, &matrix_mvp, &matrix_mvp);
-                  pdmesh->shade_mode = shade_mode;
+                  pdmesh->shader_mode = shader_mode;
                   pdmesh->blending = blend_enabled;
                }
              RENDER_MESH_NODE_ITERATE_END
@@ -1351,7 +1351,7 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende
                                      Evas_Canvas3D_Scene_Public_Data *data)
 {
    const Eina_Matrix4  *matrix_eye;
-   Evas_Canvas3D_Shade_Mode shade_mode;
+   Evas_Canvas3D_Shader_Mode shader_mode;
    Eina_Stringshare *tmp;
    Eina_Iterator *itmn;
    void *ptrmn;
@@ -1398,11 +1398,11 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende
                              pdmesh->color_pick_key.r = unic_color->r;
                              pdmesh->color_pick_key.g = unic_color->g;
                              pdmesh->color_pick_key.b = unic_color->b;
-                             shade_mode = pdmesh->shade_mode;
-                             pdmesh->shade_mode = EVAS_CANVAS3D_SHADE_MODE_COLOR_PICK;
+                             shader_mode = pdmesh->shader_mode;
+                             pdmesh->shader_mode = EVAS_CANVAS3D_SHADER_MODE_COLOR_PICK;
                              _mesh_draw(renderer, nm->mesh, nm->frame, NULL, matrix_eye, &matrix_mv,
                                         &matrix_mvp, NULL);
-                             pdmesh->shade_mode = shade_mode;
+                             pdmesh->shader_mode = shader_mode;
                           }
                         eina_stringshare_del(tmp);
                      }

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 cbdb0f7711398bd2eb38c9f03ff215804549df40..1c4d2adfacf0fbd44db64460ae968de406dce846 100644 (file)
--- 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)
 struct _E3D_Draw_Data
 {
    E3D_Shader_Flag      flags;
-   Evas_Canvas3D_Shade_Mode   mode;
+   Evas_Canvas3D_Shader_Mode   mode;
 
    Eina_Matrix4   matrix_mvp;
    Eina_Matrix4   matrix_mv;
@@ -163,10 +163,10 @@ struct _E3D_Drawable
 void                 e3d_texture_param_update(E3D_Texture *texture);
 
 /* Program */
-E3D_Program         *e3d_program_new(Evas_Canvas3D_Shade_Mode mode, E3D_Shader_Flag flags);
+E3D_Program         *e3d_program_new(Evas_Canvas3D_Shader_Mode mode, E3D_Shader_Flag flags);
 void                 e3d_program_free(E3D_Program *program);
 GLuint               e3d_program_id_get(const E3D_Program *program);
-Evas_Canvas3D_Shade_Mode   e3d_program_shade_mode_get(const E3D_Program *program);
+Evas_Canvas3D_Shader_Mode   e3d_program_shader_mode_get(const E3D_Program *program);
 E3D_Shader_Flag      e3d_program_shader_flags_get(const E3D_Program *program);
 void                 e3d_program_uniform_upload(E3D_Program *program, const E3D_Draw_Data *data);
 

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 0fc0f896d26ff8c01f32b9540d611929a2238643..2e4f885b77b5e12e1bbc49f3fc3e77e312ca98b7 100644 (file)
--- 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)
 
    EINA_LIST_FOREACH(renderer->programs, l, p)
      {
-        if (e3d_program_shade_mode_get(p) == data->mode &&
+        if (e3d_program_shader_mode_get(p) == data->mode &&
             e3d_program_shader_flags_get(p) == data->flags)
           {
              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 5f5c0a60ce1c3a1fdc58c77163f20600e0bdd5b0..7fef49092b59b8645ca82b00e39b990d69be33cc 100644 (file)
--- 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
    GLuint               prog;
 
    E3D_Shader_Flag      flags;
-   Evas_Canvas3D_Shade_Mode   mode;
+   Evas_Canvas3D_Shader_Mode   mode;
 
    GLint                uniform_locations[E3D_UNIFORM_COUNT];
 };
@@ -665,7 +665,7 @@ e3d_program_uniform_upload(E3D_Program *program, const E3D_Draw_Data *data)
 }
 
 E3D_Program *
-e3d_program_new(Evas_Canvas3D_Shade_Mode mode, E3D_Shader_Flag flags)
+e3d_program_new(Evas_Canvas3D_Shader_Mode mode, E3D_Shader_Flag flags)
 {
    E3D_Shader_String vert, frag;
    E3D_Program *program = NULL;
@@ -737,8 +737,8 @@ e3d_program_id_get(const E3D_Program *program)
    return program->prog;
 }
 
-Evas_Canvas3D_Shade_Mode
-e3d_program_shade_mode_get(const E3D_Program *program)
+Evas_Canvas3D_Shader_Mode
+e3d_program_shader_mode_get(const E3D_Program *program)
 {
    return program->mode;
 }