summaryrefslogtreecommitdiff
path: root/unsorted/elementary/evas3d_object_on_button_example.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commit25588b5ae3cfe257f97d0cd0c39a53f045742d55 (patch)
treea19e93a8583d6ec87e544add48c32ed48a95a870 /unsorted/elementary/evas3d_object_on_button_example.c
parent8d317211454924fd60b95c216ec038672a9eb8b1 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'unsorted/elementary/evas3d_object_on_button_example.c')
-rw-r--r--unsorted/elementary/evas3d_object_on_button_example.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/unsorted/elementary/evas3d_object_on_button_example.c b/unsorted/elementary/evas3d_object_on_button_example.c
index dc40bb5..a53d233 100644
--- a/unsorted/elementary/evas3d_object_on_button_example.c
+++ b/unsorted/elementary/evas3d_object_on_button_example.c
@@ -158,12 +158,12 @@ _animate_scene(void *data)
158static void 158static void
159_camera_setup(Scene_Data *data) 159_camera_setup(Scene_Data *data)
160{ 160{
161 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 161 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
162 162
163 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 163 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
164 164
165 data->camera_node = 165 data->camera_node =
166 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 166 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
167 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 167 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
168 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0); 168 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
169 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0); 169 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0);
@@ -173,13 +173,13 @@ _camera_setup(Scene_Data *data)
173static void 173static void
174_light_setup(Scene_Data *data) 174_light_setup(Scene_Data *data)
175{ 175{
176 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 176 data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
177 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); 177 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
178 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 178 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
179 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 179 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
180 180
181 data->light_node = 181 data->light_node =
182 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 182 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
183 evas_canvas3d_node_light_set(data->light_node, data->light); 183 evas_canvas3d_node_light_set(data->light_node, data->light);
184 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 184 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
185 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 185 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -189,8 +189,8 @@ static void
189_mesh_setup(Scene_Data *data) 189_mesh_setup(Scene_Data *data)
190{ 190{
191 /* Setup material and texture as widget button. */ 191 /* Setup material and texture as widget button. */
192 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 192 data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
193 data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 193 data->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
194 194
195 evas_canvas3d_texture_source_set(data->texture, btn); 195 evas_canvas3d_texture_source_set(data->texture, btn);
196 evas_canvas3d_texture_source_visible_set(data->texture, EINA_FALSE); 196 evas_canvas3d_texture_source_visible_set(data->texture, EINA_FALSE);
@@ -205,7 +205,7 @@ _mesh_setup(Scene_Data *data)
205 evas_canvas3d_material_shininess_set(data->material, 100.0); 205 evas_canvas3d_material_shininess_set(data->material, 100.0);
206 206
207 /* Setup mesh. */ 207 /* Setup mesh. */
208 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 208 data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
209 evas_canvas3d_mesh_vertex_count_set(data->mesh, 24); 209 evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
210 evas_canvas3d_mesh_frame_add(data->mesh, 0); 210 evas_canvas3d_mesh_frame_add(data->mesh, 0);
211 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]); 211 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -219,7 +219,7 @@ _mesh_setup(Scene_Data *data)
219 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE); 219 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
220 220
221 data->mesh_node = 221 data->mesh_node =
222 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 222 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
223 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 223 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
224 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 224 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
225} 225}
@@ -227,12 +227,12 @@ _mesh_setup(Scene_Data *data)
227static void 227static void
228_scene_setup(Scene_Data *data) 228_scene_setup(Scene_Data *data)
229{ 229{
230 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 230 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
231 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); 231 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
232 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 232 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
233 233
234 data->root_node = 234 data->root_node =
235 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 235 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
236 236
237 _camera_setup(data); 237 _camera_setup(data);
238 _light_setup(data); 238 _light_setup(data);
@@ -256,7 +256,7 @@ elm_main(int argc, char **argv)
256 evas = evas_object_evas_get(win); 256 evas = evas_object_evas_get(win);
257 257
258 /* Add an image object for 3D scene rendering. */ 258 /* Add an image object for 3D scene rendering. */
259 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 259 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
260 efl_gfx_size_set(image, WIDTH, HEIGHT); 260 efl_gfx_size_set(image, WIDTH, HEIGHT);
261 efl_gfx_visible_set(image, EINA_TRUE); 261 efl_gfx_visible_set(image, EINA_TRUE);
262 262