summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-06-22 12:30:11 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-22 12:36:58 +0200
commitfb7408a30df15729789807dcb143324be393fae7 (patch)
treee9f6d1a29eb361ba3ec1d553538be52a9ed3d3aa
parent4099b491614278313344123a61fd0e5be7809b70 (diff)
examples: fix changes in Evas.Canvas3D namespace.
-rw-r--r--src/examples/evas3d_map_example.c296
-rw-r--r--src/examples/evas3d_object_on_button_example.c120
-rw-r--r--src/examples/evas3d_scene_on_button_example.c110
-rw-r--r--src/examples/performance/camera_light.c18
-rw-r--r--src/examples/performance/graphical.c250
-rw-r--r--src/examples/performance/performance.c46
-rw-r--r--src/examples/sphere_hunter/evas_3d_sphere_hunter.c222
7 files changed, 531 insertions, 531 deletions
diff --git a/src/examples/evas3d_map_example.c b/src/examples/evas3d_map_example.c
index b1cc2477e..d59d82a00 100644
--- a/src/examples/evas3d_map_example.c
+++ b/src/examples/evas3d_map_example.c
@@ -74,17 +74,17 @@ static Evas_Object *menu = NULL;
74static Elm_Object_Item *menu_it = NULL; 74static Elm_Object_Item *menu_it = NULL;
75static Ecore_Animator *animator = NULL; 75static Ecore_Animator *animator = NULL;
76 76
77static Evas_3D_Scene *scene = NULL; 77static Evas_Canvas3D_Scene *scene = NULL;
78static Evas_3D_Node *root_node = NULL; 78static Evas_Canvas3D_Node *root_node = NULL;
79static Evas_3D_Node *camera_node = NULL; 79static Evas_Canvas3D_Node *camera_node = NULL;
80static Evas_3D_Camera *camera = NULL; 80static Evas_Canvas3D_Camera *camera = NULL;
81static Evas_3D_Node *light_node = NULL; 81static Evas_Canvas3D_Node *light_node = NULL;
82static Evas_3D_Light *light = NULL; 82static Evas_Canvas3D_Light *light = NULL;
83static Evas_3D_Node *mesh_node = NULL; 83static Evas_Canvas3D_Node *mesh_node = NULL;
84static Evas_3D_Mesh *mesh = NULL; 84static Evas_Canvas3D_Mesh *mesh = NULL;
85static Evas_3D_Material *material = NULL; 85static Evas_Canvas3D_Material *material = NULL;
86static Evas_3D_Texture *texture_diffuse = NULL; 86static Evas_Canvas3D_Texture *texture_diffuse = NULL;
87static Evas_3D_Texture *texture_normal = NULL; 87static Evas_Canvas3D_Texture *texture_normal = NULL;
88 88
89static int vertex_count = 0; 89static int vertex_count = 0;
90static int index_count = 0; 90static int index_count = 0;
@@ -225,8 +225,8 @@ animate_scene(void *data)
225 225
226 angle += 0.05; 226 angle += 0.05;
227 227
228 eo_do((Evas_3D_Node *)data, 228 eo_do((Evas_Canvas3D_Node *)data,
229 evas_3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0)); 229 evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0));
230 230
231 /* Rotate */ 231 /* Rotate */
232 if (angle > 360.0) 232 if (angle > 360.0)
@@ -382,7 +382,7 @@ change_to_2d_map(void)
382 elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_MANUAL); 382 elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_MANUAL);
383 elm_map_paused_set(map, EINA_TRUE); 383 elm_map_paused_set(map, EINA_TRUE);
384 384
385 eo_do(texture_diffuse, evas_3d_texture_source_visible_set(EINA_TRUE)); 385 eo_do(texture_diffuse, evas_canvas3d_texture_source_visible_set(EINA_TRUE));
386 386
387 evas_object_hide(image); 387 evas_object_hide(image);
388 388
@@ -416,8 +416,8 @@ zoom_factor_set(double new_zoom_factor)
416 double s, t; 416 double s, t;
417 double lon, lat; 417 double lon, lat;
418 vec3 camera_pos_unit_vec; 418 vec3 camera_pos_unit_vec;
419 Evas_3D_Node *n; 419 Evas_Canvas3D_Node *n;
420 Evas_3D_Mesh *m; 420 Evas_Canvas3D_Mesh *m;
421 Evas_Coord src_x, src_y; 421 Evas_Coord src_x, src_y;
422 Evas_Coord src_size; 422 Evas_Coord src_size;
423 423
@@ -433,7 +433,7 @@ zoom_factor_set(double new_zoom_factor)
433 if (cur_zoom_factor < MIN_2D_ZOOM_FACTOR) 433 if (cur_zoom_factor < MIN_2D_ZOOM_FACTOR)
434 { 434 {
435 zoom_factor = MIN_2D_ZOOM_FACTOR; 435 zoom_factor = MIN_2D_ZOOM_FACTOR;
436 eo_do(scene, evas_3d_scene_pick(IMG_SIZE / 2, IMG_SIZE / 2, 436 eo_do(scene, evas_canvas3d_scene_pick(IMG_SIZE / 2, IMG_SIZE / 2,
437 &n, &m, &s, &t)); 437 &n, &m, &s, &t));
438 src_size = IMG_SIZE * cur_zoom_factor; 438 src_size = IMG_SIZE * cur_zoom_factor;
439 src_x = (Evas_Coord)(src_size * s); 439 src_x = (Evas_Coord)(src_size * s);
@@ -465,13 +465,13 @@ zoom_factor_set(double new_zoom_factor)
465 evas_object_resize(map, src_size, src_size); 465 evas_object_resize(map, src_size, src_size);
466 466
467 /* Apply updated texture source. */ 467 /* Apply updated texture source. */
468 texture_diffuse = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 468 texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
469 eo_do(texture_diffuse, 469 eo_do(texture_diffuse,
470 evas_3d_texture_source_set(map), 470 evas_canvas3d_texture_source_set(map),
471 evas_3d_texture_source_visible_set(EINA_FALSE)); 471 evas_canvas3d_texture_source_visible_set(EINA_FALSE));
472 472
473 eo_do(material, 473 eo_do(material,
474 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture_diffuse)); 474 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture_diffuse));
475 475
476 /* Update camera position. */ 476 /* Update camera position. */
477 vec3_normalize(&camera_pos_unit_vec, &camera_pos); 477 vec3_normalize(&camera_pos_unit_vec, &camera_pos);
@@ -480,7 +480,7 @@ zoom_factor_set(double new_zoom_factor)
480 camera_pos.z = (camera_pos_unit_vec.z * MAX_CAMERA_DISTANCE) / zoom_factor; 480 camera_pos.z = (camera_pos_unit_vec.z * MAX_CAMERA_DISTANCE) / zoom_factor;
481 481
482 eo_do(camera_node, 482 eo_do(camera_node,
483 evas_3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z)); 483 evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z));
484 } 484 }
485 485
486 /* Update zoom slider. */ 486 /* Update zoom slider. */
@@ -510,14 +510,14 @@ zoom_to_2d_map_cb(void *data,
510{ 510{
511 double s, t; 511 double s, t;
512 double lon, lat; 512 double lon, lat;
513 Evas_3D_Node *n; 513 Evas_Canvas3D_Node *n;
514 Evas_3D_Mesh *m; 514 Evas_Canvas3D_Mesh *m;
515 Evas_Coord src_x, src_y; 515 Evas_Coord src_x, src_y;
516 Evas_Coord src_size; 516 Evas_Coord src_size;
517 517
518 if (map_dimension_state == MAP_DIMENSION_STATE_2D) return; 518 if (map_dimension_state == MAP_DIMENSION_STATE_2D) return;
519 519
520 eo_do(scene, evas_3d_scene_pick(mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t)); 520 eo_do(scene, evas_canvas3d_scene_pick(mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t));
521 src_size = (Evas_Coord)(IMG_SIZE * zoom_factor); 521 src_size = (Evas_Coord)(IMG_SIZE * zoom_factor);
522 src_x = (Evas_Coord)(src_size * s); 522 src_x = (Evas_Coord)(src_size * s);
523 src_y = (Evas_Coord)(src_size * t); 523 src_y = (Evas_Coord)(src_size * t);
@@ -555,8 +555,8 @@ submenu_info_add(Elm_Object_Item *parent)
555 char buf[50]; 555 char buf[50];
556 double s, t; 556 double s, t;
557 double lon, lat; 557 double lon, lat;
558 Evas_3D_Node *n; 558 Evas_Canvas3D_Node *n;
559 Evas_3D_Mesh *m; 559 Evas_Canvas3D_Mesh *m;
560 Evas_Coord src_x, src_y; 560 Evas_Coord src_x, src_y;
561 Evas_Coord src_size; 561 Evas_Coord src_size;
562 562
@@ -564,7 +564,7 @@ submenu_info_add(Elm_Object_Item *parent)
564 564
565 if (map_dimension_state == MAP_DIMENSION_STATE_3D) 565 if (map_dimension_state == MAP_DIMENSION_STATE_3D)
566 { 566 {
567 eo_do(scene, evas_3d_scene_pick(mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t)); 567 eo_do(scene, evas_canvas3d_scene_pick(mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t));
568 src_size = (Evas_Coord) (IMG_SIZE * zoom_factor); 568 src_size = (Evas_Coord) (IMG_SIZE * zoom_factor);
569 src_x = (Evas_Coord)(src_size * s); 569 src_x = (Evas_Coord)(src_size * s);
570 src_y = (Evas_Coord)(src_size * t); 570 src_y = (Evas_Coord)(src_size * t);
@@ -611,8 +611,8 @@ map_mouse_down_cb(void *data,
611 int scene_w, scene_h; 611 int scene_w, scene_h;
612 double scene_x, scene_y; 612 double scene_x, scene_y;
613 double s, t; 613 double s, t;
614 Evas_3D_Node *n; 614 Evas_Canvas3D_Node *n;
615 Evas_3D_Mesh *m; 615 Evas_Canvas3D_Mesh *m;
616 Eina_Bool pick; 616 Eina_Bool pick;
617 617
618 mouse_down_pos.x = ev->canvas.x; 618 mouse_down_pos.x = ev->canvas.x;
@@ -623,12 +623,12 @@ map_mouse_down_cb(void *data,
623 obj_x = ev->canvas.x - x; 623 obj_x = ev->canvas.x - x;
624 obj_y = ev->canvas.y - y; 624 obj_y = ev->canvas.y - y;
625 625
626 eo_do(scene, evas_3d_scene_size_get(&scene_w, &scene_h)); 626 eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
627 627
628 scene_x = obj_x * scene_w / (double)w; 628 scene_x = obj_x * scene_w / (double)w;
629 scene_y = obj_y * scene_h / (double)h; 629 scene_y = obj_y * scene_h / (double)h;
630 630
631 eo_do(scene, pick = evas_3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); 631 eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
632 if (pick) 632 if (pick)
633 printf("Picked : "); 633 printf("Picked : ");
634 else 634 else
@@ -674,8 +674,8 @@ mouse_down_cb(void *data,
674 int scene_w, scene_h; 674 int scene_w, scene_h;
675 double scene_x, scene_y; 675 double scene_x, scene_y;
676 double s, t; 676 double s, t;
677 Evas_3D_Node *n; 677 Evas_Canvas3D_Node *n;
678 Evas_3D_Mesh *m; 678 Evas_Canvas3D_Mesh *m;
679 Eina_Bool pick; 679 Eina_Bool pick;
680 680
681 mouse_down_pos.x = ev->canvas.x; 681 mouse_down_pos.x = ev->canvas.x;
@@ -693,12 +693,12 @@ mouse_down_cb(void *data,
693 obj_x = ev->canvas.x - x; 693 obj_x = ev->canvas.x - x;
694 obj_y = ev->canvas.y - y; 694 obj_y = ev->canvas.y - y;
695 695
696 eo_do(scene, evas_3d_scene_size_get(&scene_w, &scene_h)); 696 eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
697 697
698 scene_x = obj_x * scene_w / (double)w; 698 scene_x = obj_x * scene_w / (double)w;
699 scene_y = obj_y * scene_h / (double)h; 699 scene_y = obj_y * scene_h / (double)h;
700 700
701 eo_do(scene, pick = evas_3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); 701 eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
702 if (pick) 702 if (pick)
703 printf("Picked : "); 703 printf("Picked : ");
704 else 704 else
@@ -764,17 +764,17 @@ mouse_move_cb(void *data,
764 vec3_scale(&camera_pos, &camera_pos_unit_vec, distance_to_origin); 764 vec3_scale(&camera_pos, &camera_pos_unit_vec, distance_to_origin);
765 765
766 eo_do(camera_node, 766 eo_do(camera_node,
767 evas_3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z), 767 evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
768 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 768 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
769 EVAS_3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z)); 769 EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
770 770
771 if (elm_check_state_get(light_toggle)) 771 if (elm_check_state_get(light_toggle))
772 { 772 {
773 /* Update light position as the same as camera position. */ 773 /* Update light position as the same as camera position. */
774 eo_do(light_node, 774 eo_do(light_node,
775 evas_3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z), 775 evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
776 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 776 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
777 EVAS_3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z)); 777 EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
778 } 778 }
779 } 779 }
780} 780}
@@ -791,8 +791,8 @@ mouse_up_cb(void *data,
791 int scene_w, scene_h; 791 int scene_w, scene_h;
792 double scene_x, scene_y; 792 double scene_x, scene_y;
793 double s, t; 793 double s, t;
794 Evas_3D_Node *n; 794 Evas_Canvas3D_Node *n;
795 Evas_3D_Mesh *m; 795 Evas_Canvas3D_Mesh *m;
796 Eina_Bool pick; 796 Eina_Bool pick;
797 797
798 evas_object_geometry_get(o, &x, &y, &w, &h); 798 evas_object_geometry_get(o, &x, &y, &w, &h);
@@ -800,12 +800,12 @@ mouse_up_cb(void *data,
800 obj_x = ev->canvas.x - x; 800 obj_x = ev->canvas.x - x;
801 obj_y = ev->canvas.y - y; 801 obj_y = ev->canvas.y - y;
802 802
803 eo_do(scene, evas_3d_scene_size_get(&scene_w, &scene_h)); 803 eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
804 804
805 scene_x = obj_x * scene_w / (double)w; 805 scene_x = obj_x * scene_w / (double)w;
806 scene_y = obj_y * scene_h / (double)h; 806 scene_y = obj_y * scene_h / (double)h;
807 807
808 eo_do(scene, pick = evas_3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); 808 eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
809 if (pick) 809 if (pick)
810 printf("Picked : "); 810 printf("Picked : ");
811 else 811 else
@@ -848,29 +848,29 @@ mouse_wheel_cb(void *data,
848static void 848static void
849skybox_setup(void) 849skybox_setup(void)
850{ 850{
851 Evas_3D_Node *skybox_mesh_node; 851 Evas_Canvas3D_Node *skybox_mesh_node;
852 Evas_3D_Mesh *skybox_mesh; 852 Evas_Canvas3D_Mesh *skybox_mesh;
853 Evas_3D_Material *skybox_material; 853 Evas_Canvas3D_Material *skybox_material;
854 Evas_3D_Texture *skybox_texture_diffuse; 854 Evas_Canvas3D_Texture *skybox_texture_diffuse;
855 Evas_Object *skybox_image; 855 Evas_Object *skybox_image;
856 char buf[PATH_MAX]; 856 char buf[PATH_MAX];
857 857
858 skybox_mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 858 skybox_mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
859 eo_do(skybox_mesh, 859 eo_do(skybox_mesh,
860 evas_3d_mesh_vertex_count_set(24), 860 evas_canvas3d_mesh_vertex_count_set(24),
861 evas_3d_mesh_frame_add(0), 861 evas_canvas3d_mesh_frame_add(0),
862 862
863 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 863 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
864 12 * sizeof(float), &skybox_vertices[0]), 864 12 * sizeof(float), &skybox_vertices[0]),
865 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 865 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
866 12 * sizeof(float), &skybox_vertices[3]), 866 12 * sizeof(float), &skybox_vertices[3]),
867 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 867 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
868 12 * sizeof(float), &skybox_vertices[6]), 868 12 * sizeof(float), &skybox_vertices[6]),
869 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 869 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
870 12 * sizeof(float), &skybox_vertices[10]), 870 12 * sizeof(float), &skybox_vertices[10]),
871 871
872 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &skybox_indices[0]), 872 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &skybox_indices[0]),
873 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES)); 873 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES));
874 874
875 /* Set skybox texture source image. */ 875 /* Set skybox texture source image. */
876 skybox_image = elm_image_add(win); 876 skybox_image = elm_image_add(win);
@@ -880,32 +880,32 @@ skybox_setup(void)
880 evas_object_show(skybox_image); 880 evas_object_show(skybox_image);
881 881
882 /* Set skybox texture material. */ 882 /* Set skybox texture material. */
883 skybox_material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 883 skybox_material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
884 eo_do(skybox_mesh, evas_3d_mesh_frame_material_set(0, skybox_material)); 884 eo_do(skybox_mesh, evas_canvas3d_mesh_frame_material_set(0, skybox_material));
885 885
886 skybox_texture_diffuse = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 886 skybox_texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
887 887
888 eo_do(skybox_texture_diffuse, 888 eo_do(skybox_texture_diffuse,
889 evas_3d_texture_source_set(skybox_image), 889 evas_canvas3d_texture_source_set(skybox_image),
890 evas_3d_texture_source_visible_set(EINA_FALSE)); 890 evas_canvas3d_texture_source_visible_set(EINA_FALSE));
891 891
892 eo_do(skybox_material, 892 eo_do(skybox_material,
893 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, skybox_texture_diffuse), 893 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, skybox_texture_diffuse),
894 894
895 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 895 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
896 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 896 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
897 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 897 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
898 898
899 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0), 899 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0),
900 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 900 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
901 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0), 901 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0),
902 evas_3d_material_shininess_set(50.0)); 902 evas_canvas3d_material_shininess_set(50.0));
903 903
904 skybox_mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 904 skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
905 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 905 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
906 eo_do(root_node, evas_3d_node_member_add(skybox_mesh_node)); 906 eo_do(root_node, evas_canvas3d_node_member_add(skybox_mesh_node));
907 eo_do(skybox_mesh_node, evas_3d_node_mesh_add(skybox_mesh)); 907 eo_do(skybox_mesh_node, evas_canvas3d_node_mesh_add(skybox_mesh));
908 eo_do(skybox_mesh, evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE)); 908 eo_do(skybox_mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE));
909} 909}
910 910
911static void 911static void
@@ -943,8 +943,8 @@ static void
943camera_setup(void) 943camera_setup(void)
944{ 944{
945 /* Add the camera. */ 945 /* Add the camera. */
946 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 946 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
947 eo_do(camera, evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 100.0)); 947 eo_do(camera, evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 100.0));
948 948
949 /* Set camera position. */ 949 /* Set camera position. */
950 camera_pos.x = 0.0; 950 camera_pos.x = 0.0;
@@ -961,33 +961,33 @@ camera_setup(void)
961 camera_right_vec.y = 0.0; 961 camera_right_vec.y = 0.0;
962 camera_right_vec.z = 0.0; 962 camera_right_vec.z = 0.0;
963 963
964 camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, 964 camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
965 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 965 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
966 eo_do(camera_node, 966 eo_do(camera_node,
967 evas_3d_node_camera_set(camera), 967 evas_canvas3d_node_camera_set(camera),
968 evas_3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z), 968 evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
969 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 969 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
970 EVAS_3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z)); 970 EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
971 eo_do(root_node, evas_3d_node_member_add(camera_node)); 971 eo_do(root_node, evas_canvas3d_node_member_add(camera_node));
972} 972}
973 973
974static void 974static void
975light_setup(void) 975light_setup(void)
976{ 976{
977 light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 977 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
978 eo_do(light, 978 eo_do(light,
979 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 979 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
980 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 980 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
981 evas_3d_light_specular_set(0.2, 0.2, 0.2, 1.0)); 981 evas_canvas3d_light_specular_set(0.2, 0.2, 0.2, 1.0));
982 982
983 light_node = eo_add(EVAS_3D_NODE_CLASS, evas, 983 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
984 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 984 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
985 eo_do(light_node, 985 eo_do(light_node,
986 evas_3d_node_light_set(light), 986 evas_canvas3d_node_light_set(light),
987 evas_3d_node_position_set(0.0, 0.0, MAX_CAMERA_DISTANCE), 987 evas_canvas3d_node_position_set(0.0, 0.0, MAX_CAMERA_DISTANCE),
988 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 988 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
989 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 989 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
990 eo_do(root_node, evas_3d_node_member_add(light_node)); 990 eo_do(root_node, evas_canvas3d_node_member_add(light_node));
991} 991}
992 992
993static void 993static void
@@ -996,57 +996,57 @@ mesh_setup(void)
996 /* Create a sphere mesh. */ 996 /* Create a sphere mesh. */
997 sphere_init(50); 997 sphere_init(50);
998 998
999 mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 999 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
1000 eo_do(mesh, 1000 eo_do(mesh,
1001 evas_3d_mesh_vertex_count_set(vertex_count), 1001 evas_canvas3d_mesh_vertex_count_set(vertex_count),
1002 evas_3d_mesh_frame_add(0), 1002 evas_canvas3d_mesh_frame_add(0),
1003 1003
1004 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 1004 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
1005 sizeof(vertex), &vertices[0].position), 1005 sizeof(vertex), &vertices[0].position),
1006 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 1006 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
1007 sizeof(vertex), &vertices[0].normal), 1007 sizeof(vertex), &vertices[0].normal),
1008 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TANGENT, 1008 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
1009 sizeof(vertex), &vertices[0].tangent), 1009 sizeof(vertex), &vertices[0].tangent),
1010 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 1010 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
1011 sizeof(vertex), &vertices[0].color), 1011 sizeof(vertex), &vertices[0].color),
1012 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 1012 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
1013 sizeof(vertex), &vertices[0].texcoord), 1013 sizeof(vertex), &vertices[0].texcoord),
1014 1014
1015 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]), 1015 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
1016 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES)); 1016 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES));
1017 1017
1018 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 1018 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
1019 eo_do(mesh, evas_3d_mesh_frame_material_set(0, material)); 1019 eo_do(mesh, evas_canvas3d_mesh_frame_material_set(0, material));
1020 1020
1021 texture_diffuse = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 1021 texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
1022 eo_do(texture_diffuse, 1022 eo_do(texture_diffuse,
1023 evas_3d_texture_source_set(map), 1023 evas_canvas3d_texture_source_set(map),
1024 evas_3d_texture_source_visible_set(EINA_FALSE)); 1024 evas_canvas3d_texture_source_visible_set(EINA_FALSE));
1025 1025
1026 texture_normal = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 1026 texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
1027 eo_do(texture_normal, 1027 eo_do(texture_normal,
1028 evas_3d_texture_source_set(normal_map), 1028 evas_canvas3d_texture_source_set(normal_map),
1029 evas_3d_texture_source_visible_set(EINA_FALSE)); 1029 evas_canvas3d_texture_source_visible_set(EINA_FALSE));
1030 1030
1031 eo_do(material, 1031 eo_do(material,
1032 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture_diffuse), 1032 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture_diffuse),
1033 evas_3d_material_texture_set(EVAS_3D_MATERIAL_NORMAL, texture_normal), 1033 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, texture_normal),
1034 1034
1035 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 1035 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
1036 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 1036 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
1037 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 1037 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
1038 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 1038 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
1039 1039
1040 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0), 1040 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0),
1041 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 1041 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
1042 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0), 1042 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0),
1043 evas_3d_material_shininess_set(50.0)); 1043 evas_canvas3d_material_shininess_set(50.0));
1044 1044
1045 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 1045 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
1046 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 1046 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
1047 eo_do(root_node, evas_3d_node_member_add(mesh_node)); 1047 eo_do(root_node, evas_canvas3d_node_member_add(mesh_node));
1048 eo_do(mesh_node, evas_3d_node_mesh_add(mesh)); 1048 eo_do(mesh_node, evas_canvas3d_node_mesh_add(mesh));
1049 eo_do(mesh, evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_NORMAL_MAP)); 1049 eo_do(mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP));
1050} 1050}
1051 1051
1052static void 1052static void
@@ -1117,17 +1117,17 @@ light_toggle_changed_cb(void *data,
1117 { 1117 {
1118 /* Set light position as the same as camera position. */ 1118 /* Set light position as the same as camera position. */
1119 eo_do(light_node, 1119 eo_do(light_node,
1120 evas_3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z), 1120 evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
1121 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 1121 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
1122 EVAS_3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z)); 1122 EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
1123 } 1123 }
1124 else 1124 else
1125 { 1125 {
1126 /* Set light position to default position. */ 1126 /* Set light position to default position. */
1127 eo_do(light_node, 1127 eo_do(light_node,
1128 evas_3d_node_position_set(0.0, 0.0, MAX_CAMERA_DISTANCE), 1128 evas_canvas3d_node_position_set(0.0, 0.0, MAX_CAMERA_DISTANCE),
1129 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 1129 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
1130 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 1130 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
1131 } 1131 }
1132} 1132}
1133 1133
@@ -1212,11 +1212,11 @@ elm_main(int argc, char **argv)
1212 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_WHEEL, mouse_wheel_cb, NULL); 1212 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_WHEEL, mouse_wheel_cb, NULL);
1213 1213
1214 /* Add a scene object. */ 1214 /* Add a scene object. */
1215 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 1215 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
1216 1216
1217 /* Add a root node for the scene. */ 1217 /* Add a root node for the scene. */
1218 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 1218 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
1219 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 1219 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
1220 1220
1221 skybox_setup(); 1221 skybox_setup();
1222 texture_source_setup(); 1222 texture_source_setup();
@@ -1226,9 +1226,9 @@ elm_main(int argc, char **argv)
1226 1226
1227 /* Set up scene. */ 1227 /* Set up scene. */
1228 eo_do(scene, 1228 eo_do(scene,
1229 evas_3d_scene_root_node_set(root_node), 1229 evas_canvas3d_scene_root_node_set(root_node),
1230 evas_3d_scene_camera_node_set(camera_node), 1230 evas_canvas3d_scene_camera_node_set(camera_node),
1231 evas_3d_scene_size_set(WIDTH, HEIGHT)); 1231 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
1232 eo_do(image, evas_obj_image_scene_set(scene)); 1232 eo_do(image, evas_obj_image_scene_set(scene));
1233 1233
1234 /* Add a layout for controlers. */ 1234 /* Add a layout for controlers. */
diff --git a/src/examples/evas3d_object_on_button_example.c b/src/examples/evas3d_object_on_button_example.c
index b578e58af..1224558f8 100644
--- a/src/examples/evas3d_object_on_button_example.c
+++ b/src/examples/evas3d_object_on_button_example.c
@@ -106,8 +106,8 @@ _stop_scene(void *data,
106 void *event_info) 106 void *event_info)
107{ 107{
108 Evas_Event_Mouse_Down *ev = event_info; 108 Evas_Event_Mouse_Down *ev = event_info;
109 Evas_3D_Node *n; 109 Evas_Canvas3D_Node *n;
110 Evas_3D_Mesh *m; 110 Evas_Canvas3D_Mesh *m;
111 Evas_Real s, t; 111 Evas_Real s, t;
112 Scene_Data *d = (Scene_Data *)data; 112 Scene_Data *d = (Scene_Data *)data;
113 113
@@ -116,11 +116,11 @@ _stop_scene(void *data,
116 Eina_Bool ret; 116 Eina_Bool ret;
117 117
118 if (eo_do_ret(d->scene, ret, 118 if (eo_do_ret(d->scene, ret,
119 evas_3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t))) 119 evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)))
120 { 120 {
121 d_angle = 0.0; 121 d_angle = 0.0;
122 elm_object_signal_emit(btn, "mouse,down,1", "event"); 122 elm_object_signal_emit(btn, "mouse,down,1", "event");
123 eo_do(d->mesh_node, evas_3d_node_position_set(0.0, 0.0, -0.2)); 123 eo_do(d->mesh_node, evas_canvas3d_node_position_set(0.0, 0.0, -0.2));
124 } 124 }
125 } 125 }
126} 126}
@@ -135,7 +135,7 @@ _play_scene(void *data,
135 135
136 d_angle = 0.5; 136 d_angle = 0.5;
137 elm_object_signal_emit(btn, "mouse,up,1", "event"); 137 elm_object_signal_emit(btn, "mouse,up,1", "event");
138 eo_do(d->mesh_node, evas_3d_node_position_set(0.0, 0.0, 0.0)); 138 eo_do(d->mesh_node, evas_canvas3d_node_position_set(0.0, 0.0, 0.0));
139} 139}
140 140
141 141
@@ -148,7 +148,7 @@ _animate_scene(void *data)
148 angle += d_angle; 148 angle += d_angle;
149 149
150 eo_do(scene->mesh_node, 150 eo_do(scene->mesh_node,
151 evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); 151 evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
152 152
153 /* Rotate */ 153 /* Rotate */
154 if (angle > 360.0) angle -= 360.0f; 154 if (angle > 360.0) angle -= 360.0f;
@@ -159,113 +159,113 @@ _animate_scene(void *data)
159static void 159static void
160_camera_setup(Scene_Data *data) 160_camera_setup(Scene_Data *data)
161{ 161{
162 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 162 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
163 163
164 eo_do(data->camera, 164 eo_do(data->camera,
165 evas_3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0)); 165 evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0));
166 166
167 data->camera_node = 167 data->camera_node =
168 eo_add(EVAS_3D_NODE_CLASS, evas, 168 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
169 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 169 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
170 eo_do(data->camera_node, 170 eo_do(data->camera_node,
171 evas_3d_node_camera_set(data->camera), 171 evas_canvas3d_node_camera_set(data->camera),
172 evas_3d_node_position_set(0.0, 0.0, 15.0), 172 evas_canvas3d_node_position_set(0.0, 0.0, 15.0),
173 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 173 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
174 EVAS_3D_SPACE_PARENT, 0.0, -1.0, 0.0)); 174 EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0));
175 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 175 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
176} 176}
177 177
178static void 178static void
179_light_setup(Scene_Data *data) 179_light_setup(Scene_Data *data)
180{ 180{
181 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 181 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
182 eo_do(data->light, 182 eo_do(data->light,
183 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 183 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
184 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 184 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
185 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 185 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
186 186
187 data->light_node = 187 data->light_node =
188 eo_add(EVAS_3D_NODE_CLASS, evas, 188 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
189 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 189 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
190 eo_do(data->light_node, 190 eo_do(data->light_node,
191 evas_3d_node_light_set(data->light), 191 evas_canvas3d_node_light_set(data->light),
192 evas_3d_node_position_set(0.0, 0.0, 10.0), 192 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
193 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 193 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
194 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 194 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
195 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 195 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
196} 196}
197static void 197static void
198_mesh_setup(Scene_Data *data) 198_mesh_setup(Scene_Data *data)
199{ 199{
200 /* Setup material and texture as widget button. */ 200 /* Setup material and texture as widget button. */
201 data->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 201 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
202 data->texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 202 data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
203 203
204 eo_do(data->texture, 204 eo_do(data->texture,
205 evas_3d_texture_source_set(btn), 205 evas_canvas3d_texture_source_set(btn),
206 evas_3d_texture_source_visible_set(EINA_FALSE)); 206 evas_canvas3d_texture_source_visible_set(EINA_FALSE));
207 207
208 eo_do(data->material, 208 eo_do(data->material,
209 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, data->texture), 209 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture),
210 210
211 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 211 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
212 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 212 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
213 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 213 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
214 214
215 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 215 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
216 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 216 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
217 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 217 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
218 evas_3d_material_shininess_set(100.0)); 218 evas_canvas3d_material_shininess_set(100.0));
219 219
220 /* Setup mesh. */ 220 /* Setup mesh. */
221 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 221 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
222 eo_do(data->mesh, 222 eo_do(data->mesh,
223 evas_3d_mesh_vertex_count_set(24), 223 evas_canvas3d_mesh_vertex_count_set(24),
224 evas_3d_mesh_frame_add(0), 224 evas_canvas3d_mesh_frame_add(0),
225 225
226 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 226 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
227 12 * sizeof(float), &cube_vertices[ 0]), 227 12 * sizeof(float), &cube_vertices[ 0]),
228 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 228 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
229 12 * sizeof(float), &cube_vertices[ 3]), 229 12 * sizeof(float), &cube_vertices[ 3]),
230 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 230 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
231 12 * sizeof(float), &cube_vertices[ 6]), 231 12 * sizeof(float), &cube_vertices[ 6]),
232 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 232 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
233 12 * sizeof(float), &cube_vertices[10]), 233 12 * sizeof(float), &cube_vertices[10]),
234 234
235 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 235 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
236 36, &cube_indices[0]), 236 36, &cube_indices[0]),
237 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 237 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
238 238
239 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 239 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
240 240
241 evas_3d_mesh_frame_material_set(0, data->material)); 241 evas_canvas3d_mesh_frame_material_set(0, data->material));
242 242
243 data->mesh_node = 243 data->mesh_node =
244 eo_add(EVAS_3D_NODE_CLASS, evas, 244 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
245 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 245 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
246 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); 246 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
247 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); 247 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
248} 248}
249 249
250static void 250static void
251_scene_setup(Scene_Data *data) 251_scene_setup(Scene_Data *data)
252{ 252{
253 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 253 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
254 eo_do(data->scene, 254 eo_do(data->scene,
255 evas_3d_scene_size_set(WIDTH, HEIGHT); 255 evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
256 evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); 256 evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
257 257
258 data->root_node = 258 data->root_node =
259 eo_add(EVAS_3D_NODE_CLASS, evas, 259 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
260 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 260 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
261 261
262 _camera_setup(data); 262 _camera_setup(data);
263 _light_setup(data); 263 _light_setup(data);
264 _mesh_setup(data); 264 _mesh_setup(data);
265 265
266 eo_do(data->scene, 266 eo_do(data->scene,
267 evas_3d_scene_root_node_set(data->root_node), 267 evas_canvas3d_scene_root_node_set(data->root_node),
268 evas_3d_scene_camera_node_set(data->camera_node)); 268 evas_canvas3d_scene_camera_node_set(data->camera_node));
269} 269}
270 270
271static void 271static void
diff --git a/src/examples/evas3d_scene_on_button_example.c b/src/examples/evas3d_scene_on_button_example.c
index f1f014ba9..76658b663 100644
--- a/src/examples/evas3d_scene_on_button_example.c
+++ b/src/examples/evas3d_scene_on_button_example.c
@@ -110,7 +110,7 @@ _animate_scene(void *data)
110 angle += d_angle; 110 angle += d_angle;
111 111
112 eo_do(scene->mesh_node, 112 eo_do(scene->mesh_node,
113 evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); 113 evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
114 114
115 /* Rotate */ 115 /* Rotate */
116 if (angle > 360.0) angle -= 360.0f; 116 if (angle > 360.0) angle -= 360.0f;
@@ -121,111 +121,111 @@ _animate_scene(void *data)
121static void 121static void
122_camera_setup(Scene_Data *data) 122_camera_setup(Scene_Data *data)
123{ 123{
124 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 124 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
125 125
126 eo_do(data->camera, 126 eo_do(data->camera,
127 evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); 127 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
128 128
129 data->camera_node = 129 data->camera_node =
130 eo_add(EVAS_3D_NODE_CLASS, evas, 130 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
131 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 131 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
132 eo_do(data->camera_node, 132 eo_do(data->camera_node,
133 evas_3d_node_camera_set(data->camera), 133 evas_canvas3d_node_camera_set(data->camera),
134 evas_3d_node_position_set(0.0, 0.0, 10.0), 134 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
135 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 135 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
136 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 136 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
137 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 137 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
138} 138}
139 139
140static void 140static void
141_light_setup(Scene_Data *data) 141_light_setup(Scene_Data *data)
142{ 142{
143 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 143 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
144 eo_do(data->light, 144 eo_do(data->light,
145 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 145 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
146 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 146 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
147 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 147 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
148 148
149 data->light_node = 149 data->light_node =
150 eo_add(EVAS_3D_NODE_CLASS, evas, 150 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
151 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 151 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
152 eo_do(data->light_node, 152 eo_do(data->light_node,
153 evas_3d_node_light_set(data->light), 153 evas_canvas3d_node_light_set(data->light),
154 evas_3d_node_position_set(0.0, 0.0, 10.0), 154 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
155 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 155 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
156 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 156 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
157 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 157 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
158} 158}
159static void 159static void
160_mesh_setup(Scene_Data *data) 160_mesh_setup(Scene_Data *data)
161{ 161{
162 /* Setup material. */ 162 /* Setup material. */
163 data->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 163 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
164 164
165 eo_do(data->material, 165 eo_do(data->material,
166 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 166 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
167 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 167 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
168 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 168 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
169 169
170 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 170 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
171 0.2, 0.2, 0.2, 1.0), 171 0.2, 0.2, 0.2, 1.0),
172 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 172 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
173 0.8, 0.8, 0.8, 1.0), 173 0.8, 0.8, 0.8, 1.0),
174 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 174 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
175 1.0, 1.0, 1.0, 1.0), 175 1.0, 1.0, 1.0, 1.0),
176 evas_3d_material_shininess_set(100.0)); 176 evas_canvas3d_material_shininess_set(100.0));
177 177
178 /* Setup mesh. */ 178 /* Setup mesh. */
179 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 179 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
180 eo_do(data->mesh, 180 eo_do(data->mesh,
181 evas_3d_mesh_vertex_count_set(24), 181 evas_canvas3d_mesh_vertex_count_set(24),
182 evas_3d_mesh_frame_add(0), 182 evas_canvas3d_mesh_frame_add(0),
183 183
184 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 184 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
185 12 * sizeof(float), 185 12 * sizeof(float),
186 &cube_vertices[ 0]), 186 &cube_vertices[ 0]),
187 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 187 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
188 12 * sizeof(float), 188 12 * sizeof(float),
189 &cube_vertices[ 3]), 189 &cube_vertices[ 3]),
190 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 190 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
191 12 * sizeof(float), 191 12 * sizeof(float),
192 &cube_vertices[ 6]), 192 &cube_vertices[ 6]),
193 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 193 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
194 12 * sizeof(float), 194 12 * sizeof(float),
195 &cube_vertices[10]), 195 &cube_vertices[10]),
196 196
197 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 197 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
198 36, &cube_indices[0]), 198 36, &cube_indices[0]),
199 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 199 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
200 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 200 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
201 evas_3d_mesh_frame_material_set(0, data->material)); 201 evas_canvas3d_mesh_frame_material_set(0, data->material));
202 202
203 data->mesh_node = 203 data->mesh_node =
204 eo_add(EVAS_3D_NODE_CLASS, evas, 204 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
205 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 205 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
206 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); 206 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
207 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); 207 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
208} 208}
209 209
210static void 210static void
211_scene_setup(Scene_Data *data) 211_scene_setup(Scene_Data *data)
212{ 212{
213 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 213 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
214 eo_do(data->scene, 214 eo_do(data->scene,
215 evas_3d_scene_size_set(WIDTH - d_w, HEIGHT - d_h); 215 evas_canvas3d_scene_size_set(WIDTH - d_w, HEIGHT - d_h);
216 evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); 216 evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
217 217
218 data->root_node = 218 data->root_node =
219 eo_add(EVAS_3D_NODE_CLASS, evas, 219 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
220 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 220 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
221 221
222 _camera_setup(data); 222 _camera_setup(data);
223 _light_setup(data); 223 _light_setup(data);
224 _mesh_setup(data); 224 _mesh_setup(data);
225 225
226 eo_do(data->scene, 226 eo_do(data->scene,
227 evas_3d_scene_root_node_set(data->root_node), 227 evas_canvas3d_scene_root_node_set(data->root_node),
228 evas_3d_scene_camera_node_set(data->camera_node)); 228 evas_canvas3d_scene_camera_node_set(data->camera_node));
229} 229}
230 230
231static void 231static void
@@ -238,14 +238,14 @@ _stop_scene(void *data,
238 Scene_Data *d = (Scene_Data *)data; 238 Scene_Data *d = (Scene_Data *)data;
239 239
240 eo_do(d->mesh_node, 240 eo_do(d->mesh_node,
241 evas_3d_node_scale_set(0.97, 0.97, 0.97)); 241 evas_canvas3d_node_scale_set(0.97, 0.97, 0.97));
242 242
243 if (ev->button == 1) 243 if (ev->button == 1)
244 { 244 {
245 Evas_3D_Node *ret; 245 Evas_Canvas3D_Node *ret;
246 246
247 if (eo_do_ret(d->scene, ret, 247 if (eo_do_ret(d->scene, ret,
248 evas_3d_scene_exist((ev->canvas.x - (d_w / 2)), 248 evas_canvas3d_scene_exist((ev->canvas.x - (d_w / 2)),
249 (ev->canvas.y - (d_h / 2)), 249 (ev->canvas.y - (d_h / 2)),
250 d->mesh_node))) 250 d->mesh_node)))
251 { 251 {
@@ -265,7 +265,7 @@ _play_scene(void *data,
265 d_angle = 0.5; 265 d_angle = 0.5;
266 266
267 eo_do(d->mesh_node, 267 eo_do(d->mesh_node,
268 evas_3d_node_scale_set(1.0, 1.0, 1.0)); 268 evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
269} 269}
270 270
271int 271int
diff --git a/src/examples/performance/camera_light.c b/src/examples/performance/camera_light.c
index 06ad690b3..7b006f39b 100644
--- a/src/examples/performance/camera_light.c
+++ b/src/examples/performance/camera_light.c
@@ -101,7 +101,7 @@ init_panel_camera_light(Evas_Object *win, Eo *camera_node, Eo *light_node, doubl
101 evas_object_show(spZ); 101 evas_object_show(spZ);
102 evas_object_smart_callback_add(spZ, "changed", _camera_light_changeZ_cb, camera_node); 102 evas_object_smart_callback_add(spZ, "changed", _camera_light_changeZ_cb, camera_node);
103 103
104 eo_do(camera_node, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &px, &py, &pz)); 104 eo_do(camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &px, &py, &pz));
105 elm_spinner_value_set(spX, px); 105 elm_spinner_value_set(spX, px);
106 elm_spinner_value_set(spY, py); 106 elm_spinner_value_set(spY, py);
107 elm_spinner_value_set(spZ, pz); 107 elm_spinner_value_set(spZ, pz);
@@ -173,7 +173,7 @@ init_panel_camera_light(Evas_Object *win, Eo *camera_node, Eo *light_node, doubl
173 evas_object_show(splZ); 173 evas_object_show(splZ);
174 evas_object_smart_callback_add(splZ, "changed", _camera_light_changeZ_cb, light_node); 174 evas_object_smart_callback_add(splZ, "changed", _camera_light_changeZ_cb, light_node);
175 175
176 eo_do(light_node, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &px, &py, &pz)); 176 eo_do(light_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &px, &py, &pz));
177 elm_spinner_value_set(splX, px); 177 elm_spinner_value_set(splX, px);
178 elm_spinner_value_set(splY, py); 178 elm_spinner_value_set(splY, py);
179 elm_spinner_value_set(splZ, pz); 179 elm_spinner_value_set(splZ, pz);
@@ -229,9 +229,9 @@ _camera_light_changeX_cb(void *data, Evas_Object *obj, void *event_info)
229 229
230 if ((Eo*)data) 230 if ((Eo*)data)
231 { 231 {
232 eo_do((Eo*)data, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, NULL, &y, &z)); 232 eo_do((Eo*)data, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, NULL, &y, &z));
233 x = elm_spinner_value_get(obj); 233 x = elm_spinner_value_get(obj);
234 eo_do((Eo*)data, evas_3d_node_position_set(x, y, z)); 234 eo_do((Eo*)data, evas_canvas3d_node_position_set(x, y, z));
235 } 235 }
236} 236}
237static void 237static void
@@ -241,9 +241,9 @@ _camera_light_changeY_cb(void *data, Evas_Object *obj, void *event_info)
241 241
242 if ((Eo*)data) 242 if ((Eo*)data)
243 { 243 {
244 eo_do((Eo*)data, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &x, NULL, &z)); 244 eo_do((Eo*)data, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, NULL, &z));
245 y = elm_spinner_value_get(obj); 245 y = elm_spinner_value_get(obj);
246 eo_do((Eo*)data, evas_3d_node_position_set(x, y, z)); 246 eo_do((Eo*)data, evas_canvas3d_node_position_set(x, y, z));
247 } 247 }
248} 248}
249static void 249static void
@@ -253,9 +253,9 @@ _camera_light_changeZ_cb(void *data, Evas_Object *obj, void *event_info)
253 253
254 if ((Eo*)data) 254 if ((Eo*)data)
255 { 255 {
256 eo_do((Eo*)data, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &x, &y, NULL)); 256 eo_do((Eo*)data, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, NULL));
257 z = elm_spinner_value_get(obj); 257 z = elm_spinner_value_get(obj);
258 eo_do((Eo*)data, evas_3d_node_position_set(x, y, z)); 258 eo_do((Eo*)data, evas_canvas3d_node_position_set(x, y, z));
259 } 259 }
260} 260}
261static void 261static void
@@ -267,7 +267,7 @@ _camera_light_angle_change_cb(void *data, Evas_Object *obj, void *event_info)
267 { 267 {
268 aw = elm_spinner_value_get(obj); 268 aw = elm_spinner_value_get(obj);
269 aw = cos(aw * M_PI / 360.0); 269 aw = cos(aw * M_PI / 360.0);
270 eo_do(((Eo*)data), evas_3d_node_orientation_set(key->x, key->y, key->z, aw)); 270 eo_do(((Eo*)data), evas_canvas3d_node_orientation_set(key->x, key->y, key->z, aw));
271 } 271 }
272} 272}
273static void 273static void
diff --git a/src/examples/performance/graphical.c b/src/examples/performance/graphical.c
index 27b706109..23cfae6e2 100644
--- a/src/examples/performance/graphical.c
+++ b/src/examples/performance/graphical.c
@@ -248,47 +248,47 @@ void _init_bounding()
248 20, 21, 22, 22, 21, 23 248 20, 21, 22, 22, 21, 23
249 }; 249 };
250 250
251 globalGraphical.material_box = eo_add(EVAS_3D_MATERIAL_CLASS, globalGraphical.evas); 251 globalGraphical.material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
252 252
253 eo_do(globalGraphical.material_box, 253 eo_do(globalGraphical.material_box,
254 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 254 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
255 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 255 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
256 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 256 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
257 257
258 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 258 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
259 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 259 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
260 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 260 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
261 evas_3d_material_shininess_set(100.0)); 261 evas_canvas3d_material_shininess_set(100.0));
262 262
263 /* Setup mesh. */ 263 /* Setup mesh. */
264 globalGraphical.mesh_box = eo_add(EVAS_3D_MESH_CLASS, globalGraphical.evas); 264 globalGraphical.mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
265 eo_do(globalGraphical.mesh_box, 265 eo_do(globalGraphical.mesh_box,
266 evas_3d_mesh_vertex_count_set(24), 266 evas_canvas3d_mesh_vertex_count_set(24),
267 evas_3d_mesh_frame_add(0), 267 evas_canvas3d_mesh_frame_add(0),
268 268
269 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_POSITION, 269 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
270 12 * sizeof(float), &cube_vertices[ 0]), 270 12 * sizeof(float), &cube_vertices[ 0]),
271 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_NORMAL, 271 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
272 12 * sizeof(float), &cube_vertices[ 3]), 272 12 * sizeof(float), &cube_vertices[ 3]),
273 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_COLOR, 273 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
274 12 * sizeof(float), &cube_vertices[ 6]), 274 12 * sizeof(float), &cube_vertices[ 6]),
275 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_TEXCOORD, 275 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
276 12 * sizeof(float), &cube_vertices[10]), 276 12 * sizeof(float), &cube_vertices[10]),
277 277
278 evas_3d_mesh_index_data_copy_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 278 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
279 36, &cube_indices[0]), 279 36, &cube_indices[0]),
280 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 280 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
281 281
282 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 282 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
283 283
284 evas_3d_mesh_frame_material_set(0, globalGraphical.material_box)); 284 evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material_box));
285 285
286 globalGraphical.mesh_nodebox = 286 globalGraphical.mesh_nodebox =
287 eo_add(EVAS_3D_NODE_CLASS, globalGraphical.evas, 287 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
288 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH), 288 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH),
289 evas_3d_node_position_set(0, -30.0, 0.0)); 289 evas_canvas3d_node_position_set(0, -30.0, 0.0));
290 eo_do(globalGraphical.root_node, evas_3d_node_member_add(globalGraphical.mesh_nodebox)); 290 eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.mesh_nodebox));
291 eo_do(globalGraphical.mesh_nodebox, evas_3d_node_mesh_add(globalGraphical.mesh_box)); 291 eo_do(globalGraphical.mesh_nodebox, evas_canvas3d_node_mesh_add(globalGraphical.mesh_box));
292} 292}
293static void 293static void
294_change_scene_setup() 294_change_scene_setup()
@@ -298,13 +298,13 @@ _change_scene_setup()
298 int i = 0; 298 int i = 0;
299 int quantity = (globalGraphical.count + 1) * (globalGraphical.count + 1); 299 int quantity = (globalGraphical.count + 1) * (globalGraphical.count + 1);
300 eo_do(globalGraphical.camera, 300 eo_do(globalGraphical.camera,
301 evas_3d_camera_projection_perspective_set(globalGraphical.angle, 1.0, 2.0, 1000)); 301 evas_canvas3d_camera_projection_perspective_set(globalGraphical.angle, 1.0, 2.0, 1000));
302 302
303 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node) 303 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
304 { 304 {
305 eo_do(globalGraphical.root_node, evas_3d_node_member_del(node)); 305 eo_do(globalGraphical.root_node, evas_canvas3d_node_member_del(node));
306 globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node); 306 globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node);
307 /*eo_del(node);Unless evas_3d_destructors work properly*/ 307 /*eo_del(node);Unless evas_canvas3d_destructors work properly*/
308 } 308 }
309 eina_list_free(globalGraphical.list_nodes); 309 eina_list_free(globalGraphical.list_nodes);
310 eina_list_free(l); 310 eina_list_free(l);
@@ -313,7 +313,7 @@ _change_scene_setup()
313 EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m) 313 EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m)
314 { 314 {
315 globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m); 315 globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m);
316 /*eo_del(m); Unless evas_3d_destructors work properly*/ 316 /*eo_del(m); Unless evas_canvas3d_destructors work properly*/
317 } 317 }
318 eina_list_free(globalGraphical.list_meshes); 318 eina_list_free(globalGraphical.list_meshes);
319 eina_list_free(l); 319 eina_list_free(l);
@@ -322,62 +322,62 @@ _change_scene_setup()
322 _sphere_init(globalGraphical.precision); 322 _sphere_init(globalGraphical.precision);
323 for (i = 0; i < quantity; i++) 323 for (i = 0; i < quantity; i++)
324 { 324 {
325 globalGraphical.mesh = eo_add(EVAS_3D_MESH_CLASS, globalGraphical.evas); 325 globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
326 if (!globalGraphical.model_path) 326 if (!globalGraphical.model_path)
327 { 327 {
328 eo_do(globalGraphical.mesh, 328 eo_do(globalGraphical.mesh,
329 evas_3d_mesh_vertex_count_set(globalGraphical.vertex_count), 329 evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
330 evas_3d_mesh_frame_add(0), 330 evas_canvas3d_mesh_frame_add(0),
331 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_POSITION, 331 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
332 sizeof(vertex), 332 sizeof(vertex),
333 &globalGraphical.vertices[0].position), 333 &globalGraphical.vertices[0].position),
334 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_NORMAL, 334 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
335 sizeof(vertex), 335 sizeof(vertex),
336 &globalGraphical.vertices[0].normal), 336 &globalGraphical.vertices[0].normal),
337 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_TANGENT, 337 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
338 sizeof(vertex), 338 sizeof(vertex),
339 &globalGraphical.vertices[0].tangent), 339 &globalGraphical.vertices[0].tangent),
340 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_COLOR, 340 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
341 sizeof(vertex), &globalGraphical.vertices[0].color), 341 sizeof(vertex), &globalGraphical.vertices[0].color),
342 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_TEXCOORD, 342 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
343 sizeof(vertex), 343 sizeof(vertex),
344 &globalGraphical.vertices[0].texcoord), 344 &globalGraphical.vertices[0].texcoord),
345 345
346 evas_3d_mesh_index_data_copy_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 346 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
347 globalGraphical.index_count, &globalGraphical.indices[0]), 347 globalGraphical.index_count, &globalGraphical.indices[0]),
348 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 348 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
349 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 349 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
350 } 350 }
351 else 351 else
352 { 352 {
353 eo_do(globalGraphical.mesh, 353 eo_do(globalGraphical.mesh,
354 efl_file_set(globalGraphical.model_path, NULL), 354 efl_file_set(globalGraphical.model_path, NULL),
355 evas_3d_mesh_frame_material_set(0, globalGraphical.material), 355 evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material),
356 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 356 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
357 } 357 }
358 358
359 if (globalGraphical.flags.fog_enable) 359 if (globalGraphical.flags.fog_enable)
360 { 360 {
361 eo_do(globalGraphical.mesh, evas_3d_mesh_fog_enable_set(EINA_TRUE), evas_3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR)); 361 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_fog_enable_set(EINA_TRUE), evas_canvas3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR));
362 } 362 }
363 else 363 else
364 { 364 {
365 eo_do(globalGraphical.mesh, evas_3d_mesh_fog_enable_set(EINA_FALSE)); 365 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_fog_enable_set(EINA_FALSE));
366 } 366 }
367 if (globalGraphical.flags.colorpick_enable) 367 if (globalGraphical.flags.colorpick_enable)
368 eo_do(globalGraphical.mesh, evas_3d_mesh_color_pick_enable_set(EINA_TRUE)); 368 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_color_pick_enable_set(EINA_TRUE));
369 else 369 else
370 eo_do(globalGraphical.mesh, evas_3d_mesh_color_pick_enable_set(EINA_FALSE)); 370 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_color_pick_enable_set(EINA_FALSE));
371 371
372 if (globalGraphical.flags.blend_enable) 372 if (globalGraphical.flags.blend_enable)
373 { 373 {
374 eo_do(globalGraphical.mesh, evas_3d_mesh_blending_enable_set(EINA_TRUE), 374 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
375 evas_3d_mesh_blending_func_set(EVAS_3D_BLEND_SRC_ALPHA, EVAS_3D_BLEND_ONE_MINUS_SRC_ALPHA)); 375 evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_SRC_ALPHA, EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA));
376 } 376 }
377 else 377 else
378 eo_do(globalGraphical.mesh, evas_3d_mesh_blending_enable_set(EINA_FALSE)); 378 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_FALSE));
379 379
380 eo_do(globalGraphical.mesh, evas_3d_mesh_frame_material_set(0, globalGraphical.material)); 380 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material));
381 globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh); 381 globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh);
382 } 382 }
383 383
@@ -386,15 +386,15 @@ _change_scene_setup()
386 for (i = 0; i < quantity; i++) 386 for (i = 0; i < quantity; i++)
387 { 387 {
388 globalGraphical.mesh_node = 388 globalGraphical.mesh_node =
389 eo_add(EVAS_3D_NODE_CLASS, globalGraphical.evas, 389 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
390 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH), 390 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH),
391 evas_3d_node_position_set(globalGraphical.places[i].position.x * 20, 391 evas_canvas3d_node_position_set(globalGraphical.places[i].position.x * 20,
392 globalGraphical.places[i].position.y * 20, 392 globalGraphical.places[i].position.y * 20,
393 globalGraphical.places[i].position.z * 20)); 393 globalGraphical.places[i].position.z * 20));
394 if (globalGraphical.model_path) 394 if (globalGraphical.model_path)
395 eo_do(globalGraphical.mesh_node, evas_3d_node_scale_set(0.2, 0.2, 0.2)); 395 eo_do(globalGraphical.mesh_node, evas_canvas3d_node_scale_set(0.2, 0.2, 0.2));
396 eo_do(globalGraphical.root_node, evas_3d_node_member_add(globalGraphical.mesh_node)); 396 eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.mesh_node));
397 eo_do(globalGraphical.mesh_node, evas_3d_node_mesh_add((Eo*)eina_list_nth(globalGraphical.list_meshes, i))); 397 eo_do(globalGraphical.mesh_node, evas_canvas3d_node_mesh_add((Eo*)eina_list_nth(globalGraphical.list_meshes, i)));
398 globalGraphical.list_nodes = eina_list_append(globalGraphical.list_nodes, globalGraphical.mesh_node); 398 globalGraphical.list_nodes = eina_list_append(globalGraphical.list_nodes, globalGraphical.mesh_node);
399 } 399 }
400 400
@@ -405,16 +405,16 @@ _change_scene_setup()
405 ecore_animator_frametime_set(0.0001); 405 ecore_animator_frametime_set(0.0001);
406 406
407 if (globalGraphical.flags.shadow_enable) 407 if (globalGraphical.flags.shadow_enable)
408 eo_do(globalGraphical.scene, evas_3d_scene_shadows_enable_set(EINA_TRUE)); 408 eo_do(globalGraphical.scene, evas_canvas3d_scene_shadows_enable_set(EINA_TRUE));
409 else 409 else
410 eo_do(globalGraphical.scene, evas_3d_scene_shadows_enable_set(EINA_FALSE)); 410 eo_do(globalGraphical.scene, evas_canvas3d_scene_shadows_enable_set(EINA_FALSE));
411 411
412 if (globalGraphical.flags.colorpick_enable) 412 if (globalGraphical.flags.colorpick_enable)
413 { 413 {
414 eo_do(globalGraphical.scene, evas_3d_scene_color_pick_enable_set(EINA_TRUE)); 414 eo_do(globalGraphical.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_TRUE));
415 } 415 }
416 else 416 else
417 eo_do(globalGraphical.scene, evas_3d_scene_color_pick_enable_set(EINA_FALSE)); 417 eo_do(globalGraphical.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_FALSE));
418} 418}
419 419
420static void 420static void
@@ -425,105 +425,105 @@ _init_scene(Evas_Object *img)
425 /*Allocate memory - eina_mempool*/ 425 /*Allocate memory - eina_mempool*/
426 426
427 /* Add a scene object .*/ 427 /* Add a scene object .*/
428 globalGraphical.scene = eo_add(EVAS_3D_SCENE_CLASS, globalGraphical.evas); 428 globalGraphical.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
429 429
430 /* Add the root node for the scene. */ 430 /* Add the root node for the scene. */
431 globalGraphical.root_node = eo_add(EVAS_3D_NODE_CLASS, globalGraphical.evas, 431 globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
432 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 432 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
433 433
434 /* Add the camera. */ 434 /* Add the camera. */
435 globalGraphical.camera = eo_add(EVAS_3D_CAMERA_CLASS, globalGraphical.evas); 435 globalGraphical.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
436 eo_do(globalGraphical.camera, 436 eo_do(globalGraphical.camera,
437 evas_3d_camera_projection_perspective_set(globalGraphical.angle, 1.0, 2.0, 1000.0)); 437 evas_canvas3d_camera_projection_perspective_set(globalGraphical.angle, 1.0, 2.0, 1000.0));
438 438
439 globalGraphical.camera_node = 439 globalGraphical.camera_node =
440 eo_add(EVAS_3D_NODE_CLASS, globalGraphical.evas, 440 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
441 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 441 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
442 eo_do(globalGraphical.camera_node, 442 eo_do(globalGraphical.camera_node,
443 evas_3d_node_camera_set(globalGraphical.camera), 443 evas_canvas3d_node_camera_set(globalGraphical.camera),
444 evas_3d_node_position_set(0.0, 0.0, 25.0), 444 evas_canvas3d_node_position_set(0.0, 0.0, 25.0),
445 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 445 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
446 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 446 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
447 eo_do(globalGraphical.root_node, evas_3d_node_member_add(globalGraphical.camera_node)); 447 eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.camera_node));
448 448
449 globalGraphical.light = eo_add(EVAS_3D_LIGHT_CLASS, globalGraphical.evas); 449 globalGraphical.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas);
450 eo_do(globalGraphical.light, 450 eo_do(globalGraphical.light,
451 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 451 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
452 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 452 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
453 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 453 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
454 evas_3d_light_projection_perspective_set(globalGraphical.angle / 5, 1.0, 1.0, 1000.0), 454 evas_canvas3d_light_projection_perspective_set(globalGraphical.angle / 5, 1.0, 1.0, 1000.0),
455 /*evas_3d_light_projection_perspective_set(value, ...) => 455 /*evas_canvas3d_light_projection_perspective_set(value, ...) =>
456 evas_3d_light_spot_cutoff_set(~(value / 3))*/ 456 evas_canvas3d_light_spot_cutoff_set(~(value / 3))*/
457 evas_3d_light_spot_cutoff_set(globalGraphical.angle / 15)); 457 evas_canvas3d_light_spot_cutoff_set(globalGraphical.angle / 15));
458 458
459 globalGraphical.light_node = 459 globalGraphical.light_node =
460 eo_add(EVAS_3D_NODE_CLASS, globalGraphical.evas, 460 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
461 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 461 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
462 eo_do(globalGraphical.light_node, 462 eo_do(globalGraphical.light_node,
463 evas_3d_node_light_set(globalGraphical.light), 463 evas_canvas3d_node_light_set(globalGraphical.light),
464 evas_3d_node_position_set(0.0, 100.0, 1.0), 464 evas_canvas3d_node_position_set(0.0, 100.0, 1.0),
465 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 465 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
466 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 466 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
467 eo_do(globalGraphical.root_node, evas_3d_node_member_add(globalGraphical.light_node)); 467 eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.light_node));
468 468
469 469
470 globalGraphical.material = eo_add(EVAS_3D_MATERIAL_CLASS, globalGraphical.evas); 470 globalGraphical.material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
471 globalGraphical.texture = eo_add(EVAS_3D_TEXTURE_CLASS, globalGraphical.evas); 471 globalGraphical.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
472 eo_do(globalGraphical.texture, 472 eo_do(globalGraphical.texture,
473 evas_3d_texture_file_set("target_texture.png", NULL), 473 evas_canvas3d_texture_file_set("target_texture.png", NULL),
474 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, 474 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
475 EVAS_3D_TEXTURE_FILTER_LINEAR), 475 EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR),
476 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 476 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
477 EVAS_3D_WRAP_MODE_REPEAT)); 477 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
478 eo_do(globalGraphical.material, 478 eo_do(globalGraphical.material,
479 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, globalGraphical.texture), 479 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, globalGraphical.texture),
480 evas_3d_material_texture_set(EVAS_3D_MATERIAL_AMBIENT, globalGraphical.texture), 480 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, globalGraphical.texture),
481 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 481 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
482 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 482 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
483 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 483 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
484 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 484 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
485 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 1.0, 0.2, 0.2, 0.2), 485 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 1.0, 0.2, 0.2, 0.2),
486 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 0.0, 0.0, 0.2), 486 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 0.0, 0.0, 0.2),
487 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2)); 487 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2));
488 /* Add the mesh with target precision */ 488 /* Add the mesh with target precision */
489 _sphere_init(globalGraphical.precision); 489 _sphere_init(globalGraphical.precision);
490 490
491 for (i = 0; i < quantity; i++) 491 for (i = 0; i < quantity; i++)
492 { 492 {
493 globalGraphical.mesh = eo_add(EVAS_3D_MESH_CLASS, globalGraphical.evas); 493 globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
494 if (!globalGraphical.model_path) 494 if (!globalGraphical.model_path)
495 { 495 {
496 eo_do(globalGraphical.mesh, 496 eo_do(globalGraphical.mesh,
497 evas_3d_mesh_vertex_count_set(globalGraphical.vertex_count), 497 evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
498 evas_3d_mesh_frame_add(0), 498 evas_canvas3d_mesh_frame_add(0),
499 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_POSITION, 499 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
500 sizeof(vertex), 500 sizeof(vertex),
501 &globalGraphical.vertices[0].position), 501 &globalGraphical.vertices[0].position),
502 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_NORMAL, 502 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
503 sizeof(vertex), 503 sizeof(vertex),
504 &globalGraphical.vertices[0].normal), 504 &globalGraphical.vertices[0].normal),
505 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_TANGENT, 505 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
506 sizeof(vertex), 506 sizeof(vertex),
507 &globalGraphical.vertices[0].tangent), 507 &globalGraphical.vertices[0].tangent),
508 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_COLOR, 508 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
509 sizeof(vertex), &globalGraphical.vertices[0].color), 509 sizeof(vertex), &globalGraphical.vertices[0].color),
510 evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_TEXCOORD, 510 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
511 sizeof(vertex), 511 sizeof(vertex),
512 &globalGraphical.vertices[0].texcoord), 512 &globalGraphical.vertices[0].texcoord),
513 513
514 evas_3d_mesh_index_data_copy_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 514 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
515 globalGraphical.index_count, &globalGraphical.indices[0]), 515 globalGraphical.index_count, &globalGraphical.indices[0]),
516 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 516 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
517 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 517 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
518 } 518 }
519 else 519 else
520 { 520 {
521 eo_do(globalGraphical.mesh, 521 eo_do(globalGraphical.mesh,
522 efl_file_set(globalGraphical.model_path, NULL), 522 efl_file_set(globalGraphical.model_path, NULL),
523 evas_3d_mesh_frame_material_set(0, globalGraphical.material), 523 evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material),
524 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 524 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
525 } 525 }
526 eo_do(globalGraphical.mesh, evas_3d_mesh_frame_material_set(0, globalGraphical.material)); 526 eo_do(globalGraphical.mesh, evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material));
527 globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh); 527 globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh);
528 } 528 }
529 529
@@ -533,24 +533,24 @@ _init_scene(Evas_Object *img)
533 for (i = 0; i < quantity; i++) 533 for (i = 0; i < quantity; i++)
534 { 534 {
535 globalGraphical.mesh_node = 535 globalGraphical.mesh_node =
536 eo_add(EVAS_3D_NODE_CLASS, globalGraphical.evas, 536 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
537 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH), 537 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH),
538 evas_3d_node_position_set(globalGraphical.places[i].position.x * 20, 538 evas_canvas3d_node_position_set(globalGraphical.places[i].position.x * 20,
539 globalGraphical.places[i].position.y * 20, 539 globalGraphical.places[i].position.y * 20,
540 globalGraphical.places[i].position.z * 20)); 540 globalGraphical.places[i].position.z * 20));
541 if (globalGraphical.model_path) 541 if (globalGraphical.model_path)
542 eo_do(globalGraphical.mesh_node, evas_3d_node_scale_set(0.2, 0.2, 0.2)); 542 eo_do(globalGraphical.mesh_node, evas_canvas3d_node_scale_set(0.2, 0.2, 0.2));
543 eo_do(globalGraphical.root_node, evas_3d_node_member_add(globalGraphical.mesh_node)); 543 eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.mesh_node));
544 eo_do(globalGraphical.mesh_node, evas_3d_node_mesh_add((Eo*)eina_list_nth(globalGraphical.list_meshes, i))); 544 eo_do(globalGraphical.mesh_node, evas_canvas3d_node_mesh_add((Eo*)eina_list_nth(globalGraphical.list_meshes, i)));
545 globalGraphical.list_nodes = eina_list_append(globalGraphical.list_nodes, globalGraphical.mesh_node); 545 globalGraphical.list_nodes = eina_list_append(globalGraphical.list_nodes, globalGraphical.mesh_node);
546 } 546 }
547 547
548 _init_bounding(); 548 _init_bounding();
549 evas_object_geometry_get(img, &x, &y, &w, &h); 549 evas_object_geometry_get(img, &x, &y, &w, &h);
550 eo_do(globalGraphical.scene, 550 eo_do(globalGraphical.scene,
551 evas_3d_scene_root_node_set(globalGraphical.root_node), 551 evas_canvas3d_scene_root_node_set(globalGraphical.root_node),
552 evas_3d_scene_camera_node_set(globalGraphical.camera_node), 552 evas_canvas3d_scene_camera_node_set(globalGraphical.camera_node),
553 evas_3d_scene_size_set(w, h)); 553 evas_canvas3d_scene_size_set(w, h));
554 554
555 ecore_animator_frametime_set(1.0 / (globalGraphical.speed)); 555 ecore_animator_frametime_set(1.0 / (globalGraphical.speed));
556} 556}
diff --git a/src/examples/performance/performance.c b/src/examples/performance/performance.c
index 089cbddaa..968418e3f 100644
--- a/src/examples/performance/performance.c
+++ b/src/examples/performance/performance.c
@@ -80,18 +80,18 @@ static Eina_Bool
80_animate_scene(void *data) 80_animate_scene(void *data)
81{ 81{
82 Eina_List *l; 82 Eina_List *l;
83 Evas_3D_Node *node; 83 Evas_Canvas3D_Node *node;
84 84
85 static float angle = 0.0f; 85 static float angle = 0.0f;
86 angle += 0.03; 86 angle += 0.03;
87 87
88 eo_do((Evas_3D_Node *)data, 88 eo_do((Evas_Canvas3D_Node *)data,
89 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 8 * sin(angle), 0.0, 8 * cos(angle), 89 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 8 * sin(angle), 0.0, 8 * cos(angle),
90 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 90 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
91 91
92 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node) 92 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
93 { 93 {
94 eo_do(node, evas_3d_node_orientation_angle_axis_set(10 * angle, 1.0, 1.0, 0.0)); 94 eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(10 * angle, 1.0, 1.0, 0.0));
95 } 95 }
96 96
97 /* Rotate */ 97 /* Rotate */
@@ -113,8 +113,8 @@ _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
113 int scene_w, scene_h; 113 int scene_w, scene_h;
114 Evas_Real scene_x, scene_y; 114 Evas_Real scene_x, scene_y;
115 Evas_Real s, t; 115 Evas_Real s, t;
116 Evas_3D_Node *n; 116 Evas_Canvas3D_Node *n;
117 Evas_3D_Mesh *m; 117 Evas_Canvas3D_Mesh *m;
118 Eina_Bool pick; 118 Eina_Bool pick;
119 clock_t time; 119 clock_t time;
120 float diff_sec; 120 float diff_sec;
@@ -132,7 +132,7 @@ _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
132 obj_x = ev->canvas.x - x; 132 obj_x = ev->canvas.x - x;
133 obj_y = ev->canvas.y - y; 133 obj_y = ev->canvas.y - y;
134 134
135 eo_do(globalGraphical.scene, evas_3d_scene_size_get(&scene_w, &scene_h)); 135 eo_do(globalGraphical.scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
136 136
137 scene_x = obj_x * scene_w / (Evas_Real)w; 137 scene_x = obj_x * scene_w / (Evas_Real)w;
138 scene_y = obj_y * scene_h / (Evas_Real)h; 138 scene_y = obj_y * scene_h / (Evas_Real)h;
@@ -140,29 +140,29 @@ _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
140 time = clock(); 140 time = clock();
141 if (globalGraphical.flags.colorpick_enable) 141 if (globalGraphical.flags.colorpick_enable)
142 { 142 {
143 eo_do(globalGraphical.scene, pick = evas_3d_scene_color_pick_enable_set(EINA_TRUE)); 143 eo_do(globalGraphical.scene, pick = evas_canvas3d_scene_color_pick_enable_set(EINA_TRUE));
144 eo_do(globalGraphical.scene, 144 eo_do(globalGraphical.scene,
145 pick = evas_3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL)); 145 pick = evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL));
146 time = clock() - time; 146 time = clock() - time;
147 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10; 147 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10;
148 if (pick) 148 if (pick)
149 { 149 {
150 fprintf(stdout, "Boom! Color pick time expended for pick: %2.7f \n", diff_sec); 150 fprintf(stdout, "Boom! Color pick time expended for pick: %2.7f \n", diff_sec);
151 if (n != globalGraphical.mesh_nodebox) 151 if (n != globalGraphical.mesh_nodebox)
152 eo_do(n, evas_3d_node_scale_set(0.5, 0.5, 0.5)); 152 eo_do(n, evas_canvas3d_node_scale_set(0.5, 0.5, 0.5));
153 } 153 }
154 } 154 }
155 else 155 else
156 { 156 {
157 eo_do(globalGraphical.scene, pick = evas_3d_scene_color_pick_enable_set(EINA_FALSE)); 157 eo_do(globalGraphical.scene, pick = evas_canvas3d_scene_color_pick_enable_set(EINA_FALSE));
158 eo_do(globalGraphical.scene, pick = evas_3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); 158 eo_do(globalGraphical.scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
159 time = clock() - time; 159 time = clock() - time;
160 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10; 160 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10;
161 if (pick) 161 if (pick)
162 { 162 {
163 fprintf(stdout, "Boom! Geometry pick time expended for pick: %2.7f, TexCoord (%f, %f)\n", diff_sec, s, t); 163 fprintf(stdout, "Boom! Geometry pick time expended for pick: %2.7f, TexCoord (%f, %f)\n", diff_sec, s, t);
164 if (n != globalGraphical.mesh_nodebox) 164 if (n != globalGraphical.mesh_nodebox)
165 eo_do(n, evas_3d_node_scale_set(0.5, 0.5, 0.5)); 165 eo_do(n, evas_canvas3d_node_scale_set(0.5, 0.5, 0.5));
166 } 166 }
167 } 167 }
168 } 168 }
@@ -200,16 +200,16 @@ _node_orientation_change_cb(void *data, Evas_Object *obj, void *event_info)
200{ 200{
201 Elm_Object_Item *it; 201 Elm_Object_Item *it;
202 Eina_List *l; 202 Eina_List *l;
203 Evas_3D_Node *node; 203 Evas_Canvas3D_Node *node;
204 it = elm_flipselector_selected_item_get((Evas_Object*)data); 204 it = elm_flipselector_selected_item_get((Evas_Object*)data);
205 const char *str = elm_object_item_text_get(it); 205 const char *str = elm_object_item_text_get(it);
206 if (str && !strcmp(str, "root node")) 206 if (str && !strcmp(str, "root node"))
207 eo_do(globalGraphical.root_node, evas_3d_node_orientation_angle_axis_set(15, 1.0, 1.0, 1.0)); 207 eo_do(globalGraphical.root_node, evas_canvas3d_node_orientation_angle_axis_set(15, 1.0, 1.0, 1.0));
208 else 208 else
209 { 209 {
210 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node) 210 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
211 { 211 {
212 eo_do((Eo*)node, evas_3d_node_orientation_angle_axis_set(15, 1.0, 1.0, 1.0)); 212 eo_do((Eo*)node, evas_canvas3d_node_orientation_angle_axis_set(15, 1.0, 1.0, 1.0));
213 } 213 }
214 } 214 }
215} 215}
@@ -218,16 +218,16 @@ _node_position_change_cb(void *data, Evas_Object *obj, void *event_info)
218{ 218{
219 Elm_Object_Item *it; 219 Elm_Object_Item *it;
220 Eina_List *l; 220 Eina_List *l;
221 Evas_3D_Node *node; 221 Evas_Canvas3D_Node *node;
222 it = elm_flipselector_selected_item_get((Evas_Object*)data); 222 it = elm_flipselector_selected_item_get((Evas_Object*)data);
223 const char *str = elm_object_item_text_get(it); 223 const char *str = elm_object_item_text_get(it);
224 if (str && !strcmp(str, "root node")) 224 if (str && !strcmp(str, "root node"))
225 eo_do(globalGraphical.root_node, evas_3d_node_position_set(10.0, 1.0, 1.0)); 225 eo_do(globalGraphical.root_node, evas_canvas3d_node_position_set(10.0, 1.0, 1.0));
226 else 226 else
227 { 227 {
228 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node) 228 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
229 { 229 {
230 eo_do((Eo*)node, evas_3d_node_position_set(1.0, 1.0, 1.0)); 230 eo_do((Eo*)node, evas_canvas3d_node_position_set(1.0, 1.0, 1.0));
231 } 231 }
232 } 232 }
233} 233}
@@ -236,16 +236,16 @@ _node_scale_change_cb(void *data, Evas_Object *obj, void *event_info)
236{ 236{
237 Elm_Object_Item *it; 237 Elm_Object_Item *it;
238 Eina_List *l; 238 Eina_List *l;
239 Evas_3D_Node *node; 239 Evas_Canvas3D_Node *node;
240 it = elm_flipselector_selected_item_get((Evas_Object*)data); 240 it = elm_flipselector_selected_item_get((Evas_Object*)data);
241 const char *str = elm_object_item_text_get(it); 241 const char *str = elm_object_item_text_get(it);
242 if (str && !strcmp(str, "root node")) 242 if (str && !strcmp(str, "root node"))
243 eo_do(globalGraphical.root_node, evas_3d_node_scale_set(1.0, 1.0, 1.0)); 243 eo_do(globalGraphical.root_node, evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
244 else 244 else
245 { 245 {
246 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node) 246 EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
247 { 247 {
248 eo_do((Eo*)node, evas_3d_node_scale_set(1.0, 1.0, 1.0)); 248 eo_do((Eo*)node, evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
249 } 249 }
250 } 250 }
251} 251}
diff --git a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
index c55352094..53fae1d41 100644
--- a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
@@ -352,7 +352,7 @@ _restart_level(void *data, Evas_Object *btn, void *ev)
352 EINA_LIST_FOREACH(scene->items, l, item) 352 EINA_LIST_FOREACH(scene->items, l, item)
353 { 353 {
354 eo_do(scene->root_node, 354 eo_do(scene->root_node,
355 evas_3d_node_member_del(item)); 355 evas_canvas3d_node_member_del(item));
356 scene->items = eina_list_remove_list(scene->items, l); 356 scene->items = eina_list_remove_list(scene->items, l);
357 } 357 }
358 358
@@ -361,7 +361,7 @@ _restart_level(void *data, Evas_Object *btn, void *ev)
361 361
362 EINA_LIST_FOREACH(scene->items, l, item) 362 EINA_LIST_FOREACH(scene->items, l, item)
363 eo_do(scene->root_node, 363 eo_do(scene->root_node,
364 evas_3d_node_member_add(item)); 364 evas_canvas3d_node_member_add(item));
365 365
366 ball_position_x = 0.0; 366 ball_position_x = 0.0;
367 ball_position_y = -1.0; 367 ball_position_y = -1.0;
@@ -456,19 +456,19 @@ _quit_game(void *data EINA_UNUSED, Evas_Object *btn EINA_UNUSED, void *ev EINA_U
456static void 456static void
457_camera_setup(Scene_Data *data) 457_camera_setup(Scene_Data *data)
458{ 458{
459 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 459 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
460 eo_do(data->camera, 460 eo_do(data->camera,
461 evas_3d_camera_projection_perspective_set(50.0, 1.0, 1.0, 1000.0)); 461 evas_canvas3d_camera_projection_perspective_set(50.0, 1.0, 1.0, 1000.0));
462 462
463 data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, 463 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
464 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 464 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
465 eo_do(data->camera_node, 465 eo_do(data->camera_node,
466 evas_3d_node_camera_set(data->camera), 466 evas_canvas3d_node_camera_set(data->camera),
467 evas_3d_node_position_set(0.0, 40, 70), 467 evas_canvas3d_node_position_set(0.0, 40, 70),
468 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)); 468 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
469 469
470 eo_do(data->root_node, 470 eo_do(data->root_node,
471 evas_3d_node_member_add(data->camera_node)); 471 evas_canvas3d_node_member_add(data->camera_node));
472} 472}
473 473
474static Eina_Bool 474static Eina_Bool
@@ -477,7 +477,7 @@ _animate_camera(void *data)
477 Scene_Data *scene = (Scene_Data *)data; 477 Scene_Data *scene = (Scene_Data *)data;
478 478
479 eo_do(scene->camera_node, 479 eo_do(scene->camera_node,
480 evas_3d_node_position_set(0.0, camera_y, camera_z)); 480 evas_canvas3d_node_position_set(0.0, camera_y, camera_z));
481 481
482 return EINA_TRUE; 482 return EINA_TRUE;
483} 483}
@@ -485,55 +485,55 @@ _animate_camera(void *data)
485static void 485static void
486_light_setup(Scene_Data *data) 486_light_setup(Scene_Data *data)
487{ 487{
488 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 488 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
489 489
490 eo_do(data->light, 490 eo_do(data->light,
491 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 491 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
492 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 492 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
493 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 493 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
494 evas_3d_light_projection_perspective_set(100.0, 1.0, 1.0, 1000.0)); 494 evas_canvas3d_light_projection_perspective_set(100.0, 1.0, 1.0, 1000.0));
495 495
496 data->light_node = eo_add(EVAS_3D_NODE_CLASS, evas, 496 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
497 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 497 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
498 eo_do(data->light_node, 498 eo_do(data->light_node,
499 evas_3d_node_light_set(data->light), 499 evas_canvas3d_node_light_set(data->light),
500 evas_3d_node_position_set(0.1, 25.0, 0.1), 500 evas_canvas3d_node_position_set(0.1, 25.0, 0.1),
501 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)); 501 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
502 502
503 eo_do(data->root_node, 503 eo_do(data->root_node,
504 evas_3d_node_member_add(data->light_node)); 504 evas_canvas3d_node_member_add(data->light_node));
505} 505}
506 506
507static void 507static void
508_mesh_cube_setup(Scene_Data *data) 508_mesh_cube_setup(Scene_Data *data)
509{ 509{
510 data->mesh_cube = eo_add(EVAS_3D_MESH_CLASS, evas); 510 data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
511 data->material_cube = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 511 data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
512 eo_do(data->material_cube, 512 eo_do(data->material_cube,
513 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 513 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
514 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 514 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
515 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 515 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
516 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 516 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
517 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 517 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
518 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 518 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
519 evas_3d_material_shininess_set(50.0)); 519 evas_canvas3d_material_shininess_set(50.0));
520 520
521 eo_do(data->mesh_cube, 521 eo_do(data->mesh_cube,
522 evas_3d_mesh_vertex_count_set(24), 522 evas_canvas3d_mesh_vertex_count_set(24),
523 evas_3d_mesh_frame_add(0), 523 evas_canvas3d_mesh_frame_add(0),
524 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 524 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
525 12 * sizeof(float), &cube_vertices[ 0]), 525 12 * sizeof(float), &cube_vertices[ 0]),
526 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 526 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
527 12 * sizeof(float), &cube_vertices[ 3]), 527 12 * sizeof(float), &cube_vertices[ 3]),
528 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 528 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
529 12 * sizeof(float), &cube_vertices[ 6]), 529 12 * sizeof(float), &cube_vertices[ 6]),
530 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 530 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
531 12 * sizeof(float), &cube_vertices[10]), 531 12 * sizeof(float), &cube_vertices[10]),
532 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 532 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
533 36, &cube_indices[0]), 533 36, &cube_indices[0]),
534 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 534 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
535 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 535 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
536 evas_3d_mesh_frame_material_set(0, data->material_cube)); 536 evas_canvas3d_mesh_frame_material_set(0, data->material_cube));
537 537
538} 538}
539static void 539static void
@@ -543,51 +543,51 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
543 Eo *node = NULL; 543 Eo *node = NULL;
544 Eo *material = NULL; 544 Eo *material = NULL;
545 545
546 mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 546 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
547 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 547 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
548 node = eo_add(EVAS_3D_NODE_CLASS, evas, 548 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
549 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 549 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
550 550
551 eo_do(material, 551 eo_do(material,
552 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 552 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
553 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 553 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
554 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 554 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
555 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.0, 1.0, 1.0, 1.0), 555 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 1.0, 1.0, 1.0),
556 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 556 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
557 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 557 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
558 evas_3d_material_shininess_set(50.0)); 558 evas_canvas3d_material_shininess_set(50.0));
559 559
560 if (color) 560 if (color)
561 eo_do(material, 561 eo_do(material,
562 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.0, 0.7, 1.0, 1.0)); 562 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 0.7, 1.0, 1.0));
563 else 563 else
564 eo_do(material, 564 eo_do(material,
565 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.0, 1.0, 1.0, 1.0)); 565 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 1.0, 1.0, 1.0));
566 566
567 eo_do(mesh, 567 eo_do(mesh,
568 evas_3d_mesh_vertex_count_set(24), 568 evas_canvas3d_mesh_vertex_count_set(24),
569 evas_3d_mesh_frame_add(0), 569 evas_canvas3d_mesh_frame_add(0),
570 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 570 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
571 12 * sizeof(float), &cube_vertices[ 0]), 571 12 * sizeof(float), &cube_vertices[ 0]),
572 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 572 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
573 12 * sizeof(float), &cube_vertices[ 3]), 573 12 * sizeof(float), &cube_vertices[ 3]),
574 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 574 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
575 12 * sizeof(float), &cube_vertices[ 6]), 575 12 * sizeof(float), &cube_vertices[ 6]),
576 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 576 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
577 12 * sizeof(float), &cube_vertices[10]), 577 12 * sizeof(float), &cube_vertices[10]),
578 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 578 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
579 36, &cube_indices[0]), 579 36, &cube_indices[0]),
580 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 580 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
581 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 581 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
582 evas_3d_mesh_frame_material_set(0, material)); 582 evas_canvas3d_mesh_frame_material_set(0, material));
583 583
584 eo_do(data->root_node, 584 eo_do(data->root_node,
585 evas_3d_node_member_add(node)); 585 evas_canvas3d_node_member_add(node));
586 586
587 eo_do(node, 587 eo_do(node,
588 evas_3d_node_mesh_add(mesh), 588 evas_canvas3d_node_mesh_add(mesh),
589 evas_3d_node_position_set(x, y, z); 589 evas_canvas3d_node_position_set(x, y, z);
590 evas_3d_node_scale_set(scale_x, scale_y, scale_z)); 590 evas_canvas3d_node_scale_set(scale_x, scale_y, scale_z));
591 591
592} 592}
593static void 593static void
@@ -605,16 +605,16 @@ _create_cubes(Scene_Data *data, Evas_Real r, int count)
605 Eo *node = NULL; 605 Eo *node = NULL;
606 606
607 alpha = d_alpha * i * M_PI / 180; 607 alpha = d_alpha * i * M_PI / 180;
608 node = eo_add(EVAS_3D_NODE_CLASS, evas, 608 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
609 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 609 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
610 610
611 eo_do(node, 611 eo_do(node,
612 evas_3d_node_mesh_add(data->mesh_cube), 612 evas_canvas3d_node_mesh_add(data->mesh_cube),
613 evas_3d_node_position_set(r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha)); 613 evas_canvas3d_node_position_set(r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha));
614 evas_3d_node_scale_set(1.0, 1.0, 1.0)); 614 evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
615 615
616 eo_do(data->root_node, 616 eo_do(data->root_node,
617 evas_3d_node_member_add(node)); 617 evas_canvas3d_node_member_add(node));
618 618
619 data->items = eina_list_append(data->items, node); 619 data->items = eina_list_append(data->items, node);
620 } 620 }
@@ -625,45 +625,45 @@ _mesh_ball_setup(Scene_Data *data)
625{ 625{
626 _sphere_init(100); 626 _sphere_init(100);
627 627
628 data->mesh_ball = eo_add(EVAS_3D_MESH_CLASS, evas); 628 data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
629 data->material_ball = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 629 data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
630 data->mesh_node_ball = eo_add(EVAS_3D_NODE_CLASS, evas, 630 data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
631 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 631 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
632 632
633 /* Setup material for ball. */ 633 /* Setup material for ball. */
634 eo_do(data->material_ball, 634 eo_do(data->material_ball,
635 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 635 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
636 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 636 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
637 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 637 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
638 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 638 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
639 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 639 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
640 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 640 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
641 evas_3d_material_shininess_set(50.0)); 641 evas_canvas3d_material_shininess_set(50.0));
642 642
643 /* Setup mesh for ball. */ 643 /* Setup mesh for ball. */
644 eo_do(data->mesh_ball, 644 eo_do(data->mesh_ball,
645 evas_3d_mesh_vertex_count_set(vertex_count), 645 evas_canvas3d_mesh_vertex_count_set(vertex_count),
646 evas_3d_mesh_frame_add(0), 646 evas_canvas3d_mesh_frame_add(0),
647 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 647 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
648 sizeof(vertex), &vertices[0].position), 648 sizeof(vertex), &vertices[0].position),
649 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 649 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
650 sizeof(vertex), &vertices[0].normal), 650 sizeof(vertex), &vertices[0].normal),
651 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TANGENT, 651 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
652 sizeof(vertex), &vertices[0].tangent), 652 sizeof(vertex), &vertices[0].tangent),
653 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 653 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
654 sizeof(vertex), &vertices[0].color), 654 sizeof(vertex), &vertices[0].color),
655 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 655 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
656 sizeof(vertex), &vertices[0].texcoord), 656 sizeof(vertex), &vertices[0].texcoord),
657 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]), 657 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
658 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 658 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
659 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 659 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
660 evas_3d_mesh_frame_material_set(0, data->material_ball)); 660 evas_canvas3d_mesh_frame_material_set(0, data->material_ball));
661 661
662 eo_do(data->root_node, 662 eo_do(data->root_node,
663 evas_3d_node_member_add(data->mesh_node_ball)); 663 evas_canvas3d_node_member_add(data->mesh_node_ball));
664 664
665 eo_do(data->mesh_node_ball, 665 eo_do(data->mesh_node_ball,
666 evas_3d_node_mesh_add(data->mesh_ball)); 666 evas_canvas3d_node_mesh_add(data->mesh_ball));
667} 667}
668 668
669static void 669static void
@@ -671,16 +671,16 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
671{ 671{
672 Eina_List *l = NULL; 672 Eina_List *l = NULL;
673 Eo *item = NULL; 673 Eo *item = NULL;
674 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 674 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
675 675
676 /* Add the root node for the scene. */ 676 /* Add the root node for the scene. */
677 data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 677 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
678 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 678 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
679 679
680 eo_do(data->scene, 680 eo_do(data->scene,
681 evas_3d_scene_size_set(WIDTH, HEIGHT), 681 evas_canvas3d_scene_size_set(WIDTH, HEIGHT),
682 evas_3d_scene_shadows_enable_set(EINA_TRUE), 682 evas_canvas3d_scene_shadows_enable_set(EINA_TRUE),
683 evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); 683 evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
684 684
685 _camera_setup(data); 685 _camera_setup(data);
686 _light_setup(data); 686 _light_setup(data);
@@ -698,8 +698,8 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
698 nodes = eina_list_append(nodes, item); 698 nodes = eina_list_append(nodes, item);
699 699
700 eo_do(data->scene, 700 eo_do(data->scene,
701 evas_3d_scene_root_node_set(data->root_node), 701 evas_canvas3d_scene_root_node_set(data->root_node),
702 evas_3d_scene_camera_node_set(data->camera_node)); 702 evas_canvas3d_scene_camera_node_set(data->camera_node));
703} 703}
704 704
705char score_buffer[32]; 705char score_buffer[32];
@@ -738,7 +738,7 @@ _animate_ball(void *data)
738 elm_object_signal_emit(layout, "play", "efl_game"); 738 elm_object_signal_emit(layout, "play", "efl_game");
739 739
740 eo_do(scene->mesh_node_ball, 740 eo_do(scene->mesh_node_ball,
741 evas_3d_node_position_set(ball_position_x, ball_position_y, ball_position_z)); 741 evas_canvas3d_node_position_set(ball_position_x, ball_position_y, ball_position_z));
742 742
743 if ((ball_position_x < -21.0) || (ball_position_x > 21.0) || (ball_position_z < -21.0) || (ball_position_z > 21.0)) 743 if ((ball_position_x < -21.0) || (ball_position_x > 21.0) || (ball_position_z < -21.0) || (ball_position_z > 21.0))
744 { 744 {
@@ -792,12 +792,12 @@ _animate_ball(void *data)
792 } 792 }
793 793
794 eo_do(scene->mesh_node_ball, 794 eo_do(scene->mesh_node_ball,
795 evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &x, &y, &z)); 795 evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z));
796 796
797 EINA_LIST_FOREACH(scene->items, l, node) 797 EINA_LIST_FOREACH(scene->items, l, node)
798 { 798 {
799 eo_do(node, 799 eo_do(node,
800 evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &xx, &yy, &zz)); 800 evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &xx, &yy, &zz));
801 801
802 d_x = xx - x; 802 d_x = xx - x;
803 d_y = yy - y; 803 d_y = yy - y;
@@ -806,7 +806,7 @@ _animate_ball(void *data)
806 if (d_x < 2.0 && d_x > -2.0 && d_y < 2.0 && d_y > -2.0 && d_z < 2.0 && d_z > -2.0) 806 if (d_x < 2.0 && d_x > -2.0 && d_y < 2.0 && d_y > -2.0 && d_z < 2.0 && d_z > -2.0)
807 { 807 {
808 eo_do(scene->root_node, 808 eo_do(scene->root_node,
809 evas_3d_node_member_del(node)); 809 evas_canvas3d_node_member_del(node));
810 scene->items = eina_list_remove_list(scene->items, l); 810 scene->items = eina_list_remove_list(scene->items, l);
811 811
812 i--; 812 i--;
@@ -839,7 +839,7 @@ _animate_cubes(void *data)
839 839
840 EINA_LIST_FOREACH(scene->items, l, cube) 840 EINA_LIST_FOREACH(scene->items, l, cube)
841 eo_do(cube, 841 eo_do(cube,
842 evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); 842 evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
843 843
844 /* Rotate */ 844 /* Rotate */
845 if (angle > 360.0) 845 if (angle > 360.0)