diff options
Diffstat (limited to 'src/examples/evas/evas-3d-mmap-set.c')
| -rw-r--r-- | src/examples/evas/evas-3d-mmap-set.c | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index 5c50e81c5d..6ff754a515 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -32,22 +32,22 @@ #define LOAD_AND_ADD_MESH(extention, number) \ snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention); \ extention##_file = eina_file_open(buffer , 0); \ - mesh_##extention = eo_add(EVAS_3D_MESH_CLASS, evas); \ + mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \ eo_do(mesh_##extention, \ efl_file_mmap_set(extention##_file, NULL), \ - evas_3d_mesh_frame_material_set(0, material), \ - evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); \ - node_##extention = eo_add(EVAS_3D_NODE_CLASS, evas, \ - evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); \ - eo_do(root_node, evas_3d_node_member_add(node_##extention)); \ - eo_do(node_##extention, evas_3d_node_mesh_add(mesh_##extention), \ - evas_3d_node_position_set(initial_node_data[number * 10], \ + evas_canvas3d_mesh_frame_material_set(0, material), \ + evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); \ + node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, \ + evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); \ + eo_do(root_node, evas_canvas3d_node_member_add(node_##extention)); \ + eo_do(node_##extention, evas_canvas3d_node_mesh_add(mesh_##extention), \ + evas_canvas3d_node_position_set(initial_node_data[number * 10], \ initial_node_data[number * 10 + 1], \ initial_node_data[number * 10 + 2]), \ - evas_3d_node_scale_set(initial_node_data[number * 10 + 3], \ + evas_canvas3d_node_scale_set(initial_node_data[number * 10 + 3], \ initial_node_data[number * 10 + 4], \ initial_node_data[number * 10 + 5]), \ - evas_3d_node_orientation_angle_axis_set(initial_node_data[number * 10 + 6], \ + evas_canvas3d_node_orientation_angle_axis_set(initial_node_data[number * 10 + 6], \ initial_node_data[number * 10 + 7], \ initial_node_data[number * 10 + 8], \ initial_node_data[number * 10 + 9]));\ @@ -100,9 +100,9 @@ _animate_obj(void *data) obj_animation_parameter += obj_animation_velocity; float oap = obj_animation_parameter/200; - eo_do((Evas_3D_Node *)data, - evas_3d_node_scale_set(oap, oap, oap), - evas_3d_node_orientation_angle_axis_set(obj_animation_parameter, 0.0, 1.0, 0.0)); + eo_do((Evas_Canvas3D_Node *)data, + evas_canvas3d_node_scale_set(oap, oap, oap), + evas_canvas3d_node_orientation_angle_axis_set(obj_animation_parameter, 0.0, 1.0, 0.0)); if (obj_animation_parameter >= 360.0 || obj_animation_parameter <= 0.0) obj_animation_velocity *= -1.0; @@ -115,8 +115,8 @@ _animate_eet(void *data) { eet_animation_parameter += eet_animation_velocity; - eo_do((Evas_3D_Node *)data, - evas_3d_node_orientation_angle_axis_set(eet_animation_parameter, 1.0, 0.0, 0.0)); + eo_do((Evas_Canvas3D_Node *)data, + evas_canvas3d_node_orientation_angle_axis_set(eet_animation_parameter, 1.0, 0.0, 0.0)); eet_animation_velocity = sin(eet_animation_parameter / 180 * M_PI) + 1.1; return EINA_TRUE; @@ -127,8 +127,8 @@ _animate_ply(void *data) { ply_animation_parameter += ply_animation_velocity; - eo_do((Evas_3D_Node *)data, - evas_3d_node_orientation_angle_axis_set(ply_animation_parameter, 1.0, 0.0, 0.0)); + eo_do((Evas_Canvas3D_Node *)data, + evas_canvas3d_node_orientation_angle_axis_set(ply_animation_parameter, 1.0, 0.0, 0.0)); if (ply_animation_parameter > 360.0) ply_animation_parameter -= 180.0f; @@ -140,8 +140,8 @@ _animate_md2(void *data) { md2_animation_parameter += md2_animation_velocity; - eo_do((Evas_3D_Node *)data, - evas_3d_node_mesh_frame_set(mesh_md2, md2_animation_parameter)); + eo_do((Evas_Canvas3D_Node *)data, + evas_canvas3d_node_mesh_frame_set(mesh_md2, md2_animation_parameter)); if (md2_animation_parameter >= 360.0 || md2_animation_parameter <= 0.0) md2_animation_velocity *= -1.0; @@ -187,61 +187,61 @@ main(void) evas = ecore_evas_get(ecore_evas); /* Add a scene object .*/ - scene = eo_add(EVAS_3D_SCENE_CLASS, evas); + scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = eo_add(EVAS_3D_NODE_CLASS, evas, - evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); + root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, + evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ - camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); + camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); eo_do(camera, - evas_3d_camera_projection_perspective_set(10.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(10.0, 1.0, 1.0, 500.0)); camera_node = - eo_add(EVAS_3D_NODE_CLASS, evas, - evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, + evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA)); eo_do(camera_node, - evas_3d_node_camera_set(camera)); + evas_canvas3d_node_camera_set(camera)); eo_do(root_node, - evas_3d_node_member_add(camera_node)); + evas_canvas3d_node_member_add(camera_node)); eo_do(camera_node, - evas_3d_node_position_set(0.0, 0.0, 100.0), - evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_position_set(0.0, 0.0, 100.0), + evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, + EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); /* Add the light. */ - light = eo_add(EVAS_3D_LIGHT_CLASS, evas); + light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); eo_do(light, - evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), - evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), - evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), - evas_3d_light_directional_set(EINA_TRUE)); + evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), + evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), + evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), + evas_canvas3d_light_directional_set(EINA_TRUE)); light_node = - eo_add(EVAS_3D_NODE_CLASS, evas, - evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, + evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT)); eo_do(light_node, - evas_3d_node_light_set(light), - evas_3d_node_position_set(1.0, 0.0, 100.0), - evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + evas_canvas3d_node_light_set(light), + evas_canvas3d_node_position_set(1.0, 0.0, 100.0), + evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, + EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0)); eo_do(root_node, - evas_3d_node_member_add(light_node)); + evas_canvas3d_node_member_add(light_node)); - material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); + material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); eo_do(material, - evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), - evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), - evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, + evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), + evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), + evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE), + evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), + evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 1.0), - evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, + evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 0.0, 1.0), - evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, + evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0.5, 0.0, 1.0, 1.0), - evas_3d_material_shininess_set(50.0)); + evas_canvas3d_material_shininess_set(50.0)); /* Add the meshes */ LOAD_AND_ADD_MESH(obj, 0); @@ -251,9 +251,9 @@ main(void) /* Set up scene. */ eo_do(scene, - evas_3d_scene_root_node_set(root_node), - evas_3d_scene_camera_node_set(camera_node), - evas_3d_scene_size_set(WIDTH, HEIGHT)); + evas_canvas3d_scene_root_node_set(root_node), + evas_canvas3d_scene_camera_node_set(camera_node), + evas_canvas3d_scene_size_set(WIDTH, HEIGHT)); /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); |