diff options
Diffstat (limited to 'src/examples/evas/evas-3d-colorpick.c')
| -rw-r--r-- | src/examples/evas/evas-3d-colorpick.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c index 3d79500a91..bbfcdddb39 100644 --- a/src/examples/evas/evas-3d-colorpick.c +++ b/src/examples/evas/evas-3d-colorpick.c @@ -237,9 +237,9 @@ Eina_Bool _init_sphere(void *this, const char *texture) { Test_object *sphere = (Test_object *)this; - sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); - sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); - sphere->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); + sphere->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); + sphere->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); + sphere->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); evas_canvas3d_primitive_form_set(sphere->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); evas_canvas3d_primitive_precision_set(sphere->primitive, 50); evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive); @@ -248,7 +248,7 @@ _init_sphere(void *this, const char *texture) evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE); - sphere->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); + sphere->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); evas_canvas3d_texture_file_set(sphere->texture, texture, NULL); evas_canvas3d_texture_filter_set(sphere->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); evas_canvas3d_texture_wrap_set(sphere->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); @@ -272,27 +272,27 @@ _init_scene(const char *texture) Evas_Real tmp; Test_object *m; - globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); + globalscene.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + globalscene.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); - globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); + globalscene.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0); globalscene.camera_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera); evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node); evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0); evas_canvas3d_node_look_at_set(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); - globalscene.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); + globalscene.light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); evas_canvas3d_light_ambient_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_diffuse_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_specular_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE); globalscene.light_node = - eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light); evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0); evas_canvas3d_node_look_at_set(globalscene.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0); @@ -313,7 +313,7 @@ _init_scene(const char *texture) m->material = spheretmp->material; m->texture = spheretmp->texture; } - m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + m->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); m->speed = tmp; m->sphere_animate = _animate_sphere; m->animate = ecore_timer_add(m->speed, m->sphere_animate, m); @@ -381,7 +381,7 @@ int main(int argc, char **argv) globalscene.precision = precision; globalscene.scene_init(texture); - image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); + image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); efl_gfx_size_set(image, WIDTH, HEIGHT); efl_gfx_visible_set(image, EINA_TRUE); |