X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfrender.c;h=e9bba74bb8e125f81351008ce918bba27e508fd6;hb=80cc20b7784cccc9d8baf9839f9781db6bb6f539;hp=59c31bbaab247d0781f8c5a3c57c6bce195d1ec9;hpb=c98051785717925e8afb55626f88211b8e7a691d;p=swftools.git diff --git a/lib/modules/swfrender.c b/lib/modules/swfrender.c index 59c31bb..e9bba74 100644 --- a/lib/modules/swfrender.c +++ b/lib/modules/swfrender.c @@ -105,7 +105,7 @@ static inline void add_pixel(RENDERBUF*dest, float x, int y, renderpoint_t*p) /* set this to 0.777777 or something if the "both fillstyles set while not inside shape" problem appears to often */ -#define CUT 0.5 +#define CUT 0.77887789 #define INT(x) ((int)((x)+16)-16) @@ -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(++xtype == FILL_SOLID) { /* plain color fill */ fill_solid(line, zline, y, x1, x2, f->color, l->p->depth); - } else if(f->type == FILL_TILED || f->type == FILL_CLIPPED) { + } else if(f->type == FILL_TILED || f->type == FILL_CLIPPED || f->type == (FILL_TILED|2) || f->type == (FILL_CLIPPED|2)) { /* TODO: optimize (do this in add_pixel()?) */ bitmap_t* b = i->bitmaps; while(b && b->id != f->id_bitmap) { @@ -659,7 +671,7 @@ static void fill(RENDERBUF*dest, RGBA*line, int*zline, int y, int x1, int x2, st fprintf(stderr, "Shape references unknown bitmap %d\n", f->id_bitmap); fill_solid(line, zline, y, x1, x2, color_red, l->p->depth); } else { - fill_bitmap(line, zline, y, x1, x2, &f->m, b, FILL_CLIPPED?1:0, l->p->depth, i->multiply); + fill_bitmap(line, zline, y, x1, x2, &f->m, b, /*clipped?*/f->type&1, l->p->depth, i->multiply); } } else { fprintf(stderr, "Undefined fillmode: %02x\n", f->type); @@ -765,6 +777,7 @@ static void change_state(int y, state_t* state, renderpoint_t*p) we always get (0,32), (32, 33), (33, 0) in the right order if they happen to fall on the same pixel. (not: (0,32), (33, 0), (32, 33)) + Notice: Weird fill styles appear if linestyles are involved, too. */ fprintf(stderr, "\n", y); return; @@ -824,6 +837,15 @@ void swf_Process(RENDERBUF*dest, U32 clipdepth) state_t fillstate; memset(&fillstate, 0, sizeof(state_t)); qsort(points, num, sizeof(renderpoint_t), compare_renderpoints); + /* resort points */ + /*if(y==884) { + for(n=0;nfillstyle0, + points[n].shapeline->fillstyle1, + points[n].shapeline->linestyle); + } + }*/ if(i->lines[y].pending_clipdepth && !clipdepth) { fill_clip(line, zline, y, 0, i->width2, i->lines[y].pending_clipdepth); @@ -843,11 +865,14 @@ void swf_Process(RENDERBUF*dest, U32 clipdepth) endx = 0; if(clipdepth) { - /* for clipping, the inverse is filled */ + /* for clipping, the inverse is filled + TODO: lastx!=startx only at the start of the loop, + so this might be moved up + */ fill_clip(line, zline, y, lastx, startx, clipdepth); } change_state(y, &fillstate, p); - + fill(dest, line, zline, y, startx, endx, &fillstate, clipdepth); /* if(y == 0 && startx == 232 && endx == 418) { printf("ymin=%d ymax=%d\n", i->ymin, i->ymax); @@ -862,6 +887,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); @@ -934,7 +960,7 @@ typedef struct { TAG*tag; SRECT*bbox; - enum {none_type, shape_type, image_type, text_type, font_type} type; + enum {none_type, shape_type, image_type, text_type, font_type, sprite_type} type; union { SHAPE2*shape; font_t*font; @@ -996,7 +1022,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 +1044,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]); @@ -1032,29 +1061,104 @@ static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int } } -void swf_RenderSWF(RENDERBUF*buf, SWF*swf) +static void renderFromTag(RENDERBUF*buf, character_t*idtable, TAG*firstTag, MATRIX*m) { - TAG*tag; - int t; - int numplacements; - RGBA color; + TAG*tag = 0; + int numplacements = 0; SWFPLACEOBJECT* placements; - - character_t* idtable = rfx_calloc(sizeof(character_t)*65536); // id to character mapping - SWFPLACEOBJECT** depthtable = rfx_calloc(sizeof(SWFPLACEOBJECT*)*65536); // depth to placeobject mapping - - tag = swf->firstTag; + + tag = firstTag; numplacements = 0; while(tag) { if(tag->id == ST_PLACEOBJECT || tag->id == ST_PLACEOBJECT2) { numplacements++; } + if(tag->id == ST_SHOWFRAME || tag->id == ST_END) + break; tag = tag->next; } placements = rfx_calloc(sizeof(SWFPLACEOBJECT)*numplacements); numplacements = 0; + tag = firstTag; + while(tag) { + if(swf_isPlaceTag(tag)) { + SWFPLACEOBJECT p; + swf_GetPlaceObject(tag, &p); + /* TODO: add move and deletion */ + placements[numplacements++] = p; + swf_PlaceObjectFree(&p); //dirty! but it only frees fields we don't use + } + if(tag->id == ST_SHOWFRAME || tag->id == ST_END) + break; + tag = tag->next; + } + + qsort(placements, numplacements, sizeof(SWFPLACEOBJECT), compare_placements); + + int t; + for(t=0;tid; + MATRIX m2; + swf_MatrixJoin(&m2, m, &p->matrix); + + if(!idtable[id].tag) { + fprintf(stderr, "rfxswf: Id %d is unknown\n", id); + continue; + } + + if(idtable[id].type == shape_type) { + //SRECT sbbox = swf_TurnRect(*idtable[id].bbox, &p->matrix); + swf_RenderShape(buf, idtable[id].obj.shape, &m2, &p->cxform, p->depth, p->clipdepth); + } else if(idtable[id].type == sprite_type) { + swf_UnFoldSprite(idtable[id].tag); + renderFromTag(buf, idtable, idtable[id].tag->next, &m2); + swf_FoldSprite(idtable[id].tag); + } else if(idtable[id].type == text_type) { + TAG* tag = idtable[id].tag; + textcallbackblock_t info; + MATRIX mt; + + swf_SetTagPos(tag, 0); + swf_GetU16(tag); + swf_GetRect(tag,0); + swf_GetMatrix(tag,&mt); + swf_MatrixJoin(&info.m, &m2, &mt); + /*printf("Text matrix:\n"); + swf_DumpMatrix(stdout, &m); + printf("Placement matrix:\n"); + swf_DumpMatrix(stdout, &p->matrix); + printf("Final matrix:\n"); + swf_DumpMatrix(stdout, &info.m);*/ + + info.idtable = idtable; + info.depth = p->depth; + info.cxform = &p->cxform; + info.clipdepth = p->clipdepth; + info.buf = buf; + + swf_ParseDefineText(tag, textcallback, &info); + } else { + fprintf(stderr, "Unknown/Unsupported Object Type for id %d: %s\n", id, swf_TagGetName(idtable[id].tag)); + } + } + + free(placements); +} + +void swf_RenderSWF(RENDERBUF*buf, SWF*swf) +{ + TAG*tag; + int t; + int numplacements; + RGBA color; + + swf_FoldAll(swf); + + character_t* idtable = rfx_calloc(sizeof(character_t)*65536); // id to character mapping + /* set background color */ color = swf_GetSWFBackgroundColor(swf); swf_Render_SetBackgroundColor(buf, color); @@ -1104,59 +1208,16 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf) } else if(tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) { idtable[id].type = text_type; - } - } else if(tag->id == ST_PLACEOBJECT || - tag->id == ST_PLACEOBJECT2) { - SWFPLACEOBJECT p; - 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 - } - tag = tag->next; - } - - qsort(placements, numplacements, sizeof(SWFPLACEOBJECT), compare_placements); - - for(t=0;tid; - - if(!idtable[id].tag) { - fprintf(stderr, "rfxswf: Id %d is unknown\n", id); - continue; - } - - if(idtable[id].type == shape_type) { - //SRECT sbbox = swf_TurnRect(*idtable[id].bbox, &p->matrix); - swf_RenderShape(buf, idtable[id].obj.shape, &p->matrix, &p->cxform, p->depth, p->clipdepth); - } else if(idtable[id].type == text_type) { - TAG* tag = idtable[id].tag; - textcallbackblock_t info; - MATRIX m; - - swf_SetTagPos(tag, 0); - swf_GetU16(tag); - swf_GetRect(tag,0); - swf_GetMatrix(tag,&m); - swf_MatrixJoin(&info.m, &m, &p->matrix); - /*printf("Text matrix:\n"); - swf_DumpMatrix(stdout, &m); - printf("Placement matrix:\n"); - swf_DumpMatrix(stdout, &p->matrix);*/ - - info.idtable = idtable; - info.depth = p->depth; - info.cxform = &p->cxform; - info.clipdepth = p->clipdepth; - info.buf = buf; - - swf_ParseDefineText(tag, textcallback, &info); - } else { - fprintf(stderr, "Unknown/Unsupported Object Type for id %d: %s\n", id, swf_TagGetName(idtable[id].tag)); + } else if(tag->id == ST_DEFINESPRITE) { + idtable[id].type = sprite_type; + } } + tag = tag->next; } - + MATRIX m; + swf_GetMatrix(0, &m); + renderFromTag(buf, idtable, swf->firstTag, &m); + /* free id and depth tables again */ for(t=0;t<65536;t++) { if(idtable[t].bbox) { @@ -1186,8 +1247,6 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf) } } } - free(placements); free(idtable); - free(depthtable); } - +