X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfrender.c;h=e451329e4b79fa46609e0f53f8857546b5f8c94e;hb=6c3ab5574d31504d24710c2756899d49275c1a37;hp=8be9cef7c53b4d0e9764385483ad55058fb4dc7a;hpb=09dcad8fdd10d7f4ca0be5d26e264c4f90bf3896;p=swftools.git diff --git a/lib/modules/swfrender.c b/lib/modules/swfrender.c index 8be9cef..e451329 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) @@ -211,7 +211,7 @@ static void add_solidline(RENDERBUF*buf, double x1, double y1, double x2, double vy = (-dx/d); } - segments = width/2; + segments = (int)(width/2); if(segments < 2) segments = 2; @@ -330,11 +330,11 @@ void swf_Render_AddImage(RENDERBUF*buf, U16 id, RGBA*img, int width, int height) { renderbuf_internal*i = (renderbuf_internal*)buf->internal; - bitmap_t*bm = rfx_calloc(sizeof(bitmap_t)); + bitmap_t*bm = (bitmap_t*)rfx_calloc(sizeof(bitmap_t)); bm->id = id; bm->width = width; bm->height = height; - bm->data = rfx_alloc(width*height*4); + bm->data = (RGBA*)rfx_alloc(width*height*4); memcpy(bm->data, img, width*height*4); bm->next = i->bitmaps; @@ -380,7 +380,7 @@ void swf_Render_Delete(RENDERBUF*dest) static SHAPE2* linestyle2fillstyle(SHAPE2*shape) { - SHAPE2*s = rfx_calloc(sizeof(SHAPE2)); + SHAPE2*s = (SHAPE2*)rfx_calloc(sizeof(SHAPE2)); int t; s->numfillstyles = shape->numlinestyles; s->fillstyles = (FILLSTYLE*)rfx_calloc(sizeof(FILLSTYLE)*shape->numlinestyles); @@ -482,7 +482,7 @@ void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 _dept xx=x1; yy=y1; - parts = (int)(sqrt(c)/3); + parts = (int)(sqrt((float)c)/3); if(!parts) parts = 1; for(t=1;t<=parts;t++) { @@ -661,7 +661,7 @@ static void fill(RENDERBUF*dest, RGBA*line, int*zline, int y, int x1, int x2, st if(f->type == 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) { @@ -671,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); @@ -777,12 +777,13 @@ 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; } - n = rfx_calloc(sizeof(layer_t)); + n = (layer_t*)rfx_calloc(sizeof(layer_t)); if(DEBUG&2) printf("<+>"); @@ -836,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); @@ -845,8 +855,8 @@ void swf_Process(RENDERBUF*dest, U32 clipdepth) for(n=0;nx; - int endx = next?next->x:i->width2; + int startx = (int)p->x; + int endx = (int)(next?next->x:i->width2); if(endx > i->width2) endx = i->width2; if(startx < 0) @@ -946,11 +956,12 @@ typedef struct SHAPE2**glyphs; } font_t; +enum CHARACTER_TYPE {none_type, shape_type, image_type, text_type, font_type, sprite_type}; typedef struct { TAG*tag; SRECT*bbox; - enum {none_type, shape_type, image_type, text_type, font_type} type; + enum CHARACTER_TYPE type; union { SHAPE2*shape; font_t*font; @@ -1012,7 +1023,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 { @@ -1031,8 +1045,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]); @@ -1048,29 +1062,103 @@ 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); + placements = (SWFPLACEOBJECT*)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; + RGBA color; + + swf_FoldAll(swf); + + character_t* idtable = (character_t*)rfx_calloc(sizeof(character_t)*65536); // id to character mapping + /* set background color */ color = swf_GetSWFBackgroundColor(swf); swf_Render_SetBackgroundColor(buf, color); @@ -1081,11 +1169,11 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf) if(swf_isDefiningTag(tag)) { int id = swf_GetDefineID(tag); idtable[id].tag = tag; - idtable[id].bbox = rfx_alloc(sizeof(SRECT)); + idtable[id].bbox = (SRECT*)rfx_alloc(sizeof(SRECT)); *idtable[id].bbox = swf_GetDefineBBox(tag); if(swf_isShapeTag(tag)) { - SHAPE2* shape = rfx_calloc(sizeof(SHAPE2)); + SHAPE2* shape = (SHAPE2*)rfx_calloc(sizeof(SHAPE2)); swf_ParseDefineShape(tag, shape); idtable[id].type = shape_type; idtable[id].obj.shape = shape; @@ -1099,11 +1187,11 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf) tag->id == ST_DEFINEFONT2) { int t; SWFFONT*swffont; - font_t*font = rfx_calloc(sizeof(font_t)); + font_t*font = (font_t*)rfx_calloc(sizeof(font_t)); idtable[id].obj.font = font; swf_FontExtract(swf,id,&swffont); font->numchars = swffont->numchars; - font->glyphs = rfx_calloc(sizeof(SHAPE2*)*font->numchars); + font->glyphs = (SHAPE2**)rfx_calloc(sizeof(SHAPE2*)*font->numchars); for(t=0;tnumchars;t++) { if(!swffont->glyph[t].shape->fillstyle.n) { /* the actual fill color will be overwritten while rendering */ @@ -1120,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 frees fields we don't use - } - 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) { @@ -1202,8 +1247,6 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf) } } } - free(placements); free(idtable); - free(depthtable); } - +