summaryrefslogtreecommitdiff
path: root/unsorted
diff options
context:
space:
mode:
authorOleksandr Shcherbina <o.shcherbina@samsung.com>2015-06-17 16:31:14 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-17 17:52:17 +0200
commit87382a2dad3865fbf62b2dcc89cdc221603fb9ed (patch)
treedf485b433fce82004716d972d91d74b09ac34d94 /unsorted
parent090173037ec978b1c0fe493718f24cb0f382576f (diff)
evas: change interface evas_3d to evas_canvas3d
Summary: Regard to https://phab.enlightenment.org/T2479 it is need for right generation Eolian files Reviewers: cedric Subscribers: cedric, tasn Differential Revision: https://phab.enlightenment.org/D2711 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'unsorted')
-rw-r--r--unsorted/evas/evas-3d-aabb.c144
-rw-r--r--unsorted/evas/evas-3d-blending.c182
-rw-r--r--unsorted/evas/evas-3d-colorpick.c152
-rw-r--r--unsorted/evas/evas-3d-cube-rotate.c96
-rw-r--r--unsorted/evas/evas-3d-cube.c102
-rw-r--r--unsorted/evas/evas-3d-cube2.c136
-rw-r--r--unsorted/evas/evas-3d-eet.c108
-rw-r--r--unsorted/evas/evas-3d-fog.c122
-rw-r--r--unsorted/evas/evas-3d-frustum.c228
-rw-r--r--unsorted/evas/evas-3d-md2.c102
-rw-r--r--unsorted/evas/evas-3d-mmap-set.c110
-rw-r--r--unsorted/evas/evas-3d-obj.c114
-rw-r--r--unsorted/evas/evas-3d-parallax-occlusion.c180
-rw-r--r--unsorted/evas/evas-3d-pick.c96
-rw-r--r--unsorted/evas/evas-3d-ply.c110
-rw-r--r--unsorted/evas/evas-3d-proxy.c102
-rw-r--r--unsorted/evas/evas-3d-shadows.c504
-rw-r--r--unsorted/evas/resources/models/mesh_for_mmap.eetbin20213 -> 19495 bytes
-rw-r--r--unsorted/evas/shooter/evas-3d-shooter-header.c102
-rw-r--r--unsorted/evas/shooter/evas-3d-shooter-header.h16
-rw-r--r--unsorted/evas/shooter/evas-3d-shooter-macros.h118
-rw-r--r--unsorted/evas/shooter/evas-3d-shooter.c418
22 files changed, 1621 insertions, 1621 deletions
diff --git a/unsorted/evas/evas-3d-aabb.c b/unsorted/evas/evas-3d-aabb.c
index 6a9d9051..7b910893 100644
--- a/unsorted/evas/evas-3d-aabb.c
+++ b/unsorted/evas/evas-3d-aabb.c
@@ -57,7 +57,7 @@ _animate_scene(void *data)
57{ 57{
58 static int frame = 0; 58 static int frame = 0;
59 59
60 eo_do((Evas_3D_Node *)data, evas_3d_node_mesh_frame_set(mesh, frame)); 60 eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_mesh_frame_set(mesh, frame));
61 61
62 _redraw_aabb(); 62 _redraw_aabb();
63 63
@@ -78,28 +78,28 @@ static void
78_on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info) 78_on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info)
79{ 79{
80 Evas_Event_Key_Down *ev = event_info; 80 Evas_Event_Key_Down *ev = event_info;
81 Evas_3D_Node *node = (Evas_3D_Node *)data; 81 Evas_Canvas3D_Node *node = (Evas_Canvas3D_Node *)data;
82 82
83 switch(atoi(ev->key)) 83 switch(atoi(ev->key))
84 { 84 {
85 case 1: 85 case 1:
86 { 86 {
87 eo_do(node, evas_3d_node_orientation_angle_axis_set(90, 1.0, 0.0, 0.0)); 87 eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 1.0, 0.0, 0.0));
88 break; 88 break;
89 } 89 }
90 case 2: 90 case 2:
91 { 91 {
92 eo_do(node, evas_3d_node_orientation_angle_axis_set(90, 0.0, 1.0, 0.0)); 92 eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 0.0, 1.0, 0.0));
93 break; 93 break;
94 } 94 }
95 case 3: 95 case 3:
96 { 96 {
97 eo_do(node, evas_3d_node_orientation_angle_axis_set(90, 0.0, 0.0, 1.0)); 97 eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 0.0, 0.0, 1.0));
98 break; 98 break;
99 } 99 }
100 case 4: 100 case 4:
101 { 101 {
102 eo_do(node, evas_3d_node_orientation_angle_axis_set(90, 1.0, 1.0, 0.0)); 102 eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(90, 1.0, 1.0, 0.0));
103 break; 103 break;
104 } 104 }
105 } 105 }
@@ -120,9 +120,9 @@ _redraw_aabb()
120{ 120{
121 Evas_Real x0, y0, z0, x1, y1, z1; 121 Evas_Real x0, y0, z0, x1, y1, z1;
122 122
123 eo_do(mesh_node, evas_3d_node_bounding_box_get(&x0, &y0, &z0, &x1, &y1, &z1)); 123 eo_do(mesh_node, evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0, &x1, &y1, &z1));
124 eo_do(mesh_box_node, evas_3d_node_position_set((x0 + x1)/2, (y0 + y1)/2, (z0 + z1)/2), 124 eo_do(mesh_box_node, evas_canvas3d_node_position_set((x0 + x1)/2, (y0 + y1)/2, (z0 + z1)/2),
125 evas_3d_node_scale_set(x1 - x0, y1 - y0, z1 - z0)); 125 evas_canvas3d_node_scale_set(x1 - x0, y1 - y0, z1 - z0));
126 126
127 return EINA_TRUE; 127 return EINA_TRUE;
128} 128}
@@ -142,107 +142,107 @@ main(void)
142 142
143 evas = ecore_evas_get(ecore_evas); 143 evas = ecore_evas_get(ecore_evas);
144 144
145 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 145 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
146 146
147 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 147 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
148 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 148 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
149 149
150 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 150 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
151 eo_do(camera, 151 eo_do(camera,
152 evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); 152 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
153 153
154 camera_node = 154 camera_node =
155 eo_add(EVAS_3D_NODE_CLASS, evas, 155 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
156 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 156 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
157 eo_do(camera_node, 157 eo_do(camera_node,
158 evas_3d_node_camera_set(camera)); 158 evas_canvas3d_node_camera_set(camera));
159 eo_do(root_node, 159 eo_do(root_node,
160 evas_3d_node_member_add(camera_node)); 160 evas_canvas3d_node_member_add(camera_node));
161 eo_do(camera_node, 161 eo_do(camera_node,
162 evas_3d_node_position_set(100.0, 50.0, 20.0), 162 evas_canvas3d_node_position_set(100.0, 50.0, 20.0),
163 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, 163 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0,
164 EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); 164 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
165 light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 165 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
166 eo_do(light, 166 eo_do(light,
167 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 167 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
168 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 168 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
169 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 169 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
170 evas_3d_light_directional_set(EINA_TRUE)); 170 evas_canvas3d_light_directional_set(EINA_TRUE));
171 171
172 light_node = 172 light_node =
173 eo_add(EVAS_3D_NODE_CLASS, evas, 173 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
174 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 174 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
175 eo_do(light_node, 175 eo_do(light_node,
176 evas_3d_node_light_set(light), 176 evas_canvas3d_node_light_set(light),
177 evas_3d_node_position_set(1000.0, 0.0, 1000.0), 177 evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0),
178 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 178 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
179 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 179 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
180 eo_do(root_node, 180 eo_do(root_node,
181 evas_3d_node_member_add(light_node)); 181 evas_canvas3d_node_member_add(light_node));
182 182
183 mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 183 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
184 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 184 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
185 185
186 eo_do(mesh, 186 eo_do(mesh,
187 efl_file_set(model_path, NULL), 187 efl_file_set(model_path, NULL),
188 evas_3d_mesh_frame_material_set(0, material), 188 evas_canvas3d_mesh_frame_material_set(0, material),
189 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 189 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
190 190
191 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 191 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
192 eo_do(texture, 192 eo_do(texture,
193 evas_3d_texture_file_set(image_path, NULL), 193 evas_canvas3d_texture_file_set(image_path, NULL),
194 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 194 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
195 EVAS_3D_TEXTURE_FILTER_NEAREST), 195 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
196 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 196 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
197 EVAS_3D_WRAP_MODE_REPEAT)); 197 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
198 eo_do(material, 198 eo_do(material,
199 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture), 199 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture),
200 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 200 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
201 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 201 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
202 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 202 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
203 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 203 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
204 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 204 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
205 0.01, 0.01, 0.01, 1.0), 205 0.01, 0.01, 0.01, 1.0),
206 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 206 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
207 1.0, 1.0, 1.0, 1.0), 207 1.0, 1.0, 1.0, 1.0),
208 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 208 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
209 1.0, 1.0, 1.0, 1.0), 209 1.0, 1.0, 1.0, 1.0),
210 evas_3d_material_shininess_set(50.0)); 210 evas_canvas3d_material_shininess_set(50.0));
211 211
212 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 212 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
213 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 213 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
214 mesh_box_node = eo_add(EVAS_3D_NODE_CLASS, evas, 214 mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
215 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 215 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
216 216
217 material_box = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 217 material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
218 eo_do(material_box, evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE)); 218 eo_do(material_box, evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE));
219 219
220 cube = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 220 cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
221 eo_do(cube, 221 eo_do(cube,
222 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_CUBE)); 222 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
223 223
224 mesh_box = eo_add(EVAS_3D_MESH_CLASS, evas); 224 mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
225 eo_do(mesh_box, 225 eo_do(mesh_box,
226 evas_3d_mesh_from_primitive_set(0, cube), 226 evas_canvas3d_mesh_from_primitive_set(0, cube),
227 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_LINES), 227 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES),
228 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_VERTEX_COLOR), 228 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR),
229 evas_3d_mesh_frame_material_set(0, material_box)); 229 evas_canvas3d_mesh_frame_material_set(0, material_box));
230 _redraw_aabb(); 230 _redraw_aabb();
231 231
232 eo_do(root_node, 232 eo_do(root_node,
233 evas_3d_node_member_add(mesh_box_node)); 233 evas_canvas3d_node_member_add(mesh_box_node));
234 eo_do(mesh_box_node, 234 eo_do(mesh_box_node,
235 evas_3d_node_mesh_add(mesh_box)); 235 evas_canvas3d_node_mesh_add(mesh_box));
236 236
237 eo_do(root_node, 237 eo_do(root_node,
238 evas_3d_node_member_add(mesh_node)); 238 evas_canvas3d_node_member_add(mesh_node));
239 eo_do(mesh_node, 239 eo_do(mesh_node,
240 evas_3d_node_mesh_add(mesh)); 240 evas_canvas3d_node_mesh_add(mesh));
241 241
242 eo_do(scene, 242 eo_do(scene,
243 evas_3d_scene_root_node_set(root_node), 243 evas_canvas3d_scene_root_node_set(root_node),
244 evas_3d_scene_camera_node_set(camera_node), 244 evas_canvas3d_scene_camera_node_set(camera_node),
245 evas_3d_scene_size_set(WIDTH, HEIGHT)); 245 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
246 246
247 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 247 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
248 eo_do(background, 248 eo_do(background,
diff --git a/unsorted/evas/evas-3d-blending.c b/unsorted/evas/evas-3d-blending.c
index 790ba44d..b2ea6481 100644
--- a/unsorted/evas/evas-3d-blending.c
+++ b/unsorted/evas/evas-3d-blending.c
@@ -22,35 +22,35 @@
22static const char *blend_func_names[] = 22static const char *blend_func_names[] =
23{ 23{
24 /**< The scale factors for color components is (0, 0, 0, 0)*/ 24 /**< The scale factors for color components is (0, 0, 0, 0)*/
25 "EVAS_3D_BLEND_ZERO", 25 "EVAS_CANVAS3D_BLEND_ZERO",
26 /**< The scale factors for color components is (1, 1, 1, 1)*/ 26 /**< The scale factors for color components is (1, 1, 1, 1)*/
27 "EVAS_3D_BLEND_ONE", 27 "EVAS_CANVAS3D_BLEND_ONE",
28 /**< The scale factors for color components is (Rs/kR, Gs/kG, Bs/kB, As/kA)*/ 28 /**< The scale factors for color components is (Rs/kR, Gs/kG, Bs/kB, As/kA)*/
29 "EVAS_3D_BLEND_SRC_COLOR", 29 "EVAS_CANVAS3D_BLEND_SRC_COLOR",
30 /**< The scale factors for color components is (1, 1, 1, 1) - (Rs/kR, Gs/kG, Bs/kB, As/kA)*/ 30 /**< The scale factors for color components is (1, 1, 1, 1) - (Rs/kR, Gs/kG, Bs/kB, As/kA)*/
31 "EVAS_3D_BLEND_ONE_MINUS_SRC_COLOR", 31 "EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_COLOR",
32 /**< The scale factors for color components is (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/ 32 /**< The scale factors for color components is (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/
33 "EVAS_3D_BLEND_DST_COLOR", 33 "EVAS_CANVAS3D_BLEND_DST_COLOR",
34 /**< The scale factors for color components is (1, 1, 1, 1) - (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/ 34 /**< The scale factors for color components is (1, 1, 1, 1) - (Rd/kR, Gd/kG, Bd/kB, Ad/kA)*/
35 "EVAS_3D_BLEND_ONE_MINUS_DST_COLOR", 35 "EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_COLOR",
36 /**< The scale factors for color components is (As/kA, As/kA, As/kA, As/kA)*/ 36 /**< The scale factors for color components is (As/kA, As/kA, As/kA, As/kA)*/
37 "EVAS_3D_BLEND_SRC_ALPHA", 37 "EVAS_CANVAS3D_BLEND_SRC_ALPHA",
38 /**< The scale factors for color components is (1, 1, 1, 1) - (As/kA, As/kA, As/kA, As/kA)*/ 38 /**< The scale factors for color components is (1, 1, 1, 1) - (As/kA, As/kA, As/kA, As/kA)*/
39 "EVAS_3D_BLEND_ONE_MINUS_SRC_ALPHA", 39 "EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA",
40 /**< The scale factors for color components is (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/ 40 /**< The scale factors for color components is (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/
41 "EVAS_3D_BLEND_DST_ALPHA", 41 "EVAS_CANVAS3D_BLEND_DST_ALPHA",
42 /**< The scale factors for color components is (1, 1, 1, 1) - (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/ 42 /**< The scale factors for color components is (1, 1, 1, 1) - (Ad/kA, Ad/kA, Ad/kA, Ad/kA)*/
43 "EVAS_3D_BLEND_ONE_MINUS_DST_ALPHA", 43 "EVAS_CANVAS3D_BLEND_ONE_MINUS_DST_ALPHA",
44 /**< The scale factors for color components is (Rc, Gc, Bc, Ac)*/ 44 /**< The scale factors for color components is (Rc, Gc, Bc, Ac)*/
45 "EVAS_3D_BLEND_CONSTANT_COLOR", 45 "EVAS_CANVAS3D_BLEND_CONSTANT_COLOR",
46 /**< The scale factors for color components is (1, 1, 1, 1) - (Rc, Gc, Bc, Ac)*/ 46 /**< The scale factors for color components is (1, 1, 1, 1) - (Rc, Gc, Bc, Ac)*/
47 "EVAS_3D_BLEND_ONE_MINUS_CONSTANT_COLOR", 47 "EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_COLOR",
48 /**< The scale factors for color components is (Ac, Ac, Ac, Ac)*/ 48 /**< The scale factors for color components is (Ac, Ac, Ac, Ac)*/
49 "EVAS_3D_BLEND_CONSTANT_ALPHA", 49 "EVAS_CANVAS3D_BLEND_CONSTANT_ALPHA",
50 /**< The scale factors for color components is (1, 1, 1, 1) - (Ac, Ac, Ac, Ac)*/ 50 /**< The scale factors for color components is (1, 1, 1, 1) - (Ac, Ac, Ac, Ac)*/
51 "EVAS_3D_BLEND_ONE_MINUS_CONSTANT_ALPHA", 51 "EVAS_CANVAS3D_BLEND_ONE_MINUS_CONSTANT_ALPHA",
52 /**< The scale factors for color components is (i, i, i, 1) where i = min(As, kA, Ad)/kA*/ 52 /**< The scale factors for color components is (i, i, i, 1) where i = min(As, kA, Ad)/kA*/
53 "EVAS_3D_BLEND_SRC_ALPHA_SATURATE", 53 "EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE",
54}; 54};
55 55
56typedef struct _Scene_Data 56typedef struct _Scene_Data
@@ -75,8 +75,8 @@ Evas *evas = NULL;
75Eo *background = NULL; 75Eo *background = NULL;
76Eo *image = NULL; 76Eo *image = NULL;
77 77
78int func1 = EVAS_3D_BLEND_SRC_ALPHA; 78int func1 = EVAS_CANVAS3D_BLEND_SRC_ALPHA;
79int func2 = EVAS_3D_BLEND_ONE_MINUS_SRC_ALPHA; 79int func2 = EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA;
80 80
81static void 81static void
82_on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info) 82_on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info)
@@ -93,16 +93,16 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
93 if (!strcmp("Right", ev->key)) 93 if (!strcmp("Right", ev->key))
94 func2--; 94 func2--;
95 95
96 if(func1 < EVAS_3D_BLEND_ZERO) 96 if(func1 < EVAS_CANVAS3D_BLEND_ZERO)
97 func1 = EVAS_3D_BLEND_SRC_ALPHA_SATURATE; 97 func1 = EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE;
98 if(func1 > EVAS_3D_BLEND_SRC_ALPHA_SATURATE) 98 if(func1 > EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE)
99 func1 = EVAS_3D_BLEND_ZERO; 99 func1 = EVAS_CANVAS3D_BLEND_ZERO;
100 100
101 if(func2 < EVAS_3D_BLEND_ZERO) 101 if(func2 < EVAS_CANVAS3D_BLEND_ZERO)
102 func2 = EVAS_3D_BLEND_SRC_ALPHA_SATURATE; 102 func2 = EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE;
103 if(func2 > EVAS_3D_BLEND_SRC_ALPHA_SATURATE) 103 if(func2 > EVAS_CANVAS3D_BLEND_SRC_ALPHA_SATURATE)
104 func2 = EVAS_3D_BLEND_ZERO; 104 func2 = EVAS_CANVAS3D_BLEND_ZERO;
105 eo_do(scene->mesh1, evas_3d_mesh_blending_func_set(func1, func2)); 105 eo_do(scene->mesh1, evas_canvas3d_mesh_blending_func_set(func1, func2));
106 printf("sfactor = %s, dfactor = %s\n", blend_func_names[func1], blend_func_names[func2]); 106 printf("sfactor = %s, dfactor = %s\n", blend_func_names[func1], blend_func_names[func2]);
107} 107}
108 108
@@ -134,7 +134,7 @@ _animate_scene(void *data)
134 angle += 0.02; 134 angle += 0.02;
135 135
136 eo_do(scene->mesh_node, 136 eo_do(scene->mesh_node,
137 evas_3d_node_position_set(3 * sin(angle), 0.0, 3 * cos(angle))); 137 evas_canvas3d_node_position_set(3 * sin(angle), 0.0, 3 * cos(angle)));
138 138
139 if (angle > 2 * M_PI) angle = 0; 139 if (angle > 2 * M_PI) angle = 0;
140 140
@@ -144,135 +144,135 @@ _animate_scene(void *data)
144static void 144static void
145_camera_setup(Scene_Data *data) 145_camera_setup(Scene_Data *data)
146{ 146{
147 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 147 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
148 148
149 eo_do(data->camera, 149 eo_do(data->camera,
150 evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); 150 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
151 151
152 data->camera_node = 152 data->camera_node =
153 eo_add(EVAS_3D_NODE_CLASS, evas, 153 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
154 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 154 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
155 155
156 eo_do(data->camera_node, 156 eo_do(data->camera_node,
157 evas_3d_node_camera_set(data->camera), 157 evas_canvas3d_node_camera_set(data->camera),
158 evas_3d_node_position_set(0.0, 0.0, 10.0), 158 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
159 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 159 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
160 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 160 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
161 161
162 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 162 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
163} 163}
164 164
165static void 165static void
166_light_setup(Scene_Data *data) 166_light_setup(Scene_Data *data)
167{ 167{
168 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 168 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
169 eo_do(data->light, 169 eo_do(data->light,
170 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 170 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
171 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 171 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
172 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 172 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
173 173
174 data->light_node = 174 data->light_node =
175 eo_add(EVAS_3D_NODE_CLASS, evas, 175 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
176 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 176 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
177 eo_do(data->light_node, 177 eo_do(data->light_node,
178 evas_3d_node_light_set(data->light), 178 evas_canvas3d_node_light_set(data->light),
179 evas_3d_node_position_set(0.0, 0.0, 10.0), 179 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
180 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 180 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
181 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 181 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
182 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 182 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
183} 183}
184 184
185static void 185static void
186_set_ball(Eo *mesh, Eo *sphere, Evas_3D_Material *material) 186_set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
187{ 187{
188 eo_do(mesh, 188 eo_do(mesh,
189 evas_3d_mesh_from_primitive_set(0, sphere), 189 evas_canvas3d_mesh_from_primitive_set(0, sphere),
190 evas_3d_mesh_frame_material_set(0, material), 190 evas_canvas3d_mesh_frame_material_set(0, material),
191 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 191 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
192} 192}
193 193
194static void 194static void
195_mesh_setup(Scene_Data *data) 195_mesh_setup(Scene_Data *data)
196{ 196{
197 data->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 197 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
198 198
199 eo_do(data->material, 199 eo_do(data->material,
200 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 200 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
201 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 201 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
202 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 202 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
203 203
204 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 1.0, 0.2, 0.2, 0.2), 204 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 1.0, 0.2, 0.2, 0.2),
205 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 0.0, 0.0, 0.2), 205 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 0.0, 0.0, 0.2),
206 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2), 206 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2),
207 evas_3d_material_shininess_set(100.0)); 207 evas_canvas3d_material_shininess_set(100.0));
208 208
209 data->material1 = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 209 data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
210 210
211 eo_do(data->material1, 211 eo_do(data->material1,
212 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 212 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
213 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 213 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
214 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 214 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
215 215
216 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.0, 0.2, 0.2, 0.2), 216 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 0.2, 0.2, 0.2),
217 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.0, 0.0, 1.0, 0.2), 217 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.0, 0.0, 1.0, 0.2),
218 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2), 218 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2),
219 evas_3d_material_shininess_set(100.0)); 219 evas_canvas3d_material_shininess_set(100.0));
220 220
221 data->sphere = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 221 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
222 eo_do(data->sphere, 222 eo_do(data->sphere,
223 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_SPHERE), 223 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
224 evas_3d_primitive_precision_set(50)); 224 evas_canvas3d_primitive_precision_set(50));
225 225
226 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 226 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
227 data->mesh1 = eo_add(EVAS_3D_MESH_CLASS, evas); 227 data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
228 228
229 _set_ball(data->mesh, data->sphere, data->material); 229 _set_ball(data->mesh, data->sphere, data->material);
230 _set_ball(data->mesh1, data->sphere, data->material1); 230 _set_ball(data->mesh1, data->sphere, data->material1);
231 231
232 data->mesh_node = 232 data->mesh_node =
233 eo_add(EVAS_3D_NODE_CLASS, evas, 233 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
234 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 234 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
235 235
236 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); 236 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
237 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); 237 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
238 238
239 data->mesh_node1 = 239 data->mesh_node1 =
240 eo_add(EVAS_3D_NODE_CLASS, evas, 240 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
241 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 241 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
242 242
243 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node1)); 243 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node1));
244 eo_do(data->mesh_node1, evas_3d_node_mesh_add(data->mesh1)); 244 eo_do(data->mesh_node1, evas_canvas3d_node_mesh_add(data->mesh1));
245 245
246 eo_do(data->mesh1, evas_3d_mesh_blending_enable_set(EINA_TRUE), 246 eo_do(data->mesh1, evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
247 evas_3d_mesh_blending_func_set(func1, func2)); 247 evas_canvas3d_mesh_blending_func_set(func1, func2));
248 248
249 eo_do(data->mesh_node, 249 eo_do(data->mesh_node,
250 evas_3d_node_scale_set(2.0, 2.0, 2.0)); 250 evas_canvas3d_node_scale_set(2.0, 2.0, 2.0));
251 251
252 eo_do(data->mesh_node1, 252 eo_do(data->mesh_node1,
253 evas_3d_node_scale_set(5.0, 5.0, 5.0)); 253 evas_canvas3d_node_scale_set(5.0, 5.0, 5.0));
254} 254}
255 255
256static void 256static void
257_scene_setup(Scene_Data *data) 257_scene_setup(Scene_Data *data)
258{ 258{
259 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 259 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
260 260
261 eo_do(data->scene, 261 eo_do(data->scene,
262 evas_3d_scene_size_set(WIDTH, HEIGHT); 262 evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
263 evas_3d_scene_background_color_set(0.5, 0.5, 0.5, 1)); 263 evas_canvas3d_scene_background_color_set(0.5, 0.5, 0.5, 1));
264 264
265 data->root_node = 265 data->root_node =
266 eo_add(EVAS_3D_NODE_CLASS, evas, 266 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
267 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 267 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
268 268
269 _camera_setup(data); 269 _camera_setup(data);
270 _light_setup(data); 270 _light_setup(data);
271 _mesh_setup(data); 271 _mesh_setup(data);
272 272
273 eo_do(data->scene, 273 eo_do(data->scene,
274 evas_3d_scene_root_node_set(data->root_node), 274 evas_canvas3d_scene_root_node_set(data->root_node),
275 evas_3d_scene_camera_node_set(data->camera_node)); 275 evas_canvas3d_scene_camera_node_set(data->camera_node));
276} 276}
277 277
278int 278int
diff --git a/unsorted/evas/evas-3d-colorpick.c b/unsorted/evas/evas-3d-colorpick.c
index 215c4556..0691fb2e 100644
--- a/unsorted/evas/evas-3d-colorpick.c
+++ b/unsorted/evas/evas-3d-colorpick.c
@@ -130,7 +130,7 @@ _animate_sphere(void *data)
130 static int angle = 0.0; 130 static int angle = 0.0;
131 Eo *n = (Eo*)(((Test_object *)data)->node); 131 Eo *n = (Eo*)(((Test_object *)data)->node);
132 Evas_Real s = ((Test_object *)data)->speed; 132 Evas_Real s = ((Test_object *)data)->speed;
133 eo_do(n, evas_3d_node_orientation_angle_axis_set(angle, s, s - 1, s + 1)); 133 eo_do(n, evas_canvas3d_node_orientation_angle_axis_set(angle, s, s - 1, s + 1));
134 angle++; 134 angle++;
135 if (angle > 360) angle = 0.0; 135 if (angle > 360) angle = 0.0;
136 return EINA_TRUE; 136 return EINA_TRUE;
@@ -143,8 +143,8 @@ void _recalculate_position()
143 Test_object *m; 143 Test_object *m;
144 144
145 eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, 145 eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node,
146 evas_3d_object_update(), 146 evas_canvas3d_object_update(),
147 evas_3d_node_bounding_box_get(NULL, NULL, NULL, &x1, &y1, NULL)); 147 evas_canvas3d_node_bounding_box_get(NULL, NULL, NULL, &x1, &y1, NULL));
148 148
149 for (i = 0; i < globalscene.row; ++i) 149 for (i = 0; i < globalscene.row; ++i)
150 { 150 {
@@ -153,7 +153,7 @@ void _recalculate_position()
153 { 153 {
154 shifty = (j * 2 - globalscene.col) * y1; 154 shifty = (j * 2 - globalscene.col) * y1;
155 m = (Test_object *)eina_list_nth(globalscene.spheres, count); 155 m = (Test_object *)eina_list_nth(globalscene.spheres, count);
156 eo_do(m->node, evas_3d_node_position_set(shifty, 0.0, shiftx)); 156 eo_do(m->node, evas_canvas3d_node_position_set(shifty, 0.0, shiftx));
157 count++; 157 count++;
158 } 158 }
159 } 159 }
@@ -168,31 +168,31 @@ _on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
168 Test_object * item; 168 Test_object * item;
169 if (!strcmp(ev->key, "Down")) 169 if (!strcmp(ev->key, "Down"))
170 { 170 {
171 eo_do(globalscene.camera_node, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &x, &y, &z), 171 eo_do(globalscene.camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z),
172 evas_3d_node_position_set(x, y, (z - 5))); 172 evas_canvas3d_node_position_set(x, y, (z - 5)));
173 } 173 }
174 else if (!strcmp(ev->key, "Up")) 174 else if (!strcmp(ev->key, "Up"))
175 { 175 {
176 eo_do(globalscene.camera_node, evas_3d_node_position_get(EVAS_3D_SPACE_PARENT, &x, &y, &z), 176 eo_do(globalscene.camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z),
177 evas_3d_node_position_set(x, y, (z + 5))); 177 evas_canvas3d_node_position_set(x, y, (z + 5)));
178 } 178 }
179 else if (!strcmp(ev->key, "Left")) 179 else if (!strcmp(ev->key, "Left"))
180 { 180 {
181 eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, 181 eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node,
182 evas_3d_node_scale_get(EVAS_3D_SPACE_PARENT, &x, &y, &z)); 182 evas_canvas3d_node_scale_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z));
183 EINA_LIST_FOREACH(globalscene.spheres, l, item) 183 EINA_LIST_FOREACH(globalscene.spheres, l, item)
184 { 184 {
185 eo_do(item->node, evas_3d_node_scale_set((x - SCALE_UNIT), (y - SCALE_UNIT), (z - SCALE_UNIT))); 185 eo_do(item->node, evas_canvas3d_node_scale_set((x - SCALE_UNIT), (y - SCALE_UNIT), (z - SCALE_UNIT)));
186 } 186 }
187 _recalculate_position(); 187 _recalculate_position();
188 } 188 }
189 else if (!strcmp(ev->key, "Right")) 189 else if (!strcmp(ev->key, "Right"))
190 { 190 {
191 eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node, 191 eo_do(((Test_object *)eina_list_nth(globalscene.spheres, 0))->node,
192 evas_3d_node_scale_get(EVAS_3D_SPACE_PARENT, &x, &y, &z)); 192 evas_canvas3d_node_scale_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z));
193 EINA_LIST_FOREACH(globalscene.spheres, l, item) 193 EINA_LIST_FOREACH(globalscene.spheres, l, item)
194 { 194 {
195 eo_do(item->node, evas_3d_node_scale_set((x + SCALE_UNIT), (y + SCALE_UNIT), (z + SCALE_UNIT))); 195 eo_do(item->node, evas_canvas3d_node_scale_set((x + SCALE_UNIT), (y + SCALE_UNIT), (z + SCALE_UNIT)));
196 } 196 }
197 _recalculate_position(); 197 _recalculate_position();
198 } 198 }
@@ -203,8 +203,8 @@ static void
203_on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info) 203_on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void *event_info)
204{ 204{
205 Evas_Event_Mouse_Down *ev = event_info; 205 Evas_Event_Mouse_Down *ev = event_info;
206 Evas_3D_Node *n; 206 Evas_Canvas3D_Node *n;
207 Evas_3D_Mesh *m; 207 Evas_Canvas3D_Mesh *m;
208 Evas_Real s, t; 208 Evas_Real s, t;
209 clock_t time; 209 clock_t time;
210 float diff_sec; 210 float diff_sec;
@@ -213,27 +213,27 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *eo EINA
213 Eina_Bool flag; 213 Eina_Bool flag;
214 if (ev->button == 1) 214 if (ev->button == 1)
215 { 215 {
216 eo_do(globalscene.scene, evas_3d_scene_color_pick_enable_set(EINA_TRUE)); 216 eo_do(globalscene.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_TRUE));
217 eo_do(globalscene.scene, 217 eo_do(globalscene.scene,
218 flag = evas_3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL)); 218 flag = evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL));
219 time = clock() - time; 219 time = clock() - time;
220 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10; 220 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10;
221 if (flag) 221 if (flag)
222 { 222 {
223 fprintf(stdout, "Boom! Time expended for color pick: %2.7f .\n", diff_sec); 223 fprintf(stdout, "Boom! Time expended for color pick: %2.7f .\n", diff_sec);
224 eo_do(n, evas_3d_node_scale_set(VEC_3(SMALL_SCALE))); 224 eo_do(n, evas_canvas3d_node_scale_set(VEC_3(SMALL_SCALE)));
225 } 225 }
226 } 226 }
227 else 227 else
228 { 228 {
229 eo_do(globalscene.scene, evas_3d_scene_color_pick_enable_set(EINA_FALSE)); 229 eo_do(globalscene.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_FALSE));
230 eo_do(globalscene.scene, flag = evas_3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); 230 eo_do(globalscene.scene, flag = evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t));
231 time = clock() - time; 231 time = clock() - time;
232 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10; 232 diff_sec = ((float)time) / CLOCKS_PER_SEC / 10;
233 if (flag) 233 if (flag)
234 { 234 {
235 fprintf(stdout, "Boom! Time expended for geometry pick: %2.7f .\n", diff_sec); 235 fprintf(stdout, "Boom! Time expended for geometry pick: %2.7f .\n", diff_sec);
236 eo_do(n, evas_3d_node_scale_set(VEC_3(BIG_SCALE))); 236 eo_do(n, evas_canvas3d_node_scale_set(VEC_3(BIG_SCALE)));
237 } 237 }
238 } 238 }
239} 239}
@@ -242,39 +242,39 @@ Eina_Bool
242_init_sphere(void *this, const char *texture) 242_init_sphere(void *this, const char *texture)
243{ 243{
244 Test_object *sphere = (Test_object *)this; 244 Test_object *sphere = (Test_object *)this;
245 sphere->primitive = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 245 sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
246 sphere->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 246 sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
247 sphere->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 247 sphere->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
248 eo_do(sphere->primitive, 248 eo_do(sphere->primitive,
249 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_SPHERE), 249 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
250 evas_3d_primitive_precision_set(50)); 250 evas_canvas3d_primitive_precision_set(50));
251 eo_do(sphere->mesh, 251 eo_do(sphere->mesh,
252 evas_3d_mesh_from_primitive_set(0, sphere->primitive), 252 evas_canvas3d_mesh_from_primitive_set(0, sphere->primitive),
253 evas_3d_mesh_frame_material_set(0, sphere->material), 253 evas_canvas3d_mesh_frame_material_set(0, sphere->material),
254 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 254 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
255 255
256 eo_do(sphere->mesh, evas_3d_mesh_color_pick_enable_set(EINA_TRUE)); 256 eo_do(sphere->mesh, evas_canvas3d_mesh_color_pick_enable_set(EINA_TRUE));
257 257
258 sphere->texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 258 sphere->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
259 eo_do(sphere->texture, 259 eo_do(sphere->texture,
260 evas_3d_texture_file_set(texture, NULL), 260 evas_canvas3d_texture_file_set(texture, NULL),
261 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 261 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
262 EVAS_3D_TEXTURE_FILTER_NEAREST), 262 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
263 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 263 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
264 EVAS_3D_WRAP_MODE_REPEAT)); 264 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
265 eo_do(sphere->material, 265 eo_do(sphere->material,
266 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, sphere->texture), 266 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, sphere->texture),
267 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 267 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
268 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 268 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
269 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 269 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
270 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 270 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
271 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 271 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
272 0.01, 0.01, 0.01, 1.0), 272 0.01, 0.01, 0.01, 1.0),
273 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 273 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
274 1.0, 1.0, 1.0, 1.0), 274 1.0, 1.0, 1.0, 1.0),
275 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 275 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
276 1.0, 1.0, 1.0, 1.0), 276 1.0, 1.0, 1.0, 1.0),
277 evas_3d_material_shininess_set(50.0)); 277 evas_canvas3d_material_shininess_set(50.0));
278 return EINA_TRUE; 278 return EINA_TRUE;
279} 279}
280 280
@@ -286,43 +286,43 @@ _init_scene(const char *texture)
286 Evas_Real tmp; 286 Evas_Real tmp;
287 Test_object *m; 287 Test_object *m;
288 288
289 globalscene.scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 289 globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
290 290
291 globalscene.root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 291 globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
292 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 292 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
293 293
294 globalscene.camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 294 globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
295 eo_do(globalscene.camera, 295 eo_do(globalscene.camera,
296 evas_3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 1000.0)); 296 evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 1000.0));
297 297
298 globalscene.camera_node = 298 globalscene.camera_node =
299 eo_add(EVAS_3D_NODE_CLASS, evas, 299 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
300 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 300 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
301 eo_do(globalscene.camera_node, 301 eo_do(globalscene.camera_node,
302 evas_3d_node_camera_set(globalscene.camera)); 302 evas_canvas3d_node_camera_set(globalscene.camera));
303 eo_do(globalscene.root_node, 303 eo_do(globalscene.root_node,
304 evas_3d_node_member_add(globalscene.camera_node)); 304 evas_canvas3d_node_member_add(globalscene.camera_node));
305 eo_do(globalscene.camera_node, 305 eo_do(globalscene.camera_node,
306 evas_3d_node_position_set(0.0, 30.0, 800.0), 306 evas_canvas3d_node_position_set(0.0, 30.0, 800.0),
307 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, -1000.0, 307 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0,
308 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 308 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
309 globalscene.light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 309 globalscene.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
310 eo_do(globalscene.light, 310 eo_do(globalscene.light,
311 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 311 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
312 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 312 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
313 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 313 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
314 evas_3d_light_directional_set(EINA_TRUE)); 314 evas_canvas3d_light_directional_set(EINA_TRUE));
315 315
316 globalscene.light_node = 316 globalscene.light_node =
317 eo_add(EVAS_3D_NODE_CLASS, evas, 317 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
318 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 318 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
319 eo_do(globalscene.light_node, 319 eo_do(globalscene.light_node,
320 evas_3d_node_light_set(globalscene.light), 320 evas_canvas3d_node_light_set(globalscene.light),
321 evas_3d_node_position_set(100.0, 50.0, 300.0), 321 evas_canvas3d_node_position_set(100.0, 50.0, 300.0),
322 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 322 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
323 EVAS_3D_SPACE_PARENT, 1.0, 1.0, 1.0)); 323 EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0));
324 eo_do(globalscene.root_node, 324 eo_do(globalscene.root_node,
325 evas_3d_node_member_add(globalscene.light_node)); 325 evas_canvas3d_node_member_add(globalscene.light_node));
326 326
327 tmp = 0.01; 327 tmp = 0.01;
328 for (i = 0; i < globalscene.col * globalscene.row; i++) 328 for (i = 0; i < globalscene.col * globalscene.row; i++)
@@ -339,14 +339,14 @@ _init_scene(const char *texture)
339 m->material = spheretmp->material; 339 m->material = spheretmp->material;
340 m->texture = spheretmp->texture; 340 m->texture = spheretmp->texture;
341 } 341 }
342 m->node = eo_add(EVAS_3D_NODE_CLASS, evas, 342 m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
343 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 343 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
344 m->speed = tmp; 344 m->speed = tmp;
345 m->sphere_animate = _animate_sphere; 345 m->sphere_animate = _animate_sphere;
346 m->animate = ecore_timer_add(m->speed, m->sphere_animate, m); 346 m->animate = ecore_timer_add(m->speed, m->sphere_animate, m);
347 eo_do(globalscene.root_node, evas_3d_node_member_add(m->node)); 347 eo_do(globalscene.root_node, evas_canvas3d_node_member_add(m->node));
348 eo_do(m->node, evas_3d_node_mesh_add(m->mesh), 348 eo_do(m->node, evas_canvas3d_node_mesh_add(m->mesh),
349 evas_3d_node_scale_set(VEC_3(INIT_SCALE))); 349 evas_canvas3d_node_scale_set(VEC_3(INIT_SCALE)));
350 globalscene.spheres = eina_list_append(globalscene.spheres, m); 350 globalscene.spheres = eina_list_append(globalscene.spheres, m);
351 tmp += 0.01; 351 tmp += 0.01;
352 } 352 }
@@ -354,9 +354,9 @@ _init_scene(const char *texture)
354 _recalculate_position(); 354 _recalculate_position();
355 355
356 eo_do(globalscene.scene, 356 eo_do(globalscene.scene,
357 evas_3d_scene_root_node_set(globalscene.root_node), 357 evas_canvas3d_scene_root_node_set(globalscene.root_node),
358 evas_3d_scene_camera_node_set(globalscene.camera_node), 358 evas_canvas3d_scene_camera_node_set(globalscene.camera_node),
359 evas_3d_scene_size_set(WIDTH, HEIGHT)); 359 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
360 return EINA_TRUE; 360 return EINA_TRUE;
361} 361}
362 362
diff --git a/unsorted/evas/evas-3d-cube-rotate.c b/unsorted/evas/evas-3d-cube-rotate.c
index 3b487d6e..b78ed032 100644
--- a/unsorted/evas/evas-3d-cube-rotate.c
+++ b/unsorted/evas/evas-3d-cube-rotate.c
@@ -81,15 +81,15 @@ _continue_scene(void *data)
81 81
82 82
83static void 83static void
84_rotate_x_reload(Evas_3D_Scene *eo_scene, Evas_Event_Mouse_Down *ev, Evas_3D_Node *node, Evas_3D_Mesh *mesh, 84_rotate_x_reload(Evas_Canvas3D_Scene *eo_scene, Evas_Event_Mouse_Down *ev, Evas_Canvas3D_Node *node, Evas_Canvas3D_Mesh *mesh,
85 float *angle_diff, Evas_Coord *mouse_coord) 85 float *angle_diff, Evas_Coord *mouse_coord)
86{ 86{
87 Evas_3D_Node *n = NULL; 87 Evas_Canvas3D_Node *n = NULL;
88 Evas_3D_Mesh *m = NULL; 88 Evas_Canvas3D_Mesh *m = NULL;
89 Evas_Real s, t; 89 Evas_Real s, t;
90 int mouse_diff; 90 int mouse_diff;
91 91
92 eo_do(eo_scene, evas_3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t)); 92 eo_do(eo_scene, evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t));
93 93
94 if ((n == node) && (m == mesh)) 94 if ((n == node) && (m == mesh))
95 { 95 {
@@ -140,7 +140,7 @@ _animate_scene(void *data)
140 140
141 angle += sc->angle; 141 angle += sc->angle;
142 142
143 eo_do(sc->mesh_node, evas_3d_node_orientation_angle_axis_set(angle, 0, 1.0, 0.0)); 143 eo_do(sc->mesh_node, evas_canvas3d_node_orientation_angle_axis_set(angle, 0, 1.0, 0.0));
144 144
145 return EINA_TRUE; 145 return EINA_TRUE;
146} 146}
@@ -148,93 +148,93 @@ _animate_scene(void *data)
148static void 148static void
149_camera_setup(Scene_Data *data) 149_camera_setup(Scene_Data *data)
150{ 150{
151 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 151 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
152 eo_do(data->camera, 152 eo_do(data->camera,
153 evas_3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0)); 153 evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0));
154 154
155 data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, 155 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
156 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 156 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
157 eo_do(data->camera_node, 157 eo_do(data->camera_node,
158 evas_3d_node_camera_set(data->camera), 158 evas_canvas3d_node_camera_set(data->camera),
159 evas_3d_node_position_set(3.0, 3.0, 10.0), 159 evas_canvas3d_node_position_set(3.0, 3.0, 10.0),
160 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)); 160 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));
161 161
162 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 162 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
163} 163}
164 164
165static void 165static void
166_light_setup(Scene_Data *data) 166_light_setup(Scene_Data *data)
167{ 167{
168 data->light = eo_add(EVAS_3D_LIGHT_CLASS,evas); 168 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS,evas);
169 169
170 eo_do(data->light, 170 eo_do(data->light,
171 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 171 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
172 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 172 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
173 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 173 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
174 174
175 data->light_node = eo_add(EVAS_3D_NODE_CLASS, evas, 175 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
176 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 176 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
177 177
178 eo_do(data->light_node, 178 eo_do(data->light_node,
179 evas_3d_node_light_set(data->light), 179 evas_canvas3d_node_light_set(data->light),
180 evas_3d_node_position_set(5.0, 5.0, 10.0), 180 evas_canvas3d_node_position_set(5.0, 5.0, 10.0),
181 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 181 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
182 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 182 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
183 183
184 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 184 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
185} 185}
186 186
187static void 187static void
188_mesh_setup(Scene_Data *data) 188_mesh_setup(Scene_Data *data)
189{ 189{
190 /* Setup material. */ 190 /* Setup material. */
191 data->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 191 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
192 192
193 eo_do(data->material, 193 eo_do(data->material,
194 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 194 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
195 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 195 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
196 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 196 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
197 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 197 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
198 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 198 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
199 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 199 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
200 evas_3d_material_shininess_set(100.0)); 200 evas_canvas3d_material_shininess_set(100.0));
201 201
202 /* Setup primitive */ 202 /* Setup primitive */
203 data->cube = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 203 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
204 eo_do(data->cube, 204 eo_do(data->cube,
205 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_CUBE)); 205 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
206 206
207 /* Setup mesh. */ 207 /* Setup mesh. */
208 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 208 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
209 eo_do(data->mesh, 209 eo_do(data->mesh,
210 evas_3d_mesh_from_primitive_set(0, data->cube), 210 evas_canvas3d_mesh_from_primitive_set(0, data->cube),
211 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 211 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
212 evas_3d_mesh_frame_material_set(0, data->material)); 212 evas_canvas3d_mesh_frame_material_set(0, data->material));
213 213
214 data->mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 214 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
215 eo_do(data->root_node, 215 eo_do(data->root_node,
216 evas_3d_node_member_add(data->mesh_node)); 216 evas_canvas3d_node_member_add(data->mesh_node));
217 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); 217 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
218} 218}
219 219
220static void 220static void
221_scene_setup(Scene_Data *data) 221_scene_setup(Scene_Data *data)
222{ 222{
223 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 223 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
224 data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 224 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
225 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 225 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
226 226
227 eo_do(scene, 227 eo_do(scene,
228 evas_3d_scene_size_set(WIDTH, HEIGHT), 228 evas_canvas3d_scene_size_set(WIDTH, HEIGHT),
229 evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); 229 evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
230 230
231 _camera_setup(data); 231 _camera_setup(data);
232 _light_setup(data); 232 _light_setup(data);
233 _mesh_setup(data); 233 _mesh_setup(data);
234 234
235 eo_do(scene, 235 eo_do(scene,
236 evas_3d_scene_root_node_set(data->root_node), 236 evas_canvas3d_scene_root_node_set(data->root_node),
237 evas_3d_scene_camera_node_set(data->camera_node)); 237 evas_canvas3d_scene_camera_node_set(data->camera_node));
238 238
239 data->mouse_old_x = 0; 239 data->mouse_old_x = 0;
240 data->mouse_diff_x = 0; 240 data->mouse_diff_x = 0;
diff --git a/unsorted/evas/evas-3d-cube.c b/unsorted/evas/evas-3d-cube.c
index 02067c24..1ed4a075 100644
--- a/unsorted/evas/evas-3d-cube.c
+++ b/unsorted/evas/evas-3d-cube.c
@@ -123,7 +123,7 @@ _animate_scene(void *data)
123 angle += 0.5; 123 angle += 0.5;
124 124
125 eo_do(scene->mesh_node, 125 eo_do(scene->mesh_node,
126 evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); 126 evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
127 127
128 /* Rotate */ 128 /* Rotate */
129 if (angle > 360.0) angle -= 360.0f; 129 if (angle > 360.0) angle -= 360.0f;
@@ -134,106 +134,106 @@ _animate_scene(void *data)
134static void 134static void
135_camera_setup(Scene_Data *data) 135_camera_setup(Scene_Data *data)
136{ 136{
137 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 137 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
138 138
139 eo_do(data->camera, 139 eo_do(data->camera,
140 evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); 140 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
141 141
142 data->camera_node = 142 data->camera_node =
143 eo_add(EVAS_3D_NODE_CLASS, evas, 143 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
144 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 144 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
145 eo_do(data->camera_node, 145 eo_do(data->camera_node,
146 evas_3d_node_camera_set(data->camera), 146 evas_canvas3d_node_camera_set(data->camera),
147 evas_3d_node_position_set(0.0, 0.0, 10.0), 147 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
148 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 148 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
149 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 149 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
150 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 150 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
151} 151}
152 152
153static void 153static void
154_light_setup(Scene_Data *data) 154_light_setup(Scene_Data *data)
155{ 155{
156 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 156 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
157 eo_do(data->light, 157 eo_do(data->light,
158 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 158 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
159 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 159 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
160 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 160 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
161 161
162 data->light_node = 162 data->light_node =
163 eo_add(EVAS_3D_NODE_CLASS, evas, 163 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
164 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 164 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
165 eo_do(data->light_node, 165 eo_do(data->light_node,
166 evas_3d_node_light_set(data->light), 166 evas_canvas3d_node_light_set(data->light),
167 evas_3d_node_position_set(0.0, 0.0, 10.0), 167 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
168 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 168 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
169 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 169 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
170 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 170 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
171} 171}
172static void 172static void
173_mesh_setup(Scene_Data *data) 173_mesh_setup(Scene_Data *data)
174{ 174{
175 /* Setup material. */ 175 /* Setup material. */
176 data->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 176 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
177 177
178 eo_do(data->material, 178 eo_do(data->material,
179 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 179 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
180 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 180 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
181 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 181 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
182 182
183 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
184 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 184 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
185 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 185 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
186 evas_3d_material_shininess_set(100.0)); 186 evas_canvas3d_material_shininess_set(100.0));
187 187
188 /* Setup mesh. */ 188 /* Setup mesh. */
189 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 189 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
190 eo_do(data->mesh, 190 eo_do(data->mesh,
191 evas_3d_mesh_vertex_count_set(24), 191 evas_canvas3d_mesh_vertex_count_set(24),
192 evas_3d_mesh_frame_add(0), 192 evas_canvas3d_mesh_frame_add(0),
193 193
194 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_POSITION, 194 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
195 12 * sizeof(float), &cube_vertices[ 0]), 195 12 * sizeof(float), &cube_vertices[ 0]),
196 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_NORMAL, 196 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
197 12 * sizeof(float), &cube_vertices[ 3]), 197 12 * sizeof(float), &cube_vertices[ 3]),
198 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_COLOR, 198 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
199 12 * sizeof(float), &cube_vertices[ 6]), 199 12 * sizeof(float), &cube_vertices[ 6]),
200 evas_3d_mesh_frame_vertex_data_set(0, EVAS_3D_VERTEX_TEXCOORD, 200 evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
201 12 * sizeof(float), &cube_vertices[10]), 201 12 * sizeof(float), &cube_vertices[10]),
202 202
203 evas_3d_mesh_index_data_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, 203 evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
204 36, &cube_indices[0]), 204 36, &cube_indices[0]),
205 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES), 205 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
206 206
207 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 207 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
208 208
209 evas_3d_mesh_frame_material_set(0, data->material)); 209 evas_canvas3d_mesh_frame_material_set(0, data->material));
210 210
211 data->mesh_node = 211 data->mesh_node =
212 eo_add(EVAS_3D_NODE_CLASS, evas, 212 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
213 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 213 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
214 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); 214 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
215 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); 215 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
216} 216}
217 217
218static void 218static void
219_scene_setup(Scene_Data *data) 219_scene_setup(Scene_Data *data)
220{ 220{
221 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 221 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
222 eo_do(data->scene, 222 eo_do(data->scene,
223 evas_3d_scene_size_set(WIDTH, HEIGHT); 223 evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
224 evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); 224 evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
225 225
226 data->root_node = 226 data->root_node =
227 eo_add(EVAS_3D_NODE_CLASS, evas, 227 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
228 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 228 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
229 229
230 _camera_setup(data); 230 _camera_setup(data);
231 _light_setup(data); 231 _light_setup(data);
232 _mesh_setup(data); 232 _mesh_setup(data);
233 233
234 eo_do(data->scene, 234 eo_do(data->scene,
235 evas_3d_scene_root_node_set(data->root_node), 235 evas_canvas3d_scene_root_node_set(data->root_node),
236 evas_3d_scene_camera_node_set(data->camera_node)); 236 evas_canvas3d_scene_camera_node_set(data->camera_node));
237} 237}
238 238
239int 239int
diff --git a/unsorted/evas/evas-3d-cube2.c b/unsorted/evas/evas-3d-cube2.c
index 4f43c7cb..c0538671 100644
--- a/unsorted/evas/evas-3d-cube2.c
+++ b/unsorted/evas/evas-3d-cube2.c
@@ -94,7 +94,7 @@ _animate_scene(void *data)
94 angle += 0.2; 94 angle += 0.2;
95 95
96 eo_do(scene->mesh_node, 96 eo_do(scene->mesh_node,
97 evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); 97 evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
98 98
99 /* Rotate */ 99 /* Rotate */
100 if (angle > 360.0) angle -= 360.0f; 100 if (angle > 360.0) angle -= 360.0f;
@@ -104,7 +104,7 @@ _animate_scene(void *data)
104 if (frame >= 20) inc = -1; 104 if (frame >= 20) inc = -1;
105 else if (frame <= 0) inc = 1; 105 else if (frame <= 0) inc = 1;
106 106
107 eo_do(scene->mesh_node, evas_3d_node_mesh_frame_set(scene->mesh, frame)); 107 eo_do(scene->mesh_node, evas_canvas3d_node_mesh_frame_set(scene->mesh, frame));
108 108
109 return EINA_TRUE; 109 return EINA_TRUE;
110} 110}
@@ -112,129 +112,129 @@ _animate_scene(void *data)
112static void 112static void
113_camera_setup(Scene_Data *data) 113_camera_setup(Scene_Data *data)
114{ 114{
115 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 115 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
116 eo_do(data->camera, 116 eo_do(data->camera,
117 evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); 117 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
118 118
119 data->camera_node = 119 data->camera_node =
120 eo_add(EVAS_3D_NODE_CLASS, evas, 120 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
121 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 121 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
122 eo_do(data->camera_node, 122 eo_do(data->camera_node,
123 evas_3d_node_camera_set(data->camera), 123 evas_canvas3d_node_camera_set(data->camera),
124 evas_3d_node_position_set(0.0, 0.0, 3.0), 124 evas_canvas3d_node_position_set(0.0, 0.0, 3.0),
125 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 125 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
126 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 126 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
127 eo_do(data->root_node, 127 eo_do(data->root_node,
128 evas_3d_node_member_add(data->camera_node)); 128 evas_canvas3d_node_member_add(data->camera_node));
129} 129}
130 130
131static void 131static void
132_light_setup(Scene_Data *data) 132_light_setup(Scene_Data *data)
133{ 133{
134 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 134 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
135 eo_do(data->light, 135 eo_do(data->light,
136 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 136 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
137 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 137 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
138 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 138 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
139 139
140 data->light_node = 140 data->light_node =
141 eo_add(EVAS_3D_NODE_CLASS, evas, 141 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
142 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 142 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
143 eo_do(data->light_node, 143 eo_do(data->light_node,
144 evas_3d_node_light_set(data->light), 144 evas_canvas3d_node_light_set(data->light),
145 evas_3d_node_position_set(0.0, 0.0, 10.0), 145 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
146 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 146 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
147 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 147 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
148 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 148 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
149} 149}
150 150
151static void 151static void
152_mesh_setup(Scene_Data *data) 152_mesh_setup(Scene_Data *data)
153{ 153{
154 /* Setup material. */ 154 /* Setup material. */
155 data->material0 = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 155 data->material0 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
156 data->material1 = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 156 data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
157 157
158 eo_do(data->material0, 158 eo_do(data->material0,
159 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 159 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
160 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 160 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
161 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 161 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
162 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 162 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
163 163
164 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 164 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
165 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 165 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
166 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 166 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
167 evas_3d_material_shininess_set(100.0)); 167 evas_canvas3d_material_shininess_set(100.0));
168 168
169 eo_do(data->material1, 169 eo_do(data->material1,
170 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 170 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
171 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 171 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
172 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 172 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
173 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 173 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
174 174
175 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 175 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
176 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 176 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
177 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 177 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
178 evas_3d_material_shininess_set(100.0)); 178 evas_canvas3d_material_shininess_set(100.0));
179 179
180 data->texture0 = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 180 data->texture0 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
181 data->texture1 = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 181 data->texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
182 data->texture_normal = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 182 data->texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
183 183
184 eo_do(data->texture0, 184 eo_do(data->texture0,
185 evas_3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0])); 185 evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]));
186 eo_do(data->texture1, 186 eo_do(data->texture1,
187 evas_3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0])); 187 evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels1[0]));
188 eo_do(data->texture_normal, 188 eo_do(data->texture_normal,
189 evas_3d_texture_file_set(normal_map_path, NULL)); 189 evas_canvas3d_texture_file_set(normal_map_path, NULL));
190 190
191 eo_do(data->material0, 191 eo_do(data->material0,
192 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, data->texture0)); 192 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture0));
193 eo_do(data->material1, 193 eo_do(data->material1,
194 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, data->texture1)); 194 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture1));
195 eo_do(data->material1, 195 eo_do(data->material1,
196 evas_3d_material_texture_set(EVAS_3D_MATERIAL_NORMAL, data->texture_normal)); 196 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, data->texture_normal));
197 197
198 /* Set data of primitive */ 198 /* Set data of primitive */
199 data->cube = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 199 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
200 eo_do(data->cube, 200 eo_do(data->cube,
201 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_CUBE)); 201 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
202 202
203 /* Setup mesh. */ 203 /* Setup mesh. */
204 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 204 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
205 eo_do(data->mesh, 205 eo_do(data->mesh,
206 evas_3d_mesh_from_primitive_set(0, data->cube), 206 evas_canvas3d_mesh_from_primitive_set(0, data->cube),
207 evas_3d_mesh_frame_material_set(0, data->material0), 207 evas_canvas3d_mesh_frame_material_set(0, data->material0),
208 evas_3d_mesh_frame_add(20), 208 evas_canvas3d_mesh_frame_add(20),
209 evas_3d_mesh_frame_material_set(20, data->material1), 209 evas_canvas3d_mesh_frame_material_set(20, data->material1),
210 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_NORMAL_MAP)); 210 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP));
211 211
212 data->mesh_node = 212 data->mesh_node =
213 eo_add(EVAS_3D_NODE_CLASS, evas, 213 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
214 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 214 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
215 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); 215 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
216 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh)); 216 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
217} 217}
218 218
219static void 219static void
220_scene_setup(Scene_Data *data) 220_scene_setup(Scene_Data *data)
221{ 221{
222 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 222 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
223 eo_do(data->scene, 223 eo_do(data->scene,
224 evas_3d_scene_size_set(WIDTH, HEIGHT), 224 evas_canvas3d_scene_size_set(WIDTH, HEIGHT),
225 evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); 225 evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
226 226
227 data->root_node = 227 data->root_node =
228 eo_add(EVAS_3D_NODE_CLASS, evas, 228 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
229 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 229 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
230 230
231 _camera_setup(data); 231 _camera_setup(data);
232 _light_setup(data); 232 _light_setup(data);
233 _mesh_setup(data); 233 _mesh_setup(data);
234 234
235 eo_do(data->scene, 235 eo_do(data->scene,
236 evas_3d_scene_root_node_set(data->root_node), 236 evas_canvas3d_scene_root_node_set(data->root_node),
237 evas_3d_scene_camera_node_set(data->camera_node)); 237 evas_canvas3d_scene_camera_node_set(data->camera_node));
238} 238}
239 239
240int 240int
diff --git a/unsorted/evas/evas-3d-eet.c b/unsorted/evas/evas-3d-eet.c
index 4178a4ef..37035165 100644
--- a/unsorted/evas/evas-3d-eet.c
+++ b/unsorted/evas/evas-3d-eet.c
@@ -58,8 +58,8 @@ _animate_eet(void *data)
58{ 58{
59 angle += 0.5; 59 angle += 0.5;
60 60
61 eo_do((Evas_3D_Node *)data, 61 eo_do((Evas_Canvas3D_Node *)data,
62 evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); 62 evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
63 63
64 /* Rotate */ 64 /* Rotate */
65 if (angle > 360.0) angle -= 360.0f; 65 if (angle > 360.0) angle -= 360.0f;
@@ -72,7 +72,7 @@ _animate_md2(void *data)
72{ 72{
73 static int frame = 0; 73 static int frame = 0;
74 74
75 eo_do((Evas_3D_Node *)data, evas_3d_node_mesh_frame_set(mesh, frame)); 75 eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_mesh_frame_set(mesh, frame));
76 76
77 frame += 32; 77 frame += 32;
78 78
@@ -116,67 +116,67 @@ main(void)
116 evas = ecore_evas_get(ecore_evas); 116 evas = ecore_evas_get(ecore_evas);
117 117
118 /* Add a scene object .*/ 118 /* Add a scene object .*/
119 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 119 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
120 120
121 /* Add the root node for the scene. */ 121 /* Add the root node for the scene. */
122 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 122 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
123 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 123 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
124 124
125 /* Add the camera. */ 125 /* Add the camera. */
126 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 126 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
127 eo_do(camera, 127 eo_do(camera,
128 evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); 128 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
129 129
130 camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, 130 camera_node = 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(camera_node, 132 eo_do(camera_node,
133 evas_3d_node_camera_set(camera)); 133 evas_canvas3d_node_camera_set(camera));
134 eo_do(root_node, 134 eo_do(root_node,
135 evas_3d_node_member_add(camera_node)); 135 evas_canvas3d_node_member_add(camera_node));
136 eo_do(camera_node, 136 eo_do(camera_node,
137 evas_3d_node_position_set(200.0, 0.0, 40.0), 137 evas_canvas3d_node_position_set(200.0, 0.0, 40.0),
138 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, 138 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0,
139 EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); 139 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
140 /* Add the light. */ 140 /* Add the light. */
141 light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 141 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
142 eo_do(light, 142 eo_do(light,
143 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 143 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
144 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 144 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
145 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 145 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
146 evas_3d_light_directional_set(EINA_TRUE)); 146 evas_canvas3d_light_directional_set(EINA_TRUE));
147 147
148 light_node = eo_add(EVAS_3D_NODE_CLASS, evas, 148 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
149 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 149 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
150 eo_do(light_node, 150 eo_do(light_node,
151 evas_3d_node_light_set(light), 151 evas_canvas3d_node_light_set(light),
152 evas_3d_node_position_set(1000.0, 0.0, 1000.0), 152 evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0),
153 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 153 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
154 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 154 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
155 eo_do(root_node, 155 eo_do(root_node,
156 evas_3d_node_member_add(light_node)); 156 evas_canvas3d_node_member_add(light_node));
157 157
158 /* Add the meshes. */ 158 /* Add the meshes. */
159 mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 159 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
160 mesh2 = eo_add(EVAS_3D_MESH_CLASS, evas); 160 mesh2 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
161 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 161 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
162 162
163 eo_do(mesh, 163 eo_do(mesh,
164 efl_file_set(input_model_path, NULL), 164 efl_file_set(input_model_path, NULL),
165 evas_3d_mesh_frame_material_set(0, material), 165 evas_canvas3d_mesh_frame_material_set(0, material),
166 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 166 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
167 167
168 eo_do(material, 168 eo_do(material,
169 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 169 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
170 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 170 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
171 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 171 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
172 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 172 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
173 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 173 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
174 0.50, 0.50, 0.00, 0.30), 174 0.50, 0.50, 0.00, 0.30),
175 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 175 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
176 0.00, 0.50, 0.50, 0.30), 176 0.00, 0.50, 0.50, 0.30),
177 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 177 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
178 0.50, 0.00, 0.50, 0.30), 178 0.50, 0.00, 0.50, 0.30),
179 evas_3d_material_shininess_set(50.0)); 179 evas_canvas3d_material_shininess_set(50.0));
180 180
181 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES)) 181 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES))
182 fprintf(stderr, "Failed to create folder %s\n\n", 182 fprintf(stderr, "Failed to create folder %s\n\n",
@@ -186,30 +186,30 @@ main(void)
186 186
187 eo_do(mesh2, 187 eo_do(mesh2,
188 efl_file_set(output_model_path, NULL), 188 efl_file_set(output_model_path, NULL),
189 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 189 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
190 190
191 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 191 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
192 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 192 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
193 193
194 eo_do(root_node, 194 eo_do(root_node,
195 evas_3d_node_member_add(mesh_node)); 195 evas_canvas3d_node_member_add(mesh_node));
196 eo_do(mesh_node, 196 eo_do(mesh_node,
197 evas_3d_node_mesh_add(mesh), 197 evas_canvas3d_node_mesh_add(mesh),
198 evas_3d_node_position_set(0.0, -40.0, 0.0)); 198 evas_canvas3d_node_position_set(0.0, -40.0, 0.0));
199 199
200 mesh_node2 = eo_add(EVAS_3D_NODE_CLASS, evas, 200 mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
201 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 201 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
202 eo_do(root_node, 202 eo_do(root_node,
203 evas_3d_node_member_add(mesh_node2)); 203 evas_canvas3d_node_member_add(mesh_node2));
204 eo_do(mesh_node2, 204 eo_do(mesh_node2,
205 evas_3d_node_mesh_add(mesh2), 205 evas_canvas3d_node_mesh_add(mesh2),
206 evas_3d_node_position_set(0.0, 40.0, 0.0)); 206 evas_canvas3d_node_position_set(0.0, 40.0, 0.0));
207 207
208 /* Set up scene. */ 208 /* Set up scene. */
209 eo_do(scene, 209 eo_do(scene,
210 evas_3d_scene_root_node_set(root_node), 210 evas_canvas3d_scene_root_node_set(root_node),
211 evas_3d_scene_camera_node_set(camera_node), 211 evas_canvas3d_scene_camera_node_set(camera_node),
212 evas_3d_scene_size_set(WIDTH, HEIGHT)); 212 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
213 213
214 /* Add a background rectangle objects. */ 214 /* Add a background rectangle objects. */
215 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 215 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
diff --git a/unsorted/evas/evas-3d-fog.c b/unsorted/evas/evas-3d-fog.c
index 51542881..a767c2d1 100644
--- a/unsorted/evas/evas-3d-fog.c
+++ b/unsorted/evas/evas-3d-fog.c
@@ -72,7 +72,7 @@ _animate_scene(void *data)
72 angle += 0.5; 72 angle += 0.5;
73 73
74 eo_do(scene->animation_node, 74 eo_do(scene->animation_node,
75 evas_3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0)); 75 evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0));
76 76
77 if (angle > 360.0) angle -= 360.0f; 77 if (angle > 360.0) angle -= 360.0f;
78 78
@@ -82,125 +82,125 @@ _animate_scene(void *data)
82static void 82static void
83_camera_setup(Scene_Data *data) 83_camera_setup(Scene_Data *data)
84{ 84{
85 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 85 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
86 86
87 eo_do(data->camera, 87 eo_do(data->camera,
88 evas_3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0)); 88 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
89 89
90 data->camera_node = 90 data->camera_node =
91 eo_add(EVAS_3D_NODE_CLASS, evas, 91 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
92 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 92 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
93 93
94 eo_do(data->camera_node, 94 eo_do(data->camera_node,
95 evas_3d_node_camera_set(data->camera), 95 evas_canvas3d_node_camera_set(data->camera),
96 evas_3d_node_position_set(0.0, 0.0, 7.0), 96 evas_canvas3d_node_position_set(0.0, 0.0, 7.0),
97 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 97 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
98 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 98 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
99 99
100 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 100 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
101} 101}
102 102
103static void 103static void
104_light_setup(Scene_Data *data) 104_light_setup(Scene_Data *data)
105{ 105{
106 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 106 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
107 eo_do(data->light, 107 eo_do(data->light,
108 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 108 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
109 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 109 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
110 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 110 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
111 111
112 data->light_node = 112 data->light_node =
113 eo_add(EVAS_3D_NODE_CLASS, evas, 113 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
114 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 114 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
115 eo_do(data->light_node, 115 eo_do(data->light_node,
116 evas_3d_node_light_set(data->light), 116 evas_canvas3d_node_light_set(data->light),
117 evas_3d_node_position_set(0.0, 0.0, 10.0), 117 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
118 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 118 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
119 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 119 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
120 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 120 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
121} 121}
122 122
123static void 123static void
124_set_ball(Eo *mesh, Eo *sphere, Evas_3D_Material *material) 124_set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
125{ 125{
126 eo_do(mesh, 126 eo_do(mesh,
127 evas_3d_mesh_from_primitive_set(0, sphere), 127 evas_canvas3d_mesh_from_primitive_set(0, sphere),
128 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG), 128 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
129 evas_3d_mesh_frame_material_set(0, material)); 129 evas_canvas3d_mesh_frame_material_set(0, material));
130} 130}
131 131
132 132
133static void 133static void
134_mesh_setup(Scene_Data *data) 134_mesh_setup(Scene_Data *data)
135{ 135{
136 data->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 136 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
137 137
138 eo_do(data->material, 138 eo_do(data->material,
139 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 139 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
140 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 140 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
141 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 141 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
142 142
143 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 143 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
144 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 144 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
145 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 145 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
146 evas_3d_material_shininess_set(100.0)); 146 evas_canvas3d_material_shininess_set(100.0));
147 147
148 data->sphere = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 148 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
149 eo_do(data->sphere, 149 eo_do(data->sphere,
150 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_SPHERE), 150 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
151 evas_3d_primitive_precision_set(50)); 151 evas_canvas3d_primitive_precision_set(50));
152 152
153 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 153 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
154 data->mesh1 = eo_add(EVAS_3D_MESH_CLASS, evas); 154 data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
155 155
156 _set_ball(data->mesh, data->sphere, data->material); 156 _set_ball(data->mesh, data->sphere, data->material);
157 _set_ball(data->mesh1, data->sphere, data->material); 157 _set_ball(data->mesh1, data->sphere, data->material);
158 158
159 data->animation_node = 159 data->animation_node =
160 eo_add(EVAS_3D_NODE_CLASS, evas, 160 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
161 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 161 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
162 162
163 data->mesh_node = 163 data->mesh_node =
164 eo_add(EVAS_3D_NODE_CLASS, evas, 164 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
165 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 165 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
166 166
167 eo_do(data->animation_node, evas_3d_node_member_add(data->mesh_node)); 167 eo_do(data->animation_node, evas_canvas3d_node_member_add(data->mesh_node));
168 eo_do(data->root_node, evas_3d_node_member_add(data->animation_node)); 168 eo_do(data->root_node, evas_canvas3d_node_member_add(data->animation_node));
169 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh), 169 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh),
170 evas_3d_node_position_set(0.0, 0.0, 3.0)); 170 evas_canvas3d_node_position_set(0.0, 0.0, 3.0));
171 171
172 data->mesh_node1 = 172 data->mesh_node1 =
173 eo_add(EVAS_3D_NODE_CLASS, evas, 173 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
174 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 174 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
175 175
176 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node1)); 176 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node1));
177 eo_do(data->mesh_node1, evas_3d_node_mesh_add(data->mesh1), 177 eo_do(data->mesh_node1, evas_canvas3d_node_mesh_add(data->mesh1),
178 evas_3d_node_scale_set(3, 3, 3)); 178 evas_canvas3d_node_scale_set(3, 3, 3));
179 179
180 eo_do(data->mesh, evas_3d_mesh_fog_enable_set(EINA_TRUE), evas_3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR)); 180 eo_do(data->mesh, evas_canvas3d_mesh_fog_enable_set(EINA_TRUE), evas_canvas3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR));
181 eo_do(data->mesh1, evas_3d_mesh_fog_enable_set(EINA_TRUE), evas_3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR)); 181 eo_do(data->mesh1, evas_canvas3d_mesh_fog_enable_set(EINA_TRUE), evas_canvas3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR));
182} 182}
183 183
184static void 184static void
185_scene_setup(Scene_Data *data) 185_scene_setup(Scene_Data *data)
186{ 186{
187 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 187 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
188 188
189 eo_do(data->scene, 189 eo_do(data->scene,
190 evas_3d_scene_size_set(WIDTH, HEIGHT); 190 evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
191 evas_3d_scene_background_color_set(FOG_COLOR, 1)); 191 evas_canvas3d_scene_background_color_set(FOG_COLOR, 1));
192 192
193 data->root_node = 193 data->root_node =
194 eo_add(EVAS_3D_NODE_CLASS, evas, 194 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
195 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 195 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
196 196
197 _camera_setup(data); 197 _camera_setup(data);
198 _light_setup(data); 198 _light_setup(data);
199 _mesh_setup(data); 199 _mesh_setup(data);
200 200
201 eo_do(data->scene, 201 eo_do(data->scene,
202 evas_3d_scene_root_node_set(data->root_node), 202 evas_canvas3d_scene_root_node_set(data->root_node),
203 evas_3d_scene_camera_node_set(data->camera_node)); 203 evas_canvas3d_scene_camera_node_set(data->camera_node));
204} 204}
205 205
206int 206int
diff --git a/unsorted/evas/evas-3d-frustum.c b/unsorted/evas/evas-3d-frustum.c
index d3e9f818..15e5e3ca 100644
--- a/unsorted/evas/evas-3d-frustum.c
+++ b/unsorted/evas/evas-3d-frustum.c
@@ -7,7 +7,7 @@
7 * Use 'i', 'k', 'j', 'l', 'u' and 'o' keys to move mesh node (model) in 3D. 7 * Use 'i', 'k', 'j', 'l', 'u' and 'o' keys to move mesh node (model) in 3D.
8 * Use 'z', 'x', 'c', 'Z', 'X' and 'C' keys to change scaling constants of mesh (model). 8 * Use 'z', 'x', 'c', 'Z', 'X' and 'C' keys to change scaling constants of mesh (model).
9 * See in terminal output value distance to far plane of frustum and value of visibility of node 9 * See in terminal output value distance to far plane of frustum and value of visibility of node
10 * @see evas_3d_camera_node_visible_get. 10 * @see evas_canvas3d_camera_node_visible_get.
11 * 11 *
12 * @verbatim 12 * @verbatim
13 * gcc -o evas-3d-frustum evas-3d-frustum.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` -lm 13 * gcc -o evas-3d-frustum evas-3d-frustum.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` -lm
@@ -60,7 +60,7 @@ Evas_Object *background,*image;
60Evas_Real obj_x = 0.0, obj_y = 0.0, obj_z = 0.0, obj_sc_x = 10.0, obj_sc_y = 10.0, obj_sc_z = 10.0; 60Evas_Real obj_x = 0.0, obj_y = 0.0, obj_z = 0.0, obj_sc_x = 10.0, obj_sc_y = 10.0, obj_sc_z = 10.0;
61Evas_Real fleft = -5, fright = 5, fbottom = -5, fup = 5, fnear = 20, ffar = 1000; 61Evas_Real fleft = -5, fright = 5, fbottom = -5, fup = 5, fnear = 20, ffar = 1000;
62Evas_Real radius = 0; 62Evas_Real radius = 0;
63Evas_3D_Frustum_Mode key = EVAS_3D_FRUSTUM_MODE_AABB; 63Evas_Canvas3D_Frustum_Mode key = EVAS_CANVAS3D_FRUSTUM_MODE_AABB;
64 64
65static void 65static void
66_show_help() 66_show_help()
@@ -100,18 +100,18 @@ _redraw_bounding_object(void *data)
100 Eo *current_mesh; 100 Eo *current_mesh;
101 Eina_List *meshes = NULL, *l; 101 Eina_List *meshes = NULL, *l;
102 102
103 eo_do(scene->mesh_node, meshes = (Eina_List *)evas_3d_node_mesh_list_get()); 103 eo_do(scene->mesh_node, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get());
104 EINA_LIST_FOREACH(meshes, l, current_mesh) 104 EINA_LIST_FOREACH(meshes, l, current_mesh)
105 { 105 {
106 eo_do(scene->mesh_node, evas_3d_node_mesh_del(current_mesh)); 106 eo_do(scene->mesh_node, evas_canvas3d_node_mesh_del(current_mesh));
107 } 107 }
108 108
109 switch (key) 109 switch (key)
110 { 110 {
111 case EVAS_3D_FRUSTUM_MODE_BSPHERE: 111 case EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE:
112 { 112 {
113 eo_do(scene->mesh_node_model, 113 eo_do(scene->mesh_node_model,
114 evas_3d_node_bounding_sphere_get(&x0, &y0, &z0, &radius)); 114 evas_canvas3d_node_bounding_sphere_get(&x0, &y0, &z0, &radius));
115 current_mesh = scene->mesh_sphere; 115 current_mesh = scene->mesh_sphere;
116 px = x0; 116 px = x0;
117 py = y0; 117 py = y0;
@@ -119,10 +119,10 @@ _redraw_bounding_object(void *data)
119 sx = sy = sz = 2.0 * radius; 119 sx = sy = sz = 2.0 * radius;
120 break; 120 break;
121 } 121 }
122 case EVAS_3D_FRUSTUM_MODE_AABB: 122 case EVAS_CANVAS3D_FRUSTUM_MODE_AABB:
123 { 123 {
124 eo_do(scene->mesh_node_model, 124 eo_do(scene->mesh_node_model,
125 evas_3d_node_bounding_box_get(&x0, &y0, &z0, 125 evas_canvas3d_node_bounding_box_get(&x0, &y0, &z0,
126 &x1, &y1, &z1)); 126 &x1, &y1, &z1));
127 current_mesh = scene->mesh_aabb; 127 current_mesh = scene->mesh_aabb;
128 px = (x1 + x0) / 2; 128 px = (x1 + x0) / 2;
@@ -133,10 +133,10 @@ _redraw_bounding_object(void *data)
133 sz = z1 - z0; 133 sz = z1 - z0;
134 break; 134 break;
135 } 135 }
136 case EVAS_3D_FRUSTUM_MODE_CENTRAL_POINT: 136 case EVAS_CANVAS3D_FRUSTUM_MODE_CENTRAL_POINT:
137 { 137 {
138 eo_do(scene->mesh_node_model, 138 eo_do(scene->mesh_node_model,
139 evas_3d_node_bounding_sphere_get(&x0, &y0, &z0, &radius)); 139 evas_canvas3d_node_bounding_sphere_get(&x0, &y0, &z0, &radius));
140 current_mesh = scene->mesh_sphere; 140 current_mesh = scene->mesh_sphere;
141 px = x0; 141 px = x0;
142 py = y0; 142 py = y0;
@@ -149,9 +149,9 @@ _redraw_bounding_object(void *data)
149 } 149 }
150 150
151 eo_do(scene->mesh_node, 151 eo_do(scene->mesh_node,
152 evas_3d_node_mesh_add(current_mesh), 152 evas_canvas3d_node_mesh_add(current_mesh),
153 evas_3d_node_position_set(px, py, pz), 153 evas_canvas3d_node_position_set(px, py, pz),
154 evas_3d_node_scale_set(sx, sy, sz)); 154 evas_canvas3d_node_scale_set(sx, sy, sz));
155 155
156 return ECORE_CALLBACK_RENEW; 156 return ECORE_CALLBACK_RENEW;
157} 157}
@@ -166,122 +166,122 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
166 if (!strcmp("w", ev->key)) 166 if (!strcmp("w", ev->key))
167 { 167 {
168 ffar += 20; 168 ffar += 20;
169 eo_do(scene->camera, evas_3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); 169 eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar));
170 } 170 }
171 else if(!strcmp("s", ev->key)) 171 else if(!strcmp("s", ev->key))
172 { 172 {
173 ffar -= 20; 173 ffar -= 20;
174 eo_do(scene->camera, evas_3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); 174 eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar));
175 } 175 }
176 else if(!strcmp("t", ev->key)) 176 else if(!strcmp("t", ev->key))
177 { 177 {
178 fnear += 2; 178 fnear += 2;
179 eo_do(scene->camera, evas_3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); 179 eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar));
180 } 180 }
181 else if(!strcmp("g", ev->key)) 181 else if(!strcmp("g", ev->key))
182 { 182 {
183 fnear -= 2; 183 fnear -= 2;
184 eo_do(scene->camera, evas_3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); 184 eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar));
185 } 185 }
186 else if(!strcmp("i", ev->key)) 186 else if(!strcmp("i", ev->key))
187 { 187 {
188 obj_y++; 188 obj_y++;
189 eo_do(scene->mesh_node_model, 189 eo_do(scene->mesh_node_model,
190 evas_3d_node_position_set(obj_x, obj_y, obj_z)); 190 evas_canvas3d_node_position_set(obj_x, obj_y, obj_z));
191 } 191 }
192 else if(!strcmp("k", ev->key)) 192 else if(!strcmp("k", ev->key))
193 { 193 {
194 obj_y--; 194 obj_y--;
195 eo_do(scene->mesh_node_model, 195 eo_do(scene->mesh_node_model,
196 evas_3d_node_position_set(obj_x, obj_y, obj_z)); 196 evas_canvas3d_node_position_set(obj_x, obj_y, obj_z));
197 } 197 }
198 else if(!strcmp("o", ev->key)) 198 else if(!strcmp("o", ev->key))
199 { 199 {
200 obj_z++; 200 obj_z++;
201 eo_do(scene->mesh_node_model, 201 eo_do(scene->mesh_node_model,
202 evas_3d_node_position_set(obj_x, obj_y, obj_z)); 202 evas_canvas3d_node_position_set(obj_x, obj_y, obj_z));
203 } 203 }
204 else if(!strcmp("u", ev->key)) 204 else if(!strcmp("u", ev->key))
205 { 205 {
206 obj_z--; 206 obj_z--;
207 eo_do(scene->mesh_node_model, 207 eo_do(scene->mesh_node_model,
208 evas_3d_node_position_set(obj_x, obj_y, obj_z)); 208 evas_canvas3d_node_position_set(obj_x, obj_y, obj_z));
209 } 209 }
210 else if(!strcmp("l", ev->key)) 210 else if(!strcmp("l", ev->key))
211 { 211 {
212 obj_x++; 212 obj_x++;
213 eo_do(scene->mesh_node_model, 213 eo_do(scene->mesh_node_model,
214 evas_3d_node_position_set(obj_x, obj_y, obj_z)); 214 evas_canvas3d_node_position_set(obj_x, obj_y, obj_z));
215 } 215 }
216 else if(!strcmp("j", ev->key)) 216 else if(!strcmp("j", ev->key))
217 { 217 {
218 obj_x--; 218 obj_x--;
219 eo_do(scene->mesh_node_model, 219 eo_do(scene->mesh_node_model,
220 evas_3d_node_position_set(obj_x, obj_y, obj_z)); 220 evas_canvas3d_node_position_set(obj_x, obj_y, obj_z));
221 } 221 }
222 else if(!strcmp("z", ev->key)) 222 else if(!strcmp("z", ev->key))
223 { 223 {
224 obj_sc_y+=0.02; 224 obj_sc_y+=0.02;
225 eo_do(scene->mesh_node_model, 225 eo_do(scene->mesh_node_model,
226 evas_3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); 226 evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z));
227 } 227 }
228 else if(!strcmp("Z", ev->key)) 228 else if(!strcmp("Z", ev->key))
229 { 229 {
230 obj_sc_y-=0.02; 230 obj_sc_y-=0.02;
231 eo_do(scene->mesh_node_model, 231 eo_do(scene->mesh_node_model,
232 evas_3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); 232 evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z));
233 } 233 }
234 else if(!strcmp("x", ev->key)) 234 else if(!strcmp("x", ev->key))
235 { 235 {
236 obj_sc_z+=0.02; 236 obj_sc_z+=0.02;
237 eo_do(scene->mesh_node_model, 237 eo_do(scene->mesh_node_model,
238 evas_3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); 238 evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z));
239 } 239 }
240 else if(!strcmp("X", ev->key)) 240 else if(!strcmp("X", ev->key))
241 { 241 {
242 obj_sc_z-=0.02; 242 obj_sc_z-=0.02;
243 eo_do(scene->mesh_node_model, 243 eo_do(scene->mesh_node_model,
244 evas_3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); 244 evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z));
245 } 245 }
246 else if(!strcmp("c", ev->key)) 246 else if(!strcmp("c", ev->key))
247 { 247 {
248 obj_sc_x+=0.02; 248 obj_sc_x+=0.02;
249 eo_do(scene->mesh_node_model, 249 eo_do(scene->mesh_node_model,
250 evas_3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); 250 evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z));
251 } 251 }
252 else if(!strcmp("C", ev->key)) 252 else if(!strcmp("C", ev->key))
253 { 253 {
254 obj_sc_x-=0.02; 254 obj_sc_x-=0.02;
255 eo_do(scene->mesh_node_model, 255 eo_do(scene->mesh_node_model,
256 evas_3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); 256 evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z));
257 } 257 }
258 else if(!strcmp("Return", ev->key)) 258 else if(!strcmp("Return", ev->key))
259 { 259 {
260 eo_do(scene->camera, evas_3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); 260 eo_do(scene->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar));
261 } 261 }
262 else if (!strcmp("1", ev->key)) 262 else if (!strcmp("1", ev->key))
263 { 263 {
264 eo_do(scene->camera_node, evas_3d_node_position_set(0.0, 0.0, 300.0), 264 eo_do(scene->camera_node, evas_canvas3d_node_position_set(0.0, 0.0, 300.0),
265 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)); 265 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));
266 fprintf(stdout, "Changed position and view of camera\n"); 266 fprintf(stdout, "Changed position and view of camera\n");
267 } 267 }
268 else if (!strcmp("2", ev->key)) 268 else if (!strcmp("2", ev->key))
269 { 269 {
270 eo_do(scene->camera_node, evas_3d_node_position_set(300.0, 300.0, 300.0); 270 eo_do(scene->camera_node, evas_canvas3d_node_position_set(300.0, 300.0, 300.0);
271 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)); 271 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));
272 fprintf(stdout, "Changed position and view of camera\n"); 272 fprintf(stdout, "Changed position and view of camera\n");
273 } 273 }
274 else if (!strcmp("3", ev->key)) 274 else if (!strcmp("3", ev->key))
275 { 275 {
276 key = EVAS_3D_FRUSTUM_MODE_BSPHERE; 276 key = EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE;
277 } 277 }
278 else if (!strcmp("4", ev->key)) 278 else if (!strcmp("4", ev->key))
279 { 279 {
280 key = EVAS_3D_FRUSTUM_MODE_AABB; 280 key = EVAS_CANVAS3D_FRUSTUM_MODE_AABB;
281 } 281 }
282 else if (!strcmp("5", ev->key)) 282 else if (!strcmp("5", ev->key))
283 { 283 {
284 key = EVAS_3D_FRUSTUM_MODE_CENTRAL_POINT; 284 key = EVAS_CANVAS3D_FRUSTUM_MODE_CENTRAL_POINT;
285 } 285 }
286 else 286 else
287 { 287 {
@@ -289,147 +289,147 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
289 } 289 }
290 290
291 _redraw_bounding_object(data); 291 _redraw_bounding_object(data);
292 eo_do(scene->camera, frustum = evas_3d_camera_node_visible_get(scene->camera_node, scene->mesh_node_model, key)); 292 eo_do(scene->camera, frustum = evas_canvas3d_camera_node_visible_get(scene->camera_node, scene->mesh_node_model, key));
293 fprintf(stdout, "far - %f frustum - %d radius - %f\n", ffar, frustum, radius); 293 fprintf(stdout, "far - %f frustum - %d radius - %f\n", ffar, frustum, radius);
294} 294}
295 295
296static void 296static void
297_camera_setup(Scene_Data *data) 297_camera_setup(Scene_Data *data)
298{ 298{
299 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 299 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
300 data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, 300 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
301 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 301 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
302 eo_do(data->camera_node, 302 eo_do(data->camera_node,
303 evas_3d_node_camera_set(data->camera), 303 evas_canvas3d_node_camera_set(data->camera),
304 evas_3d_node_position_set(0.0, 0.0, 300.0); 304 evas_canvas3d_node_position_set(0.0, 0.0, 300.0);
305 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)); 305 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));
306 306
307 eo_do(data->camera, evas_3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar)); 307 eo_do(data->camera, evas_canvas3d_camera_projection_frustum_set(fleft, fright, fbottom, fup, fnear, ffar));
308 308
309 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 309 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
310} 310}
311 311
312static void 312static void
313_light_setup(Scene_Data *data) 313_light_setup(Scene_Data *data)
314{ 314{
315 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 315 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
316 eo_do(data->light, 316 eo_do(data->light,
317 evas_3d_light_ambient_set( 0.2, 0.2, 0.2, 1.0); 317 evas_canvas3d_light_ambient_set( 0.2, 0.2, 0.2, 1.0);
318 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0); 318 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0);
319 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 319 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
320 320
321 data->light_node = eo_add(EVAS_3D_NODE_CLASS,evas, 321 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS,evas,
322 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 322 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
323 eo_do(data->light_node, 323 eo_do(data->light_node,
324 evas_3d_node_light_set(data->light), 324 evas_canvas3d_node_light_set(data->light),
325 evas_3d_node_position_set(0.0, 0.0, 200.0), 325 evas_canvas3d_node_position_set(0.0, 0.0, 200.0),
326 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); 326 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
327 327
328 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 328 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
329} 329}
330 330
331static void 331static void
332_mesh_setup(Scene_Data *data) 332_mesh_setup(Scene_Data *data)
333{ 333{
334 data->material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 334 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
335 335
336 eo_do(data->material, 336 eo_do(data->material,
337 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 337 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
338 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 338 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
339 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 339 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
340 340
341 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0), 341 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
342 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0), 342 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
343 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 343 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
344 evas_3d_material_shininess_set(100.0)); 344 evas_canvas3d_material_shininess_set(100.0));
345 345
346 data->cube = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 346 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
347 eo_do(data->cube, 347 eo_do(data->cube,
348 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_CUBE)); 348 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
349 349
350 data->sphere = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 350 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
351 eo_do(data->sphere, 351 eo_do(data->sphere,
352 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_SPHERE), 352 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
353 evas_3d_primitive_precision_set(20)); 353 evas_canvas3d_primitive_precision_set(20));
354 354
355 data->mesh_aabb = eo_add(EVAS_3D_MESH_CLASS, evas); 355 data->mesh_aabb = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
356 eo_do(data->mesh_aabb, 356 eo_do(data->mesh_aabb,
357 evas_3d_mesh_from_primitive_set(0, data->cube), 357 evas_canvas3d_mesh_from_primitive_set(0, data->cube),
358 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_LINES), 358 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES),
359 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE), 359 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE),
360 evas_3d_mesh_frame_material_set(0, data->material)); 360 evas_canvas3d_mesh_frame_material_set(0, data->material));
361 361
362 data->mesh_sphere = eo_add(EVAS_3D_MESH_CLASS, evas); 362 data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
363 eo_do(data->mesh_sphere, 363 eo_do(data->mesh_sphere,
364 evas_3d_mesh_from_primitive_set(0, data->sphere), 364 evas_canvas3d_mesh_from_primitive_set(0, data->sphere),
365 evas_3d_mesh_vertex_assembly_set(EVAS_3D_VERTEX_ASSEMBLY_LINES), 365 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES),
366 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE), 366 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE),
367 evas_3d_mesh_frame_material_set(0, data->material)); 367 evas_canvas3d_mesh_frame_material_set(0, data->material));
368 368
369 data->mesh_node = 369 data->mesh_node =
370 eo_add(EVAS_3D_NODE_CLASS, evas, evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 370 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
371 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); 371 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
372 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh_aabb)); 372 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh_aabb));
373} 373}
374 374
375static void 375static void
376_mesh_setup_model(Scene_Data *data) 376_mesh_setup_model(Scene_Data *data)
377{ 377{
378 data->mesh_model = eo_add(EVAS_3D_MESH_CLASS, evas); 378 data->mesh_model = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
379 data->material_model = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 379 data->material_model = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
380 data->texture_model = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 380 data->texture_model = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
381 381
382 eo_do(data->texture_model, 382 eo_do(data->texture_model,
383 evas_3d_texture_file_set(texture_path, NULL), 383 evas_canvas3d_texture_file_set(texture_path, NULL),
384 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, EVAS_3D_TEXTURE_FILTER_NEAREST), 384 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
385 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, EVAS_3D_WRAP_MODE_REPEAT)); 385 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT));
386 386
387 eo_do(data->material_model, 387 eo_do(data->material_model,
388 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 388 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
389 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 389 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
390 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 390 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
391 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE); 391 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE);
392 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 392 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
393 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 1.0), 393 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 1.0),
394 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 394 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
395 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 395 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
396 evas_3d_material_texture_set( EVAS_3D_MATERIAL_DIFFUSE, data->texture_model), 396 evas_canvas3d_material_texture_set( EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture_model),
397 evas_3d_material_shininess_set(100.0)); 397 evas_canvas3d_material_shininess_set(100.0));
398 398
399 eo_do(data->mesh_model, 399 eo_do(data->mesh_model,
400 efl_file_set(mesh_path, NULL), 400 efl_file_set(mesh_path, NULL),
401 evas_3d_mesh_frame_material_set(0, data->material_model), 401 evas_canvas3d_mesh_frame_material_set(0, data->material_model),
402 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE)); 402 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE));
403} 403}
404 404
405static void 405static void
406_scene_setup(Scene_Data *data) 406_scene_setup(Scene_Data *data)
407{ 407{
408 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 408 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
409 409
410 data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 410 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
411 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 411 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
412 412
413 _light_setup(data); 413 _light_setup(data);
414 _mesh_setup_model(data); 414 _mesh_setup_model(data);
415 _camera_setup(data); 415 _camera_setup(data);
416 416
417 data->mesh_node_model = eo_add(EVAS_3D_NODE_CLASS, evas, 417 data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
418 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 418 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
419 eo_do(data->mesh_node_model, 419 eo_do(data->mesh_node_model,
420 evas_3d_node_position_set(obj_x, obj_y, obj_z), 420 evas_canvas3d_node_position_set(obj_x, obj_y, obj_z),
421 evas_3d_node_orientation_angle_axis_set(-90, 1.0, 0.0, 0.0), 421 evas_canvas3d_node_orientation_angle_axis_set(-90, 1.0, 0.0, 0.0),
422 evas_3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z)); 422 evas_canvas3d_node_scale_set(obj_sc_x, obj_sc_y, obj_sc_z));
423 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node_model)); 423 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node_model));
424 eo_do(data->mesh_node_model, evas_3d_node_mesh_add(data->mesh_model)); 424 eo_do(data->mesh_node_model, evas_canvas3d_node_mesh_add(data->mesh_model));
425 425
426 _mesh_setup(data); 426 _mesh_setup(data);
427 427
428 eo_do(data->scene, 428 eo_do(data->scene,
429 evas_3d_scene_size_set( WIDTH, HEIGHT), 429 evas_canvas3d_scene_size_set( WIDTH, HEIGHT),
430 evas_3d_scene_background_color_set(0.5, 0.5, 0.5, 0.0), 430 evas_canvas3d_scene_background_color_set(0.5, 0.5, 0.5, 0.0),
431 evas_3d_scene_root_node_set(data->root_node); 431 evas_canvas3d_scene_root_node_set(data->root_node);
432 evas_3d_scene_camera_node_set(data->camera_node)); 432 evas_canvas3d_scene_camera_node_set(data->camera_node));
433} 433}
434 434
435int 435int
diff --git a/unsorted/evas/evas-3d-md2.c b/unsorted/evas/evas-3d-md2.c
index 428379da..28272749 100644
--- a/unsorted/evas/evas-3d-md2.c
+++ b/unsorted/evas/evas-3d-md2.c
@@ -47,7 +47,7 @@ _animate_scene(void *data)
47{ 47{
48 static int frame = 0; 48 static int frame = 0;
49 49
50 eo_do((Evas_3D_Node *)data, evas_3d_node_mesh_frame_set(mesh, frame)); 50 eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_mesh_frame_set(mesh, frame));
51 51
52 frame += 32; 52 frame += 32;
53 53
@@ -91,89 +91,89 @@ main(void)
91 evas = ecore_evas_get(ecore_evas); 91 evas = ecore_evas_get(ecore_evas);
92 92
93 /* Add a scene object .*/ 93 /* Add a scene object .*/
94 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 94 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
95 95
96 /* Add the root node for the scene. */ 96 /* Add the root node for the scene. */
97 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 97 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
98 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 98 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
99 99
100 /* Add the camera. */ 100 /* Add the camera. */
101 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 101 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
102 eo_do(camera, 102 eo_do(camera,
103 evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); 103 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
104 104
105 camera_node = 105 camera_node =
106 eo_add(EVAS_3D_NODE_CLASS, evas, 106 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
107 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 107 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
108 eo_do(camera_node, 108 eo_do(camera_node,
109 evas_3d_node_camera_set(camera)); 109 evas_canvas3d_node_camera_set(camera));
110 eo_do(root_node, 110 eo_do(root_node,
111 evas_3d_node_member_add(camera_node)); 111 evas_canvas3d_node_member_add(camera_node));
112 eo_do(camera_node, 112 eo_do(camera_node,
113 evas_3d_node_position_set(100.0, 0.0, 20.0), 113 evas_canvas3d_node_position_set(100.0, 0.0, 20.0),
114 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 20.0, 114 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0,
115 EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); 115 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
116 /* Add the light. */ 116 /* Add the light. */
117 light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 117 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
118 eo_do(light, 118 eo_do(light,
119 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 119 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
120 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 120 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
121 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 121 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
122 evas_3d_light_directional_set(EINA_TRUE)); 122 evas_canvas3d_light_directional_set(EINA_TRUE));
123 123
124 light_node = 124 light_node =
125 eo_add(EVAS_3D_NODE_CLASS, evas, 125 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
126 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 126 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
127 eo_do(light_node, 127 eo_do(light_node,
128 evas_3d_node_light_set(light), 128 evas_canvas3d_node_light_set(light),
129 evas_3d_node_position_set(1000.0, 0.0, 1000.0), 129 evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0),
130 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 130 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
131 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 131 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
132 eo_do(root_node, 132 eo_do(root_node,
133 evas_3d_node_member_add(light_node)); 133 evas_canvas3d_node_member_add(light_node));
134 134
135 /* Add the mesh. */ 135 /* Add the mesh. */
136 mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 136 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
137 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 137 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
138 138
139 eo_do(mesh, 139 eo_do(mesh,
140 efl_file_set(model_path, NULL), 140 efl_file_set(model_path, NULL),
141 evas_3d_mesh_frame_material_set(0, material), 141 evas_canvas3d_mesh_frame_material_set(0, material),
142 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); 142 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
143 143
144 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 144 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
145 eo_do(texture, 145 eo_do(texture,
146 evas_3d_texture_file_set(image_path, NULL), 146 evas_canvas3d_texture_file_set(image_path, NULL),
147 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 147 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
148 EVAS_3D_TEXTURE_FILTER_NEAREST), 148 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
149 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 149 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
150 EVAS_3D_WRAP_MODE_REPEAT)); 150 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
151 eo_do(material, 151 eo_do(material,
152 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture), 152 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture),
153 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 153 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
154 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 154 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
155 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 155 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
156 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 156 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
157 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 157 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
158 0.01, 0.01, 0.01, 1.0), 158 0.01, 0.01, 0.01, 1.0),
159 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 159 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
160 1.0, 1.0, 1.0, 1.0), 160 1.0, 1.0, 1.0, 1.0),
161 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 161 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
162 1.0, 1.0, 1.0, 1.0), 162 1.0, 1.0, 1.0, 1.0),
163 evas_3d_material_shininess_set(50.0)); 163 evas_canvas3d_material_shininess_set(50.0));
164 164
165 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 165 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
166 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 166 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
167 eo_do(root_node, 167 eo_do(root_node,
168 evas_3d_node_member_add(mesh_node)); 168 evas_canvas3d_node_member_add(mesh_node));
169 eo_do(mesh_node, 169 eo_do(mesh_node,
170 evas_3d_node_mesh_add(mesh)); 170 evas_canvas3d_node_mesh_add(mesh));
171 171
172 /* Set up scene. */ 172 /* Set up scene. */
173 eo_do(scene, 173 eo_do(scene,
174 evas_3d_scene_root_node_set(root_node), 174 evas_canvas3d_scene_root_node_set(root_node),
175 evas_3d_scene_camera_node_set(camera_node), 175 evas_canvas3d_scene_camera_node_set(camera_node),
176 evas_3d_scene_size_set(WIDTH, HEIGHT)); 176 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
177 177
178 /* Add a background rectangle objects. */ 178 /* Add a background rectangle objects. */
179 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 179 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
diff --git a/unsorted/evas/evas-3d-mmap-set.c b/unsorted/evas/evas-3d-mmap-set.c
index 5c50e81c..6ff754a5 100644
--- a/unsorted/evas/evas-3d-mmap-set.c
+++ b/unsorted/evas/evas-3d-mmap-set.c
@@ -32,22 +32,22 @@
32#define LOAD_AND_ADD_MESH(extention, number) \ 32#define LOAD_AND_ADD_MESH(extention, number) \
33 snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention); \ 33 snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention); \
34 extention##_file = eina_file_open(buffer , 0); \ 34 extention##_file = eina_file_open(buffer , 0); \
35 mesh_##extention = eo_add(EVAS_3D_MESH_CLASS, evas); \ 35 mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \
36 eo_do(mesh_##extention, \ 36 eo_do(mesh_##extention, \
37 efl_file_mmap_set(extention##_file, NULL), \ 37 efl_file_mmap_set(extention##_file, NULL), \
38 evas_3d_mesh_frame_material_set(0, material), \ 38 evas_canvas3d_mesh_frame_material_set(0, material), \
39 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); \ 39 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); \
40 node_##extention = eo_add(EVAS_3D_NODE_CLASS, evas, \ 40 node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, \
41 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); \ 41 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); \
42 eo_do(root_node, evas_3d_node_member_add(node_##extention)); \ 42 eo_do(root_node, evas_canvas3d_node_member_add(node_##extention)); \
43 eo_do(node_##extention, evas_3d_node_mesh_add(mesh_##extention), \ 43 eo_do(node_##extention, evas_canvas3d_node_mesh_add(mesh_##extention), \
44 evas_3d_node_position_set(initial_node_data[number * 10], \ 44 evas_canvas3d_node_position_set(initial_node_data[number * 10], \
45 initial_node_data[number * 10 + 1], \ 45 initial_node_data[number * 10 + 1], \
46 initial_node_data[number * 10 + 2]), \ 46 initial_node_data[number * 10 + 2]), \
47 evas_3d_node_scale_set(initial_node_data[number * 10 + 3], \ 47 evas_canvas3d_node_scale_set(initial_node_data[number * 10 + 3], \
48 initial_node_data[number * 10 + 4], \ 48 initial_node_data[number * 10 + 4], \
49 initial_node_data[number * 10 + 5]), \ 49 initial_node_data[number * 10 + 5]), \
50 evas_3d_node_orientation_angle_axis_set(initial_node_data[number * 10 + 6], \ 50 evas_canvas3d_node_orientation_angle_axis_set(initial_node_data[number * 10 + 6], \
51 initial_node_data[number * 10 + 7], \ 51 initial_node_data[number * 10 + 7], \
52 initial_node_data[number * 10 + 8], \ 52 initial_node_data[number * 10 + 8], \
53 initial_node_data[number * 10 + 9]));\ 53 initial_node_data[number * 10 + 9]));\
@@ -100,9 +100,9 @@ _animate_obj(void *data)
100 obj_animation_parameter += obj_animation_velocity; 100 obj_animation_parameter += obj_animation_velocity;
101 float oap = obj_animation_parameter/200; 101 float oap = obj_animation_parameter/200;
102 102
103 eo_do((Evas_3D_Node *)data, 103 eo_do((Evas_Canvas3D_Node *)data,
104 evas_3d_node_scale_set(oap, oap, oap), 104 evas_canvas3d_node_scale_set(oap, oap, oap),
105 evas_3d_node_orientation_angle_axis_set(obj_animation_parameter, 0.0, 1.0, 0.0)); 105 evas_canvas3d_node_orientation_angle_axis_set(obj_animation_parameter, 0.0, 1.0, 0.0));
106 106
107 if (obj_animation_parameter >= 360.0 || obj_animation_parameter <= 0.0) 107 if (obj_animation_parameter >= 360.0 || obj_animation_parameter <= 0.0)
108 obj_animation_velocity *= -1.0; 108 obj_animation_velocity *= -1.0;
@@ -115,8 +115,8 @@ _animate_eet(void *data)
115{ 115{
116 eet_animation_parameter += eet_animation_velocity; 116 eet_animation_parameter += eet_animation_velocity;
117 117
118 eo_do((Evas_3D_Node *)data, 118 eo_do((Evas_Canvas3D_Node *)data,
119 evas_3d_node_orientation_angle_axis_set(eet_animation_parameter, 1.0, 0.0, 0.0)); 119 evas_canvas3d_node_orientation_angle_axis_set(eet_animation_parameter, 1.0, 0.0, 0.0));
120 eet_animation_velocity = sin(eet_animation_parameter / 180 * M_PI) + 1.1; 120 eet_animation_velocity = sin(eet_animation_parameter / 180 * M_PI) + 1.1;
121 121
122 return EINA_TRUE; 122 return EINA_TRUE;
@@ -127,8 +127,8 @@ _animate_ply(void *data)
127{ 127{
128 ply_animation_parameter += ply_animation_velocity; 128 ply_animation_parameter += ply_animation_velocity;
129 129
130 eo_do((Evas_3D_Node *)data, 130 eo_do((Evas_Canvas3D_Node *)data,
131 evas_3d_node_orientation_angle_axis_set(ply_animation_parameter, 1.0, 0.0, 0.0)); 131 evas_canvas3d_node_orientation_angle_axis_set(ply_animation_parameter, 1.0, 0.0, 0.0));
132 132
133 if (ply_animation_parameter > 360.0) ply_animation_parameter -= 180.0f; 133 if (ply_animation_parameter > 360.0) ply_animation_parameter -= 180.0f;
134 134
@@ -140,8 +140,8 @@ _animate_md2(void *data)
140{ 140{
141 md2_animation_parameter += md2_animation_velocity; 141 md2_animation_parameter += md2_animation_velocity;
142 142
143 eo_do((Evas_3D_Node *)data, 143 eo_do((Evas_Canvas3D_Node *)data,
144 evas_3d_node_mesh_frame_set(mesh_md2, md2_animation_parameter)); 144 evas_canvas3d_node_mesh_frame_set(mesh_md2, md2_animation_parameter));
145 145
146 if (md2_animation_parameter >= 360.0 || md2_animation_parameter <= 0.0) 146 if (md2_animation_parameter >= 360.0 || md2_animation_parameter <= 0.0)
147 md2_animation_velocity *= -1.0; 147 md2_animation_velocity *= -1.0;
@@ -187,61 +187,61 @@ main(void)
187 evas = ecore_evas_get(ecore_evas); 187 evas = ecore_evas_get(ecore_evas);
188 188
189 /* Add a scene object .*/ 189 /* Add a scene object .*/
190 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 190 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
191 191
192 /* Add the root node for the scene. */ 192 /* Add the root node for the scene. */
193 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 193 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
194 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 194 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
195 195
196 /* Add the camera. */ 196 /* Add the camera. */
197 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 197 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
198 eo_do(camera, 198 eo_do(camera,
199 evas_3d_camera_projection_perspective_set(10.0, 1.0, 1.0, 500.0)); 199 evas_canvas3d_camera_projection_perspective_set(10.0, 1.0, 1.0, 500.0));
200 200
201 camera_node = 201 camera_node =
202 eo_add(EVAS_3D_NODE_CLASS, evas, 202 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
203 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 203 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
204 eo_do(camera_node, 204 eo_do(camera_node,
205 evas_3d_node_camera_set(camera)); 205 evas_canvas3d_node_camera_set(camera));
206 eo_do(root_node, 206 eo_do(root_node,
207 evas_3d_node_member_add(camera_node)); 207 evas_canvas3d_node_member_add(camera_node));
208 eo_do(camera_node, 208 eo_do(camera_node,
209 evas_3d_node_position_set(0.0, 0.0, 100.0), 209 evas_canvas3d_node_position_set(0.0, 0.0, 100.0),
210 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 210 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
211 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 211 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
212 /* Add the light. */ 212 /* Add the light. */
213 light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 213 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
214 eo_do(light, 214 eo_do(light,
215 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 215 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
216 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 216 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
217 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 217 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
218 evas_3d_light_directional_set(EINA_TRUE)); 218 evas_canvas3d_light_directional_set(EINA_TRUE));
219 219
220 light_node = 220 light_node =
221 eo_add(EVAS_3D_NODE_CLASS, evas, 221 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
222 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 222 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
223 eo_do(light_node, 223 eo_do(light_node,
224 evas_3d_node_light_set(light), 224 evas_canvas3d_node_light_set(light),
225 evas_3d_node_position_set(1.0, 0.0, 100.0), 225 evas_canvas3d_node_position_set(1.0, 0.0, 100.0),
226 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 226 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
227 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 227 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
228 eo_do(root_node, 228 eo_do(root_node,
229 evas_3d_node_member_add(light_node)); 229 evas_canvas3d_node_member_add(light_node));
230 230
231 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 231 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
232 232
233 eo_do(material, 233 eo_do(material,
234 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 234 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
235 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 235 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
236 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 236 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
237 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 237 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
238 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 238 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
239 0.01, 0.01, 0.01, 1.0), 239 0.01, 0.01, 0.01, 1.0),
240 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 240 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
241 1.0, 1.0, 0.0, 1.0), 241 1.0, 1.0, 0.0, 1.0),
242 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 242 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
243 0.5, 0.0, 1.0, 1.0), 243 0.5, 0.0, 1.0, 1.0),
244 evas_3d_material_shininess_set(50.0)); 244 evas_canvas3d_material_shininess_set(50.0));
245 245
246 /* Add the meshes */ 246 /* Add the meshes */
247 LOAD_AND_ADD_MESH(obj, 0); 247 LOAD_AND_ADD_MESH(obj, 0);
@@ -251,9 +251,9 @@ main(void)
251 251
252 /* Set up scene. */ 252 /* Set up scene. */
253 eo_do(scene, 253 eo_do(scene,
254 evas_3d_scene_root_node_set(root_node), 254 evas_canvas3d_scene_root_node_set(root_node),
255 evas_3d_scene_camera_node_set(camera_node), 255 evas_canvas3d_scene_camera_node_set(camera_node),
256 evas_3d_scene_size_set(WIDTH, HEIGHT)); 256 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
257 257
258 /* Add a background rectangle objects. */ 258 /* Add a background rectangle objects. */
259 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 259 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
diff --git a/unsorted/evas/evas-3d-obj.c b/unsorted/evas/evas-3d-obj.c
index 406ac7fd..2f998754 100644
--- a/unsorted/evas/evas-3d-obj.c
+++ b/unsorted/evas/evas-3d-obj.c
@@ -44,19 +44,19 @@
44#define NUMBER_OF_MESHES 8 44#define NUMBER_OF_MESHES 8
45 45
46#define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material) \ 46#define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material) \
47 mesh[num] = eo_add(EVAS_3D_MESH_CLASS, evas); \ 47 mesh[num] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); \
48 snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj"); \ 48 snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj"); \
49 eo_do(mesh[num], \ 49 eo_do(mesh[num], \
50 efl_file_set(full_file_path, NULL), \ 50 efl_file_set(full_file_path, NULL), \
51 evas_3d_mesh_frame_material_set(0, name_of_material), \ 51 evas_canvas3d_mesh_frame_material_set(0, name_of_material), \
52 evas_3d_mesh_shade_mode_set(shade_mode)); \ 52 evas_canvas3d_mesh_shade_mode_set(shade_mode)); \
53 mesh_node[num] = eo_add(EVAS_3D_NODE_CLASS, evas, \ 53 mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, \
54 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); \ 54 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH)); \
55 eo_do(root_node, \ 55 eo_do(root_node, \
56 evas_3d_node_member_add(mesh_node[num])); \ 56 evas_canvas3d_node_member_add(mesh_node[num])); \
57 eo_do(mesh_node[num], \ 57 eo_do(mesh_node[num], \
58 evas_3d_node_mesh_add(mesh[num]), \ 58 evas_canvas3d_node_mesh_add(mesh[num]), \
59 evas_3d_node_position_set(0, Y, Z)); \ 59 evas_canvas3d_node_position_set(0, Y, Z)); \
60 60
61#define ADD_OBJ_MESH_AND_SAVED_COPY(path, Y, Z, num, shade_mode, name_of_material)\ 61#define ADD_OBJ_MESH_AND_SAVED_COPY(path, Y, Z, num, shade_mode, name_of_material)\
62 snprintf(buffer, PATH_MAX, "%s%s", input_template, #path); \ 62 snprintf(buffer, PATH_MAX, "%s%s", input_template, #path); \
@@ -67,28 +67,28 @@
67 ADD_OBJ_MESH(buffer, Y + COPY_OFFSET, Z, num + 4, shade_mode, name_of_material) 67 ADD_OBJ_MESH(buffer, Y + COPY_OFFSET, Z, num + 4, shade_mode, name_of_material)
68 68
69#define ADD_TEXTURE(name, path) \ 69#define ADD_TEXTURE(name, path) \
70 name = eo_add(EVAS_3D_TEXTURE_CLASS, evas); \ 70 name = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); \
71 eo_do(name, \ 71 eo_do(name, \
72 evas_3d_texture_file_set(path, NULL), \ 72 evas_canvas3d_texture_file_set(path, NULL), \
73 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, \ 73 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, \
74 EVAS_3D_TEXTURE_FILTER_NEAREST), \ 74 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST), \
75 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, \ 75 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT, \
76 EVAS_3D_WRAP_MODE_REPEAT)); 76 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
77 77
78#define ADD_MATERIAL(name) \ 78#define ADD_MATERIAL(name) \
79 name = eo_add(EVAS_3D_MATERIAL_CLASS, evas); \ 79 name = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); \
80 eo_do(name, \ 80 eo_do(name, \
81 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), \ 81 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE), \
82 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), \ 82 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE), \
83 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE),\ 83 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),\
84 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), \ 84 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE), \
85 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, \ 85 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, \
86 COL_RED, 0.5), \ 86 COL_RED, 0.5), \
87 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, \ 87 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, \
88 COL_GREEN, 0.5), \ 88 COL_GREEN, 0.5), \
89 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, \ 89 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, \
90 COL_BLUE, 0.5), \ 90 COL_BLUE, 0.5), \
91 evas_3d_material_shininess_set(100.0)); 91 evas_canvas3d_material_shininess_set(100.0));
92 92
93static const char *texture_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/sweet_home_reversed.png"; 93static const char *texture_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/sweet_home_reversed.png";
94static const char *output_template = PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES "/saved_"; 94static const char *output_template = PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES "/saved_";
@@ -118,8 +118,8 @@ _animate_scene(void *data)
118{ 118{
119 angle += 0.2; 119 angle += 0.2;
120 120
121 eo_do((Evas_3D_Node *)data, 121 eo_do((Evas_Canvas3D_Node *)data,
122 evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, -1.0)); 122 evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, -1.0));
123 123
124 /* Rotate */ 124 /* Rotate */
125 if (angle > 360.0) angle -= 360.0f; 125 if (angle > 360.0) angle -= 360.0f;
@@ -164,46 +164,46 @@ main(void)
164 evas = ecore_evas_get(ecore_evas); 164 evas = ecore_evas_get(ecore_evas);
165 165
166 /* Add a scene object .*/ 166 /* Add a scene object .*/
167 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 167 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
168 168
169 /* Add the root node for the scene. */ 169 /* Add the root node for the scene. */
170 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 170 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
171 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 171 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
172 172
173 /* Add the camera. */ 173 /* Add the camera. */
174 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 174 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
175 eo_do(camera, 175 eo_do(camera,
176 evas_3d_camera_projection_perspective_set(20.0, 1.0, 1.0, 500.0)); 176 evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 1.0, 500.0));
177 177
178 camera_node = 178 camera_node =
179 eo_add(EVAS_3D_NODE_CLASS, evas, 179 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
180 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 180 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
181 eo_do(camera_node, 181 eo_do(camera_node,
182 evas_3d_node_camera_set(camera)); 182 evas_canvas3d_node_camera_set(camera));
183 eo_do(root_node, 183 eo_do(root_node,
184 evas_3d_node_member_add(camera_node)); 184 evas_canvas3d_node_member_add(camera_node));
185 eo_do(camera_node, 185 eo_do(camera_node,
186 evas_3d_node_position_set(100.0, 0.0, 0.0), 186 evas_canvas3d_node_position_set(100.0, 0.0, 0.0),
187 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 187 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
188 EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); 188 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
189 /* Add the light. */ 189 /* Add the light. */
190 light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 190 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
191 eo_do(light, 191 eo_do(light,
192 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 192 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
193 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 193 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
194 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 194 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
195 evas_3d_light_directional_set(EINA_TRUE)); 195 evas_canvas3d_light_directional_set(EINA_TRUE));
196 196
197 light_node = 197 light_node =
198 eo_add(EVAS_3D_NODE_CLASS, evas, 198 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
199 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 199 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
200 eo_do(light_node, 200 eo_do(light_node,
201 evas_3d_node_light_set(light), 201 evas_canvas3d_node_light_set(light),
202 evas_3d_node_position_set(10.0, 0.0, 0.0), 202 evas_canvas3d_node_position_set(10.0, 0.0, 0.0),
203 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 203 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
204 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 204 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
205 eo_do(root_node, 205 eo_do(root_node,
206 evas_3d_node_member_add(light_node)); 206 evas_canvas3d_node_member_add(light_node));
207 207
208 ADD_TEXTURE(texture, texture_path) 208 ADD_TEXTURE(texture, texture_path)
209 209
@@ -211,26 +211,26 @@ main(void)
211 211
212 ADD_MATERIAL(material_with_tex) 212 ADD_MATERIAL(material_with_tex)
213 eo_do(material_with_tex, 213 eo_do(material_with_tex,
214 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture)); 214 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture));
215 215
216 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES)) 216 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES))
217 fprintf(stderr, "Failed to create folder %s\n\n", 217 fprintf(stderr, "Failed to create folder %s\n\n",
218 PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES); 218 PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES);
219 219
220 ADD_OBJ_MESH_AND_SAVED_COPY(home, -GRID_SIZE, -GRID_SIZE, 0, 220 ADD_OBJ_MESH_AND_SAVED_COPY(home, -GRID_SIZE, -GRID_SIZE, 0,
221 EVAS_3D_SHADE_MODE_PHONG, material_with_tex) 221 EVAS_CANVAS3D_SHADE_MODE_PHONG, material_with_tex)
222 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_normals, -GRID_SIZE, GRID_SIZE, 1, 222 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_normals, -GRID_SIZE, GRID_SIZE, 1,
223 EVAS_3D_SHADE_MODE_DIFFUSE, material_with_tex) 223 EVAS_CANVAS3D_SHADE_MODE_DIFFUSE, material_with_tex)
224 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_tex_coords, GRID_SIZE, -GRID_SIZE, 2, 224 ADD_OBJ_MESH_AND_SAVED_COPY(home_without_tex_coords, GRID_SIZE, -GRID_SIZE, 2,
225 EVAS_3D_SHADE_MODE_PHONG, material) 225 EVAS_CANVAS3D_SHADE_MODE_PHONG, material)
226 ADD_OBJ_MESH_AND_SAVED_COPY(home_only_vertex_coords, GRID_SIZE, GRID_SIZE, 3, 226 ADD_OBJ_MESH_AND_SAVED_COPY(home_only_vertex_coords, GRID_SIZE, GRID_SIZE, 3,
227 EVAS_3D_SHADE_MODE_SHADOW_MAP_RENDER, NULL) 227 EVAS_CANVAS3D_SHADE_MODE_SHADOW_MAP_RENDER, NULL)
228 228
229 /* Set up scene. */ 229 /* Set up scene. */
230 eo_do(scene, 230 eo_do(scene,
231 evas_3d_scene_root_node_set(root_node), 231 evas_canvas3d_scene_root_node_set(root_node),
232 evas_3d_scene_camera_node_set(camera_node), 232 evas_canvas3d_scene_camera_node_set(camera_node),
233 evas_3d_scene_size_set(WIDTH, HEIGHT)); 233 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
234 234
235 /* Add a background rectangle MESHES. */ 235 /* Add a background rectangle MESHES. */
236 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 236 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
diff --git a/unsorted/evas/evas-3d-parallax-occlusion.c b/unsorted/evas/evas-3d-parallax-occlusion.c
index 33b1e436..70d24b31 100644
--- a/unsorted/evas/evas-3d-parallax-occlusion.c
+++ b/unsorted/evas/evas-3d-parallax-occlusion.c
@@ -62,10 +62,10 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
62 Evas_Event_Key_Down *ev = event_info; 62 Evas_Event_Key_Down *ev = event_info;
63 63
64 if (!strcmp("n", ev->key)) 64 if (!strcmp("n", ev->key))
65 eo_do(scene->mesh, evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_NORMAL_MAP)); 65 eo_do(scene->mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP));
66 66
67 if (!strcmp("p", ev->key)) 67 if (!strcmp("p", ev->key))
68 eo_do(scene->mesh, evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PARALLAX_OCCLUSION)); 68 eo_do(scene->mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION));
69} 69}
70 70
71static void 71static void
@@ -93,9 +93,9 @@ _animate_scene(void *data)
93 angle += 0.5; 93 angle += 0.5;
94 94
95 eo_do(scene->mesh_node, 95 eo_do(scene->mesh_node,
96 evas_3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0)); 96 evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0));
97 97
98 eo_do(scene->mesh_node, evas_3d_node_mesh_frame_set(scene->mesh, 50 * (1 + sin(angle / 180.0 * M_PI)))); 98 eo_do(scene->mesh_node, evas_canvas3d_node_mesh_frame_set(scene->mesh, 50 * (1 + sin(angle / 180.0 * M_PI))));
99 /* Rotate */ 99 /* Rotate */
100 if (angle > 360.0) angle = 0.0f; 100 if (angle > 360.0) angle = 0.0f;
101 101
@@ -105,137 +105,137 @@ _animate_scene(void *data)
105static void 105static void
106_camera_setup(Scene_Data *data) 106_camera_setup(Scene_Data *data)
107{ 107{
108 data->camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 108 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
109 109
110 eo_do(data->camera, 110 eo_do(data->camera,
111 evas_3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0)); 111 evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0));
112 112
113 data->camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, 113 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
114 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 114 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
115 eo_do(data->camera_node, 115 eo_do(data->camera_node,
116 evas_3d_node_camera_set(data->camera), 116 evas_canvas3d_node_camera_set(data->camera),
117 evas_3d_node_position_set(0.0, 0.0, 10.0), 117 evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
118 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 118 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
119 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 119 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
120 eo_do(data->root_node, evas_3d_node_member_add(data->camera_node)); 120 eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
121} 121}
122 122
123static void 123static void
124_light_setup(Scene_Data *data) 124_light_setup(Scene_Data *data)
125{ 125{
126 data->light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 126 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
127 eo_do(data->light, 127 eo_do(data->light,
128 evas_3d_light_ambient_set(0.2, 0.2, 0.2, 1.0), 128 evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
129 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 129 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
130 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0)); 130 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
131 131
132 data->light_node = eo_add(EVAS_3D_NODE_CLASS, evas, 132 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
133 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 133 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
134 eo_do(data->light_node, 134 eo_do(data->light_node,
135 evas_3d_node_light_set(data->light), 135 evas_canvas3d_node_light_set(data->light),
136 evas_3d_node_position_set(-20.0, 20.0, 50.0), 136 evas_canvas3d_node_position_set(-20.0, 20.0, 50.0),
137 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 137 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
138 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 138 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
139 eo_do(data->root_node, evas_3d_node_member_add(data->light_node)); 139 eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
140} 140}
141 141
142static void 142static void
143_mesh_setup(Scene_Data *data) 143_mesh_setup(Scene_Data *data)
144{ 144{
145 /* Setup material. */ 145 /* Setup material. */
146 data->material_rocks = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 146 data->material_rocks = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
147 147
148 data->texture_rocks = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 148 data->texture_rocks = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
149 data->texture_rocks_n = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 149 data->texture_rocks_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
150 eo_do(data->texture_rocks, evas_3d_texture_file_set(rock_diffuse, NULL), 150 eo_do(data->texture_rocks, evas_canvas3d_texture_file_set(rock_diffuse, NULL),
151 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 151 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
152 EVAS_3D_WRAP_MODE_REPEAT)); 152 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
153 eo_do(data->texture_rocks_n, evas_3d_texture_file_set(rock_n_and_height_map, NULL), 153 eo_do(data->texture_rocks_n, evas_canvas3d_texture_file_set(rock_n_and_height_map, NULL),
154 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 154 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
155 EVAS_3D_WRAP_MODE_REPEAT)); 155 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
156 156
157 eo_do(data->material_rocks, 157 eo_do(data->material_rocks,
158 evas_3d_material_texture_set(EVAS_3D_MATERIAL_NORMAL, data->texture_rocks_n), 158 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, data->texture_rocks_n),
159 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, data->texture_rocks), 159 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture_rocks),
160 evas_3d_material_texture_set(EVAS_3D_MATERIAL_AMBIENT, data->texture_rocks), 160 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, data->texture_rocks),
161 evas_3d_material_texture_set(EVAS_3D_MATERIAL_SPECULAR, data->texture_rocks), 161 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, data->texture_rocks),
162 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 162 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
163 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 163 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
164 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 164 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
165 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 165 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
166 166
167 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0), 167 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0),
168 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 168 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
169 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 169 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
170 evas_3d_material_shininess_set(100.0)); 170 evas_canvas3d_material_shininess_set(100.0));
171 171
172 data->material_wood = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 172 data->material_wood = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
173 173
174 data->texture_wood = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 174 data->texture_wood = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
175 data->texture_four_n = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 175 data->texture_four_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
176 eo_do(data->texture_wood, evas_3d_texture_file_set(wood_diffuse, NULL), 176 eo_do(data->texture_wood, evas_canvas3d_texture_file_set(wood_diffuse, NULL),
177 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 177 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
178 EVAS_3D_WRAP_MODE_REPEAT)); 178 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
179 eo_do(data->texture_four_n, evas_3d_texture_file_set(wood_n_and_height_map, NULL), 179 eo_do(data->texture_four_n, evas_canvas3d_texture_file_set(wood_n_and_height_map, NULL),
180 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 180 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
181 EVAS_3D_WRAP_MODE_REPEAT)); 181 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
182 182
183 eo_do(data->material_wood, 183 eo_do(data->material_wood,
184 evas_3d_material_texture_set(EVAS_3D_MATERIAL_NORMAL, data->texture_four_n), 184 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, data->texture_four_n),
185 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, data->texture_wood), 185 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture_wood),
186 evas_3d_material_texture_set(EVAS_3D_MATERIAL_AMBIENT, data->texture_wood), 186 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, data->texture_wood),
187 evas_3d_material_texture_set(EVAS_3D_MATERIAL_SPECULAR, data->texture_wood), 187 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, data->texture_wood),
188 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 188 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
189 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 189 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
190 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 190 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
191 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 191 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
192 192
193 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0), 193 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0),
194 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0), 194 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
195 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0), 195 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
196 evas_3d_material_shininess_set(100.0)); 196 evas_canvas3d_material_shininess_set(100.0));
197 197
198 /* Set data of primitive */ 198 /* Set data of primitive */
199 data->cube = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 199 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
200 eo_do(data->cube, 200 eo_do(data->cube,
201 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_CUBE)); 201 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
202 202
203 /* Setup mesh. */ 203 /* Setup mesh. */
204 data->mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 204 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
205 eo_do(data->mesh, 205 eo_do(data->mesh,
206 evas_3d_mesh_from_primitive_set(0, data->cube), 206 evas_canvas3d_mesh_from_primitive_set(0, data->cube),
207 evas_3d_mesh_from_primitive_set(100, data->cube), 207 evas_canvas3d_mesh_from_primitive_set(100, data->cube),
208 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PARALLAX_OCCLUSION), 208 evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PARALLAX_OCCLUSION),
209 evas_3d_mesh_frame_material_set(0, data->material_rocks)); 209 evas_canvas3d_mesh_frame_material_set(0, data->material_rocks));
210 210
211 eo_do(data->mesh, 211 eo_do(data->mesh,
212 evas_3d_mesh_frame_material_set(100, data->material_wood)); 212 evas_canvas3d_mesh_frame_material_set(100, data->material_wood));
213 213
214 data->mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 214 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
215 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 215 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
216 eo_do(data->root_node, evas_3d_node_member_add(data->mesh_node)); 216 eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
217 eo_do(data->mesh_node, evas_3d_node_mesh_add(data->mesh), 217 eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh),
218 evas_3d_node_scale_set(3, 3, 3)); 218 evas_canvas3d_node_scale_set(3, 3, 3));
219} 219}
220 220
221static void 221static void
222_scene_setup(Scene_Data *data) 222_scene_setup(Scene_Data *data)
223{ 223{
224 data->scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 224 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
225 eo_do(data->scene, 225 eo_do(data->scene,
226 evas_3d_scene_size_set(WIDTH, HEIGHT); 226 evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
227 evas_3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0)); 227 evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
228 228
229 data->root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 229 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
230 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 230 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
231 231
232 _camera_setup(data); 232 _camera_setup(data);
233 _light_setup(data); 233 _light_setup(data);
234 _mesh_setup(data); 234 _mesh_setup(data);
235 235
236 eo_do(data->scene, 236 eo_do(data->scene,
237 evas_3d_scene_root_node_set(data->root_node), 237 evas_canvas3d_scene_root_node_set(data->root_node),
238 evas_3d_scene_camera_node_set(data->camera_node)); 238 evas_canvas3d_scene_camera_node_set(data->camera_node));
239} 239}
240 240
241int 241int
diff --git a/unsorted/evas/evas-3d-pick.c b/unsorted/evas/evas-3d-pick.c
index 9e8e19ba..261acc49 100644
--- a/unsorted/evas/evas-3d-pick.c
+++ b/unsorted/evas/evas-3d-pick.c
@@ -1,8 +1,8 @@
1/** 1/**
2 * This example shows how to attach mechanism of pick. 2 * This example shows how to attach mechanism of pick.
3 * 3 *
4 * Here shown which transformation should be applied to event_info of 4 * Here shown which transformation should be applied to event_info of
5 * _on_mouse_down to make them usable in evas_3d_scene_pick() 5 * _on_mouse_down to make them usable in evas_canvas3d_scene_pick()
6 * and parameters which can be got from this function. 6 * and parameters which can be got from this function.
7 * 7 *
8 * @verbatim 8 * @verbatim
@@ -51,8 +51,8 @@ _animate_scene(void *data)
51 51
52 angle += 0.3; 52 angle += 0.3;
53 53
54 eo_do((Evas_3D_Node *)data, 54 eo_do((Evas_Canvas3D_Node *)data,
55 evas_3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0)); 55 evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0));
56 56
57 /* Rotate */ 57 /* Rotate */
58 if (angle > 360.0) angle -= 360.0f; 58 if (angle > 360.0) angle -= 360.0f;
@@ -87,8 +87,8 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
87 int scene_w, scene_h; 87 int scene_w, scene_h;
88 Evas_Real scene_x, scene_y; 88 Evas_Real scene_x, scene_y;
89 Evas_Real s, t; 89 Evas_Real s, t;
90 Evas_3D_Node *n; 90 Evas_Canvas3D_Node *n;
91 Evas_3D_Mesh *m; 91 Evas_Canvas3D_Mesh *m;
92 Eina_Bool pick; 92 Eina_Bool pick;
93 93
94 evas_object_geometry_get(obj, &x, &y, &w, &h); 94 evas_object_geometry_get(obj, &x, &y, &w, &h);
@@ -96,12 +96,12 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
96 obj_x = ev->canvas.x - x; 96 obj_x = ev->canvas.x - x;
97 obj_y = ev->canvas.y - y; 97 obj_y = ev->canvas.y - y;
98 98
99 eo_do(scene, evas_3d_scene_size_get(&scene_w, &scene_h)); 99 eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
100 100
101 scene_x = obj_x * scene_w / (Evas_Real)w; 101 scene_x = obj_x * scene_w / (Evas_Real)w;
102 scene_y = obj_y * scene_h / (Evas_Real)h; 102 scene_y = obj_y * scene_h / (Evas_Real)h;
103 103
104 eo_do(scene, pick = evas_3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t)); 104 eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
105 if (pick) printf("Picked : "); 105 if (pick) printf("Picked : ");
106 else printf("Not picked : "); 106 else printf("Not picked : ");
107 107
@@ -133,70 +133,70 @@ main(void)
133 evas = ecore_evas_get(ecore_evas); 133 evas = ecore_evas_get(ecore_evas);
134 134
135 /* Add a scene object .*/ 135 /* Add a scene object .*/
136 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 136 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
137 137
138 /* Add the root node for the scene. */ 138 /* Add the root node for the scene. */
139 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 139 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
140 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 140 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
141 141
142 /* Add the camera. */ 142 /* Add the camera. */
143 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 143 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
144 eo_do(camera, 144 eo_do(camera,
145 evas_3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 100.0)); 145 evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 100.0));
146 146
147 camera_node = 147 camera_node =
148 eo_add(EVAS_3D_NODE_CLASS, evas, 148 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
149 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 149 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
150 eo_do(camera_node, 150 eo_do(camera_node,
151 evas_3d_node_camera_set(camera), 151 evas_canvas3d_node_camera_set(camera),
152 evas_3d_node_position_set(0.0, 0.0, 2.5), 152 evas_canvas3d_node_position_set(0.0, 0.0, 2.5),
153 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 153 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
154 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 154 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
155 eo_do(root_node, evas_3d_node_member_add(camera_node)); 155 eo_do(root_node, evas_canvas3d_node_member_add(camera_node));
156 156
157 sphere = eo_add(EVAS_3D_PRIMITIVE_CLASS, evas); 157 sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
158 eo_do(sphere, 158 eo_do(sphere,
159 evas_3d_primitive_form_set(EVAS_3D_MESH_PRIMITIVE_SPHERE), 159 evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
160 evas_3d_primitive_precision_set(50)); 160 evas_canvas3d_primitive_precision_set(50));
161 161
162 mesh = eo_add(EVAS_3D_MESH_CLASS, evas); 162 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
163 eo_do(mesh, evas_3d_mesh_from_primitive_set(0, sphere)); 163 eo_do(mesh, evas_canvas3d_mesh_from_primitive_set(0, sphere));
164 164
165 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 165 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
166 166
167 texture_diffuse = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 167 texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
168 eo_do(texture_diffuse, 168 eo_do(texture_diffuse,
169 evas_3d_texture_file_set(image_path, NULL), 169 evas_canvas3d_texture_file_set(image_path, NULL),
170 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_LINEAR, 170 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
171 EVAS_3D_TEXTURE_FILTER_LINEAR)); 171 EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR));
172 eo_do(material, 172 eo_do(material,
173 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, 173 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
174 texture_diffuse), 174 texture_diffuse),
175 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 175 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
176 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 176 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
177 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 177 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
178 178
179 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01, 179 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.01, 0.01, 0.01,
180 1.0), 180 1.0),
181 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 181 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0,
182 1.0), 182 1.0),
183 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0,
184 1.0), 184 1.0),
185 evas_3d_material_shininess_set(50.0)); 185 evas_canvas3d_material_shininess_set(50.0));
186 186
187 mesh_node = eo_add(EVAS_3D_NODE_CLASS, evas, 187 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
188 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_MESH)); 188 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
189 189
190 eo_do(root_node, evas_3d_node_member_add(mesh_node)); 190 eo_do(root_node, evas_canvas3d_node_member_add(mesh_node));
191 eo_do(mesh_node, evas_3d_node_mesh_add(mesh)); 191 eo_do(mesh_node, evas_canvas3d_node_mesh_add(mesh));
192 eo_do(mesh, evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_DIFFUSE), 192 eo_do(mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE),
193 evas_3d_mesh_frame_material_set(0, material)); 193 evas_canvas3d_mesh_frame_material_set(0, material));
194 194
195 /* Set up scene. */ 195 /* Set up scene. */
196 eo_do(scene, 196 eo_do(scene,
197 evas_3d_scene_root_node_set(root_node), 197 evas_canvas3d_scene_root_node_set(root_node),
198 evas_3d_scene_camera_node_set(camera_node), 198 evas_canvas3d_scene_camera_node_set(camera_node),
199 evas_3d_scene_size_set(WIDTH, HEIGHT)); 199 evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
200 200
201 /* Add evas objects. */ 201 /* Add evas objects. */
202 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 202 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
diff --git a/unsorted/evas/evas-3d-ply.c b/unsorted/evas/evas-3d-ply.c
index 502b3d63..341011a5 100644
--- a/unsorted/evas/evas-3d-ply.c
+++ b/unsorted/evas/evas-3d-ply.c
@@ -43,7 +43,7 @@ static const char *file_name[8] = {"Normal_UVs_Colors.ply",
43 "NoNormal_NoUVs_Colors.ply", 43 "NoNormal_NoUVs_Colors.ply",
44 "NoNormal_NoUVs_NoColors.ply"}; 44 "NoNormal_NoUVs_NoColors.ply"};
45 45
46int draw_mode[2] = {EVAS_3D_SHADE_MODE_PHONG, EVAS_3D_SHADE_MODE_VERTEX_COLOR}; 46int draw_mode[2] = {EVAS_CANVAS3D_SHADE_MODE_PHONG, EVAS_CANVAS3D_SHADE_MODE_VERTEX_COLOR};
47 47
48Ecore_Evas *ecore_evas = NULL; 48Ecore_Evas *ecore_evas = NULL;
49Evas *evas = NULL; 49Evas *evas = NULL;
@@ -71,7 +71,7 @@ _animate_scene(void *data)
71{ 71{
72 angle += 0.2; 72 angle += 0.2;
73 73
74 eo_do((Evas_3D_Node *)data, evas_3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0)); 74 eo_do((Evas_Canvas3D_Node *)data, evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
75 75
76 /* Rotate */ 76 /* Rotate */
77 if (angle > 360.0) angle -= 360.0f; 77 if (angle > 360.0) angle -= 360.0f;
@@ -123,66 +123,66 @@ main(void)
123 evas = ecore_evas_get(ecore_evas); 123 evas = ecore_evas_get(ecore_evas);
124 124
125 /* Add a scene object .*/ 125 /* Add a scene object .*/
126 scene = eo_add(EVAS_3D_SCENE_CLASS, evas); 126 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
127 127
128 /* Add the root node for the scene. */ 128 /* Add the root node for the scene. */
129 root_node = eo_add(EVAS_3D_NODE_CLASS, evas, 129 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
130 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_NODE)); 130 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
131 131
132 /* Add the camera. */ 132 /* Add the camera. */
133 camera = eo_add(EVAS_3D_CAMERA_CLASS, evas); 133 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
134 eo_do(camera, 134 eo_do(camera,
135 evas_3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0)); 135 evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
136 136
137 camera_node = eo_add(EVAS_3D_NODE_CLASS, evas, 137 camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
138 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_CAMERA)); 138 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
139 eo_do(camera_node, 139 eo_do(camera_node,
140 evas_3d_node_camera_set(camera)); 140 evas_canvas3d_node_camera_set(camera));
141 eo_do(root_node, 141 eo_do(root_node,
142 evas_3d_node_member_add(camera_node)); 142 evas_canvas3d_node_member_add(camera_node));
143 eo_do(camera_node, 143 eo_do(camera_node,
144 evas_3d_node_position_set(15.0, 0.0, 0.0), 144 evas_canvas3d_node_position_set(15.0, 0.0, 0.0),
145 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 145 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
146 EVAS_3D_SPACE_PARENT, 0.0, 0.0, 1.0)); 146 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
147 /* Add the light. */ 147 /* Add the light. */
148 light = eo_add(EVAS_3D_LIGHT_CLASS, evas); 148 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
149 eo_do(light, 149 eo_do(light,
150 evas_3d_light_ambient_set(1.0, 1.0, 1.0, 1.0), 150 evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
151 evas_3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 151 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
152 evas_3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 152 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
153 evas_3d_light_directional_set(EINA_TRUE)); 153 evas_canvas3d_light_directional_set(EINA_TRUE));
154 154
155 light_node = eo_add(EVAS_3D_NODE_CLASS, evas, 155 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
156 evas_3d_node_constructor(EVAS_3D_NODE_TYPE_LIGHT)); 156 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
157 eo_do(light_node, 157 eo_do(light_node,
158 evas_3d_node_light_set(light), 158 evas_canvas3d_node_light_set(light),
159 evas_3d_node_position_set(1000.0, 0.0, 1000.0), 159 evas_canvas3d_node_position_set(1000.0, 0.0, 1000.0),
160 evas_3d_node_look_at_set(EVAS_3D_SPACE_PARENT, 0.0, 0.0, 0.0, 160 evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
161 EVAS_3D_SPACE_PARENT, 0.0, 1.0, 0.0)); 161 EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
162 eo_do(root_node, 162 eo_do(root_node,
163 evas_3d_node_member_add(light_node)); 163 evas_canvas3d_node_member_add(light_node));
164 164
165 material = eo_add(EVAS_3D_MATERIAL_CLASS, evas); 165 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
166 texture = eo_add(EVAS_3D_TEXTURE_CLASS, evas); 166 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
167 eo_do(texture, 167 eo_do(texture,
168 evas_3d_texture_file_set(image_path, NULL), 168 evas_canvas3d_texture_file_set(image_path, NULL),
169 evas_3d_texture_filter_set(EVAS_3D_TEXTURE_FILTER_NEAREST, 169 evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
170 EVAS_3D_TEXTURE_FILTER_NEAREST), 170 EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
171 evas_3d_texture_wrap_set(EVAS_3D_WRAP_MODE_REPEAT, 171 evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
172 EVAS_3D_WRAP_MODE_REPEAT)); 172 EVAS_CANVAS3D_WRAP_MODE_REPEAT));
173 eo_do(material, 173 eo_do(material,
174 evas_3d_material_texture_set(EVAS_3D_MATERIAL_DIFFUSE, texture), 174 evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture),
175 evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE), 175 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
176 evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE), 176 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
177 evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE), 177 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
178 evas_3d_material_enable_set(EVAS_3D_MATERIAL_NORMAL, EINA_TRUE), 178 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
179 evas_3d_material_color_set(EVAS_3D_MATERIAL_AMBIENT, 179 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
180 0.01, 0.01, 0.01, 1.0), 180 0.01, 0.01, 0.01, 1.0),
181 evas_3d_material_color_set(EVAS_3D_MATERIAL_DIFFUSE, 181 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
182 1.0, 1.0, 1.0, 1.0), 182 1.0, 1.0, 1.0, 1.0),
183 evas_3d_material_color_set(EVAS_3D_MATERIAL_SPECULAR, 183 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
184 1.0, 1.0, 1.0, 1.0), 184 1.0, 1.0, 1.0, 1.0),
185 evas_3d_material_shininess_set(50.0)); 185 evas_canvas3d_material_shininess_set(50.0));
186 186
187 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES)) 187 if (!ecore_file_mkpath(PACKAGE_EXAMPLES_DIR EVAS_SAVED_FILES))
188 fprintf(stderr, "Failed to create folder %s\n\n", 188 fprintf(stderr, "Failed to create folder %s\n\n",
@@ -191,13 +191,13 @@ main(void)
191 /* Add the meshes. */ 191 /* Add the meshes. */
192 for (i = 0; i < NUMBER_OF_MESHES; i++)