X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfdraw.c;h=ae04aeee57e8edafe32597c73c3e1cb0ea110444;hb=879d0eec420fe0fd5ddcd56c8fe62b82a6744edd;hp=29a8b1fa08471e8ee05d50a64b689c9c74655254;hpb=2263d81f05b753babe027bda63de7d121f608fcb;p=swftools.git

diff --git a/lib/modules/swfdraw.c b/lib/modules/swfdraw.c
index 29a8b1f..ae04aee 100644
--- a/lib/modules/swfdraw.c
+++ b/lib/modules/swfdraw.c
@@ -1,172 +1,211 @@
-#define SCOORD_MAX 0x7fffffff
-#define SCOORD_MIN -0x80000000
-
 // swfdraw.c
-void swf_DrawerInit(SWFSHAPEDRAWER*draw, TAG*tag)
+
+#include "../rfxswf.h"
+
+typedef struct _SWFSHAPEDRAWER
+{
+    SHAPE*shape;
+    TAG*tag;
+    int tagfree;
+    SCOORD firstx;
+    SCOORD firsty;
+    SCOORD lastx;
+    SCOORD lasty;
+    SRECT bbox;
+    char isfinished;
+} SWFSHAPEDRAWER;
+
+static void swf_ShapeDrawerSetLineStyle(drawer_t*draw, void*style);
+static void swf_ShapeDrawerSetFillStyle(drawer_t*draw, void*style);
+static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to);
+static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to);
+static void swf_ShapeDrawerSplineTo(drawer_t*draw, FPOINT * c1, FPOINT*  to);
+static void swf_ShapeDrawerFinish(drawer_t*draw);
+static void swf_ShapeDrawerClear(drawer_t*draw);
+
+static void swf_ShapeDrawerInit(drawer_t*draw, TAG*tag, int fillstylebits, int linestylebits)
 {
-    memset(draw, 0, sizeof(SWFSHAPEDRAWER));
-    draw->tagfree = 0;
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)rfx_calloc(sizeof(SWFSHAPEDRAWER));
+    draw->internal = sdraw;
+
+    draw->setLineStyle = swf_ShapeDrawerSetLineStyle;
+    draw->setFillStyle = swf_ShapeDrawerSetFillStyle;
+    draw->moveTo = swf_ShapeDrawerMoveTo;
+    draw->lineTo = swf_ShapeDrawerLineTo;
+    draw->splineTo = swf_ShapeDrawerSplineTo;
+    draw->finish = swf_ShapeDrawerFinish;
+    draw->dealloc = swf_ShapeDrawerClear;
+    
+    sdraw->tagfree = 0;
     if(tag == 0) {
 	tag = swf_InsertTag(0, ST_DEFINESHAPE);
-	draw->tagfree = 1;
+	sdraw->tagfree = 1;
     }
-    draw->tag = tag;
-    swf_ShapeNew(&draw->shape);
+    sdraw->tag = tag;
+    swf_ShapeNew(&sdraw->shape);
     draw->pos.x = 0;
     draw->pos.y = 0;
 
-    swf_SetU8(draw->tag,0);
-    draw->shape->bits.fill = 1;
-    draw->shape->bits.line = 1;
+    swf_SetU8(sdraw->tag,0);
+    sdraw->shape->bits.fill = fillstylebits;
+    sdraw->shape->bits.line = linestylebits;
     
-    draw->bbox.xmin = draw->bbox.ymin = SCOORD_MAX;
-    draw->bbox.xmax = draw->bbox.ymax = SCOORD_MIN;
+    sdraw->bbox.xmin = sdraw->bbox.ymin = SCOORD_MAX;
+    sdraw->bbox.xmax = sdraw->bbox.ymax = SCOORD_MIN;
 
-    draw->isfinished = 0;
+    sdraw->isfinished = 0;
 
-    swf_ShapeSetStyle(draw->tag,draw->shape,1,1,0);
+    swf_ShapeSetStyle(sdraw->tag,sdraw->shape,linestylebits?1:0,fillstylebits?1:0,0/*?*/);
 }
