kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas/evas3d: removed export of evas_3d_node_add() and apply eo to examples. 

but still i don't like eo apis used in app side (if it's only way)
we should export legacy apis for convenience.

lets decide this policy later.
This commit is contained in:
ChunEon Park 2014-05-07 22:33:15 +09:00
parent 5faa53d27f
commit 5a1c7f6d9b
6 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/examples/evas/evas-3d-cube.c
View File

@ -130,10 +130,9 @@ _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(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_CAMERA);
data->camera_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_CAMERA);
data->camera_node =
eo_add_custom(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_node_position_set(0.0, 0.0, 10.0),
@ -151,8 +150,9 @@ _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(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_LIGHT);
data->light_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_LIGHT);
data->light_node =
eo_add_custom(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_node_position_set(0.0, 0.0, 10.0),
@ -199,7 +199,9 @@ _mesh_setup(Scene_Data *data)
evas_3d_mesh_frame_material_set(0, data->material));
data->mesh_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_MESH);
data->mesh_node =
eo_add_custom(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));
}
@ -212,8 +214,9 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_size_set(WIDTH, HEIGHT);
evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
// data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_NODE);
data->root_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_NODE);
data->root_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);
_light_setup(data);

20
src/examples/evas/evas-3d-cube2.c
View File

@ -159,9 +159,9 @@ _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(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_CAMERA);
data->camera_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_CAMERA);
data->camera_node =
eo_add_custom(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_node_position_set(0.0, 0.0, 10.0),
@ -180,8 +180,9 @@ _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(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_LIGHT);
data->light_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_LIGHT);
data->light_node =
eo_add_custom(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_node_position_set(0.0, 0.0, 10.0),
@ -264,7 +265,9 @@ _mesh_setup(Scene_Data *data)
evas_3d_mesh_frame_add(20),
evas_3d_mesh_frame_material_set(20, data->material1));
data->mesh_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_MESH);
data->mesh_node =
eo_add_custom(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));
}
@ -277,8 +280,9 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_size_set(WIDTH, HEIGHT),
evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
// data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_NODE);
data->root_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_NODE);
data->root_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);
_light_setup(data);

19
src/examples/evas/evas-3d-md2.c
View File

@ -78,17 +78,17 @@ main(void)
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
// root_node = eo_add(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_NODE);
root_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_NODE);
root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
/* Add the camera. */
camera = eo_add(EVAS_3D_CAMERA_CLASS, evas);
eo_do(camera,
evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
// camera_node =
// eo_add(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_CAMERA);
camera_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_CAMERA);
camera_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA));
eo_do(camera_node,
evas_3d_node_camera_set(camera));
eo_do(root_node,
@ -105,8 +105,9 @@ main(void)
evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
evas_3d_light_directional_set(EINA_TRUE));
// light_node = eo_add(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_LIGHT);
light_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_LIGHT);
light_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT));
eo_do(light_node,
evas_3d_node_light_set(light),
evas_3d_node_position_set(1000.0, 0.0, 1000.0),
@ -145,8 +146,8 @@ main(void)
1.0, 1.0, 1.0, 1.0),
evas_3d_material_shininess_set(50.0));
// data->mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, EVAS_3D_NODE_TYPE_MESH);
mesh_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_MESH);
mesh_node = eo_add_custom(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(mesh_node,

11
src/examples/evas/evas-3d-pick.c
View File

@ -316,13 +316,16 @@ main(void)
scene = eo_add(EVAS_3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
root_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_NODE);
root_node = eo_add_custom(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
/* Add the camera. */
camera = eo_add(EVAS_3D_CAMERA_CLASS, evas);
eo_do(camera, evas_3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 100.0));
camera_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_CAMERA);
camera_node =
eo_add_custom(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_node_position_set(0.0, 0.0, 5.0),
@ -370,7 +373,9 @@ main(void)
evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
evas_3d_material_shininess_set(50.0));
mesh_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_MESH);
mesh_node = eo_add_custom(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(mesh_node, evas_3d_node_mesh_add(mesh));
eo_do(mesh, evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE));

17
src/examples/evas/evas-3d-proxy.c
View File

@ -154,7 +154,9 @@ _camera_setup(Scene_Data *data)
eo_do(data->camera,
evas_3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0));
data->camera_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_CAMERA);
data->camera_node =
eo_add_custom(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_node_position_set(0.0, 0.0, 10.0),
@ -173,7 +175,9 @@ _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 = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_LIGHT);
data->light_node =
eo_add_custom(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_node_position_set(0.0, 0.0, 10.0),
@ -228,7 +232,10 @@ _mesh_setup(Scene_Data *data)
evas_3d_mesh_frame_material_set(0, data->material));
data->mesh_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_MESH);
data->mesh_node =
eo_add_custom(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));
}
@ -241,7 +248,9 @@ _scene_setup(Scene_Data *data)
evas_3d_scene_size_set(WIDTH, HEIGHT),
evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
data->root_node = evas_3d_node_add(evas, EVAS_3D_NODE_TYPE_NODE);
data->root_node =
eo_add_custom(EVAS_3D_NODE_CLASS, evas,
evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE));
_camera_setup(data);
_light_setup(data);

3
src/lib/evas/Evas_Eo.h
View File

@ -222,9 +222,6 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST;
#include "canvas/evas_3d_mesh.eo.h"
// Manually added at it is not generated by Eolian and not a legacy function either.
EAPI Evas_3D_Node *evas_3d_node_add(Evas *e, Evas_3D_Node_Type type);
#include "canvas/evas_3d_node.eo.h"
#include "canvas/evas_3d_scene.eo.h"