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);
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));
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);
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));
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),
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);
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),
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_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));
_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,
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),
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),
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));
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);
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),
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),
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));
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);
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_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),
_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));
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);
_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),
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),
{
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);
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. */
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));
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),
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));
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),
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),
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. */
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,
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. */
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));
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),
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));
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. */
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),
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));
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),
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),
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));
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);
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. */
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));
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),
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));
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));
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));
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),
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,
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,
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,
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));
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));
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));
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));
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,
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,
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,
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);
_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,
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],
}
_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),
}
animator->obj = obj;
- eo_do_super(obj, MY_CLASS, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
return EINA_TRUE;
}
-EOLIAN static void
-_ecore_animator_eo_base_constructor(Eo *obj, Ecore_Animator_Data *_pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
EAPI Ecore_Animator *
ecore_animator_add(Ecore_Task_Cb func,
const void *data)
{
Ecore_Animator *animator = NULL;
- animator = eo_add_custom(MY_CLASS, _ecore_parent,
+ animator = eo_add(MY_CLASS, _ecore_parent,
ecore_animator_constructor(func, data));
eo_unref(animator);
return animator;
const void *data)
{
Ecore_Animator *animator;
- animator = eo_add_custom(MY_CLASS, _ecore_parent,
+ animator = eo_add(MY_CLASS, _ecore_parent,
ecore_animator_timeline_constructor(runtime, func, data));
eo_unref(animator);
return animator;
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.event_freeze;
Eo.Base.event_thaw;
}
ie->obj = obj;
- eo_do_super(obj, MY_CLASS, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
const void *data)
{
Ecore_Idle_Enterer *ie = NULL;
- ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(func, data));
+ ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(func, data));
eo_unref(ie);
return ie;
}
const void *data)
{
Ecore_Idle_Enterer *ie = NULL;
- ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(func, data));
+ ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(func, data));
eo_unref(ie);
return ie;
}
_ecore_unlock();
}
-EOLIAN static void
-_ecore_idle_enterer_eo_base_constructor(Eo *obj, Ecore_Idle_Enterer_Data *_pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
EAPI void *
ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
{
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
}
constructors {
const void *data)
{
Ecore_Idle_Exiter *ie = NULL;
- ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(func, data));
+ ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(func, data));
eo_unref(ie);
return ie;
}
ie->obj = obj;
- eo_do_super(obj, MY_CLASS, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
_ecore_unlock();
}
-EOLIAN static void
-_ecore_idle_exiter_eo_base_constructor(Eo *obj, Ecore_Idle_Exiter_Data *_pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
EAPI void *
ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
{
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
}
constructors {
_ecore_lock();
- ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idler_constructor(func, data));
+ ie = eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(func, data));
eo_unref(ie);
_ecore_unlock();
}
ie->obj = obj;
- eo_do_super(obj, MY_CLASS, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
idlers = (Ecore_Idler_Data *)eina_inlist_append(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
}
-EOLIAN static void
-_ecore_idler_eo_base_constructor(Eo *obj, Ecore_Idler_Data *_pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
EAPI void *
ecore_idler_del(Ecore_Idler *idler)
{
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
}
constructors {
ecore_job_add(Ecore_Cb func,
const void *data)
{
- Ecore_Job *job = eo_add_custom(MY_CLASS, _ecore_parent, ecore_job_constructor(func, data));
+ Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(func, data));
eo_unref(job);
return job;
}
eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN;
}
- eo_do_super(obj, MY_CLASS, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
job->data = (void *)data;
}
-EOLIAN static void
-_ecore_job_eo_base_constructor(Eo *obj, Ecore_Job_Data *_pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
EAPI void *
ecore_job_del(Ecore_Job *obj)
{
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
}
constructors {
return poll_interval;
}
-EOLIAN static void
-_ecore_poller_eo_base_constructor(Eo *obj, Ecore_Poller_Data *_pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
EAPI Ecore_Poller *
ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
int interval,
const void *data)
{
Ecore_Poller *poller;
- poller = eo_add_custom(MY_CLASS, _ecore_parent,
+ poller = eo_add(MY_CLASS, _ecore_parent,
ecore_poller_constructor(type, interval, func, data));
eo_unref(poller);
return poller;
EINA_MAIN_LOOP_CHECK_RETURN;
}
- eo_do_super(obj, MY_CLASS, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
}
constructors {
Ecore_Timer *timer = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
- timer = eo_add_custom(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data));
+ timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data));
eo_unref(timer);
return timer;
}
}
timer->obj = obj;
- eo_do_super(obj, MY_CLASS, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
_ecore_timer_add(obj, timer, now, in, func, data);
}
-EOLIAN static void
-_ecore_timer_eo_base_constructor(Eo *obj, Ecore_Timer_Data *_pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
EAPI Ecore_Timer *
ecore_timer_loop_add(double in,
Ecore_Task_Cb func,
const void *data)
{
Ecore_Timer *timer = NULL;
- timer = eo_add_custom(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data));
+ timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data));
eo_unref(timer);
return timer;
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.event_freeze;
/* XXX: can't document overriden methods
* @param parent the parent to set to the object.
* @param ... The ops to run.
* @return An handle to the new object on success, NULL otherwise.
- *
- * @see #eo_add_custom
*/
#define eo_add(klass, parent, ...) \
({ \
_tmp_obj; \
})
-/**
- * @def eo_add_custom
- * @brief Create a new object with a custom constructor.
- * @param klass the class of the object to create.
- * @param parent the parent to set to the object.
- * @param ... The ops to run. With the constructor being first.
- * @return An handle to the new object on success, NULL otherwise.
- *
- * @see #eo_add
- */
-#define eo_add_custom(klass, parent, ...) \
- ({ \
- const Eo_Class *_tmp_klass = klass; \
- Eo *_tmp_obj = _eo_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
- eo_do(_tmp_obj, \
- __VA_ARGS__; \
- _tmp_obj = eo_finalize(); \
- ); \
- _tmp_obj; \
- })
-
EAPI Eo * _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent);
/**
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add_custom(MY_CLASS, e, evas_3d_node_constructor(type));
+ Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_3d_node_constructor(type));
eo_unref(eo_obj);
return eo_obj;
}
EOLIAN static void
_evas_3d_node_constructor(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Node_Type type)
{
- eo_do_super(obj, MY_CLASS, eo_constructor());
-
eo_do(obj, evas_3d_object_type_set(EVAS_3D_OBJECT_TYPE_NODE));
evas_vec3_set(&pd->position, 0.0, 0.0, 0.0);
}
EOLIAN static void
-_evas_3d_node_eo_base_constructor(Eo *obj, Evas_3D_Node_Data *pd EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
-}
-
-EOLIAN static void
_evas_3d_node_eo_base_destructor(Eo *obj, Evas_3D_Node_Data *pd EINA_UNUSED)
{
eo_unref(obj);
}
}
implements {
- Eo.Base.constructor;
Eo.Base.destructor;
Evas_3D_Object.update_notify;
Evas_3D_Object.change_notify;
fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
ecore_animator_frametime_set(interval1);
- animator = eo_add_custom(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(1, _anim_cb, &interval1));
+ animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(1, _anim_cb, &interval1));
fail_if(!animator);
ecore_animator_frametime_set(interval2);
prev = 0;
- animator = eo_add_custom(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(1, _anim_cb, &interval2));
+ animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(1, _anim_cb, &interval2));
fail_if(!animator);
ecore_main_loop_begin();
Eo *obj = NULL;
eo_init();
- obj = eo_add_custom(SIMPLE_CLASS, NULL, eo_constructor());
+ obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor());
fail_if(!obj);
eo_unref(obj);
fail_if(pd->a != 7);
eo_unref(obj);
- obj = eo_add_custom(SIMPLE_CLASS, NULL, eo_constructor(), simple_a_set(7));
+ obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(), simple_a_set(7));
fail_if(!obj);
pd = eo_data_scope_get(obj, SIMPLE_CLASS);
fail_if(pd->a != 7);
}
static void
-_constructor(Eo *obj, void *class_data EINA_UNUSED, int v)
+_constructor(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, int v)
{
Thread_Test_Public_Data *pd = class_data;
- eo_do_super(obj, THREAD_TEST_CLASS, eo_constructor());
-
pd->v = v;
}
if (v == 1)
eina_spinlock_take(&locks[0]);
- obj = eo_add_custom(THREAD_TEST_CLASS, NULL, thread_test_constructor(v));
+ obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(v));
eo_do(obj, thread_test_try_swap_stack(), v = thread_test_v_get());