diff options
Diffstat (limited to 'src/examples/evas/evas-3d-proxy.c')
-rw-r--r-- | src/examples/evas/evas-3d-proxy.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 4ee8091a96..6445ee9564 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -63,8 +63,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, EINA_SIZE2D(w, h)); - efl_gfx_size_set(image, EINA_SIZE2D(w, h)); + efl_gfx_entity_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_entity_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -121,7 +121,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -137,7 +137,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -174,7 +174,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); @@ -188,7 +188,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); @@ -221,16 +221,16 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); - efl_gfx_visible_set(background, EINA_TRUE); + efl_gfx_entity_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); + efl_gfx_entity_visible_set(background, EINA_TRUE); /* Add a background image. */ #ifdef USE_EO_IMAGE source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_gfx_buffer_copy_set(source, NULL, EINA_SIZE2D(IMG_WIDTH, IMG_HEIGHT), 0, EFL_GFX_COLORSPACE_ARGB8888, 0); - efl_gfx_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2))); - efl_gfx_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); - efl_gfx_visible_set(source, EINA_TRUE); + efl_gfx_entity_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2))); + efl_gfx_entity_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); + efl_gfx_entity_visible_set(source, EINA_TRUE); #else source = evas_object_image_filled_add(evas); evas_object_image_size_set(source, IMG_WIDTH, IMG_HEIGHT); @@ -241,8 +241,8 @@ main(void) /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); - efl_gfx_visible_set(image, EINA_TRUE); + efl_gfx_entity_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); + efl_gfx_entity_visible_set(image, EINA_TRUE); /* Setup scene */ _scene_setup(&data); |