diff options
author | Oleksandr Shcherbina <o.shcherbina@samsung.com> | 2015-06-17 16:31:14 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-06-17 17:52:17 +0200 |
commit | d409df1caa38ae7eac87f85ff4113484bc5b2099 (patch) | |
tree | 2adcbeadf2f4b2e7f4e7ba327a574c6620c23663 /src/examples/evas/evas-3d-md2.c | |
parent | 9bf6f14a8a59195fe9be004aaff446c51474fc5d (diff) | |
download | efl-d409df1caa38ae7eac87f85ff4113484bc5b2099.tar.gz |
evas: change interface evas_3d to evas_canvas3d
Summary:
Regard to https://phab.enlightenment.org/T2479 it is need for right generation
Eolian files
Reviewers: cedric
Subscribers: cedric, tasn
Differential Revision: https://phab.enlightenment.org/D2711
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/examples/evas/evas-3d-md2.c')
-rw-r--r-- | src/examples/evas/evas-3d-md2.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 428379da40..282727497e 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -47,7 +47,7 @@ _animate_scene(void *data) { static int frame = 0; - eo_do((Evas_3D_Node *)data, evas_3d_node_mesh_frame_set(mesh, frame)); + eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_mesh_frame_set(mesh, frame)); frame += 32; @@ -91,89 +91,89 @@ 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(60.0, 1.0, 1.0, 500.0)); + evas_canvas3d_camera_projection_perspective_set(60.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(100.0, 0.0, 20.0), - evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, - EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); + evas_canvas3d_node_position_set(100.0, 0.0, 20.0), + evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, + EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.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(1000.0, 0.0, 1000.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(1000.0, 0.0, 1000.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)); /* Add the mesh. */ - mesh = eo_add(EVAS_3D_MESH_CLASS, evas); - material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); + mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); + material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); eo_do(mesh, efl_file_set(model_path, NULL), - evas_3d_mesh_frame_material_set(0, material), - evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); + evas_canvas3d_mesh_frame_material_set(0, material), + evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); - texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); + texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); eo_do(texture, - evas_3d_texture_file_set(image_path, NULL), - evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, - EVAS_3D_TEXTURE_FILTER_NEAREST), - evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, - EVAS_3D_WRAP_MODE_REPEAT)); + evas_canvas3d_texture_file_set(image_path, NULL), + evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, + EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), + evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, + EVAS_CANVAS3D_WRAP_MODE_REPEAT)); eo_do(material, - evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture), - 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_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture), + 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, 1.0, 1.0), - evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, + evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), - evas_3d_material_shininess_set(50.0)); + evas_canvas3d_material_shininess_set(50.0)); - mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, - evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); + mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, + evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); eo_do(root_node, - evas_3d_node_member_add(mesh_node)); + evas_canvas3d_node_member_add(mesh_node)); eo_do(mesh_node, - evas_3d_node_mesh_add(mesh)); + evas_canvas3d_node_mesh_add(mesh)); /* 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); |