forked from enlightenment/efl
examples: fix attrib name due to change in Evas Canvas3D API.
This commit is contained in:
parent
190c774d04
commit
c6c4f23c04
|
@ -471,7 +471,7 @@ zoom_factor_set(double new_zoom_factor)
|
||||||
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
||||||
|
|
||||||
eo_do(material,
|
eo_do(material,
|
||||||
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture_diffuse));
|
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse));
|
||||||
|
|
||||||
/* Update camera position. */
|
/* Update camera position. */
|
||||||
vec3_normalize(&camera_pos_unit_vec, &camera_pos);
|
vec3_normalize(&camera_pos_unit_vec, &camera_pos);
|
||||||
|
@ -860,13 +860,13 @@ skybox_setup(void)
|
||||||
evas_canvas3d_mesh_vertex_count_set(24),
|
evas_canvas3d_mesh_vertex_count_set(24),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
|
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
12 * sizeof(float), &skybox_vertices[0]),
|
12 * sizeof(float), &skybox_vertices[0]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
12 * sizeof(float), &skybox_vertices[3]),
|
12 * sizeof(float), &skybox_vertices[3]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
12 * sizeof(float), &skybox_vertices[6]),
|
12 * sizeof(float), &skybox_vertices[6]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
12 * sizeof(float), &skybox_vertices[10]),
|
12 * sizeof(float), &skybox_vertices[10]),
|
||||||
|
|
||||||
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &skybox_indices[0]),
|
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &skybox_indices[0]),
|
||||||
|
@ -890,15 +890,15 @@ skybox_setup(void)
|
||||||
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
||||||
|
|
||||||
eo_do(skybox_material,
|
eo_do(skybox_material,
|
||||||
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, skybox_texture_diffuse),
|
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, skybox_texture_diffuse),
|
||||||
|
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
|
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0),
|
||||||
evas_canvas3d_material_shininess_set(50.0));
|
evas_canvas3d_material_shininess_set(50.0));
|
||||||
|
|
||||||
skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
|
skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
|
||||||
|
@ -1001,15 +1001,15 @@ mesh_setup(void)
|
||||||
evas_canvas3d_mesh_vertex_count_set(vertex_count),
|
evas_canvas3d_mesh_vertex_count_set(vertex_count),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
|
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
sizeof(vertex), &vertices[0].position),
|
sizeof(vertex), &vertices[0].position),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
sizeof(vertex), &vertices[0].normal),
|
sizeof(vertex), &vertices[0].normal),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
|
||||||
sizeof(vertex), &vertices[0].tangent),
|
sizeof(vertex), &vertices[0].tangent),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
sizeof(vertex), &vertices[0].color),
|
sizeof(vertex), &vertices[0].color),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
sizeof(vertex), &vertices[0].texcoord),
|
sizeof(vertex), &vertices[0].texcoord),
|
||||||
|
|
||||||
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
|
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
|
||||||
|
@ -1029,17 +1029,17 @@ mesh_setup(void)
|
||||||
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
||||||
|
|
||||||
eo_do(material,
|
eo_do(material,
|
||||||
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, texture_diffuse),
|
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse),
|
||||||
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_NORMAL, texture_normal),
|
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, texture_normal),
|
||||||
|
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
|
||||||
|
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.1, 0.1, 0.1, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 0.1, 0.1, 0.1, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0),
|
||||||
evas_canvas3d_material_shininess_set(50.0));
|
evas_canvas3d_material_shininess_set(50.0));
|
||||||
|
|
||||||
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
|
mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
|
||||||
|
|
|
@ -206,15 +206,15 @@ _mesh_setup(Scene_Data *data)
|
||||||
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
evas_canvas3d_texture_source_visible_set(EINA_FALSE));
|
||||||
|
|
||||||
eo_do(data->material,
|
eo_do(data->material,
|
||||||
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, data->texture),
|
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture),
|
||||||
|
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
|
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
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));
|
evas_canvas3d_material_shininess_set(100.0));
|
||||||
|
|
||||||
/* Setup mesh. */
|
/* Setup mesh. */
|
||||||
|
@ -223,13 +223,13 @@ _mesh_setup(Scene_Data *data)
|
||||||
evas_canvas3d_mesh_vertex_count_set(24),
|
evas_canvas3d_mesh_vertex_count_set(24),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
|
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
12 * sizeof(float), &cube_vertices[ 0]),
|
12 * sizeof(float), &cube_vertices[ 0]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
12 * sizeof(float), &cube_vertices[ 3]),
|
12 * sizeof(float), &cube_vertices[ 3]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
12 * sizeof(float), &cube_vertices[ 6]),
|
12 * sizeof(float), &cube_vertices[ 6]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
12 * sizeof(float), &cube_vertices[10]),
|
12 * sizeof(float), &cube_vertices[10]),
|
||||||
|
|
||||||
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
||||||
|
|
|
@ -163,15 +163,15 @@ _mesh_setup(Scene_Data *data)
|
||||||
data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
|
data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
|
||||||
|
|
||||||
eo_do(data->material,
|
eo_do(data->material,
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
|
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT,
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
|
||||||
0.2, 0.2, 0.2, 1.0),
|
0.2, 0.2, 0.2, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE,
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
|
||||||
0.8, 0.8, 0.8, 1.0),
|
0.8, 0.8, 0.8, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR,
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
|
||||||
1.0, 1.0, 1.0, 1.0),
|
1.0, 1.0, 1.0, 1.0),
|
||||||
evas_canvas3d_material_shininess_set(100.0));
|
evas_canvas3d_material_shininess_set(100.0));
|
||||||
|
|
||||||
|
@ -181,16 +181,16 @@ _mesh_setup(Scene_Data *data)
|
||||||
evas_canvas3d_mesh_vertex_count_set(24),
|
evas_canvas3d_mesh_vertex_count_set(24),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
|
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
12 * sizeof(float),
|
12 * sizeof(float),
|
||||||
&cube_vertices[ 0]),
|
&cube_vertices[ 0]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
12 * sizeof(float),
|
12 * sizeof(float),
|
||||||
&cube_vertices[ 3]),
|
&cube_vertices[ 3]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
12 * sizeof(float),
|
12 * sizeof(float),
|
||||||
&cube_vertices[ 6]),
|
&cube_vertices[ 6]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
12 * sizeof(float),
|
12 * sizeof(float),
|
||||||
&cube_vertices[10]),
|
&cube_vertices[10]),
|
||||||
|
|
||||||
|
|
|
@ -251,13 +251,13 @@ void _init_bounding()
|
||||||
globalGraphical.material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
|
globalGraphical.material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
|
||||||
|
|
||||||
eo_do(globalGraphical.material_box,
|
eo_do(globalGraphical.material_box,
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
|
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
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));
|
evas_canvas3d_material_shininess_set(100.0));
|
||||||
|
|
||||||
/* Setup mesh. */
|
/* Setup mesh. */
|
||||||
|
@ -266,13 +266,13 @@ void _init_bounding()
|
||||||
evas_canvas3d_mesh_vertex_count_set(24),
|
evas_canvas3d_mesh_vertex_count_set(24),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
|
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
12 * sizeof(float), &cube_vertices[ 0]),
|
12 * sizeof(float), &cube_vertices[ 0]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
12 * sizeof(float), &cube_vertices[ 3]),
|
12 * sizeof(float), &cube_vertices[ 3]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
12 * sizeof(float), &cube_vertices[ 6]),
|
12 * sizeof(float), &cube_vertices[ 6]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
12 * sizeof(float), &cube_vertices[10]),
|
12 * sizeof(float), &cube_vertices[10]),
|
||||||
|
|
||||||
evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
||||||
|
@ -328,18 +328,18 @@ _change_scene_setup()
|
||||||
eo_do(globalGraphical.mesh,
|
eo_do(globalGraphical.mesh,
|
||||||
evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
|
evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].position),
|
&globalGraphical.vertices[0].position),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].normal),
|
&globalGraphical.vertices[0].normal),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].tangent),
|
&globalGraphical.vertices[0].tangent),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
sizeof(vertex), &globalGraphical.vertices[0].color),
|
sizeof(vertex), &globalGraphical.vertices[0].color),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].texcoord),
|
&globalGraphical.vertices[0].texcoord),
|
||||||
|
|
||||||
|
@ -372,7 +372,7 @@ _change_scene_setup()
|
||||||
if (globalGraphical.flags.blend_enable)
|
if (globalGraphical.flags.blend_enable)
|
||||||
{
|
{
|
||||||
eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
|
eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
|
||||||
evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_SRC_ALPHA, EVAS_CANVAS3D_BLEND_ONE_MINUS_SRC_ALPHA));
|
evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_FALSE));
|
eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_FALSE));
|
||||||
|
@ -476,15 +476,15 @@ _init_scene(Evas_Object *img)
|
||||||
evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
|
evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
|
||||||
EVAS_CANVAS3D_WRAP_MODE_REPEAT));
|
EVAS_CANVAS3D_WRAP_MODE_REPEAT));
|
||||||
eo_do(globalGraphical.material,
|
eo_do(globalGraphical.material,
|
||||||
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, globalGraphical.texture),
|
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, globalGraphical.texture),
|
||||||
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, globalGraphical.texture),
|
evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, globalGraphical.texture),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_NORMAL, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 1.0, 0.2, 0.2, 0.2),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 0.2, 0.2, 0.2),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 1.0, 0.0, 0.0, 0.2),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 0.0, 0.0, 0.2),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 0.2));
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2));
|
||||||
/* Add the mesh with target precision */
|
/* Add the mesh with target precision */
|
||||||
_sphere_init(globalGraphical.precision);
|
_sphere_init(globalGraphical.precision);
|
||||||
|
|
||||||
|
@ -496,18 +496,18 @@ _init_scene(Evas_Object *img)
|
||||||
eo_do(globalGraphical.mesh,
|
eo_do(globalGraphical.mesh,
|
||||||
evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
|
evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].position),
|
&globalGraphical.vertices[0].position),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].normal),
|
&globalGraphical.vertices[0].normal),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].tangent),
|
&globalGraphical.vertices[0].tangent),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
sizeof(vertex), &globalGraphical.vertices[0].color),
|
sizeof(vertex), &globalGraphical.vertices[0].color),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
sizeof(vertex),
|
sizeof(vertex),
|
||||||
&globalGraphical.vertices[0].texcoord),
|
&globalGraphical.vertices[0].texcoord),
|
||||||
|
|
||||||
|
|
|
@ -510,24 +510,24 @@ _mesh_cube_setup(Scene_Data *data)
|
||||||
data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
|
data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
|
||||||
data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
|
data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
|
||||||
eo_do(data->material_cube,
|
eo_do(data->material_cube,
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
||||||
evas_canvas3d_material_shininess_set(50.0));
|
evas_canvas3d_material_shininess_set(50.0));
|
||||||
|
|
||||||
eo_do(data->mesh_cube,
|
eo_do(data->mesh_cube,
|
||||||
evas_canvas3d_mesh_vertex_count_set(24),
|
evas_canvas3d_mesh_vertex_count_set(24),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
12 * sizeof(float), &cube_vertices[ 0]),
|
12 * sizeof(float), &cube_vertices[ 0]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
12 * sizeof(float), &cube_vertices[ 3]),
|
12 * sizeof(float), &cube_vertices[ 3]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
12 * sizeof(float), &cube_vertices[ 6]),
|
12 * sizeof(float), &cube_vertices[ 6]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
12 * sizeof(float), &cube_vertices[10]),
|
12 * sizeof(float), &cube_vertices[10]),
|
||||||
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
||||||
36, &cube_indices[0]),
|
36, &cube_indices[0]),
|
||||||
|
@ -549,31 +549,31 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
|
||||||
evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
|
evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
|
||||||
|
|
||||||
eo_do(material,
|
eo_do(material,
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 1.0, 1.0, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 1.0, 1.0, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
||||||
evas_canvas3d_material_shininess_set(50.0));
|
evas_canvas3d_material_shininess_set(50.0));
|
||||||
|
|
||||||
if (color)
|
if (color)
|
||||||
eo_do(material,
|
eo_do(material,
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 0.7, 1.0, 1.0));
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 0.7, 1.0, 1.0));
|
||||||
else
|
else
|
||||||
eo_do(material,
|
eo_do(material,
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.0, 1.0, 1.0, 1.0));
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 1.0, 1.0, 1.0));
|
||||||
|
|
||||||
eo_do(mesh,
|
eo_do(mesh,
|
||||||
evas_canvas3d_mesh_vertex_count_set(24),
|
evas_canvas3d_mesh_vertex_count_set(24),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
12 * sizeof(float), &cube_vertices[ 0]),
|
12 * sizeof(float), &cube_vertices[ 0]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
12 * sizeof(float), &cube_vertices[ 3]),
|
12 * sizeof(float), &cube_vertices[ 3]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
12 * sizeof(float), &cube_vertices[ 6]),
|
12 * sizeof(float), &cube_vertices[ 6]),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
12 * sizeof(float), &cube_vertices[10]),
|
12 * sizeof(float), &cube_vertices[10]),
|
||||||
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
|
||||||
36, &cube_indices[0]),
|
36, &cube_indices[0]),
|
||||||
|
@ -632,27 +632,27 @@ _mesh_ball_setup(Scene_Data *data)
|
||||||
|
|
||||||
/* Setup material for ball. */
|
/* Setup material for ball. */
|
||||||
eo_do(data->material_ball,
|
eo_do(data->material_ball,
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
|
||||||
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, EINA_TRUE),
|
evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
|
||||||
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
|
||||||
evas_canvas3d_material_shininess_set(50.0));
|
evas_canvas3d_material_shininess_set(50.0));
|
||||||
|
|
||||||
/* Setup mesh for ball. */
|
/* Setup mesh for ball. */
|
||||||
eo_do(data->mesh_ball,
|
eo_do(data->mesh_ball,
|
||||||
evas_canvas3d_mesh_vertex_count_set(vertex_count),
|
evas_canvas3d_mesh_vertex_count_set(vertex_count),
|
||||||
evas_canvas3d_mesh_frame_add(0),
|
evas_canvas3d_mesh_frame_add(0),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_POSITION,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
|
||||||
sizeof(vertex), &vertices[0].position),
|
sizeof(vertex), &vertices[0].position),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_NORMAL,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
|
||||||
sizeof(vertex), &vertices[0].normal),
|
sizeof(vertex), &vertices[0].normal),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TANGENT,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
|
||||||
sizeof(vertex), &vertices[0].tangent),
|
sizeof(vertex), &vertices[0].tangent),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_COLOR,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
|
||||||
sizeof(vertex), &vertices[0].color),
|
sizeof(vertex), &vertices[0].color),
|
||||||
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_TEXCOORD,
|
evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
|
||||||
sizeof(vertex), &vertices[0].texcoord),
|
sizeof(vertex), &vertices[0].texcoord),
|
||||||
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
|
evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
|
||||||
evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
|
evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
|
||||||
|
|
Loading…
Reference in New Issue