enlightenment
/
examples
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eo: Get rid of eo_add_custom. 

We decided to deprecate this one in favour of setting thing in the
construction between the constructor and the finalizer.
This commit is contained in:
Tom Hacohen 2014-09-25 10:24:27 +01:00
parent 6ef671c7ae
commit ffdd193100
16 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evas/evas-3d-moon-space.c
View File

@ -383,7 +383,7 @@ _camera_setup(Scene_Data *data)
eo_do(data->camera,
evas_3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 100.0));
data->camera_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
evas_3d_node_camera_set(data->camera),
@ -403,7 +403,7 @@ _light_setup(Scene_Data *data)
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));
data->light_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->light_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_3d_node_light_set(data->light),
@ -428,11 +428,11 @@ _mesh_setup(Scene_Data *data)
data->texture_diffuse_planet = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
data->texture_diffuse_moon = eo_add(EVAS_3D_TEXTURE_CLASS, evas);
data->mesh_node_planet = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_planet = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
data->mesh_node_cube = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_cube = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
data->mesh_node_moon = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_moon = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
/* Setup material for cube. */
@ -561,7 +561,7 @@ _scene_setup(Scene_Data *data)
data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
data->root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
eo_do(data->scene,

2
unsorted/ecore/ecore_idler_example.c
View File

@ -111,7 +111,7 @@ main(void)
ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
// ctxt.idler = eo_add_custom(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(_idler_cb, &ctxt));
// ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(_idler_cb, &ctxt));
ctxt.handler = ecore_event_handler_add(_event_type,
_event_handler_cb,
&ctxt);

6
unsorted/ecore/ecore_poller_example.c
View File

@ -48,11 +48,11 @@ main(void)
poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
// poller1 = eo_add_custom(ECORE_POLLER_CLASS, NULL,
// poller1 = eo_add(ECORE_POLLER_CLASS, NULL,
// ecore_poller_constructor(ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
// poller2 = eo_add_custom(ECORE_POLLER_CLASS, NULL,
// poller2 = eo_add(ECORE_POLLER_CLASS, NULL,
// ecore_poller_constructor(ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
// poller3 = eo_add_custom(ECORE_POLLER_CLASS, NULL,
// poller3 = eo_add(ECORE_POLLER_CLASS, NULL,
// ecore_poller_constructor(ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));

10
unsorted/evas/evas-3d-aabb.c
View File

@ -187,7 +187,7 @@ main(void)
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
camera = eo_add(EVAS_3D_CAMERA_CLASS, evas);
@ -195,7 +195,7 @@ main(void)
evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(camera_node,
evas_3d_node_camera_set(camera));
@ -213,7 +213,7 @@ main(void)
evas_3d_light_directional_set(EINA_TRUE));
light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(light_node,
evas_3d_node_light_set(light),
@ -252,9 +252,9 @@ main(void)
1.0, 1.0, 1.0, 1.0),
evas_3d_material_shininess_set(50.0));
mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
mesh_box_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
mesh_box_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
material_box = eo_add(EVAS_3D_MATERIAL_CLASS, evas);

8
unsorted/evas/evas-3d-cube-rotate.c
View File

@ -218,7 +218,7 @@ _camera_setup(Scene_Data *data)
eo_do(data->camera,
evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
data->camera_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
evas_3d_node_camera_set(data->camera),
@ -238,7 +238,7 @@ _light_setup(Scene_Data *data)
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));
data->light_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->light_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
@ -284,7 +284,7 @@ _mesh_setup(Scene_Data *data)
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG),
evas_3d_mesh_frame_material_set(0, data->material));
data->mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
data->mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node,
evas_3d_node_member_add(data->mesh_node));
eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh));
@ -294,7 +294,7 @@ static void
_scene_setup(Scene_Data *data)
{
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
data->root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
eo_do(scene,

8
unsorted/evas/evas-3d-cube.c
View File

@ -130,7 +130,7 @@ _camera_setup(Scene_Data *data)
evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
data->camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
evas_3d_node_camera_set(data->camera),
@ -150,7 +150,7 @@ _light_setup(Scene_Data *data)
evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
data->light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_3d_node_light_set(data->light),
@ -199,7 +199,7 @@ _mesh_setup(Scene_Data *data)
evas_3d_mesh_frame_material_set(0, data->material));
data->mesh_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node));
eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh));
@ -214,7 +214,7 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
data->root_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);

8
unsorted/evas/evas-3d-cube2.c
View File

