diff options
Diffstat (limited to 'src/examples/evas3d_scene_on_button_example.c')
| -rw-r--r-- | src/examples/evas3d_scene_on_button_example.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/examples/evas3d_scene_on_button_example.c b/src/examples/evas3d_scene_on_button_example.c index 8a70ec8a5..c7cf82c32 100644 --- a/src/examples/evas3d_scene_on_button_example.c +++ b/src/examples/evas3d_scene_on_button_example.c @@ -120,11 +120,12 @@ _animate_scene(void *data) static void _camera_setup(Scene_Data *data) { - eo_add(&data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas); + data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); - eo_add(&data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->camera_node, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + data->camera_node = + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, 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, 10.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); @@ -134,12 +135,13 @@ _camera_setup(Scene_Data *data) static void _light_setup(Scene_Data *data) { - eo_add(&data->light, EVAS_CANVAS3D_LIGHT_CLASS, evas); + data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); - eo_add(&data->light_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->light_node, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, 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); @@ -149,7 +151,7 @@ static void _mesh_setup(Scene_Data *data) { /* Setup material. */ - eo_add(&data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas); + data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); @@ -160,7 +162,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_material_shininess_set(data->material, 100.0); /* Setup mesh. */ - eo_add(&data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas); + data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); evas_canvas3d_mesh_vertex_count_set(data->mesh, 24); evas_canvas3d_mesh_frame_add(data->mesh, 0); evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]); @@ -172,7 +174,8 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); - eo_add(&data->mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->mesh_node, EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->mesh_node = + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, 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); } @@ -180,11 +183,12 @@ _mesh_setup(Scene_Data *data) static void _scene_setup(Scene_Data *data) { - eo_add(&data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas); + data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); evas_canvas3d_scene_size_set(data->scene, WIDTH - d_w, HEIGHT - d_h); evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); - eo_add(&data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->root_node, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = + eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); |