-void swf_DrawerMoveTo(SWFSHAPEDRAWER*draw, FPOINT * to)
+
+void swf_Shape10DrawerInit(drawer_t*draw, TAG*tag)
 {
-    int x = to->x*20;
-    int y = to->y*20;
-    swf_ShapeSetMove(draw->tag,draw->shape,x,y);
-    draw->lastx = x;
-    draw->lasty = y;
-    draw->pos = *to;
+    swf_ShapeDrawerInit(draw, tag, 0, 1);
 }
-void swf_DrawerLineTo(SWFSHAPEDRAWER*draw, FPOINT * to)
+
+void swf_Shape01DrawerInit(drawer_t*draw, TAG*tag)
 {
-    int x = to->x*20;
-    int y = to->y*20;
-    if(draw->lastx < draw->bbox.xmin) draw->bbox.xmin = draw->lastx;
-    if(draw->lasty < draw->bbox.ymin) draw->bbox.ymin = draw->lasty;
-    if(draw->lastx > draw->bbox.xmax) draw->bbox.xmax = draw->lastx;
-    if(draw->lasty > draw->bbox.ymax) draw->bbox.ymax = draw->lasty;
-    if(x < draw->bbox.xmin) draw->bbox.xmin = x;
-    if(y < draw->bbox.ymin) draw->bbox.ymin = y;
-    if(x > draw->bbox.xmax) draw->bbox.xmax = x;
-    if(y > draw->bbox.ymax) draw->bbox.ymax = y;
-    swf_ShapeSetLine(draw->tag,draw->shape,x-draw->lastx,y-draw->lasty);
-    draw->lastx = x;
-    draw->lasty = y;
-    draw->pos = *to;
+    swf_ShapeDrawerInit(draw, tag, 1, 0);
 }
-void swf_DrawerSplineTo(SWFSHAPEDRAWER*draw, FPOINT * c1, FPOINT*  to)
+
+void swf_Shape11DrawerInit(drawer_t*draw, TAG*tag)
 {
-    int tx = c1->x*20;
-    int ty = c1->y*20;
-    int x = to->x*20;
-    int y = to->y*20;
-    if(draw->lastx < draw->bbox.xmin) draw->bbox.xmin = draw->lastx;
-    if(draw->lasty < draw->bbox.ymin) draw->bbox.ymin = draw->lasty;
-    if(draw->lastx > draw->bbox.xmax) draw->bbox.xmax = draw->lastx;
-    if(draw->lasty > draw->bbox.ymax) draw->bbox.ymax = draw->lasty;
-    if(x < draw->bbox.xmin) draw->bbox.xmin = x;
-    if(y < draw->bbox.ymin) draw->bbox.ymin = y;
-    if(x > draw->bbox.xmax) draw->bbox.xmax = x;
-    if(y > draw->bbox.ymax) draw->bbox.ymax = y;
-    if(tx < draw->bbox.xmin) draw->bbox.xmin = tx;
-    if(ty < draw->bbox.ymin) draw->bbox.ymin = ty;
-    if(tx > draw->bbox.xmax) draw->bbox.xmax = tx;
-    if(ty > draw->bbox.ymax) draw->bbox.ymax = ty;
-    swf_ShapeSetCurve(draw->tag,draw->shape, tx-draw->lastx,ty-draw->lasty, x-tx,y-ty);
-    draw->lastx = x;
-    draw->lasty = y;
-    draw->pos = *to;
+    swf_ShapeDrawerInit(draw, tag, 1, 1);
 }
-void swf_DrawerCubicTo(SWFSHAPEDRAWER*draw, FPOINT*  c1, FPOINT* c2, FPOINT*  to)
+
+static void swf_ShapeDrawerSetLineStyle(drawer_t*draw, void*style)
 {
-    /*TODO*/
-    draw->pos = *to;
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
 }
-void swf_DrawerConicTo(SWFSHAPEDRAWER*draw, FPOINT* c, FPOINT*  to)
+static void swf_ShapeDrawerSetFillStyle(drawer_t*draw, void*style)
 {
-    FPOINT* pos = &draw->pos;
-    FPOINT c1,c2;
-    c1.x = (pos->x + 2 * c->x) / 3;
-    c1.y = (pos->y + 2 * c->y) / 3;
-    c2.x = (2 * c->x + to->x) / 3;
-    c2.y = (2 * c->y + to->y) / 3;
-    swf_DrawerCubicTo(draw, &c1,&c2,to);
-    draw->pos = *to;
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
 }
