Change the EFL according to the renaming of the eo_add() current object.
This commit is contained in:
parent
29b645ea26
commit
6b4d54df87
|
@ -110,7 +110,7 @@ main(void)
|
|||
ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
|
||||
ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
|
||||
ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
|
||||
// ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(eoid, _idler_cb, &ctxt));
|
||||
// ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(eo_self, _idler_cb, &ctxt));
|
||||
ctxt.handler = ecore_event_handler_add(_event_type,
|
||||
_event_handler_cb,
|
||||
&ctxt);
|
||||
|
|
|
@ -48,9 +48,9 @@ main(void)
|
|||
poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
|
||||
poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
|
||||
|
||||
// poller1 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
|
||||
// poller2 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
|
||||
// poller3 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
|
||||
// poller1 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
|
||||
// poller2 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
|
||||
// poller3 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
|
||||
|
||||
|
||||
ecore_main_loop_begin();
|
||||
|
|
|
@ -102,7 +102,7 @@ main(int argc, char **argv EINA_UNUSED)
|
|||
if (argc > 1) bus = argv[1];
|
||||
if (argc > 2) path = argv[2];
|
||||
|
||||
root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path));
|
||||
root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path));
|
||||
|
||||
eo_event_callback_add(root, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_cb, NULL);
|
||||
efl_model_load(root);
|
||||
|
|
|
@ -144,13 +144,13 @@ main(void)
|
|||
|
||||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
|
||||
|
||||
camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(camera_node, camera);
|
||||
evas_canvas3d_node_member_add(root_node, camera_node);
|
||||
evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0);
|
||||
|
@ -162,7 +162,7 @@ main(void)
|
|||
evas_canvas3d_light_directional_set(light, EINA_TRUE);
|
||||
|
||||
light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(light_node, light);
|
||||
evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
|
||||
evas_canvas3d_node_look_at_set(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 @@ main(void)
|
|||
evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_material_shininess_set(material, 50.0);
|
||||
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
|
||||
evas_canvas3d_material_enable_set(material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
|
||||
|
|
|
@ -148,7 +148,7 @@ _camera_setup(Scene_Data *data)
|
|||
evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
|
||||
|
@ -166,7 +166,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -215,13 +215,13 @@ _mesh_setup(Scene_Data *data)
|
|||
_set_ball(data->mesh1, data->sphere, data->material1);
|
||||
|
||||
data->mesh_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
|
||||
|
||||
data->mesh_node1 =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
|
||||
|
@ -243,7 +243,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1);
|
||||
|
||||
data->root_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
|
|
@ -274,13 +274,13 @@ _init_scene(const char *texture)
|
|||
|
||||
globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0);
|
||||
|
||||
globalscene.camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera);
|
||||
evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node);
|
||||
evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0);
|
||||
|
@ -292,7 +292,7 @@ _init_scene(const char *texture)
|
|||
evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE);
|
||||
|
||||
globalscene.light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light);
|
||||
evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0);
|
||||
evas_canvas3d_node_look_at_set(globalscene.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0);
|
||||
|
@ -313,7 +313,7 @@ _init_scene(const char *texture)
|
|||
m->material = spheretmp->material;
|
||||
m->texture = spheretmp->texture;
|
||||
}
|
||||
m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
m->speed = tmp;
|
||||
m->sphere_animate = _animate_sphere;
|
||||
m->animate = ecore_timer_add(m->speed, m->sphere_animate, m);
|
||||
|
|
|
@ -151,7 +151,7 @@ _camera_setup(Scene_Data *data)
|
|||
data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0);
|
||||
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);
|
||||
|
@ -168,7 +168,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0);
|
||||
|
@ -201,7 +201,7 @@ _mesh_setup(Scene_Data *data)
|
|||
evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
|
||||
evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
|
||||
|
||||
data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
|
||||
}
|
||||
|
@ -210,7 +210,7 @@ static void
|
|||
_scene_setup(Scene_Data *data)
|
||||
{
|
||||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
|
||||
evas_canvas3d_scene_background_color_set(scene, 0.0, 0.0, 0.0, 0.0);
|
||||
|
|
|
@ -138,7 +138,7 @@ _camera_setup(Scene_Data *data)
|
|||
evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -154,7 +154,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -188,7 +188,7 @@ _mesh_setup(Scene_Data *data)
|
|||
evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
|
||||
|
||||
data->mesh_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
|
||||
}
|
||||
|
@ -201,7 +201,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
|
||||
|
||||
data->root_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
|
|
@ -115,7 +115,7 @@ _camera_setup(Scene_Data *data)
|
|||
evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0);
|
||||
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);
|
||||
|
@ -131,7 +131,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -188,7 +188,7 @@ _mesh_setup(Scene_Data *data)
|
|||
evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
|
||||
|
||||
data->mesh_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
|
||||
}
|
||||
|
@ -201,7 +201,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
|
||||
|
||||
data->root_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
|
|
@ -118,13 +118,13 @@ main(void)
|
|||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
/* Add the root node for the scene. */
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
/* Add the camera. */
|
||||
camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
|
||||
|
||||
camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(camera_node, camera);
|
||||
evas_canvas3d_node_member_add(root_node, camera_node);
|
||||
evas_canvas3d_node_position_set(camera_node, 200.0, 0.0, 40.0);
|
||||
|
@ -136,7 +136,7 @@ main(void)
|
|||
evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_light_directional_set(light, EINA_TRUE);
|
||||
|
||||
light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(light_node, light);
|
||||
evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
|
||||
evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
|
||||
|
@ -169,13 +169,13 @@ main(void)
|
|||
efl_file_set(mesh2, output_model_path, NULL);
|
||||
evas_canvas3d_mesh_shade_mode_set(mesh2, EVAS_CANVAS3D_SHADE_MODE_PHONG);
|
||||
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(root_node, mesh_node);
|
||||
evas_canvas3d_node_mesh_add(mesh_node, mesh);
|
||||
evas_canvas3d_node_position_set(mesh_node, 0.0, -40.0, 0.0);
|
||||
|
||||
mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(root_node, mesh_node2);
|
||||
evas_canvas3d_node_mesh_add(mesh_node2, mesh2);
|
||||
evas_canvas3d_node_position_set(mesh_node2, 0.0, 40.0, 0.0);
|
||||
|
|
|
@ -86,7 +86,7 @@ _camera_setup(Scene_Data *data)
|
|||
evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0);
|
||||
|
@ -104,7 +104,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -144,10 +144,10 @@ _mesh_setup(Scene_Data *data)
|
|||
_set_ball(data->mesh1, data->sphere, data->material);
|
||||
|
||||
data->animation_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
data->mesh_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(data->animation_node, data->mesh_node);
|
||||
evas_canvas3d_node_member_add(data->root_node, data->animation_node);
|
||||
|
@ -155,7 +155,7 @@ _mesh_setup(Scene_Data *data)
|
|||
evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0);
|
||||
|
||||
data->mesh_node1 =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
|
||||
|
@ -176,7 +176,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1);
|
||||
|
||||
data->root_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
|
|
@ -280,7 +280,7 @@ static void
|
|||
_camera_setup(Scene_Data *data)
|
||||
{
|
||||
data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0);
|
||||
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);
|
||||
|
@ -298,7 +298,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 200.0);
|
||||
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, 0.0, 1.0);
|
||||
|
@ -339,7 +339,7 @@ _mesh_setup(Scene_Data *data)
|
|||
evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
|
||||
|
||||
data->mesh_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_aabb);
|
||||
}
|
||||
|
@ -376,13 +376,13 @@ _scene_setup(Scene_Data *data)
|
|||
{
|
||||
data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_light_setup(data);
|
||||
_mesh_setup_model(data);
|
||||
_camera_setup(data);
|
||||
|
||||
data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_position_set(data->mesh_node_model, obj_x, obj_y, obj_z);
|
||||
evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_model, -90, 1.0, 0.0, 0.0);
|
||||
evas_canvas3d_node_scale_set(data->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z);
|
||||
|
|
|
@ -260,7 +260,7 @@ _camera_setup(Scene_Data *data)
|
|||
evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -276,7 +276,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -354,7 +354,7 @@ _mesh_setup(Scene_Data *data)
|
|||
MODEL_MESH_INIT(blender_test_sonic, sonic_test, DIFFUSE)
|
||||
|
||||
data->mesh_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_sphere);
|
||||
evas_canvas3d_node_scale_set(data->mesh_node, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
|
||||
|
@ -372,14 +372,14 @@ _mesh_setup(Scene_Data *data)
|
|||
_print_result(data->mesh_sphere_ch, data->mesh_blender_test_sphere);
|
||||
|
||||
data->mesh_node_convex_hull =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node_convex_hull);
|
||||
evas_canvas3d_node_position_set(data->mesh_node_convex_hull, 0.0, 0.0, 0.0);
|
||||
evas_canvas3d_node_scale_set(data->mesh_node_convex_hull, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node_convex_hull, data->mesh_sphere_ch);
|
||||
|
||||
data->mesh_node_blender =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node_blender);
|
||||
evas_canvas3d_node_position_set(data->mesh_node_blender, -3.0, 0.0, 0.0);
|
||||
evas_canvas3d_node_scale_set(data->mesh_node_blender, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
|
||||
|
@ -394,7 +394,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
|
||||
|
||||
data->root_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
|
|
@ -94,14 +94,14 @@ main(void)
|
|||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
/* Add the root node for the scene. */
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
/* Add the camera. */
|
||||
camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
|
||||
|
||||
camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(camera_node, camera);
|
||||
evas_canvas3d_node_member_add(root_node, camera_node);
|
||||
evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 20.0);
|
||||
|
@ -114,7 +114,7 @@ main(void)
|
|||
evas_canvas3d_light_directional_set(light, EINA_TRUE);
|
||||
|
||||
light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(light_node, light);
|
||||
evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
|
||||
evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
|
||||
|
@ -142,7 +142,7 @@ main(void)
|
|||
evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_material_shininess_set(material, 50.0);
|
||||
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(root_node, mesh_node);
|
||||
evas_canvas3d_node_mesh_add(mesh_node, mesh);
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \
|
||||
evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \
|
||||
evas_canvas3d_mesh_shade_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADE_MODE_PHONG); \
|
||||
node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
|
||||
node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
|
||||
evas_canvas3d_node_member_add(root_node, node_##extention); \
|
||||
evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \
|
||||
evas_canvas3d_node_position_set(node_##extention, initial_node_data[number * 10], \
|
||||
|
@ -184,14 +184,14 @@ main(void)
|
|||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
/* Add the root node for the scene. */
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
/* Add the camera. */
|
||||
camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(camera, 10.0, 1.0, 1.0, 500.0);
|
||||
|
||||
camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(camera_node, camera);
|
||||
evas_canvas3d_node_member_add(root_node, camera_node);
|
||||
evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 100.0);
|
||||
|
@ -204,7 +204,7 @@ main(void)
|
|||
evas_canvas3d_light_directional_set(light, EINA_TRUE);
|
||||
|
||||
light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(light_node, light);
|
||||
evas_canvas3d_node_position_set(light_node, 1.0, 0.0, 100.0);
|
||||
evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
efl_file_set(mesh[num], full_file_path, NULL); \
|
||||
evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \
|
||||
evas_canvas3d_mesh_shade_mode_set(mesh[num], shade_mode); \
|
||||
mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
|
||||
mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
|
||||
evas_canvas3d_node_member_add(root_node, mesh_node[num]); \
|
||||
evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \
|
||||
evas_canvas3d_node_position_set(mesh_node[num], 0, Y, Z); \
|
||||
|
@ -160,14 +160,14 @@ main(void)
|
|||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
/* Add the root node for the scene. */
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
/* Add the camera. */
|
||||
camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(camera, 20.0, 1.0, 1.0, 500.0);
|
||||
|
||||
camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(camera_node, camera);
|
||||
evas_canvas3d_node_member_add(root_node, camera_node);
|
||||
evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 0.0);
|
||||
|
@ -180,7 +180,7 @@ main(void)
|
|||
evas_canvas3d_light_directional_set(light, EINA_TRUE);
|
||||
|
||||
light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(light_node, light);
|
||||
evas_canvas3d_node_position_set(light_node, 10.0, 0.0, 0.0);
|
||||
evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
|
||||
|
|
|
@ -108,7 +108,7 @@ _camera_setup(Scene_Data *data)
|
|||
|
||||
evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -123,7 +123,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, -20.0, 20.0, 50.0);
|
||||
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);
|
||||
|
@ -191,7 +191,7 @@ _mesh_setup(Scene_Data *data)
|
|||
|
||||
evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood);
|
||||
|
||||
data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
|
||||
evas_canvas3d_node_scale_set(data->mesh_node, 3, 3, 3);
|
||||
|
@ -204,7 +204,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
|
||||
evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
|
||||
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
|
|
@ -135,14 +135,14 @@ main(void)
|
|||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
/* Add the root node for the scene. */
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
/* Add the camera. */
|
||||
camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0);
|
||||
|
||||
camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(camera_node, camera);
|
||||
evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5);
|
||||
evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
|
||||
|
@ -169,7 +169,7 @@ main(void)
|
|||
evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_material_shininess_set(material, 50.0);
|
||||
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(root_node, mesh_node);
|
||||
evas_canvas3d_node_mesh_add(mesh_node, mesh);
|
||||
|
|
|
@ -133,13 +133,13 @@ main(void)
|
|||
scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
|
||||
|
||||
/* Add the root node for the scene. */
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
/* Add the camera. */
|
||||
camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
|
||||
|
||||
camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(camera_node, camera);
|
||||
evas_canvas3d_node_member_add(root_node, camera_node);
|
||||
evas_canvas3d_node_position_set(camera_node, 15.0, 0.0, 0.0);
|
||||
|
@ -151,7 +151,7 @@ main(void)
|
|||
evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
|
||||
evas_canvas3d_light_directional_set(light, EINA_TRUE);
|
||||
|
||||
light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(light_node, light);
|
||||
evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
|
||||
evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
|
||||
|
@ -196,7 +196,7 @@ main(void)
|
|||
evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]);
|
||||
}
|
||||
|
||||
mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_member_add(root_node, mesh_node[i]);
|
||||
evas_canvas3d_node_mesh_add(mesh_node[i], mesh[i]);
|
||||
evas_canvas3d_node_position_set(mesh_node[i], 0, ((i % 4) * 4) + ((i / 16) * 1) - 6.5, (((i % 16) / 4) * 4) - 6);
|
||||
|
|
|
@ -104,7 +104,7 @@ _camera_setup(Scene_Data *data)
|
|||
evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0);
|
||||
|
||||
data->camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0);
|
||||
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,7 +120,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
data->light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
|
||||
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);
|
||||
|
@ -157,7 +157,7 @@ _mesh_setup(Scene_Data *data)
|
|||
evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
|
||||
|
||||
data->mesh_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
|
||||
|
@ -171,7 +171,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
|
||||
|
||||
data->root_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
|
|
@ -200,7 +200,7 @@ _sphere_setup(Body_3D *sphere)
|
|||
|
||||
_body_material_set(sphere, 1, 0.0, 0.0);
|
||||
|
||||
sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, 3.0, 3.0, 0.0));
|
||||
sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, 3.0, 3.0, 0.0));
|
||||
evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh);
|
||||
}
|
||||
|
||||
|
@ -217,7 +217,7 @@ _cone_setup(Body_3D *cone)
|
|||
_body_material_set(cone, 0.8, 0.5, 0.5);
|
||||
|
||||
cone->node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_mesh_add(cone->node, cone->mesh);
|
||||
evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0);
|
||||
evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0);
|
||||
|
@ -236,7 +236,7 @@ _cylinder_setup(Body_3D *cylinder)
|
|||
_body_material_set(cylinder, 0.0, 0.0, 1.0);
|
||||
|
||||
cylinder->node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh);
|
||||
evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0);
|
||||
evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0);
|
||||
|
@ -284,7 +284,7 @@ _fence_setup(Body_3D *fence)
|
|||
evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE);
|
||||
evas_canvas3d_mesh_shade_mode_set(fence->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
|
||||
fence->node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_mesh_add(fence->node, fence->mesh);
|
||||
evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0);
|
||||
evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0);
|
||||
|
@ -303,7 +303,7 @@ _square_setup(Body_3D *square)
|
|||
_body_material_set(square, 0.4, 0.4, 0.4);
|
||||
|
||||
square->node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_mesh_add(square->node, square->mesh);
|
||||
evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0);
|
||||
evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0);
|
||||
|
@ -321,7 +321,7 @@ _box_setup(Body_3D *box)
|
|||
|
||||
_body_material_set(box, 0, 1, 0);
|
||||
|
||||
box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_mesh_add(box->node, box->mesh);
|
||||
evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0);
|
||||
}
|
||||
|
@ -349,7 +349,7 @@ _model_setup(Body_3D *model)
|
|||
evas_canvas3d_mesh_shade_mode_set(model->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
|
||||
|
||||
model->node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_mesh_add(model->node, model->mesh);
|
||||
evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1);
|
||||
evas_canvas3d_node_orientation_angle_axis_set(model->node, 120.0, -0.577, -0.577, -0.577);
|
||||
|
@ -380,7 +380,7 @@ _billboard_setup(Scene_Data *data)
|
|||
evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE);
|
||||
evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh);
|
||||
evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0);
|
||||
evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0);
|
||||
|
@ -392,12 +392,12 @@ static void
|
|||
_camera_setup(Scene_Data *data)
|
||||
{
|
||||
data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0);
|
||||
|
||||
data->camera_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
|
||||
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
|
||||
|
||||
|
@ -420,7 +420,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0);
|
||||
|
||||
data->light_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0);
|
||||
evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 15.0, 0.0, -5.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
|
||||
|
@ -438,7 +438,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1);
|
||||
|
||||
data->root_node =
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
|
||||
_camera_setup(data);
|
||||
|
|
|
@ -449,15 +449,15 @@ vector_set(int x, int y, int w, int h)
|
|||
root = evas_object_vg_root_node_get(d.vg);
|
||||
//evas_vg_node_transformation_set(root, &matrix);
|
||||
|
||||
Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "bg"));
|
||||
Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "bg"));
|
||||
_rect_add(bg, 0, 0 , vg_w, vg_h);
|
||||
evas_vg_node_origin_set(bg, 0,0);
|
||||
evas_vg_shape_stroke_width_set(bg, 1.0);
|
||||
evas_vg_node_color_set(bg, 80, 80, 80, 80);
|
||||
|
||||
Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "shape"));
|
||||
Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(eoid, "rgradient"));
|
||||
Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(eoid, "lgradient"));
|
||||
Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "shape"));
|
||||
Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(eo_self, "rgradient"));
|
||||
Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(eo_self, "lgradient"));
|
||||
|
||||
_arcto(shape, 0, 0, 100, 100, 25, 330);
|
||||
|
||||
|
@ -498,7 +498,7 @@ vector_set(int x, int y, int w, int h)
|
|||
evas_vg_node_color_set(shape, 0, 0, 255, 255);
|
||||
evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
|
||||
|
||||
Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect"));
|
||||
Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "rect"));
|
||||
_rect_add(rect, 0, 0, 100, 100);
|
||||
evas_vg_node_origin_set(rect, 100, 100);
|
||||
evas_vg_shape_fill_set(rect, lgradient);
|
||||
|
@ -506,7 +506,7 @@ vector_set(int x, int y, int w, int h)
|
|||
evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
|
||||
evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
|
||||
|
||||
Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect1"));
|
||||
Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "rect1"));
|
||||
_rect_add(rect1, 0, 0, 70, 70);
|
||||
evas_vg_node_origin_set(rect1, 50, 70);
|
||||
evas_vg_shape_stroke_scale_set(rect1, 2);
|
||||
|
@ -514,7 +514,7 @@ vector_set(int x, int y, int w, int h)
|
|||
evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND);
|
||||
evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
|
||||
|
||||
Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "circle"));
|
||||
Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "circle"));
|
||||
_arcto(circle, 0, 0, 250, 100, 30, 300);
|
||||
evas_vg_shape_fill_set(circle, lgradient);
|
||||
//evas_vg_node_transformation_set(&matrix),
|
||||
|
@ -522,27 +522,27 @@ vector_set(int x, int y, int w, int h)
|
|||
evas_vg_node_color_set(circle, 50, 0, 0, 50);
|
||||
|
||||
// Foreground
|
||||
Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "fg"));
|
||||
Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "fg"));
|
||||
_rect_add(fg, 0, 0, vg_w, vg_h);
|
||||
evas_vg_node_origin_set(fg, 0, 0);
|
||||
evas_vg_shape_stroke_width_set(fg, 5.0);
|
||||
evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
|
||||
evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
|
||||
|
||||
Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "tst"));
|
||||
Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "tst"));
|
||||
evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
|
||||
evas_vg_node_color_set(tst, 0, 0, 200, 200);
|
||||
evas_vg_shape_stroke_width_set(tst, 2);
|
||||
evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
|
||||
|
||||
Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "vc"));
|
||||
Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "vc"));
|
||||
evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
|
||||
evas_vg_node_color_set(vc, 0, 200, 0, 255);
|
||||
evas_vg_shape_stroke_width_set(vc, 4);
|
||||
evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);
|
||||
|
||||
beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root));
|
||||
end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root));
|
||||
beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eo_self, root));
|
||||
end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eo_self, root));
|
||||
|
||||
circle = efl_vg_container_child_get(end, "circle");
|
||||
efl_vg_transformation_set(circle, &matrix);
|
||||
|
|
|
@ -29,8 +29,8 @@ _camera_setup(Scene_Data *data)
|
|||
data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
|
||||
evas_canvas3d_camera_projection_perspective_set(data->camera, 65.0, 1.0, 1.0, 300.0);
|
||||
|
||||
data->mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
data->mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
|
||||
|
||||
evas_canvas3d_node_member_add(data->root_node, data->mediator_node);
|
||||
evas_canvas3d_node_member_add(data->mediator_node, data->camera_node);
|
||||
|
@ -50,7 +50,7 @@ _light_setup(Scene_Data *data)
|
|||
evas_canvas3d_light_specular_set(data->light, 0.2, 0.2, 0.2, 1.0);
|
||||
evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 200.0);
|
||||
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
|
||||
|
||||
evas_canvas3d_node_light_set(data->light_node, data->light);
|
||||
evas_canvas3d_node_position_set(data->light_node, -30.0, 70.0, 0.0);
|
||||
|
|
|
@ -147,7 +147,7 @@ typedef struct _vec2
|
|||
|
||||
|
||||
#define SETUP_MESH_NODE(Name) \
|
||||
data->mesh_node_##Name = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
|
||||
data->mesh_node_##Name = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
|
||||
\
|
||||
evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name);
|
||||
|
||||
|
|
|
@ -1004,7 +1004,7 @@ _scene_setup(Scene_Data *data)
|
|||
evas_canvas3d_scene_size_set(global_scene, WIDTH, HEIGHT);
|
||||
evas_canvas3d_scene_background_color_set(global_scene, 0.5, 0.5, 0.9, 0.0);
|
||||
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
|
||||
|
||||
_camera_setup(data);
|
||||
_light_setup(data);
|
||||
|
@ -1069,7 +1069,7 @@ _scene_setup(Scene_Data *data)
|
|||
}
|
||||
}
|
||||
|
||||
data->carp_mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
data->carp_mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||
|
||||
evas_canvas3d_node_member_add(data->carp_mediator_node, data->mesh_node_carpet);
|
||||
|
||||
|
|
Loading…
Reference in New Issue