@ -159,7 +159,7 @@ _camera_setup(Scene_Data *data)
evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
data->camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
evas_3d_node_camera_set(data->camera),
@ -180,7 +180,7 @@ _light_setup(Scene_Data *data)
evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
data->light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_3d_node_light_set(data->light),
@ -265,7 +265,7 @@ _mesh_setup(Scene_Data *data)
evas_3d_mesh_frame_material_set(20, data->material1));
data->mesh_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node));
eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh));
@ -280,7 +280,7 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
data->root_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);

10
unsorted/evas/evas-3d-fog.c
View File

@ -102,7 +102,7 @@ _camera_setup(Scene_Data *data)
evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
data->camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
@ -124,7 +124,7 @@ _light_setup(Scene_Data *data)
evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
data->light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_3d_node_light_set(data->light),
@ -223,14 +223,14 @@ _mesh_setup(Scene_Data *data)
_set_ball(data->mesh1, 2, 0, 0, 0, 100, data->material);
data->mesh_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node));
eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh));
data->mesh_node1 =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node1));
@ -250,7 +250,7 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_background_color_set(FOG_COLOR, 1));
data->root_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);

8
unsorted/evas/evas-3d-frustum.c
View File

@ -121,7 +121,7 @@ static void
_camera_setup(Scene_Data *data)
{
data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas);
data->camera_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
evas_3d_node_camera_set(data->camera),
@ -140,7 +140,7 @@ _light_setup(Scene_Data *data)
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));
data->light_node = eo_add_custom(EVAS_3D_NODE_CLASS,evas,
data->light_node = eo_add(EVAS_3D_NODE_CLASS,evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_3d_node_light_set(data->light),
@ -185,13 +185,13 @@ _scene_setup(Scene_Data *data)
{
data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
data->root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);
_light_setup(data);
_mesh_setup_model(data);
data->mesh_node_model = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_model = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mesh_node_model,
evas_3d_node_position_set(0, 0, 0);

8
unsorted/evas/evas-3d-md2.c
View File

@ -77,7 +77,7 @@ main(void)
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
/* Add the camera. */
@ -86,7 +86,7 @@ main(void)
evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(camera_node,
evas_3d_node_camera_set(camera));
@ -105,7 +105,7 @@ main(void)
evas_3d_light_directional_set(EINA_TRUE));
light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(light_node,
evas_3d_node_light_set(light),
@ -145,7 +145,7 @@ main(void)
1.0, 1.0, 1.0, 1.0),
evas_3d_material_shininess_set(50.0));
mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
mesh_node = 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(mesh_node));

8
unsorted/evas/evas-3d-obj.c
View File

@ -91,7 +91,7 @@ main(void)
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
/* Add the camera. */
@ -100,7 +100,7 @@ main(void)
evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(camera_node,
evas_3d_node_camera_set(camera));
@ -119,7 +119,7 @@ main(void)
evas_3d_light_directional_set(EINA_TRUE));
light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(light_node,
evas_3d_node_light_set(light),
@ -161,7 +161,7 @@ main(void)
eo_do(mesh, evas_3d_mesh_save(EVAS_3D_MESH_FILE_TYPE_OBJ, "saved_man", NULL));
mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
mesh_node = 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(mesh_node));

6
unsorted/evas/evas-3d-pick.c
View File

@ -294,7 +294,7 @@ main(void)
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
/* Add the camera. */
@ -303,7 +303,7 @@ main(void)
evas_3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 100.0));
camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(camera_node,
evas_3d_node_camera_set(camera),
@ -361,7 +361,7 @@ main(void)
1.0),
evas_3d_material_shininess_set(50.0));
mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
mesh_node = 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(mesh_node));

8
unsorted/evas/evas-3d-proxy.c
View File

@ -154,7 +154,7 @@ _camera_setup(Scene_Data *data)
evas_3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0));
data->camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
evas_3d_node_camera_set(data->camera),
@ -175,7 +175,7 @@ _light_setup(Scene_Data *data)
evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
data->light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_3d_node_light_set(data->light),
@ -232,7 +232,7 @@ _mesh_setup(Scene_Data *data)
evas_3d_mesh_frame_material_set(0, data->material));
data->mesh_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node));
@ -248,7 +248,7 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
data->root_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);

10
unsorted/evas/evas-3d-shadows.c
View File