-void swf_DrawerFinish(SWFSHAPEDRAWER*draw)
+static void fixEndPoint(drawer_t*draw)
 {
-    if(draw->bbox.xmin == SCOORD_MAX) {
-	/* no points at all -> empty bounding box */
-	draw->bbox.xmin = draw->bbox.ymin = 
-	draw->bbox.xmax = draw->bbox.ymax = 0;
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    if(   sdraw->firstx != sdraw->lastx 
+       || sdraw->firsty != sdraw->lasty) {
+	/* fix non-closing shapes */
+	FPOINT to;
+	to.x = sdraw->firstx/20.0;
+	to.y = sdraw->firsty/20.0;
+	if(sdraw->shape->bits.fill) // do this only if the shape is filled
+	    draw->lineTo(draw, &to);
     }
-    draw->isfinished = 1;
-    swf_ShapeSetEnd(draw->tag);
 }
-SHAPE* swf_DrawerToShape(SWFSHAPEDRAWER*draw)
+static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to)
 {
-    SHAPE* shape = malloc(sizeof(SHAPE));
-    if(!draw->isfinished) {
-	fprintf(stderr, "Warning: you should Finish() your drawer before calling DrawerToShape");
-	swf_DrawerFinish(draw);
-    }
-    memcpy(shape, draw->shape, sizeof(SHAPE));
-    shape->bitlen = (draw->tag->len-1)*8;
-    shape->data = (U8*)malloc(draw->tag->len-1);
-    memcpy(shape->data, &draw->tag->data[1], draw->tag->len-1);
-    return shape;
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    int x = floor(to->x*20);
+    int y = floor(to->y*20);
+
+    /* we need to write moveto always- it
+       might be that it signals the end of a polygon, otherwise
+       we would end up connecting two polygons which should
+       be seperate 
+	TODO: check if the last operation was a moveTo- if
+	      yes we *can* skip it.
+     */
+
+    //if(sdraw->lastx != x || sdraw->lasty != y) {
+	fixEndPoint(draw);
+	swf_ShapeSetMove(sdraw->tag,sdraw->shape,x,y);
+	sdraw->firstx = sdraw->lastx = x;
+	sdraw->firsty = sdraw->lasty = y;
+	draw->pos = *to;
+    //}
+}
+static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to)
+{
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    int x = floor(to->x*20);
+    int y = floor(to->y*20);
+    if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
+    if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
+    if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
+    if(sdraw->lasty > sdraw->bbox.ymax) sdraw->bbox.ymax = sdraw->lasty;
+    if(x < sdraw->bbox.xmin) sdraw->bbox.xmin = x;
+    if(y < sdraw->bbox.ymin) sdraw->bbox.ymin = y;
+    if(x > sdraw->bbox.xmax) sdraw->bbox.xmax = x;
+    if(y > sdraw->bbox.ymax) sdraw->bbox.ymax = y;
+    swf_ShapeSetLine(sdraw->tag,sdraw->shape,x-sdraw->lastx,y-sdraw->lasty);
+    sdraw->lastx = x;
+    sdraw->lasty = y;
+    draw->pos = *to;
+}
+static void swf_ShapeDrawerSplineTo(drawer_t*draw, FPOINT * c1, FPOINT*  to)
+{
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    int tx = floor(c1->x*20);
+    int ty = floor(c1->y*20);
+    int x = floor(to->x*20);
+    int y = floor(to->y*20);
+    if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
+    if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
+    if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
+    if(sdraw->lasty > sdraw->bbox.ymax) sdraw->bbox.ymax = sdraw->lasty;
+    if(x < sdraw->bbox.xmin) sdraw->bbox.xmin = x;
+    if(y < sdraw->bbox.ymin) sdraw->bbox.ymin = y;
+    if(x > sdraw->bbox.xmax) sdraw->bbox.xmax = x;
+    if(y > sdraw->bbox.ymax) sdraw->bbox.ymax = y;
+    if(tx < sdraw->bbox.xmin) sdraw->bbox.xmin = tx;
+    if(ty < sdraw->bbox.ymin) sdraw->bbox.ymin = ty;
+    if(tx > sdraw->bbox.xmax) sdraw->bbox.xmax = tx;
+    if(ty > sdraw->bbox.ymax) sdraw->bbox.ymax = ty;
+    swf_ShapeSetCurve(sdraw->tag,sdraw->shape, tx-sdraw->lastx,ty-sdraw->lasty, x-tx,y-ty);
+    sdraw->lastx = x;
+    sdraw->lasty = y;
+    draw->pos = *to;
 }
