summaryrefslogtreecommitdiff
path: root/src/examples/evas/evas-3d-cube2.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
commit27ae060633fdc5d950410492fec14806e2d4b9f3 (patch)
tree6ae5220dc8c9f881f668efc5daba1c49b0e3cedc /src/examples/evas/evas-3d-cube2.c
parent87d741052b51e081faf0d8a9cf5cdd765adf262c (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 'src/examples/evas/evas-3d-cube2.c')
-rw-r--r--src/examples/evas/evas-3d-cube2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index c07e530..0b1d31c 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -114,7 +114,7 @@ _camera_setup(Scene_Data *data)
114 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 114 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
115 115
116 data->camera_node = 116 data->camera_node =
117 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 117 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
118 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 118 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
119 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0); 119 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0);
120 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); 120 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);
@@ -130,7 +130,7 @@ _light_setup(Scene_Data *data)
130 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 130 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
131 131
132 data->light_node = 132 data->light_node =
133 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 133 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
134 evas_canvas3d_node_light_set(data->light_node, data->light); 134 evas_canvas3d_node_light_set(data->light_node, data->light);
135 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 135 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
136 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); 136 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);
@@ -187,7 +187,7 @@ _mesh_setup(Scene_Data *data)
187 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); 187 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
188 188
189 data->mesh_node = 189 data->mesh_node =
190 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); 190 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
191 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 191 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
192 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 192 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
193} 193}
@@ -200,7 +200,7 @@ _scene_setup(Scene_Data *data)
200 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 200 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
201 201
202 data->root_node = 202 data->root_node =
203 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); 203 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_type_set(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
204 204
205 _camera_setup(data); 205 _camera_setup(data);
206 _light_setup(data); 206 _light_setup(data);