hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a238e091d6342d39fc0ff03473fe32baf46cad32
commit a238e091d6342d39fc0ff03473fe32baf46cad32 Author: ChunEon Park <[email protected]> Date: Wed Apr 30 22:02:23 2014 +0900 evas/evas3d: rewrite evas-3d-md2 example with eo based. --- src/examples/evas/evas-3d-md2.c | 210 ++++++++++++++++++++++------------------ 1 file changed, 114 insertions(+), 96 deletions(-) diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 067c07f..14de506 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -1,39 +1,41 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <Eo.h> +#include <Evas.h> #include <Ecore.h> #include <Ecore_Evas.h> -#include <stdio.h> -#include <math.h> -#include <Evas.h> -#define WIDTH 1024 -#define HEIGHT 1024 - -Ecore_Evas *ecore_evas = NULL; -Evas *evas = NULL; -Evas_Object *background = NULL; -Evas_Object *image = NULL; - -Evas_3D_Scene *scene = NULL; -Evas_3D_Node *root_node = NULL; -Evas_3D_Node *camera_node = NULL; -Evas_3D_Node *light_node = NULL; -Evas_3D_Camera *camera = NULL; -Evas_3D_Node *mesh_node = NULL; -Evas_3D_Mesh *mesh = NULL; -Evas_3D_Material *material = NULL; -Evas_3D_Texture *texture = NULL; -Evas_3D_Light *light = NULL; +#define WIDTH 400 +#define HEIGHT 400 + +Ecore_Evas *ecore_evas = NULL; +Evas *evas = NULL; +Eo *background = NULL; +Eo *image = NULL; + +Eo *scene = NULL; +Eo *root_node = NULL; +Eo *camera_node = NULL; +Eo *light_node = NULL; +Eo *camera = NULL; +Eo *mesh_node = NULL; +Eo *mesh = NULL; +Eo *material = NULL; +Eo *texture = NULL; +Eo *light = NULL; static Eina_Bool _animate_scene(void *data) { static int frame = 0; - evas_3d_node_mesh_frame_set((Evas_3D_Node *)data, mesh, frame); + eo_do((Evas_3D_Node *)data, evas_3d_node_mesh_frame_set(mesh, frame)); frame += 32; - if (frame > 256 * 50) - frame = 0; + if (frame > 256 * 50) frame = 0; return EINA_TRUE; } @@ -50,22 +52,18 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - - evas_object_resize(background, w, h); - evas_object_resize(image, w, h); - evas_object_move(image, 0, 0); + eo_do(background, evas_obj_size_set(w, h)); + eo_do(image, evas_obj_size_set(w, h)); } int main(void) { - if (!ecore_evas_init()) - return 0; + if (!ecore_evas_init()) return 0; ecore_evas = ecore_evas_new(NULL, 10, 10, WIDTH, HEIGHT, NULL); - if (!ecore_evas) - return 0; + if (!ecore_evas) return 0; ecore_evas_callback_delete_request_set(ecore_evas, _on_delete); ecore_evas_callback_resize_set(ecore_evas, _on_canvas_resize); @@ -74,88 +72,108 @@ main(void) evas = ecore_evas_get(ecore_evas); /* Add a scene object .*/ - scene = evas_3d_scene_add(evas); + 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); /* Add the camera. */ - camera = evas_3d_camera_add(evas); - evas_3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); + 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); - evas_3d_node_camera_set(camera_node, camera); - evas_3d_node_member_add(root_node, camera_node); - evas_3d_node_position_set(camera_node, 100.0, 0.0, 20.0); - evas_3d_node_look_at_set(camera_node, EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, - EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0); - + eo_do(camera_node, + evas_3d_node_camera_set(camera)); + eo_do(root_node, + evas_3d_node_member_add(camera_node)); + eo_do(camera_node, + evas_3d_node_position_set(100.0, 0.0, 20.0), + evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, + EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); /* Add the light. */ - light = evas_3d_light_add(evas); - evas_3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); - evas_3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); - evas_3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); - + light = eo_add(EVAS_3D_LIGHT_CLASS, evas); + eo_do(light, + evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), + 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), + 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); - evas_3d_node_light_set(light_node, light); - evas_3d_node_member_add(root_node, light_node); - evas_3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); - evas_3d_light_directional_set(light, EINA_TRUE); - evas_3d_node_look_at_set(light_node, EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, - EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0); + eo_do(light_node, + evas_3d_node_light_set(light), + evas_3d_node_position_set(1000.0, 0.0, 1000.0), + evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, + EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); + eo_do(root_node, + evas_3d_node_member_add(light_node)); /* Add the mesh. */ - mesh = evas_3d_mesh_add(evas); - evas_3d_mesh_file_set(mesh, EVAS_3D_MESH_FILE_TYPE_MD2, "sonic.md2", NULL); - - material = evas_3d_material_add(evas); - evas_3d_mesh_frame_material_set(mesh, 0, material); - - texture = evas_3d_texture_add(evas); - - evas_3d_texture_file_set(texture, "sonic.png", NULL); - evas_3d_texture_filter_set(texture, EVAS_3D_TEXTURE_FILTER_NEAREST, EVAS_3D_TEXTURE_FILTER_NEAREST); - evas_3d_texture_wrap_set(texture, EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT); - - evas_3d_material_texture_set(material, EVAS_3D_MATERIAL_DIFFUSE, texture); - - evas_3d_material_enable_set(material, EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE); - evas_3d_material_enable_set(material, EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE); - evas_3d_material_enable_set(material, EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE); - evas_3d_material_enable_set(material, EVAS_3D_MATERIAL_NORMAL, EINA_TRUE); - - evas_3d_material_color_set(material, EVAS_3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 1.0); - evas_3d_material_color_set(material, EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0); - evas_3d_material_color_set(material, EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0); - evas_3d_material_shininess_set(material, 50.0); - + mesh = eo_add(EVAS_3D_MESH_CLASS, evas); + material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); + + eo_do(mesh, + evas_3d_mesh_file_set(EVAS_3D_MESH_FILE_TYPE_MD2, "sonic.md2", NULL), + evas_3d_mesh_frame_material_set(0, material), + evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); + + texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); + eo_do(texture, + evas_3d_texture_file_set("sonic.png", NULL), + evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, + EVAS_3D_TEXTURE_FILTER_NEAREST), + evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, + EVAS_3D_WRAP_MODE_REPEAT)); + eo_do(material, + evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), + evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), + evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, + 0.01, 0.01, 0.01, 1.0), + evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, + 1.0, 1.0, 1.0, 1.0), + evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, + 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); - evas_3d_node_member_add(root_node, mesh_node); - evas_3d_node_mesh_add(mesh_node, mesh); - evas_3d_mesh_shade_mode_set(mesh, EVAS_3D_SHADE_MODE_PHONG); + eo_do(root_node, + evas_3d_node_member_add(mesh_node)); + eo_do(mesh_node, + evas_3d_node_mesh_add(mesh)); /* Set up scene. */ - evas_3d_scene_root_node_set(scene, root_node); - evas_3d_scene_camera_node_set(scene, camera_node); - evas_3d_scene_size_set(scene, WIDTH, HEIGHT); - - /* Add evas objects. */ - background = evas_object_rectangle_add(evas); - evas_object_color_set(background, 0, 0, 0, 255); - evas_object_move(background, 0, 0); - evas_object_resize(background, WIDTH, HEIGHT); - evas_object_show(background); - + eo_do(scene, + evas_3d_scene_root_node_set(root_node), + evas_3d_scene_camera_node_set(camera_node), + evas_3d_scene_size_set(WIDTH, HEIGHT)); + + /* Add a background rectangle objects. */ + background = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas); + eo_do(background, + evas_obj_color_set(0, 0, 0, 255), + evas_obj_size_set(WIDTH, HEIGHT), + evas_obj_visibility_set(EINA_TRUE)); + + /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); - evas_object_image_size_set(image, WIDTH, HEIGHT); - evas_object_image_scene_set(image, scene); - evas_object_move(image, 0, 0); - evas_object_resize(image, WIDTH, HEIGHT); - evas_object_show(image); + eo_do(image, + evas_obj_size_set(WIDTH, HEIGHT), + evas_obj_visibility_set(EINA_TRUE)); + + /* Set the image object as render target for 3D scene. */ + eo_do(image, evas_obj_image_scene_set(scene)); ecore_timer_add(0.01, _animate_scene, mesh_node); - printf ("Enter main loop\n"); + /* Enter main loop. */ ecore_main_loop_begin(); ecore_evas_free(ecore_evas); --
