X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmodules%2Fswfrender.c;h=64dc69644c350f29dd26a3f7e75df0e43334ee53;hb=30d18fbbe53427135310896abd30dadb10d1f249;hp=59c31bbaab247d0781f8c5a3c57c6bce195d1ec9;hpb=c98051785717925e8afb55626f88211b8e7a691d;p=swftools.git diff --git a/lib/modules/swfrender.c b/lib/modules/swfrender.c index 59c31bb..64dc696 100644 --- a/lib/modules/swfrender.c +++ b/lib/modules/swfrender.c @@ -172,7 +172,7 @@ static void add_line(RENDERBUF*buf, double x1, double y1, double x2, double y2, } } #define PI 3.14159265358979 -static void add_solidline(RENDERBUF*buf, double x1, double y1, double x2, double y2, int width, renderpoint_t*p) +static void add_solidline(RENDERBUF*buf, double x1, double y1, double x2, double y2, double width, renderpoint_t*p) { renderbuf_internal*i = (renderbuf_internal*)buf->internal; @@ -194,8 +194,10 @@ static void add_solidline(RENDERBUF*buf, double x1, double y1, double x2, double #else /* That's what Macromedia's Player seems to do at zoom level 0. */ /* TODO: needs testing */ - if(width<20) - width = 20; + + /* TODO: how does this interact with scaling? */ + if(width * i->multiply < 20) + width = 20 / i->multiply; #endif sd = (double)dx*(double)dx+(double)dy*(double)dy; @@ -393,6 +395,13 @@ static SHAPE2* linestyle2fillstyle(SHAPE2*shape) void swf_Process(RENDERBUF*dest, U32 clipdepth); +double matrixsize(MATRIX*m) +{ + double l1 = sqrt((m->sx /65536.0) * (m->sx /65536.0) + (m->r0 /65536.0) * (m->r0/65536.0) ); + double l2 = sqrt((m->r1 /65536.0) * (m->r1 /65536.0) + (m->sy /65536.0) * (m->sy/65536.0) ); + return sqrt(l1*l2); +} + void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 _depth,U16 _clipdepth) { renderbuf_internal*i = (renderbuf_internal*)dest->internal; @@ -404,6 +413,7 @@ void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 _dept SHAPE2* lshape = 0; renderpoint_t p, lp; U32 clipdepth; + double widthmultiply = matrixsize(m); memset(&p, 0, sizeof(renderpoint_t)); memset(&lp, 0, sizeof(renderpoint_t)); @@ -423,7 +433,7 @@ void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 _dept important for texture and gradient fill */ for(t=0;tnumfillstyles;t++) { MATRIX nm; - swf_MatrixJoin(&nm, &s2->fillstyles[t].m, &mat); //TODO: is this the right order? + swf_MatrixJoin(&nm, &mat, &s2->fillstyles[t].m); /*nm.sx *= i->multiply; nm.sy *= i->multiply; nm.r0 *= i->multiply; @@ -440,6 +450,7 @@ void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 _dept lp.depth = (_depth << 16)+1; } + while(line) { int x1,y1,x2,y2,x3,y3; @@ -451,7 +462,7 @@ void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 _dept if(line->linestyle && ! clipdepth) { lp.shapeline = &lshape->lines[line->linestyle-1]; - add_solidline(dest, x1, y1, x3, y3, shape->linestyles[line->linestyle-1].width, &lp); + add_solidline(dest, x1, y1, x3, y3, shape->linestyles[line->linestyle-1].width * widthmultiply, &lp); lp.depth++; } if(line->fillstyle0 || line->fillstyle1) { @@ -480,7 +491,7 @@ void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 _dept if(line->linestyle && ! clipdepth) { lp.shapeline = &lshape->lines[line->linestyle-1]; - add_solidline(dest, xx, yy, nx, ny, shape->linestyles[line->linestyle-1].width, &lp); + add_solidline(dest, xx, yy, nx, ny, shape->linestyles[line->linestyle-1].width * widthmultiply, &lp); lp.depth++; } if(line->fillstyle0 || line->fillstyle1) { @@ -525,6 +536,7 @@ static void fill_clip(RGBA*line, int*z, int y, int x1, int x2, U32 depth) } while(++xymin, i->ymax); @@ -862,6 +877,7 @@ void swf_Process(RENDERBUF*dest, U32 clipdepth) break; } if(clipdepth) { + /* TODO: is lastx *ever* != i->width2 here? */ fill_clip(line, zline, y, lastx, i->width2, clipdepth); } free_layers(&fillstate); @@ -996,7 +1012,10 @@ static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int textcallbackblock_t * info = (textcallbackblock_t*)self; font_t*font = 0; int t; - if(!info->idtable[fontid].obj.font) { + if(info->idtable[fontid].type != font_type) { + fprintf(stderr, "ID %d is not a font\n", fontid); + return; + } else if(!info->idtable[fontid].obj.font) { fprintf(stderr, "Font %d unknown\n", fontid); return; } else { @@ -1015,8 +1034,8 @@ static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int m.sy = (m.sy * fontsize) / 1024; m.r0 = (m.r0 * fontsize) / 1024; m.r1 = (m.r1 * fontsize) / 1024; - m.tx += p.x; - m.ty += p.y; + m.tx = p.x; + m.ty = p.y; if(chars[t]<0 || chars[t]>= font->numchars) { fprintf(stderr, "Character out of range: %d\n", chars[t]); @@ -1111,7 +1130,7 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf) swf_GetPlaceObject(tag, &p); /* TODO: add move and deletion */ placements[numplacements++] = p; - swf_PlaceObjectFree(&p); //dirty! but it only removes items we don't need + swf_PlaceObjectFree(&p); //dirty! but it only frees fields we don't use } tag = tag->next; } @@ -1139,11 +1158,13 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf) swf_GetU16(tag); swf_GetRect(tag,0); swf_GetMatrix(tag,&m); - swf_MatrixJoin(&info.m, &m, &p->matrix); + swf_MatrixJoin(&info.m, &p->matrix, &m); /*printf("Text matrix:\n"); swf_DumpMatrix(stdout, &m); printf("Placement matrix:\n"); - swf_DumpMatrix(stdout, &p->matrix);*/ + swf_DumpMatrix(stdout, &p->matrix); + printf("Final matrix:\n"); + swf_DumpMatrix(stdout, &info.m);*/ info.idtable = idtable; info.depth = p->depth;