@ -176,7 +176,7 @@ main(void)
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
/* Add the camera. */
@ -185,7 +185,7 @@ main(void)
evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 1000.0));
camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(camera_node,
evas_3d_node_camera_set(camera));
@ -204,7 +204,7 @@ main(void)
evas_3d_light_projection_perspective_set(45.0, 1.0, 2.0, 1000.0));
light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(light_node,
evas_3d_node_light_set(light),
@ -246,7 +246,7 @@ main(void)
1.0, 1.0, 1.0, 1.0),
evas_3d_material_shininess_set(50.0));
mesh_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
mesh_node = 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(mesh_node));
@ -270,7 +270,7 @@ main(void)
mesh_node1 =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
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(mesh_node1));
eo_do(mesh_node1, evas_3d_node_mesh_add(mesh1));

6
unsorted/evas/shooter/evas-3d-shooter-header.c
View File

@ -124,9 +124,9 @@ _camera_setup(Scene_Data *data)
eo_do(data->camera,
evas_3d_camera_projection_perspective_set(65.0, 1.0, 1.0, 100.0));
data->mediator_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mediator_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
data->camera_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(data->root_node, evas_3d_node_member_add(data->mediator_node));
@ -148,7 +148,7 @@ _light_setup(Scene_Data *data)
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));
data->light_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->light_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_3d_node_light_set(data->light),

28
unsorted/evas/shooter/evas-3d-shooter.c
View File

@ -870,7 +870,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
eo_do(data->mesh_eagle,
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE));
data->mesh_node_eagle = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_eagle = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mesh_node_eagle,
@ -904,7 +904,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES));
data->mesh_node_world = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_world = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node,
@ -957,7 +957,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG),
evas_3d_mesh_frame_material_set(0, data->gun));
data->mesh_node_gun = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_gun = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mediator_node,
@ -1000,7 +1000,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG),
evas_3d_mesh_frame_material_set(0, data->material_gun_butt));
data->mesh_node_gun_butt = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_gun_butt = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mediator_node,
evas_3d_node_member_add(data->mesh_node_gun_butt));
@ -1040,7 +1040,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG),
evas_3d_mesh_frame_material_set(0, data->material_gun_cage));
data->mesh_node_gun_cage = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_gun_cage = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mediator_node,
evas_3d_node_member_add(data->mesh_node_gun_cage));
@ -1084,7 +1084,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG),
evas_3d_mesh_frame_material_set(0, data->rocket));
data->mesh_node_rocket = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_rocket = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mediator_node,
evas_3d_node_member_add(data->mesh_node_rocket));
@ -1111,7 +1111,7 @@ _mesh_setup_gun_planet(Scene_Data *data)
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE),
evas_3d_mesh_frame_material_set(0, data->material_cube));
data->mesh_node_cube = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_cube = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node,
evas_3d_node_member_add(data->mesh_node_cube));
@ -1159,7 +1159,7 @@ _mesh_setup_grass(Scene_Data *data, int index)
6, &grass_indices[0]),
evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES));
data->mesh_node_grass[index] = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_grass[index] = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node,
@ -1211,7 +1211,7 @@ _mesh_setup_gun_bling(Scene_Data *data, int index)
evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES));
data->mesh_node_gun_bling[index] = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_gun_bling[index] = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mediator_node,
@ -1357,7 +1357,7 @@ _mesh_setup_snake(Scene_Data *data)
eo_do(data->mesh_snake,
evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE));
data->mesh_node_snake = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_snake = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mesh_node_snake,
@ -1381,7 +1381,7 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_size_set(WIDTH, HEIGHT),
evas_3d_scene_background_color_set(0.5, 0.5, 0.5, 0.0));
data->root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);
@ -1398,7 +1398,7 @@ _scene_setup(Scene_Data *data)
_mesh_setup(data, bricks_vertices, 0);
_mesh_setup(data, wall_vertices, 1);
data->mesh_node_level[0] = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_level[0] = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->root_node,
@ -1415,7 +1415,7 @@ _scene_setup(Scene_Data *data)
Evas_Real bx, by, bz;
for ( i = 1; i < 10; ++i)
{
data->mesh_node_level[i] = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_level[i] = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mesh_node_level[i],
@ -1433,7 +1433,7 @@ _scene_setup(Scene_Data *data)
}
_mesh_setup_warrior(data, 2);
data->mesh_node_level[10] = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
data->mesh_node_level[10] = eo_add(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH));
eo_do(data->mesh_node_level[10],
evas_3d_node_position_set(17, -10, 0),