summaryrefslogtreecommitdiff
path: root/src/lib/evas/common3d
diff options
context:
space:
mode:
authorOleksandr Shcherbina <o.shcherbina@samsung.com>2015-06-17 16:31:14 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-17 17:52:17 +0200
commitd409df1caa38ae7eac87f85ff4113484bc5b2099 (patch)
tree2adcbeadf2f4b2e7f4e7ba327a574c6620c23663 /src/lib/evas/common3d
parent9bf6f14a8a59195fe9be004aaff446c51474fc5d (diff)
evas: change interface evas_3d to evas_canvas3d
Summary: Regard to https://phab.enlightenment.org/T2479 it is need for right generation Eolian files Reviewers: cedric Subscribers: cedric, tasn Differential Revision: https://phab.enlightenment.org/D2711 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/evas/common3d')
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.c64
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.h36
-rw-r--r--src/lib/evas/common3d/primitives/solids_of_revolution/cone.c14
-rw-r--r--src/lib/evas/common3d/primitives/solids_of_revolution/cylinder.c14
-rw-r--r--src/lib/evas/common3d/primitives/solids_of_revolution/sphere.c14
-rw-r--r--src/lib/evas/common3d/primitives/solids_of_revolution/torus.c2
-rw-r--r--src/lib/evas/common3d/primitives/surfaces/surface.c6
-rw-r--r--src/lib/evas/common3d/primitives/surfaces/terrain.c2
-rw-r--r--src/lib/evas/common3d/primitives/tabulated_primitives/cube.c2
-rw-r--r--src/lib/evas/common3d/primitives/tabulated_primitives/square.c2
10 files changed, 78 insertions, 78 deletions
diff --git a/src/lib/evas/common3d/primitives/primitive_common.c b/src/lib/evas/common3d/primitives/primitive_common.c
index 066ef3b35c..882e95216e 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.c
+++ b/src/lib/evas/common3d/primitives/primitive_common.c
@@ -1,9 +1,9 @@
1#include "primitive_common.h" 1#include "primitive_common.h"
2 2
3void _set_vertex_data_from_array(Evas_3D_Mesh *mesh, 3void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh,
4 int frame, 4 int frame,
5 const float *data, 5 const float *data,
6 Evas_3D_Vertex_Attrib attr, 6 Evas_Canvas3D_Vertex_Attrib attr,
7 int start, 7 int start,
8 int attr_count, 8 int attr_count,
9 int line, 9 int line,
@@ -12,9 +12,9 @@ void _set_vertex_data_from_array(Evas_3D_Mesh *mesh,
12 float *address, *out; 12 float *address, *out;
13 int stride, i, j; 13 int stride, i, j;
14 eo_do(mesh, 14 eo_do(mesh,
15 evas_3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL), 15 evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
16 address = (float *)evas_3d_mesh_frame_vertex_data_map(frame, attr), 16 address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
17 stride = evas_3d_mesh_frame_vertex_stride_get(frame, attr)); 17 stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
18 if (stride == 0) stride = sizeof(float) * attr_count; 18 if (stride == 0) stride = sizeof(float) * attr_count;
19 for (i = 0; i < vcount; i++) 19 for (i = 0; i < vcount; i++)
20 { 20 {
@@ -23,22 +23,22 @@ void _set_vertex_data_from_array(Evas_3D_Mesh *mesh,
23 out[j] = data[start + (line * i) + j]; 23 out[j] = data[start + (line * i) + j];
24 } 24 }
25 eo_do(mesh, 25 eo_do(mesh,
26 evas_3d_mesh_frame_vertex_data_unmap(frame, attr)); 26 evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
27} 27}
28 28
29void 29void
30_set_vec3_vertex_data(Evas_3D_Mesh *mesh, 30_set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh,
31 int frame, 31 int frame,
32 int vcount, 32 int vcount,
33 Evas_Vec3 *data, 33 Evas_Vec3 *data,
34 Evas_3D_Vertex_Attrib attr) 34 Evas_Canvas3D_Vertex_Attrib attr)
35{ 35{
36 float *address, *out; 36 float *address, *out;
37 int stride, i; 37 int stride, i;
38 eo_do(mesh, 38 eo_do(mesh,
39 evas_3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL), 39 evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
40 address = (float *)evas_3d_mesh_frame_vertex_data_map(frame, attr), 40 address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
41 stride = evas_3d_mesh_frame_vertex_stride_get(frame, attr)); 41 stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
42 if (stride == 0) stride = sizeof(float) * 3; 42 if (stride == 0) stride = sizeof(float) * 3;
43 for (i = 0; i < vcount; i++) 43 for (i = 0; i < vcount; i++)
44 { 44 {
@@ -49,22 +49,22 @@ _set_vec3_vertex_data(Evas_3D_Mesh *mesh,
49 } 49 }
50 free(data); 50 free(data);
51 eo_do(mesh, 51 eo_do(mesh,
52 evas_3d_mesh_frame_vertex_data_unmap(frame, attr)); 52 evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
53} 53}
54 54
55void 55void
56_set_vec2_vertex_data(Evas_3D_Mesh *mesh, 56_set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh,
57 int frame, 57 int frame,
58 int vcount, 58 int vcount,
59 Evas_Vec2 *data, 59 Evas_Vec2 *data,
60 Evas_3D_Vertex_Attrib attr) 60 Evas_Canvas3D_Vertex_Attrib attr)
61{ 61{
62 float *address, *out; 62 float *address, *out;
63 int stride, i; 63 int stride, i;
64 eo_do(mesh, 64 eo_do(mesh,
65 evas_3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL), 65 evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
66 address = (float *)evas_3d_mesh_frame_vertex_data_map(frame, attr), 66 address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
67 stride = evas_3d_mesh_frame_vertex_stride_get(frame, attr)); 67 stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
68 if (stride == 0) stride = sizeof(float) * 2; 68 if (stride == 0) stride = sizeof(float) * 2;
69 for (i = 0; i < vcount; i++) 69 for (i = 0; i < vcount; i++)
70 { 70 {
@@ -74,7 +74,7 @@ _set_vec2_vertex_data(Evas_3D_Mesh *mesh,
74 } 74 }
75 free(data); 75 free(data);
76 eo_do(mesh, 76 eo_do(mesh,
77 evas_3d_mesh_frame_vertex_data_unmap(frame, attr)); 77 evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
78} 78}
79 79
80void 80void
@@ -137,65 +137,65 @@ _primitives_vec3_normalize(Evas_Vec3 *out)
137} 137}
138 138
139void 139void
140evas_common_set_model_from_primitive(Evas_3D_Mesh *model, 140evas_common_set_model_from_primitive(Evas_Canvas3D_Mesh *model,
141 int frame, 141 int frame,
142 Evas_3D_Primitive_Data *primitive) 142 Evas_Canvas3D_Primitive_Data *primitive)
143{ 143{
144 Evas_Real ratio = primitive->ratio; 144 Evas_Real ratio = primitive->ratio;
145 int precision = primitive->precision; 145 int precision = primitive->precision;
146 Evas_3D_Surface_Func *surface = primitive->surface; 146 Evas_Canvas3D_Surface_Func *surface = primitive->surface;
147 Evas_Vec2 tex_scale = primitive->tex_scale; 147 Evas_Vec2 tex_scale = primitive->tex_scale;
148 Evas_3D_Primitive_Mode mode = primitive->mode; 148 Evas_Canvas3D_Primitive_Mode mode = primitive->mode;
149 149
150 switch (primitive->form) 150 switch (primitive->form)
151 { 151 {
152 case EVAS_3D_MESH_PRIMITIVE_NONE: 152 case EVAS_CANVAS3D_MESH_PRIMITIVE_NONE:
153 case EVAS_3D_MESH_PRIMITIVE_COUNT: 153 case EVAS_CANVAS3D_MESH_PRIMITIVE_COUNT:
154 { 154 {
155 ERR("Primitive with this type cannot be set to mesh."); 155 ERR("Primitive with this type cannot be set to mesh.");
156 break; 156 break;
157 } 157 }
158 case EVAS_3D_MESH_PRIMITIVE_SQUARE: 158 case EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE:
159 { 159 {
160 evas_model_set_from_square_primitive(model, frame); 160 evas_model_set_from_square_primitive(model, frame);
161 break; 161 break;
162 } 162 }
163 case EVAS_3D_MESH_PRIMITIVE_CUBE: 163 case EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE:
164 { 164 {
165 evas_model_set_from_cube_primitive(model, frame); 165 evas_model_set_from_cube_primitive(model, frame);
166 break; 166 break;
167 } 167 }
168 case EVAS_3D_MESH_PRIMITIVE_CYLINDER: 168 case EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER:
169 { 169 {
170 evas_model_set_from_cylinder_primitive(model, frame, mode, 170 evas_model_set_from_cylinder_primitive(model, frame, mode,
171 precision, tex_scale); 171 precision, tex_scale);
172 break; 172 break;
173 } 173 }
174 case EVAS_3D_MESH_PRIMITIVE_CONE: 174 case EVAS_CANVAS3D_MESH_PRIMITIVE_CONE:
175 { 175 {
176 evas_model_set_from_cone_primitive(model, frame, mode, 176 evas_model_set_from_cone_primitive(model, frame, mode,
177 precision, tex_scale); 177 precision, tex_scale);
178 break; 178 break;
179 } 179 }
180 case EVAS_3D_MESH_PRIMITIVE_SPHERE: 180 case EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE:
181 { 181 {
182 evas_model_set_from_sphere_primitive(model, frame, mode, 182 evas_model_set_from_sphere_primitive(model, frame, mode,
183 precision, tex_scale); 183 precision, tex_scale);
184 break; 184 break;
185 } 185 }
186 case EVAS_3D_MESH_PRIMITIVE_TORUS: 186 case EVAS_CANVAS3D_MESH_PRIMITIVE_TORUS:
187 { 187 {
188 evas_model_set_from_torus_primitive(model, frame, 188 evas_model_set_from_torus_primitive(model, frame,
189 ratio, precision, tex_scale); 189 ratio, precision, tex_scale);
190 break; 190 break;
191 } 191 }
192 case EVAS_3D_MESH_PRIMITIVE_SURFACE: 192 case EVAS_CANVAS3D_MESH_PRIMITIVE_SURFACE:
193 { 193 {
194 evas_model_set_from_surface_primitive(model, frame, 194 evas_model_set_from_surface_primitive(model, frame,
195 surface, precision, tex_scale); 195 surface, precision, tex_scale);
196 break; 196 break;
197 } 197 }
198 case EVAS_3D_MESH_PRIMITIVE_TERRAIN: 198 case EVAS_CANVAS3D_MESH_PRIMITIVE_TERRAIN:
199 { 199 {
200 evas_model_set_from_terrain_primitive(model, frame, 200 evas_model_set_from_terrain_primitive(model, frame,
201 precision, tex_scale); 201 precision, tex_scale);
diff --git a/src/lib/evas/common3d/primitives/primitive_common.h b/src/lib/evas/common3d/primitives/primitive_common.h
index c2b47f375b..fa05b6f649 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.h
+++ b/src/lib/evas/common3d/primitives/primitive_common.h
@@ -18,37 +18,37 @@
18 18
19#define SET_VERTEX_DATA(frame) \ 19#define SET_VERTEX_DATA(frame) \
20 eo_do(mesh, \ 20 eo_do(mesh, \
21 evas_3d_mesh_vertex_count_set(vcount), \ 21 evas_canvas3d_mesh_vertex_count_set(vcount), \
22 evas_3d_mesh_frame_add(frame), \ 22 evas_canvas3d_mesh_frame_add(frame), \
23 evas_3d_mesh_index_data_copy_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 23 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
24 icount, &indices[0])); \ 24 icount, &indices[0])); \
25 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_3D_VERTEX_POSITION); \ 25 _set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_POSITION); \
26 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_3D_VERTEX_NORMAL); \ 26 _set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_NORMAL); \
27 _set_vec2_vertex_data(mesh, frame, vcount, tex_coord, EVAS_3D_VERTEX_TEXCOORD); \ 27 _set_vec2_vertex_data(mesh, frame, vcount, tex_coord, EVAS_CANVAS3D_VERTEX_TEXCOORD); \
28 _set_vec3_vertex_data(mesh, frame, vcount, tangents, EVAS_3D_VERTEX_TANGENT); \ 28 _set_vec3_vertex_data(mesh, frame, vcount, tangents, EVAS_CANVAS3D_VERTEX_TANGENT); \
29 free(indices); 29 free(indices);
30 30
31#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \ 31#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \
32 eo_do(mesh, \ 32 eo_do(mesh, \
33 evas_3d_mesh_vertex_count_set(vcount), \ 33 evas_canvas3d_mesh_vertex_count_set(vcount), \
34 evas_3d_mesh_frame_add(frame), \ 34 evas_canvas3d_mesh_frame_add(frame), \
35 evas_3d_mesh_index_data_copy_set(EVAS_3D_INDEX_FORMAT_UNSIGNED_SHORT, \ 35 evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
36 icount, &indices[0])); \ 36 icount, &indices[0])); \
37 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_POSITION, \ 37 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_POSITION, \
38 0, 3, 15, vcount); \ 38 0, 3, 15, vcount); \
39 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_NORMAL, \ 39 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_NORMAL, \
40 3, 3, 15, vcount); \ 40 3, 3, 15, vcount); \
41 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_COLOR, \ 41 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_COLOR, \
42 6, 4, 15, vcount); \ 42 6, 4, 15, vcount); \
43 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_TEXCOORD, \ 43 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_TEXCOORD, \
44 10, 2, 15, vcount); \ 44 10, 2, 15, vcount); \
45 _set_vertex_data_from_array(mesh, frame, varray, EVAS_3D_VERTEX_TANGENT, \ 45 _set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_TANGENT, \
46 12, 3, 15, vcount); 46 12, 3, 15, vcount);
47 47
48void _generate_indices(unsigned short *indices, int count, int width); 48void _generate_indices(unsigned short *indices, int count, int width);
49void _set_vec3_vertex_data(Evas_3D_Mesh *mesh, int frame, int vcount, Evas_Vec3 *data, Evas_3D_Vertex_Attrib attr); 49void _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh, int frame, int vcount, Evas_Vec3 *data, Evas_Canvas3D_Vertex_Attrib attr);
50void _set_vec2_vertex_data(Evas_3D_Mesh *mesh, int frame, int vcount, Evas_Vec2 *data, Evas_3D_Vertex_Attrib attr); 50void _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh, int frame, int vcount, Evas_Vec2 *data, Evas_Canvas3D_Vertex_Attrib attr);
51void _set_vertex_data_from_array(Evas_3D_Mesh *mesh, int frame, const float *data, Evas_3D_Vertex_Attrib attr, int start, int attr_count, int line, int vcount); 51void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh, int frame, const float *data, Evas_Canvas3D_Vertex_Attrib attr, int start, int attr_count, int line, int vcount);
52 52
53void _primitives_vec3_copy(Evas_Vec3 *dst, const Evas_Vec3 *src); 53void _primitives_vec3_copy(Evas_Vec3 *dst, const Evas_Vec3 *src);
54void _primitives_vec3_subtract(Evas_Vec3 *out, const Evas_Vec3 *a, const Evas_Vec3 *b); 54void _primitives_vec3_subtract(Evas_Vec3 *out, const Evas_Vec3 *a, const Evas_Vec3 *b);
diff --git a/src/lib/evas/common3d/primitives/solids_of_revolution/cone.c b/src/lib/evas/common3d/primitives/solids_of_revolution/cone.c
index 2b62f287c0..9a48c2a8df 100644
--- a/src/lib/evas/common3d/primitives/solids_of_revolution/cone.c
+++ b/src/lib/evas/common3d/primitives/solids_of_revolution/cone.c
@@ -1,7 +1,7 @@
1#include "../primitive_common.h" 1#include "../primitive_common.h"
2 2
3void 3void
4_set_default_cone(Evas_3D_Mesh *mesh, 4_set_default_cone(Evas_Canvas3D_Mesh *mesh,
5 int frame, 5 int frame,
6 int p, 6 int p,
7 Evas_Vec2 tex_scale) 7 Evas_Vec2 tex_scale)
@@ -63,7 +63,7 @@ _set_default_cone(Evas_3D_Mesh *mesh,
63} 63}
64 64
65void 65void
66_set_cone_without_base(Evas_3D_Mesh *mesh, 66_set_cone_without_base(Evas_Canvas3D_Mesh *mesh,
67 int frame, 67 int frame,
68 int p, 68 int p,
69 Evas_Vec2 tex_scale) 69 Evas_Vec2 tex_scale)
@@ -113,21 +113,21 @@ _set_cone_without_base(Evas_3D_Mesh *mesh,
113} 113}
114 114
115void 115void
116evas_model_set_from_cone_primitive(Evas_3D_Mesh *mesh, 116evas_model_set_from_cone_primitive(Evas_Canvas3D_Mesh *mesh,
117 int frame, 117 int frame,
118 Evas_3D_Primitive_Mode mode, 118 Evas_Canvas3D_Primitive_Mode mode,
119 int p, 119 int p,
120 Evas_Vec2 tex_scale) 120 Evas_Vec2 tex_scale)
121{ 121{
122 switch (mode) 122 switch (mode)
123 { 123 {
124 case EVAS_3D_PRIMITIVE_MODE_DEFAULT: 124 case EVAS_CANVAS3D_PRIMITIVE_MODE_DEFAULT:
125 case EVAS_3D_PRIMITIVE_MODE_ALTERNATIVE_UV: 125 case EVAS_CANVAS3D_PRIMITIVE_MODE_ALTERNATIVE_UV:
126 { 126 {
127 _set_default_cone(mesh, frame, p, tex_scale); 127 _set_default_cone(mesh, frame, p, tex_scale);
128 break; 128 break;
129 } 129 }
130 case EVAS_3D_PRIMITIVE_MODE_WITHOUT_BASE: 130 case EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE:
131 { 131 {
132 _set_cone_without_base(mesh, frame, p, tex_scale); 132 _set_cone_without_base(mesh, frame, p, tex_scale);
133 break; 133 break;
diff --git a/src/lib/evas/common3d/primitives/solids_of_revolution/cylinder.c b/src/lib/evas/common3d/primitives/solids_of_revolution/cylinder.c
index dabe6f4989..d990a057d2 100644
--- a/src/lib/evas/common3d/primitives/solids_of_revolution/cylinder.c
+++ b/src/lib/evas/common3d/primitives/solids_of_revolution/cylinder.c
@@ -1,7 +1,7 @@
1#include "../primitive_common.h" 1#include "../primitive_common.h"
2 2
3void 3void
4_set_default_cylinder(Evas_3D_Mesh *mesh, 4_set_default_cylinder(Evas_Canvas3D_Mesh *mesh,
5 int frame, 5 int frame,
6 int p, 6 int p,
7 Evas_Vec2 tex_scale) 7 Evas_Vec2 tex_scale)
@@ -64,7 +64,7 @@ _set_default_cylinder(Evas_3D_Mesh *mesh,
64} 64}
65 65
66void 66void
67_set_cylinder_without_bases(Evas_3D_Mesh *mesh, 67_set_cylinder_without_bases(Evas_Canvas3D_Mesh *mesh,
68 int frame, 68 int frame,
69 int p, 69 int p,
70 Evas_Vec2 tex_scale) 70 Evas_Vec2 tex_scale)
@@ -109,21 +109,21 @@ _set_cylinder_without_bases(Evas_3D_Mesh *mesh,
109} 109}
110 110
111void 111void
112evas_model_set_from_cylinder_primitive(Evas_3D_Mesh *mesh, 112evas_model_set_from_cylinder_primitive(Evas_Canvas3D_Mesh *mesh,
113 int frame, 113 int frame,
114 Evas_3D_Primitive_Mode mode, 114 Evas_Canvas3D_Primitive_Mode mode,
115 int p, 115 int p,
116 Evas_Vec2 tex_scale) 116 Evas_Vec2 tex_scale)
117{ 117{
118 switch (mode) 118 switch (mode)
119 { 119 {
120 case EVAS_3D_PRIMITIVE_MODE_DEFAULT: 120 case EVAS_CANVAS3D_PRIMITIVE_MODE_DEFAULT:
121 case EVAS_3D_PRIMITIVE_MODE_ALTERNATIVE_UV: 121 case EVAS_CANVAS3D_PRIMITIVE_MODE_ALTERNATIVE_UV:
122 { 122 {
123 _set_default_cylinder(mesh, frame, p, tex_scale); 123 _set_default_cylinder(mesh, frame, p, tex_scale);
124 break; 124 break;
125 } 125 }
126 case EVAS_3D_PRIMITIVE_MODE_WITHOUT_BASE: 126 case EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE:
127 { 127 {
128 _set_cylinder_without_bases(mesh, frame, p, tex_scale); 128 _set_cylinder_without_bases(mesh, frame, p, tex_scale);
129 break; 129 break;
diff --git a/src/lib/evas/common3d/primitives/solids_of_revolution/sphere.c b/src/lib/evas/common3d/primitives/solids_of_revolution/sphere.c
index 1a2409b2a5..adbd22aa79 100644
--- a/src/lib/evas/common3d/primitives/solids_of_revolution/sphere.c
+++ b/src/lib/evas/common3d/primitives/solids_of_revolution/sphere.c
@@ -1,7 +1,7 @@
1#include "../primitive_common.h" 1#include "../primitive_common.h"
2 2
3void 3void
4_set_default_sphere(Evas_3D_Mesh *mesh, 4_set_default_sphere(Evas_Canvas3D_Mesh *mesh,
5 int frame, 5 int frame,
6 int p, 6 int p,
7 Evas_Vec2 tex_scale) 7 Evas_Vec2 tex_scale)
@@ -52,7 +52,7 @@ _set_default_sphere(Evas_3D_Mesh *mesh,
52} 52}
53 53
54void 54void
55_set_sphere_with_alternative_uv(Evas_3D_Mesh *mesh, 55_set_sphere_with_alternative_uv(Evas_Canvas3D_Mesh *mesh,
56 int frame, 56 int frame,
57 int p, 57 int p,
58 Evas_Vec2 tex_scale) 58 Evas_Vec2 tex_scale)
@@ -162,21 +162,21 @@ _set_sphere_with_alternative_uv(Evas_3D_Mesh *mesh,
162} 162}
163 163
164void 164void
165evas_model_set_from_sphere_primitive(Evas_3D_Mesh *mesh, 165evas_model_set_from_sphere_primitive(Evas_Canvas3D_Mesh *mesh,
166 int frame, 166 int frame,
167 Evas_3D_Primitive_Mode mode, 167 Evas_Canvas3D_Primitive_Mode mode,
168 int p, 168 int p,
169 Evas_Vec2 tex_scale) 169 Evas_Vec2 tex_scale)
170{ 170{
171 switch (mode) 171 switch (mode)
172 { 172 {
173 case EVAS_3D_PRIMITIVE_MODE_DEFAULT: 173 case EVAS_CANVAS3D_PRIMITIVE_MODE_DEFAULT:
174 case EVAS_3D_PRIMITIVE_MODE_WITHOUT_BASE: 174 case EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE:
175 { 175 {
176 _set_default_sphere(mesh, frame, p, tex_scale); 176 _set_default_sphere(mesh, frame, p, tex_scale);
177 break; 177 break;
178 } 178 }
179 case EVAS_3D_PRIMITIVE_MODE_ALTERNATIVE_UV: 179 case EVAS_CANVAS3D_PRIMITIVE_MODE_ALTERNATIVE_UV:
180 { 180 {
181 _set_sphere_with_alternative_uv(mesh, frame, p, tex_scale); 181 _set_sphere_with_alternative_uv(mesh, frame, p, tex_scale);
182 break; 182 break;
diff --git a/src/lib/evas/common3d/primitives/solids_of_revolution/torus.c b/src/lib/evas/common3d/primitives/solids_of_revolution/torus.c
index abb76d8c88..91101229fa 100644
--- a/src/lib/evas/common3d/primitives/solids_of_revolution/torus.c
+++ b/src/lib/evas/common3d/primitives/solids_of_revolution/torus.c
@@ -1,7 +1,7 @@
1#include "../primitive_common.h" 1#include "../primitive_common.h"
2 2
3void 3void
4evas_model_set_from_torus_primitive(Evas_3D_Mesh *mesh, 4evas_model_set_from_torus_primitive(Evas_Canvas3D_Mesh *mesh,
5 int frame, 5 int frame,
6 Evas_Real ratio, 6 Evas_Real ratio,
7 int p, 7 int p,
diff --git a/src/lib/evas/common3d/primitives/surfaces/surface.c b/src/lib/evas/common3d/primitives/surfaces/surface.c
index 7eb1779ebe..8d0bd3fc46 100644
--- a/src/lib/evas/common3d/primitives/surfaces/surface.c
+++ b/src/lib/evas/common3d/primitives/surfaces/surface.c
@@ -1,6 +1,6 @@
1#include "../primitive_common.h" 1#include "../primitive_common.h"
2 2
3Evas_Vec3 _get_func_normal(Evas_3D_Surface_Func *func, Evas_Real x, Evas_Real y) 3Evas_Vec3 _get_func_normal(Evas_Canvas3D_Surface_Func *func, Evas_Real x, Evas_Real y)
4{ 4{
5 Evas_Vec3 v00, v01, v10, d1, d2, normal; 5 Evas_Vec3 v00, v01, v10, d1, d2, normal;
6 6
@@ -50,9 +50,9 @@ _normalize(Evas_Vec3 *vertices, Evas_Vec3 *normals, int vcount)
50} 50}
51 51
52void 52void
53evas_model_set_from_surface_primitive(Evas_3D_Mesh *mesh, 53evas_model_set_from_surface_primitive(Evas_Canvas3D_Mesh *mesh,
54 int frame, 54 int frame,
55 Evas_3D_Surface_Func func, 55 Evas_Canvas3D_Surface_Func func,
56 int p, 56 int p,
57 Evas_Vec2 tex_scale) 57 Evas_Vec2 tex_scale)
58{ 58{
diff --git a/src/lib/evas/common3d/primitives/surfaces/terrain.c b/src/lib/evas/common3d/primitives/surfaces/terrain.c
index 542ed74b0d..a71f94fa22 100644
--- a/src/lib/evas/common3d/primitives/surfaces/terrain.c
+++ b/src/lib/evas/common3d/primitives/surfaces/terrain.c
@@ -76,7 +76,7 @@ _perlin_terrain(Evas_Real *out_x,
76} 76}
77 77
78void 78void
79evas_model_set_from_terrain_primitive(Evas_3D_Mesh *mesh, 79evas_model_set_from_terrain_primitive(Evas_Canvas3D_Mesh *mesh,
80 int frame, 80 int frame,
81 int p, 81 int p,
82 Evas_Vec2 tex_scale) 82 Evas_Vec2 tex_scale)
diff --git a/src/lib/evas/common3d/primitives/tabulated_primitives/cube.c b/src/lib/evas/common3d/primitives/tabulated_primitives/cube.c
index 6f70a02b9d..85d49beaaa 100644
--- a/src/lib/evas/common3d/primitives/tabulated_primitives/cube.c
+++ b/src/lib/evas/common3d/primitives/tabulated_primitives/cube.c
@@ -51,7 +51,7 @@ const unsigned short indices_of_cube[] =
51}; 51};
52 52
53void 53void
54evas_model_set_from_cube_primitive(Evas_3D_Mesh *mesh, int frame) 54evas_model_set_from_cube_primitive(Evas_Canvas3D_Mesh *mesh, int frame)
55{ 55{
56 SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, vertices_of_cube, 24, indices_of_cube, 36) 56 SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, vertices_of_cube, 24, indices_of_cube, 36)
57} 57}
diff --git a/src/lib/evas/common3d/primitives/tabulated_primitives/square.c b/src/lib/evas/common3d/primitives/tabulated_primitives/square.c
index 6f5c0c6f27..e34e2b0dbb 100644
--- a/src/lib/evas/common3d/primitives/tabulated_primitives/square.c
+++ b/src/lib/evas/common3d/primitives/tabulated_primitives/square.c
@@ -12,7 +12,7 @@ const float vertices_of_square[] =
12const unsigned short indices_of_square[] = {0, 1, 2, 2, 1, 3}; 12const unsigned short indices_of_square[] = {0, 1, 2, 2, 1, 3};
13 13
14void 14void
15evas_model_set_from_square_primitive(Evas_3D_Mesh *mesh, int frame) 15evas_model_set_from_square_primitive(Evas_Canvas3D_Mesh *mesh, int frame)
16{ 16{
17 SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, vertices_of_square, 4, indices_of_square, 6) 17 SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, vertices_of_square, 4, indices_of_square, 6)
18} 18}