summaryrefslogtreecommitdiff
path: root/unsorted/elementary/evas3d_object_on_button_example.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 14:29:20 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 16:47:41 -0500
commit7604985c8e8cb2103c85755a7a2e9f717d3cae8b (patch)
tree5267a9685677aa0b6c6a2e2e979434ec6baf2158 /unsorted/elementary/evas3d_object_on_button_example.c
parent73838ff2b4085d71bd26f5c368e9414453e5dc29 (diff)
evas3d: use a type setter function with finalize instead of a custom constructor
resolves a conflict with the 'constructor' method name
Diffstat (limited to 'unsorted/elementary/evas3d_object_on_button_example.c')
-rw-r--r--unsorted/elementary/evas3d_object_on_button_example.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/unsorted/elementary/evas3d_object_on_button_example.c b/unsorted/elementary/evas3d_object_on_button_example.c
index c3866b7..7be8f60 100644
--- a/unsorted/elementary/evas3d_object_on_button_example.c
+++ b/unsorted/elementary/evas3d_object_on_button_example.c
@@ -164,7 +164,7 @@ _camera_setup(Scene_Data *data)
164 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 164 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
165 165
166 data->camera_node = 166 data->camera_node =
167 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 167 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
168 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 168 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
169 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0); 169 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
170 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); 170 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);
@@ -180,7 +180,7 @@ _light_setup(Scene_Data *data)
180 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 180 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
181 181
182 data->light_node = 182 data->light_node =
183 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 183 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
184 evas_canvas3d_node_light_set(data->light_node, data->light); 184 evas_canvas3d_node_light_set(data->light_node, data->light);
185 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 185 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
186 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); 186 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);
@@ -220,7 +220,7 @@ _mesh_setup(Scene_Data *data)
220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE); 220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
221 221
222 data->mesh_node = 222 data->mesh_node =
223 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); 223 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
224 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 224 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
225 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 225 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
226} 226}
@@ -233,7 +233,7 @@ _scene_setup(Scene_Data *data)
233 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 233 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
234 234
235 data->root_node = 235 data->root_node =
236 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); 236 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
237 237
238 _camera_setup(data); 238 _camera_setup(data);
239 _light_setup(data); 239 _light_setup(data);