bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas/map: code refactoring. 

use array for easier indexing in the coming anti-alias logic code.
This commit is contained in:
ChunEon Park 2014-11-25 21:35:33 +09:00
parent b395d7dbd4
commit cc115ec786
2 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/lib/evas/common/evas_map_image.c
View File

@ -21,7 +21,7 @@ typedef struct _Span Span;
struct _Span struct _Span
{ {
int x1, x2; int x[2];
FPc o1, o2, z1, z2; FPc o1, o2, z1, z2;
FPc u[2], v[2]; FPc u[2], v[2];
DATA32 col[2]; DATA32 col[2];
@ -60,23 +60,23 @@ _interp_col(int x1, int x2, int p, DATA32 col1, DATA32 col2)
static inline void static inline void
_interpolated_clip_span(Span *s, int c1, int c2, Eina_Bool interp_col) _interpolated_clip_span(Span *s, int c1, int c2, Eina_Bool interp_col)
{ {
if (s->x1 < c1) if (s->x[0] < c1)
{ {
s->u[0] = _interp(s->x1, s->x2, c1, s->u[0], s->u[1]); s->u[0] = _interp(s->x[0], s->x[1], c1, s->u[0], s->u[1]);
s->v[0] = _interp(s->x1, s->x2, c1, s->v[0], s->v[1]); s->v[0] = _interp(s->x[0], s->x[1], c1, s->v[0], s->v[1]);
if (interp_col) if (interp_col)
s->col[0] = _interp_col(s->x1, s->x2, c1, s->col[0], s->col[1]); s->col[0] = _interp_col(s->x[0], s->x[1], c1, s->col[0], s->col[1]);
s->x1 = c1; s->x[0] = c1;
s->o1 = c1 << FP; s->o1 = c1 << FP;
// FIXME: do s->z1 // FIXME: do s->z1
} }
if (s->x2 > c2) if (s->x[1] > c2)
{ {
s->u[1] = _interp(s->x1, s->x2, c2, s->u[0], s->u[1]); s->u[1] = _interp(s->x[0], s->x[1], c2, s->u[0], s->u[1]);
s->v[1] = _interp(s->x1, s->x2, c2, s->v[0], s->v[1]); s->v[1] = _interp(s->x[0], s->x[1], c2, s->v[0], s->v[1]);
if (interp_col) if (interp_col)
s->col[1] = _interp_col(s->x1, s->x2, c2, s->col[0], s->col[1]); s->col[1] = _interp_col(s->x[0], s->x[1], c2, s->col[0], s->col[1]);
s->x2 = c2; s->x[1] = c2;
s->o2 = c2 << FP; s->o2 = c2 << FP;
// FIXME: do s->z2 // FIXME: do s->z2
} }
@ -115,31 +115,31 @@ _calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy
if (y == py[0]) if (y == py[0])
{ {
i = 0; i = 0;
spans[yp].span[i].x1 = p[leftp].x >> FP; spans[yp].span[i].x[0] = p[leftp].x >> FP;
spans[yp].span[i].o1 = p[leftp].x; spans[yp].span[i].o1 = p[leftp].x;
spans[yp].span[i].u[0] = p[leftp].u; spans[yp].span[i].u[0] = p[leftp].u;
spans[yp].span[i].v[0] = p[leftp].v; spans[yp].span[i].v[0] = p[leftp].v;
spans[yp].span[i].col[0] = p[leftp].col; spans[yp].span[i].col[0] = p[leftp].col;
spans[yp].span[i].x2 = p[rightp].x >> FP; spans[yp].span[i].x[1] = p[rightp].x >> FP;
spans[yp].span[i].o2 = p[rightp].x; spans[yp].span[i].o2 = p[rightp].x;
spans[yp].span[i].u[1] = p[rightp].u; spans[yp].span[i].u[1] = p[rightp].u;
spans[yp].span[i].v[1] = p[rightp].v; spans[yp].span[i].v[1] = p[rightp].v;
spans[yp].span[i].col[1] = p[rightp].col; spans[yp].span[i].col[1] = p[rightp].col;
//Outside of the clipper //Outside of the clipper
if ((spans[yp].span[i].x1 >= (cx + cw)) || if ((spans[yp].span[i].x[0] > (cx + cw)) ||
(spans[yp].span[i].x2 < cx)) (spans[yp].span[i].x[1] < cx))
spans[yp].span[i].x1 = -1; spans[yp].span[i].x[0] = -1;
else else
{ {
_interpolated_clip_span(&(spans[yp].span[i]), cx, _interpolated_clip_span(&(spans[yp].span[i]), cx,
(cx + cw), interp_col); (cx + cw), interp_col);
i++; i++;
spans[yp].span[i].x1 = -1; spans[yp].span[i].x[0] = -1;
} }
} }
//The polygon shape seems not be completed definitely. //The polygon shape seems not be completed definitely.
else else
spans[yp].span[0].x1 = -1; spans[yp].span[0].x[0] = -1;
} }
return; return;
} }
@ -268,47 +268,47 @@ _calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy
if (edge_num == 2) if (edge_num == 2)
{ {
i = 0; i = 0;
spans[yp].span[i].x1 = edge[order[0]][2]; spans[yp].span[i].x[0] = edge[order[0]][2];
spans[yp].span[i].o1 = edge[order[0]][3]; spans[yp].span[i].o1 = edge[order[0]][3];
spans[yp].span[i].u[0] = uv[order[0]][0]; spans[yp].span[i].u[0] = uv[order[0]][0];
spans[yp].span[i].v[0] = uv[order[0]][1]; spans[yp].span[i].v[0] = uv[order[0]][1];
spans[yp].span[i].col[0] = col[order[0]]; spans[yp].span[i].col[0] = col[order[0]];
spans[yp].span[i].x2 = edge[order[1]][2]; spans[yp].span[i].x[1] = edge[order[1]][2];
spans[yp].span[i].o2 = edge[order[1]][3]; spans[yp].span[i].o2 = edge[order[1]][3];
spans[yp].span[i].u[1] = uv[order[1]][0]; spans[yp].span[i].u[1] = uv[order[1]][0];
spans[yp].span[i].v[1] = uv[order[1]][1]; spans[yp].span[i].v[1] = uv[order[1]][1];
spans[yp].span[i].col[1] = col[order[1]]; spans[yp].span[i].col[1] = col[order[1]];
//Outside of the clipper //Outside of the clipper
if ((spans[yp].span[i].x1 >= (cx + cw)) || if ((spans[yp].span[i].x[0] >= (cx + cw)) ||
(spans[yp].span[i].x2 < cx)) (spans[yp].span[i].x[1] < cx))
spans[yp].span[i].x1 = -1; spans[yp].span[i].x[0] = -1;
else else
{ {
_interpolated_clip_span(&(spans[yp].span[i]), cx, (cx + cw), _interpolated_clip_span(&(spans[yp].span[i]), cx, (cx + cw),
interp_col); interp_col);
i++; i++;
spans[yp].span[i].x1 = -1; spans[yp].span[i].x[0] = -1;
} }
} }
else if (edge_num == 4) else if (edge_num == 4)
{ {
i = 0; i = 0;
spans[yp].span[i].x1 = edge[order[0]][2]; spans[yp].span[i].x[0] = edge[order[0]][2];
spans[yp].span[i].u[0] = uv[order[0]][0]; spans[yp].span[i].u[0] = uv[order[0]][0];
spans[yp].span[i].v[0] = uv[order[0]][1]; spans[yp].span[i].v[0] = uv[order[0]][1];
spans[yp].span[i].col[0] = col[order[0]]; spans[yp].span[i].col[0] = col[order[0]];
spans[yp].span[i].x2 = edge[order[1]][2]; spans[yp].span[i].x[1] = edge[order[1]][2];
spans[yp].span[i].u[1] = uv[order[1]][0]; spans[yp].span[i].u[1] = uv[order[1]][0];
spans[yp].span[i].v[1] = uv[order[1]][1]; spans[yp].span[i].v[1] = uv[order[1]][1];
spans[yp].span[i].col[1] = col[order[1]]; spans[yp].span[i].col[1] = col[order[1]];
//Outside of the clipper //Outside of the clipper
if ((spans[yp].span[i].x1 >= (cx + cw)) || if ((spans[yp].span[i].x[0] >= (cx + cw)) ||
(spans[yp].span[i].x2 < cx)) (spans[yp].span[i].x[1] < cx))
spans[yp].span[i].x1 = -1; spans[yp].span[i].x[0] = -1;
else else
{ {
_interpolated_clip_span(&(spans[yp].span[i]), cx, (cx + cw), _interpolated_clip_span(&(spans[yp].span[i]), cx, (cx + cw),
@ -316,32 +316,32 @@ _calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy
i++; i++;
} }
spans[yp].span[i].x1 = edge[order[2]][2]; spans[yp].span[i].x[0] = edge[order[2]][2];
spans[yp].span[i].u[0] = uv[order[2]][0]; spans[yp].span[i].u[0] = uv[order[2]][0];
spans[yp].span[i].v[0] = uv[order[2]][1]; spans[yp].span[i].v[0] = uv[order[2]][1];
spans[yp].span[i].col[0] = col[order[2]]; spans[yp].span[i].col[0] = col[order[2]];
spans[yp].span[i].x2 = edge[order[3]][2]; spans[yp].span[i].x[1] = edge[order[3]][2];
spans[yp].span[i].u[1] = uv[order[3]][0]; spans[yp].span[i].u[1] = uv[order[3]][0];
spans[yp].span[i].v[1] = uv[order[3]][1]; spans[yp].span[i].v[1] = uv[order[3]][1];
spans[yp].span[i].col[1] = col[order[3]]; spans[yp].span[i].col[1] = col[order[3]];
//Outside of the clipper //Outside of the clipper
if ((spans[yp].span[i].x1 >= (cx + cw)) || if ((spans[yp].span[i].x[0] >= (cx + cw)) ||
(spans[yp].span[i].x2 < cx)) (spans[yp].span[i].x[1] < cx))
spans[yp].span[i].x1 = -1; spans[yp].span[i].x[0] = -1;
else else
{ {
int l = cx; int l = cx;
if (i > 0) l = spans[yp].span[i - 1].x2; if (i > 0) l = spans[yp].span[i - 1].x[1];
_interpolated_clip_span(&(spans[yp].span[i]), l, (cx + cw), _interpolated_clip_span(&(spans[yp].span[i]), l, (cx + cw),
interp_col); interp_col);
} }
} }
//The polygon shape seems not be completed definitely. //The polygon shape seems not be completed definitely.
else else
spans[yp].span[0].x1 = -1; spans[yp].span[0].x[0] = -1;
} }
} }
@ -356,27 +356,27 @@ _clip_spans(Line *spans, int ystart, int yend,
for (y = ystart, yp = 0; y <= yend; y++, yp++) for (y = ystart, yp = 0; y <= yend; y++, yp++)
{ {
if (spans[yp].span[0].x1 > -1) if (spans[yp].span[0].x[0] > -1)
{ {
if ((spans[yp].span[0].x1 >= (cx + cw)) || if ((spans[yp].span[0].x[0] >= (cx + cw)) ||
(spans[yp].span[0].x2 < cx)) (spans[yp].span[0].x[1] < cx))
{ {
spans[yp].span[0].x1 = -1; spans[yp].span[0].x[0] = -1;
} }
else else
{ {
_interpolated_clip_span(&(spans[yp].span[0]), cx, (cx + cw), _interpolated_clip_span(&(spans[yp].span[0]), cx, (cx + cw),
interp_col); interp_col);
if ((spans[yp].span[1].x1 >= (cx + cw)) || if ((spans[yp].span[1].x[0] >= (cx + cw)) ||
(spans[yp].span[1].x2 < cx)) (spans[yp].span[1].x[1] < cx))
{ {
spans[yp].span[1].x1 = -1; spans[yp].span[1].x[0] = -1;
} }
else else
{ {
_interpolated_clip_span(&(spans[yp].span[1]), _interpolated_clip_span(&(spans[yp].span[1]),
spans[yp].span[0].x2, spans[yp].span[0].x[1],
cx + cw, interp_col); cx + cw, interp_col);
} }
} }

16
src/lib/evas/common/evas_map_image_core.c
View File

@ -26,11 +26,11 @@
span = &(line->span[i]); span = &(line->span[i]);
//The polygon shape won't be completed type //The polygon shape won't be completed type
if (span->x1 < 0) break; if (span->x[0] < 0) break;
x = span->x1; x = span->x[0];
w = (span->x2 - x); w = (span->x[1] - x);
if (w <= 0) continue; if (w <= 0) continue;
dv = (span->o2 - span->o1); dv = (span->o2 - span->o1);
@ -47,7 +47,7 @@
else if (u2 > swp) u2 = swp; else if (u2 > swp) u2 = swp;
ud = (u2 - u) / w; ud = (u2 - u) / w;
ud = ((long long)ud * (w << FP)) / dv; ud = ((long long)ud * (w << FP)) / dv;
u -= (ud * (span->o1 - (span->x1 << FP))) / FP1; u -= (ud * (span->o1 - (span->x[0] << FP))) / FP1;
if (ud < 0) u += ud; if (ud < 0) u += ud;
if (u < 0) u = 0; if (u < 0) u = 0;
else if (u >= swp) u = swp - 1; else if (u >= swp) u = swp - 1;
@ -61,7 +61,7 @@
else if (v2 > shp) v2 = shp; else if (v2 > shp) v2 = shp;
vd = (v2 - v) / w; vd = (v2 - v) / w;
vd = ((long long)vd * (w << FP)) / dv; vd = ((long long)vd * (w << FP)) / dv;
v -= (vd * (span->o1 - (span->x1 << FP))) / FP1; v -= (vd * (span->o1 - (span->x[0] << FP))) / FP1;
if (vd < 0) v += vd; if (vd < 0) v += vd;
if (v < 0) v = 0; if (v < 0) v = 0;
else if (v >= shp) v = shp - 1; else if (v >= shp) v = shp - 1;
@ -141,11 +141,11 @@
span = &(line->span[i]); span = &(line->span[i]);
//The polygon shape won't be completed type //The polygon shape won't be completed type
if (span->x1 < 0) break; if (span->x[0] < 0) break;
x = span->x1; x = span->x[0];
w = (span->x2 - x); w = (span->x[1] - x);
if (w <= 0) continue; if (w <= 0) continue;
ww = w; ww = w;