diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/scenri.c | 226 |
1 files changed, 113 insertions, 113 deletions
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c index 0b72b20..02be81c 100644 --- a/src/extantz/scenri.c +++ b/src/extantz/scenri.c | |||
@@ -36,7 +36,7 @@ static void _animateCube(ExtantzStuffs *stuffs) | |||
36 | static float angle = 0.0f; | 36 | static float angle = 0.0f; |
37 | static int frame = 0; | 37 | static int frame = 0; |
38 | static int inc = 1; | 38 | static int inc = 1; |
39 | Evas_3D_Mesh *m; | 39 | Eo *m; |
40 | 40 | ||
41 | eina_accessor_data_get(stuffs->aMesh, 0, (void **) &m); | 41 | eina_accessor_data_get(stuffs->aMesh, 0, (void **) &m); |
42 | 42 | ||
@@ -48,8 +48,8 @@ static void _animateCube(ExtantzStuffs *stuffs) | |||
48 | else if (frame <= 0) inc = 1; | 48 | else if (frame <= 0) inc = 1; |
49 | 49 | ||
50 | eo_do(stuffs->mesh_node, | 50 | eo_do(stuffs->mesh_node, |
51 | evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0), | 51 | evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0), |
52 | evas_3d_node_mesh_frame_set(m, frame) | 52 | evas_canvas3d_node_mesh_frame_set(m, frame) |
53 | ); | 53 | ); |
54 | } | 54 | } |
55 | 55 | ||
@@ -60,20 +60,20 @@ static void _animateSphere(ExtantzStuffs *stuffs) | |||
60 | earthAngle += 0.3; | 60 | earthAngle += 0.3; |
61 | if (earthAngle > 360.0) earthAngle -= 360.0f; | 61 | if (earthAngle > 360.0) earthAngle -= 360.0f; |
62 | eo_do(stuffs->mesh_node, | 62 | eo_do(stuffs->mesh_node, |
63 | evas_3d_node_orientation_angle_axis_set(earthAngle, 0.0, 1.0, 0.0) | 63 | evas_canvas3d_node_orientation_angle_axis_set(earthAngle, 0.0, 1.0, 0.0) |
64 | ); | 64 | ); |
65 | } | 65 | } |
66 | 66 | ||
67 | static void _animateSonic(ExtantzStuffs *stuffs) | 67 | static void _animateSonic(ExtantzStuffs *stuffs) |
68 | { | 68 | { |
69 | static int sonicFrame = 0; | 69 | static int sonicFrame = 0; |
70 | Evas_3D_Mesh *m; | 70 | Eo *m; |
71 | 71 | ||
72 | eina_accessor_data_get(stuffs->aMesh, 0, (void **) &m); | 72 | eina_accessor_data_get(stuffs->aMesh, 0, (void **) &m); |
73 | sonicFrame += 32; | 73 | sonicFrame += 32; |
74 | if (sonicFrame > 256 * 50) sonicFrame = 0; | 74 | if (sonicFrame > 256 * 50) sonicFrame = 0; |
75 | eo_do(stuffs->mesh_node, | 75 | eo_do(stuffs->mesh_node, |
76 | evas_3d_node_mesh_frame_set(m, sonicFrame) | 76 | evas_canvas3d_node_mesh_frame_set(m, sonicFrame) |
77 | ); | 77 | ); |
78 | } | 78 | } |
79 | 79 | ||
@@ -98,8 +98,8 @@ static void _on_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void | |||
98 | int scene_w, scene_h; | 98 | int scene_w, scene_h; |
99 | Evas_Real scene_x, scene_y; | 99 | Evas_Real scene_x, scene_y; |
100 | Evas_Real s, t; | 100 | Evas_Real s, t; |
101 | Evas_3D_Node *n; | 101 | Eo *n; |
102 | Evas_3D_Mesh *m; | 102 | Eo *m; |
103 | Eina_Bool pick; | 103 | Eina_Bool pick; |
104 | char *name = NULL; | 104 | char *name = NULL; |
105 | 105 | ||
@@ -108,12 +108,12 @@ static void _on_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void | |||
108 | obj_x = ev->cur.canvas.x - x; | 108 | obj_x = ev->cur.canvas.x - x; |
109 | obj_y = ev->cur.canvas.y - y; | 109 | obj_y = ev->cur.canvas.y - y; |
110 | 110 | ||
111 | eo_do(scene->scene, evas_3d_scene_size_get(&scene_w, &scene_h)); | 111 | eo_do(scene->scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h)); |
112 | 112 | ||
113 | scene_x = obj_x * scene_w / (Evas_Real)w; | 113 | scene_x = obj_x * scene_w / (Evas_Real)w; |
114 | scene_y = obj_y * scene_h / (Evas_Real)h; | 114 | scene_y = obj_y * scene_h / (Evas_Real)h; |
115 | 115 | ||
116 | eo_do(scene->scene, pick = evas_3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); | 116 | eo_do(scene->scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); |
117 | if (pick) | 117 | if (pick) |
118 | name = evas_object_data_get(n, "Name"); | 118 | name = evas_object_data_get(n, "Name"); |
119 | // This is a raw Evas callback, on the Elm image internal Evas_Object. | 119 | // This is a raw Evas callback, on the Elm image internal Evas_Object. |
@@ -140,8 +140,8 @@ static void _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void | |||
140 | int scene_w, scene_h; | 140 | int scene_w, scene_h; |
141 | Evas_Real scene_x, scene_y; | 141 | Evas_Real scene_x, scene_y; |
142 | Evas_Real s, t; | 142 | Evas_Real s, t; |
143 | Evas_3D_Node *n; | 143 | Eo *n; |
144 | Evas_3D_Mesh *m; | 144 | Eo *m; |
145 | Eina_Bool pick; | 145 | Eina_Bool pick; |
146 | char *name = NULL; | 146 | char *name = NULL; |
147 | 147 | ||
@@ -153,12 +153,12 @@ static void _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void | |||
153 | obj_x = ev->canvas.x - x; | 153 | obj_x = ev->canvas.x - x; |
154 | obj_y = ev->canvas.y - y; | 154 | obj_y = ev->canvas.y - y; |
155 | 155 | ||
156 | eo_do(scene->scene, evas_3d_scene_size_get(&scene_w, &scene_h)); | 156 | eo_do(scene->scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h)); |
157 | 157 | ||
158 | scene_x = obj_x * scene_w / (Evas_Real)w; | 158 | scene_x = obj_x * scene_w / (Evas_Real)w; |
159 | scene_y = obj_y * scene_h / (Evas_Real)h; | 159 | scene_y = obj_y * scene_h / (Evas_Real)h; |
160 | 160 | ||
161 | eo_do(scene->scene, pick = evas_3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); | 161 | eo_do(scene->scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); |
162 | if (pick) | 162 | if (pick) |
163 | { | 163 | { |
164 | name = evas_object_data_get(n, "Name"); | 164 | name = evas_object_data_get(n, "Name"); |
@@ -361,12 +361,12 @@ Scene_Data *scenriAdd(Evas_Object *win) | |||
361 | eina_clist_init(&(scene->stuffs)); | 361 | eina_clist_init(&(scene->stuffs)); |
362 | eina_clist_init(&(scene->loading)); | 362 | eina_clist_init(&(scene->loading)); |
363 | 363 | ||
364 | scene->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); | 364 | scene->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE)); |
365 | 365 | ||
366 | scene->scene = eo_add(EVAS_3D_SCENE_CLASS, evas, | 366 | scene->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas, |
367 | evas_3d_scene_root_node_set(scene->root_node), | 367 | evas_canvas3d_scene_root_node_set(scene->root_node), |
368 | evas_3d_scene_size_set(w, h), | 368 | evas_canvas3d_scene_size_set(w, h), |
369 | evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0) | 369 | evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0) |
370 | ); | 370 | ); |
371 | 371 | ||
372 | // Add an image object for 3D scene rendering. | 372 | // Add an image object for 3D scene rendering. |
@@ -383,18 +383,18 @@ Scene_Data *scenriAdd(Evas_Object *win) | |||
383 | elm_object_tooltip_hide(scene->image); | 383 | elm_object_tooltip_hide(scene->image); |
384 | scene->camera_node = cameraAdd(evas, scene, scene->image); | 384 | scene->camera_node = cameraAdd(evas, scene, scene->image); |
385 | 385 | ||
386 | scene->light = eo_add(EVAS_3D_LIGHT_CLASS, evas, | 386 | scene->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas, |
387 | evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), | 387 | evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), |
388 | evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), | 388 | evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), |
389 | evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), | 389 | evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), |
390 | evas_3d_light_directional_set(EINA_TRUE) | 390 | evas_canvas3d_light_directional_set(EINA_TRUE) |
391 | ); | 391 | ); |
392 | scene->light_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT), | 392 | scene->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT), |
393 | evas_3d_node_light_set(scene->light), | 393 | evas_canvas3d_node_light_set(scene->light), |
394 | evas_3d_node_position_set(1000.0, 0.0, 1000.0), | 394 | evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0), |
395 | 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) | 395 | 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) |
396 | ); | 396 | ); |
397 | eo_do(scene->root_node, evas_3d_node_member_add(scene->light_node)); | 397 | eo_do(scene->root_node, evas_canvas3d_node_member_add(scene->light_node)); |
398 | 398 | ||
399 | eo_do(temp, evas_obj_image_scene_set(scene->scene)); | 399 | eo_do(temp, evas_obj_image_scene_set(scene->scene)); |
400 | 400 | ||
@@ -717,9 +717,9 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake) | |||
717 | { | 717 | { |
718 | char buf[PATH_MAX]; | 718 | char buf[PATH_MAX]; |
719 | Material *m; | 719 | Material *m; |
720 | Evas_3D_Texture *t, *t1, *ti; | 720 | Eo *t, *t1, *ti; |
721 | Evas_3D_Material *mi, *mj; | 721 | Eo *mi, *mj; |
722 | Evas_3D_Mesh *me; | 722 | Eo *me; |
723 | 723 | ||
724 | PI("REZZING %s", stuffs->stuffs.name); | 724 | PI("REZZING %s", stuffs->stuffs.name); |
725 | // TODO - These examples just don't fit neatly into anything I can whip up quickly as a data format. | 725 | // TODO - These examples just don't fit neatly into anything I can whip up quickly as a data format. |
@@ -728,13 +728,13 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake) | |||
728 | // Textures | 728 | // Textures |
729 | if (1 == fake) | 729 | if (1 == fake) |
730 | { | 730 | { |
731 | t = eo_add(EVAS_3D_TEXTURE_CLASS, scene->evas, | 731 | t = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, scene->evas, |
732 | evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA, EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels0[0]) | 732 | evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]) |
733 | ); | 733 | ); |
734 | eina_array_push(stuffs->textures, t); | 734 | eina_array_push(stuffs->textures, t); |
735 | 735 | ||
736 | t1 = eo_add(EVAS_3D_TEXTURE_CLASS, scene->evas, | 736 | t1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, scene->evas, |
737 | evas_3d_texture_data_set(EVAS_3D_COLOR_FORMAT_RGBA, EVAS_3D_PIXEL_FORMAT_8888, 4, 4, &pixels1[0]) | 737 | evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0]) |
738 | ); | 738 | ); |
739 | eina_array_push(stuffs->textures, t1); | 739 | eina_array_push(stuffs->textures, t1); |
740 | } | 740 | } |
@@ -742,11 +742,11 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake) | |||
742 | EINA_INARRAY_FOREACH(stuffs->stuffs.details.mesh->materials, m) | 742 | EINA_INARRAY_FOREACH(stuffs->stuffs.details.mesh->materials, m) |
743 | { | 743 | { |
744 | snprintf(buf, sizeof(buf), "%s/%s", prefix_data_get(), m->texture); | 744 | snprintf(buf, sizeof(buf), "%s/%s", prefix_data_get(), m->texture); |
745 | ti = eo_add(EVAS_3D_TEXTURE_CLASS, scene->evas, | 745 | ti = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, scene->evas, |
746 | evas_3d_texture_file_set(buf, NULL), | 746 | evas_canvas3d_texture_file_set(buf, NULL), |
747 | evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, EVAS_3D_TEXTURE_FILTER_LINEAR), // Only for sphere originally. | 747 | evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR), // Only for sphere originally. |
748 | evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, EVAS_3D_TEXTURE_FILTER_NEAREST), // Only for sonic originally. | 748 | evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), // Only for sonic originally. |
749 | evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT) | 749 | evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT) |
750 | ); | 750 | ); |
751 | eina_array_push(stuffs->textures, ti); | 751 | eina_array_push(stuffs->textures, ti); |
752 | } | 752 | } |
@@ -755,53 +755,53 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake) | |||
755 | if (1 == fake) | 755 | if (1 == fake) |
756 | { | 756 | { |
757 | eina_accessor_data_get(stuffs->aTexture, 0, (void **) &t); | 757 | eina_accessor_data_get(stuffs->aTexture, 0, (void **) &t); |
758 | mi = eo_add(EVAS_3D_MATERIAL_CLASS, scene->evas, | 758 | mi = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, scene->evas, |
759 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), | 759 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), |
760 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), | 760 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), |
761 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), | 761 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), |
762 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), | 762 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), |
763 | 763 | ||
764 | evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), | 764 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), |
765 | evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), | 765 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), |
766 | evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), | 766 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), |
767 | evas_3d_material_shininess_set(100.0), | 767 | evas_canvas3d_material_shininess_set(100.0), |
768 | evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, t) | 768 | evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, t) |
769 | ); | 769 | ); |
770 | eina_array_push(stuffs->materials, mi); | 770 | eina_array_push(stuffs->materials, mi); |
771 | 771 | ||
772 | eina_accessor_data_get(stuffs->aTexture, 1, (void **) &t1); | 772 | eina_accessor_data_get(stuffs->aTexture, 1, (void **) &t1); |
773 | eina_accessor_data_get(stuffs->aTexture, 2, (void **) &ti); | 773 | eina_accessor_data_get(stuffs->aTexture, 2, (void **) &ti); |
774 | mj = eo_add(EVAS_3D_MATERIAL_CLASS, scene->evas, | 774 | mj = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, scene->evas, |
775 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), | 775 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), |
776 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), | 776 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), |
777 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), | 777 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), |
778 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), | 778 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), |
779 | 779 | ||
780 | evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), | 780 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0), |
781 | evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), | 781 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0), |
782 | evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), | 782 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), |
783 | evas_3d_material_shininess_set(100.0), | 783 | evas_canvas3d_material_shininess_set(100.0), |
784 | 784 | ||
785 | evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, t1), | 785 | evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, t1), |
786 | evas_3d_material_texture_set(EVAS_3D_MATERIAL_NORMAL, ti) | 786 | evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, ti) |
787 | ); | 787 | ); |
788 | eina_array_push(stuffs->materials, mj); | 788 | eina_array_push(stuffs->materials, mj); |
789 | } | 789 | } |
790 | else | 790 | else |
791 | { | 791 | { |
792 | eina_accessor_data_get(stuffs->aTexture, 0, (void **) &t); | 792 | eina_accessor_data_get(stuffs->aTexture, 0, (void **) &t); |
793 | mi = eo_add(EVAS_3D_MATERIAL_CLASS, scene->evas, | 793 | mi = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, scene->evas, |
794 | evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, t), | 794 | evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, t), |
795 | 795 | ||
796 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), | 796 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), |
797 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), | 797 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), |
798 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), | 798 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE), |
799 | evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), // Not for sphere originally. | 799 | evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), // Not for sphere originally. |
800 | 800 | ||
801 | evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 1.0), | 801 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.01, 0.01, 0.01, 1.0), |
802 | evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), | 802 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0), |
803 | evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), | 803 | evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0), |
804 | evas_3d_material_shininess_set(50.0) | 804 | evas_canvas3d_material_shininess_set(50.0) |
805 | ); | 805 | ); |
806 | eina_array_push(stuffs->materials, mi); | 806 | eina_array_push(stuffs->materials, mi); |
807 | } | 807 | } |
@@ -812,24 +812,24 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake) | |||
812 | { | 812 | { |
813 | eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); | 813 | eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); |
814 | eina_accessor_data_get(stuffs->aMaterial, 1, (void **) &mj); | 814 | eina_accessor_data_get(stuffs->aMaterial, 1, (void **) &mj); |
815 | me = eo_add(EVAS_3D_MESH_CLASS, scene->evas, | 815 | me = eo_add(EVAS_CANVAS3D_MESH_CLASS, scene->evas, |
816 | evas_3d_mesh_vertex_count_set(24), | 816 | evas_canvas3d_mesh_vertex_count_set(24), |
817 | evas_3d_mesh_frame_add(0), | 817 | evas_canvas3d_mesh_frame_add(0), |
818 | 818 | ||
819 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 12 * sizeof(float), &cube_vertices[ 0]), | 819 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]), |
820 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]), | 820 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]), |
821 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 12 * sizeof(float), &cube_vertices[ 6]), | 821 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &cube_vertices[ 6]), |
822 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]), | 822 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]), |
823 | 823 | ||
824 | evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]), | 824 | evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]), |
825 | evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), | 825 | evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), |
826 | 826 | ||
827 | evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_NORMAL_MAP), | 827 | evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP), |
828 | 828 | ||
829 | evas_3d_mesh_frame_material_set(0, mi), | 829 | evas_canvas3d_mesh_frame_material_set(0, mi), |
830 | 830 | ||
831 | evas_3d_mesh_frame_add(20), | 831 | evas_canvas3d_mesh_frame_add(20), |
832 | evas_3d_mesh_frame_material_set(20, mj) | 832 | evas_canvas3d_mesh_frame_material_set(20, mj) |
833 | ); | 833 | ); |
834 | eina_array_push(stuffs->mesh, me); | 834 | eina_array_push(stuffs->mesh, me); |
835 | } | 835 | } |
@@ -838,20 +838,20 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake) | |||
838 | _sphere_init(100); | 838 | _sphere_init(100); |
839 | 839 | ||
840 | eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); | 840 | eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); |
841 | me = eo_add(EVAS_3D_MESH_CLASS, scene->evas, | 841 | me = eo_add(EVAS_CANVAS3D_MESH_CLASS, scene->evas, |
842 | evas_3d_mesh_vertex_count_set(vertex_count), | 842 | evas_canvas3d_mesh_vertex_count_set(vertex_count), |
843 | evas_3d_mesh_frame_add(0), | 843 | evas_canvas3d_mesh_frame_add(0), |
844 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, sizeof(vertex), &sphere_vertices[0].position), | 844 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &sphere_vertices[0].position), |
845 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, sizeof(vertex), &sphere_vertices[0].normal), | 845 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, sizeof(vertex), &sphere_vertices[0].normal), |
846 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TANGENT, sizeof(vertex), &sphere_vertices[0].tangent), | 846 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, sizeof(vertex), &sphere_vertices[0].tangent), |
847 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, sizeof(vertex), &sphere_vertices[0].color), | 847 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, sizeof(vertex), &sphere_vertices[0].color), |
848 | evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, sizeof(vertex), &sphere_vertices[0].texcoord), | 848 | evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &sphere_vertices[0].texcoord), |
849 | 849 | ||
850 | evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &sphere_indices[0]), | 850 | evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &sphere_indices[0]), |
851 | evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), | 851 | evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), |
852 | evas_3d_mesh_frame_material_set(0, mi), | 852 | evas_canvas3d_mesh_frame_material_set(0, mi), |
853 | 853 | ||
854 | evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE) | 854 | evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE) |
855 | ); | 855 | ); |
856 | eina_array_push(stuffs->mesh, me); | 856 | eina_array_push(stuffs->mesh, me); |
857 | } | 857 | } |
@@ -859,23 +859,23 @@ void stuffsSetup(ExtantzStuffs *stuffs, Scene_Data *scene, int fake) | |||
859 | { | 859 | { |
860 | eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); | 860 | eina_accessor_data_get(stuffs->aMaterial, 0, (void **) &mi); |
861 | snprintf(buf, sizeof(buf), "%s/%s", prefix_data_get(), stuffs->stuffs.details.mesh->fileName); | 861 | snprintf(buf, sizeof(buf), "%s/%s", prefix_data_get(), stuffs->stuffs.details.mesh->fileName); |
862 | me = eo_add(EVAS_3D_MESH_CLASS, scene->evas, | 862 | me = eo_add(EVAS_CANVAS3D_MESH_CLASS, scene->evas, |
863 | efl_file_set(buf, NULL), | 863 | efl_file_set(buf, NULL), |
864 | evas_3d_mesh_frame_material_set(0, mi), | 864 | evas_canvas3d_mesh_frame_material_set(0, mi), |
865 | evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG) | 865 | evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG) |
866 | ); | 866 | ); |
867 | eina_array_push(stuffs->mesh, me); | 867 | eina_array_push(stuffs->mesh, me); |
868 | } | 868 | } |
869 | 869 | ||
870 | eina_accessor_data_get(stuffs->aMesh, 0, (void **) &me); | 870 | eina_accessor_data_get(stuffs->aMesh, 0, (void **) &me); |
871 | stuffs->mesh_node = eo_add(EVAS_3D_NODE_CLASS, scene->evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH), | 871 | stuffs->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, scene->evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH), |
872 | eo_key_data_set("Name", stuffs->stuffs.name, NULL), | 872 | eo_key_data_set("Name", stuffs->stuffs.name), |
873 | evas_3d_node_position_set(stuffs->stuffs.details.mesh->pos.x, stuffs->stuffs.details.mesh->pos.y, stuffs->stuffs.details.mesh->pos.z), | 873 | evas_canvas3d_node_position_set(stuffs->stuffs.details.mesh->pos.x, stuffs->stuffs.details.mesh->pos.y, stuffs->stuffs.details.mesh->pos.z), |
874 | evas_3d_node_orientation_set(stuffs->stuffs.details.mesh->rot.x, stuffs->stuffs.details.mesh->rot.y, stuffs->stuffs.details.mesh->rot.z, stuffs->stuffs.details.mesh->rot.w), | 874 | evas_canvas3d_node_orientation_set(stuffs->stuffs.details.mesh->rot.x, stuffs->stuffs.details.mesh->rot.y, stuffs->stuffs.details.mesh->rot.z, stuffs->stuffs.details.mesh->rot.w), |
875 | evas_3d_node_mesh_add(me) | 875 | evas_canvas3d_node_mesh_add(me) |
876 | ); | 876 | ); |
877 | 877 | ||
878 | eo_do(scene->root_node, evas_3d_node_member_add(stuffs->mesh_node)); | 878 | eo_do(scene->root_node, evas_canvas3d_node_member_add(stuffs->mesh_node)); |
879 | eina_clist_add_head(&(scene->stuffs), &(stuffs->node)); | 879 | eina_clist_add_head(&(scene->stuffs), &(stuffs->node)); |
880 | 880 | ||
881 | if (1 == fake) | 881 | if (1 == fake) |