aboutsummaryrefslogtreecommitdiffstats
path: root/src/examples/evas/evas-3d-cube2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/examples/evas/evas-3d-cube2.c')
-rw-r--r--src/examples/evas/evas-3d-cube2.c36
1 files changed, 17 insertions, 19 deletions
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index a2dd1febf5..9f811e1500 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -112,12 +112,11 @@ _animate_scene(void *data)
static void
_camera_setup(Scene_Data *data)
{
- data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+ eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
eo_do(data->camera,
evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
- data->camera_node =
- eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+ eo_add(data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
eo_do(data->camera_node,
evas_canvas3d_node_camera_set(data->camera),
@@ -131,14 +130,13 @@ _camera_setup(Scene_Data *data)
static void
_light_setup(Scene_Data *data)
{
- data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+ eo_add(data->light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
eo_do(data->light,
evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
- data->light_node =
- eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+ eo_add(data->light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
eo_do(data->light_node,
evas_canvas3d_node_light_set(data->light),
@@ -152,8 +150,8 @@ static void
_mesh_setup(Scene_Data *data)
{
/* Setup material. */
- data->material0 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
- data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ eo_add(data->material0, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ eo_add(data->material1, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
eo_do(data->material0,
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -177,9 +175,9 @@ _mesh_setup(Scene_Data *data)
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
evas_canvas3d_material_shininess_set(100.0));
- data->texture0 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
- data->texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
- data->texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ eo_add(data->texture0, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ eo_add(data->texture1, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ eo_add(data->texture_normal, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
eo_do(data->texture0,
evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]));
@@ -196,12 +194,12 @@ _mesh_setup(Scene_Data *data)
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_normal));
/* Set data of primitive */
- data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+ eo_add(data->cube, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
eo_do(data->cube,
evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
/* Setup mesh. */
- data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+ eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
eo_do(data->mesh,
evas_canvas3d_mesh_from_primitive_set(0, data->cube),
evas_canvas3d_mesh_frame_material_set(0, data->material0),
@@ -209,8 +207,8 @@ _mesh_setup(Scene_Data *data)
evas_canvas3d_mesh_frame_material_set(20, data->material1),
evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP));
- data->mesh_node =
- eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+
+ eo_add(data->mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas,
evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
@@ -219,13 +217,13 @@ _mesh_setup(Scene_Data *data)
static void
_scene_setup(Scene_Data *data)
{
- data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+ eo_add(data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
eo_do(data->scene,
evas_canvas3d_scene_size_set(WIDTH, HEIGHT),
evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
- data->root_node =
- eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+
+ eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
_camera_setup(data);
@@ -260,7 +258,7 @@ main(void)
_scene_setup(&data);
/* Add a background rectangle objects. */
- background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+ eo_add(background, EVAS_RECTANGLE_CLASS, evas);
eo_do(background,
efl_gfx_color_set(0, 0, 0, 255),
efl_gfx_size_set(WIDTH, HEIGHT),