X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=2f410e79b9a3f0c3497e1a83e35b267e7bf42f79;hb=75b8553b58806406c4378e3685e94883f6703fc0;hp=40febb17d2e75fe49726187b6359e68240fe8588;hpb=7bf948531c2ee33d6dbadeca057c1dcbab500972;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index 40febb1..2f410e7 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -40,9 +40,9 @@ #include "../rfxswf.h" #include "../gfxdevice.h" #include "../gfxtools.h" -#include "../art/libart.h" #include "swf.h" #include "../gfxpoly.h" +#include "../png.h" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -76,10 +76,14 @@ typedef struct _swfoutput_internal double config_dumpfonts; double config_ppmsubpixels; double config_jpegsubpixels; + char hasbuttons; + int config_dots; int config_simpleviewer; int config_opennewwindow; int config_ignoredraworder; int config_drawonlyshapes; + int config_frameresets; + int config_linknameurl; int config_jpegquality; int config_storeallcharacters; int config_enablezlib; @@ -95,6 +99,7 @@ typedef struct _swfoutput_internal int config_bboxvars; int config_disable_polygon_conversion; int config_normalize_polygon_positions; + char config_disablelinks; RGBA config_linkcolor; float config_minlinewidth; double config_caplinewidth; @@ -114,6 +119,7 @@ typedef struct _swfoutput_internal TAG *tag; int currentswfid; + int startids; int depth; int startdepth; int linewidth; @@ -139,12 +145,14 @@ typedef struct _swfoutput_internal int clippos; /* image cache */ + /* int pic_xids[1024]; int pic_yids[1024]; int pic_ids[1024]; int pic_width[1024]; int pic_height[1024]; int picpos; + */ int frameno; int lastframeno; @@ -230,6 +238,7 @@ static swfoutput_internal* init_internal_struct() i->firstpage = 1; i->pagefinished = 1; + i->config_disablelinks=0; i->config_dumpfonts=0; i->config_ppmsubpixels=0; i->config_jpegsubpixels=0; @@ -238,6 +247,7 @@ static swfoutput_internal* init_internal_struct() i->config_drawonlyshapes=0; i->config_jpegquality=85; i->config_storeallcharacters=0; + i->config_dots=1; i->config_enablezlib=0; i->config_insertstoptag=0; i->config_flashversion=6; @@ -254,6 +264,7 @@ static swfoutput_internal* init_internal_struct() i->config_internallinkfunction=0; i->config_externallinkfunction=0; i->config_reordertags=1; + i->config_linknameurl=0; i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255; i->config_linkcolor.a = 0x40; @@ -377,10 +388,16 @@ static void linetoxy(gfxdevice_t*dev, TAG*tag, plotxy_t p0) swf_ShapeSetLine (tag, i->shape, rx,ry); addPointToBBox(dev, i->swflastx,i->swflasty); addPointToBBox(dev, px,py); - }/* else if(!i->fill) { + } /* this is a nice idea, but doesn't work with current flash + players (the pixel will be invisible if they're not + precisely on a pixel boundary) + Besides, we should only do this if this lineto itself + is again followed by a "move". + else if(!i->fill && i->config_dots) { // treat lines of length 0 as plots, making them // at least 1 twip wide so Flash will display them - plot(dev, i->swflastx, i->swflasty, tag); + //plot(dev, i->swflastx, i->swflasty, tag); + swf_ShapeSetLine (tag, i->shape, rx+1,ry); }*/ i->shapeisempty = 0; @@ -1009,6 +1026,14 @@ void swf_endframe(gfxdevice_t*dev) swf_SetU16(i->tag,i->depth); } i->depth = i->startdepth; + + if(i->config_frameresets) { + for(i->currentswfid;i->currentswfid>i->startids;i->currentswfid--) { + i->tag = swf_InsertTag(i->tag,ST_FREECHARACTER); + swf_SetU16(i->tag,i->currentswfid); + } + i->currentswfid = i->startids; + } } static void setBackground(gfxdevice_t*dev, int x1, int y1, int x2, int y2) @@ -1081,15 +1106,17 @@ void gfxdevice_swf_init(gfxdevice_t* dev) i->swf->movieSize.ymin = 0; i->swf->movieSize.xmax = 0; i->swf->movieSize.ymax = 0; + i->swf->fileAttributes = 9; // as3, local-with-network i->swf->firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); i->tag = i->swf->firstTag; RGBA rgb; rgb.a = rgb.r = rgb.g = rgb.b = 0xff; - rgb.r = 0; + //rgb.r = 0; swf_SetRGB(i->tag,&rgb); i->startdepth = i->depth = 0; + i->startids = i->currentswfid = 0; } static void startshape(gfxdevice_t*dev) @@ -1179,7 +1206,7 @@ void cancelshape(gfxdevice_t*dev) /* delete old shape tag */ TAG*todel = i->tag; i->tag = i->tag->prev; - swf_DeleteTag(todel); + swf_DeleteTag(0, todel); if(i->shape) {swf_ShapeFree(i->shape);i->shape=0;} i->shapeid = -1; i->bboxrectpos = -1; @@ -1304,7 +1331,7 @@ void wipeSWF(SWF*swf) tag->id != ST_END && tag->id != ST_DOACTION && tag->id != ST_SHOWFRAME) { - swf_DeleteTag(tag); + swf_DeleteTag(swf, tag); } tag = next; } @@ -1376,7 +1403,7 @@ void swfoutput_finalize(gfxdevice_t*dev) and the ST_END- they confuse the flash player */ while(tag->id == ST_REMOVEOBJECT2) { TAG* prev = tag->prev; - swf_DeleteTag(tag); + swf_DeleteTag(i->swf, tag); tag = prev; } @@ -1387,9 +1414,11 @@ void swfoutput_finalize(gfxdevice_t*dev) i->swf->compressed = 1; } - /* Initialize AVM2 if it is a Flash9 file */ - if(i->config_flashversion>=9 && i->config_insertstoptag) { - AVM2_InsertStops(i->swf); + /* Add AVM2 actionscript */ + if(i->config_flashversion>=9 && + (i->config_insertstoptag || i->hasbuttons)) { + swf_AddButtonLinks(i->swf, i->config_insertstoptag, + i->config_internallinkfunction||i->config_externallinkfunction); } // if(i->config_reordertags) // swf_Optimize(i->swf); @@ -1526,7 +1555,7 @@ static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth) } -static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover); +static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover, const char*url); static void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points); static void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points); static void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points); @@ -1541,6 +1570,9 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, const char*url) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(i->config_disablelinks) + return; + if(!strncmp("http://pdf2swf:", url, 15)) { char*tmp = strdup(url); int l = strlen(tmp); @@ -1571,8 +1603,10 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points) endshape(dev); if(i->textid>=0) endtext(dev); + + /* TODO: escape special characters in url */ - if(i->config_externallinkfunction) { + if(i->config_externallinkfunction && i->config_flashversion<=8) { actions = action_PushString(actions, url); //parameter actions = action_PushInt(actions, 1); //number of parameters (1) actions = action_PushString(actions, i->config_externallinkfunction); //function name @@ -1587,7 +1621,7 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points) } actions = action_End(actions); - drawlink(dev, actions, 0, points, 0); + drawlink(dev, actions, 0, points, 0, url); } void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) { @@ -1599,7 +1633,7 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) if(i->textid>=0) endtext(dev); - if(!i->config_internallinkfunction) { + if(!i->config_internallinkfunction || i->config_flashversion>=9) { actions = action_GotoFrame(actions, page-1); actions = action_End(actions); } else { @@ -1610,7 +1644,10 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) actions = action_End(actions); } - drawlink(dev, actions, 0, points, 0); + char name[80]; + sprintf(name, "page%d", page); + + drawlink(dev, actions, 0, points, 0, name); } /* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets @@ -1660,19 +1697,22 @@ void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points) actions2 = action_End(actions2); } - drawlink(dev, actions1, actions2, points, mouseover); + drawlink(dev, actions1, actions2, points, mouseover, name); swf_ActionFree(actions1); swf_ActionFree(actions2); free(tmp); } -static void drawgfxline(gfxdevice_t*dev, gfxline_t*line) +static void drawgfxline(gfxdevice_t*dev, gfxline_t*line, int fill) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; gfxcoord_t lastx=0,lasty=0,px=0,py=0; char lastwasmoveto; int lines= 0, splines=0; + + i->fill = fill; + while(1) { if(!line) break; @@ -1704,7 +1744,7 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line) } -static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gfxline_t*points, char mouseover) +static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gfxline_t*points, char mouseover, const char*url) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; RGBA rgb; @@ -1717,6 +1757,8 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf double posy = 0; int buttonid = getNewID(dev); gfxbbox_t bbox = gfxline_getbbox(points); + + i->hasbuttons = 1; /* shape */ myshapeid = getNewID(dev); @@ -1736,7 +1778,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf swf_SetShapeBits(i->tag,i->shape); swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0); i->swflastx = i->swflasty = 0; - drawgfxline(dev, points); + drawgfxline(dev, points, 1); swf_ShapeSetEnd(i->tag); /* shape2 */ @@ -1759,7 +1801,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf swf_SetShapeBits(i->tag,i->shape); swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0); i->swflastx = i->swflasty = 0; - drawgfxline(dev, points); + drawgfxline(dev, points, 1); swf_ShapeSetEnd(i->tag); if(!mouseover) @@ -1797,8 +1839,14 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf swf_ButtonPostProcess(i->tag, 1); } } - char name[80]; - sprintf(name, "link%d", buttonid); + char buf[80]; + const char* name = 0; + if(i->config_linknameurl) { + name = url; + } else { + name = buf; + sprintf(buf, "button%d", buttonid); + } msg(" Placing link ID %d", buttonid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); @@ -1897,6 +1945,10 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_enablezlib = atoi(value); } else if(!strcmp(name, "bboxvars")) { i->config_bboxvars = atoi(value); + } else if(!strcmp(name, "dots")) { + i->config_dots = atoi(value); + } else if(!strcmp(name, "frameresets")) { + i->config_frameresets = atoi(value); } else if(!strcmp(name, "showclipshapes")) { i->config_showclipshapes = atoi(value); } else if(!strcmp(name, "reordertags")) { @@ -1927,7 +1979,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->swf->fileVersion = i->config_flashversion; } } else if(!strcmp(name, "framerate")) { - i->config_framerate = atoi(value); + i->config_framerate = atof(value); if(i->swf) { i->swf->frameRate = i->config_framerate*0x100; } @@ -1941,6 +1993,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_dumpfonts = atoi(value); } else if(!strcmp(name, "animate")) { i->config_animate = atoi(value); + } else if(!strcmp(name, "disablelinks")) { + i->config_disablelinks = atoi(value); } else if(!strcmp(name, "simpleviewer")) { i->config_simpleviewer = atoi(value); } else if(!strcmp(name, "next_bitmap_is_jpeg")) { @@ -1972,9 +2026,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_linkcolor.a = NIBBLE(value[6])<<4 | NIBBLE(value[7]); } else if(!strcmp(name, "help")) { printf("\nSWF layer options:\n"); - printf("jpegdpi= resolution adjustment for jpeg images\n"); printf("jpegsubpixels= resolution adjustment for jpeg images (same as jpegdpi, but in pixels)\n"); - printf("ppmdpi= resolution adjustment for lossless images\n"); printf("ppmsubpixels= shortcut for setting both jpegsubpixels and ppmsubpixels\n"); printf("drawonlyshapes convert everything to shapes (currently broken)\n"); @@ -1982,9 +2034,11 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) printf("linksopennewwindow make links open a new browser window\n"); printf("linktarget target window name of new links\n"); printf("linkcolor==7)\n"); printf("bboxvars store the bounding box of the SWF file in actionscript variables\n"); + printf("dots Take care to handle dots correctly\n"); printf("reordertags=0/1 (default: 1) perform some tag optimizations\n"); printf("internallinkfunction= when the user clicks a internal link (to a different page) in the converted file, this actionscript function is called\n"); printf("externallinkfunction= when the user clicks an external link (e.g. http://www.foo.bar/) on the converted file, this actionscript function is called\n"); @@ -1993,9 +2047,13 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) printf("insertstop put an ActionScript \"STOP\" tag in every frame\n"); printf("protect add a \"protect\" tag to the file, to prevent loading in the Flash editor\n"); printf("flashversion= the SWF fileversion (6)\n"); + printf("framerate= SWF framerate\n"); printf("minlinewidth= convert horizontal/vertical boxes smaller than this width to lines (0.05) \n"); + printf("simpleviewer Add next/previous buttons to the SWF\n"); printf("animate insert a showframe tag after each placeobject (animate draw order of PDF files)\n"); printf("jpegquality= set compression quality of jpeg images\n"); + printf("splinequality= Set the quality of spline convertion to value (0-100, default: 100).\n"); + printf("disablelinks Disable links.\n"); } else { return 0; } @@ -2107,6 +2165,7 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int if(cacheid<=0) { bitid = getNewID(dev); + i->tag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, i->config_jpegquality); addImageToCache(dev, mem, sizex, sizey); } else { @@ -2180,7 +2239,7 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm swf_SetShapeBits(i->tag,shape); swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0); i->swflastx = i->swflasty = UNDEFINED_COORD; - drawgfxline(dev, line); + drawgfxline(dev, line, 1); swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); @@ -2211,7 +2270,7 @@ static void drawoutline(gfxdevice_t*dev, gfxline_t*line) swf_ShapeCountBits(shape,NULL,NULL); swf_SetShapeBits(i->tag,shape); swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,lsid,0,0); - drawgfxline(dev, line); + drawgfxline(dev, line, 1); swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); @@ -2257,7 +2316,7 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0); i->swflastx = i->swflasty = UNDEFINED_COORD; i->shapeisempty = 1; - drawgfxline(dev, line); + drawgfxline(dev, line, 1); if(i->shapeisempty) { /* an empty clip shape is equivalent to a shape with no area */ int x = line?line->x:0; @@ -2436,12 +2495,14 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol /* TODO: * split line into segments, and perform this check for all segments */ - if(i->config_disable_polygon_conversion || type>=5 || + if(i->config_disable_polygon_conversion || /*type>=5 ||*/ (!has_dots && (width <= i->config_caplinewidth || (cap_style == gfx_capRound && joint_style == gfx_joinRound) - || (cap_style == gfx_capRound && type<=2)))) {} else + || (cap_style == gfx_capRound && type<=2)))) { + // ... + } else { /* convert line to polygon */ msg(" draw as polygon, type=%d dots=%d", type, has_dots); if(has_dots) @@ -2474,7 +2535,7 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol swfoutput_setlinewidth(dev, width); startshape(dev); stopFill(dev); - drawgfxline(dev, line); + drawgfxline(dev, line, 0); if(i->config_normalize_polygon_positions) { free(line); //account for _move @@ -2513,8 +2574,7 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a); startshape(dev); startFill(dev); - i->fill=1; - drawgfxline(dev, line); + drawgfxline(dev, line, 1); if(i->currentswfid==2 && r.xmin==0 && r.ymin==0 && r.xmax==i->max_x && r.ymax==i->max_y) { if(i->config_watermark) { @@ -2591,7 +2651,7 @@ static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*grad swf_SetShapeBits(i->tag,shape); swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0); i->swflastx = i->swflasty = UNDEFINED_COORD; - drawgfxline(dev, line); + drawgfxline(dev, line, 1); swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); @@ -2626,10 +2686,11 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) for(t=0;tmax_unicode;t++) { swffont->ascii2glyph[t] = font->unicode2glyph[t]; } + SRECT max = {0,0,0,0}; for(t=0;tnum_glyphs;t++) { drawer_t draw; gfxline_t*line; - int advance = 0; + double advance = 0; swffont->glyph2ascii[t] = font->glyphs[t].unicode; if(swffont->glyph2ascii[t] == 0xffff || swffont->glyph2ascii[t] == 0x0000) { /* flash 8 flashtype requires unique unicode IDs for each character. @@ -2643,7 +2704,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) } else { swffont->glyphnames[t] = 0; } - advance = (int)(font->glyphs[t].advance); + advance = font->glyphs[t].advance; swf_Shape01DrawerInit(&draw, 0); line = font->glyphs[t].line; @@ -2662,17 +2723,16 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) } draw.finish(&draw); swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw); - swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw); - int xmax = swffont->layout->bounds[t].xmax / 20; - if(xmax>0 && xmax*2 < advance) { - printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", xmax, advance, font->glyphs[t].advance); - advance = xmax; - } + SRECT bbox = swf_ShapeDrawerGetBBox(&draw); + swf_ExpandRect2(&max, &bbox); + + swffont->layout->bounds[t] = bbox; - if(advance<32768/20) { - swffont->glyph[t].advance = advance*20; + if(advance<32768.0/20) { + swffont->glyph[t].advance = (int)(advance*20); } else { + //msg(" Advance value overflow in glyph %d", t); swffont->glyph[t].advance = 32767; } @@ -2680,6 +2740,24 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]); } + for(t=0;tnum_glyphs;t++) { + SRECT bbox = swffont->layout->bounds[t]; + + /* if the glyph doesn't have a bounding box, use the + combined bounding box (necessary e.g. for space characters) */ + if(!(bbox.xmin|bbox.ymin|bbox.xmax|bbox.ymax)) { + swffont->layout->bounds[t] = bbox = max; + } + + /* check that the advance value is reasonable, by comparing it + with the bounding box */ + if(bbox.xmax>0 && (bbox.xmax*10 < swffont->glyph[t].advance || !swffont->glyph[t].advance)) { + if(swffont->glyph[t].advance) + msg(" fix bad advance value for char %d: bbox=%.2f, advance=%.2f\n", t, bbox.xmax/20.0, swffont->glyph[t].advance/20.0); + swffont->glyph[t].advance = bbox.xmax; + } + //swffont->glyph[t].advance = bbox.xmax - bbox.xmin; + } /* Flash player will use the advance value from the char, and the ascent/descent values @@ -2697,6 +2775,14 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) swffont->layout->descent = 0; swffont->layout->leading = bounds.ymax - bounds.ymin; + /* if the font has proper ascent/descent values (>0) and those define + greater line spacing that what we estimated from the bounding boxes, + use the font's parameters */ + if(font->ascent*20 > swffont->layout->ascent) + swffont->layout->ascent = font->ascent*20; + if(font->descent*20 > swffont->layout->descent) + swffont->layout->descent = font->descent*20; + return swffont; } @@ -2778,6 +2864,16 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* msg(" swf_drawchar called (glyph %d) without font", glyph); return; } + + if(i->config_drawonlyshapes) { + gfxglyph_t*g = &font->glyphs[glyph]; + gfxline_t*line2 = gfxline_clone(g->line); + gfxline_transform(line2, matrix); + dev->fill(dev, line2, color); + gfxline_free(line2); + return; + } + if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,font->id)) // not equal to current font { /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope @@ -2823,6 +2919,9 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* msg(" Moving character origin to %f %f\n", matrix->tx, matrix->ty); endtext(dev); setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 1); + /* since we just moved the char origin to the current char's position, + it now has the relative position (0,0) */ + x = y = 0; } if(i->shapeid>=0)