-void swf_DrawerFree(SWFSHAPEDRAWER*draw)
+static void swf_ShapeDrawerFinish(drawer_t*draw)
 {
-    if(draw->tagfree) {
-	swf_DeleteTag(draw->tag);
-	draw->tag = 0;
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    if(sdraw->isfinished)
+	return;
+	
+    fixEndPoint(draw);
+
+    if(sdraw->bbox.xmin == SCOORD_MAX) {
+	/* no points at all -> empty bounding box */
+	sdraw->bbox.xmin = sdraw->bbox.ymin = 
+	sdraw->bbox.xmax = sdraw->bbox.ymax = 0;
     }
-//    swf_ShapeFree(draw->s);
- //   draw->s = 0;
+    sdraw->isfinished = 1;
+    swf_ShapeSetEnd(sdraw->tag);
 }
 
-static char* getToken(const char**p)
+static void swf_ShapeDrawerClear(drawer_t*draw)
 {
-    const char*start;
-    char*result;
-    while(**p && strchr(" ,\t\n\r", **p)) {
-	(*p)++;
-    } 
-    start = *p;
-    while(**p && !strchr(" ,\t\n\r", **p)) {
-	(*p)++;
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    if(sdraw->tagfree) {
+	swf_DeleteTag(0, sdraw->tag);
+	sdraw->tag = 0;
     }
-    result = malloc((*p)-start+1);
-    memcpy(result,start,(*p)-start+1);
-    result[(*p)-start] = 0;
-    return result;
+    swf_ShapeFree(sdraw->shape);
+    sdraw->shape = 0;
+
+    rfx_free(draw->internal);
+    draw->internal = 0;
 }
 
-void swf_DrawString(SWFSHAPEDRAWER*draw, const char*string)
+SRECT swf_ShapeDrawerGetBBox(drawer_t*draw)
 {
-    const char*p = string;
-    while(*p) {
-	char*token = getToken(&p);
-	if(!strncmp(token, "moveTo", 6)) {
-	    FPOINT to;
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
-	    swf_DrawerMoveTo(draw, &to);
-	}
-	else if(!strncmp(token, "lineTo", 6)) {
-	    FPOINT to;
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
-	    swf_DrawerLineTo(draw, &to);
-	}
-	else if(!strncmp(token, "curveTo", 7) || !strncmp(token, "splineTo", 8)) {
-	    FPOINT mid,to;
-	    mid.x = atoi(getToken(&p));
-	    mid.y = atoi(getToken(&p));
-	    to.x = atoi(getToken(&p));
-	    to.y = atoi(getToken(&p));
-	    swf_DrawerSplineTo(draw, &mid, &to);
-	}
-	free(token);
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    return sdraw->bbox;
+}
+
+SHAPE* swf_ShapeDrawerToShape(drawer_t*draw)
+{
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    SHAPE* shape = (SHAPE*)rfx_alloc(sizeof(SHAPE));
+    if(!sdraw->isfinished) {
+	fprintf(stderr, "Warning: you should Finish() your drawer before calling DrawerToShape");
+	swf_ShapeDrawerFinish(draw);
     }
-    //swf_DrawerFinish(draw); // must be done by application.
+    memcpy(shape, sdraw->shape, sizeof(SHAPE));
+    shape->bitlen = (sdraw->tag->len-1)*8;
+    shape->data = (U8*)rfx_alloc(sdraw->tag->len-1);
+    memcpy(shape->data, &sdraw->tag->data[1], sdraw->tag->len-1);
+    return shape;
 }