swf_SetU16(t,f->id_bitmap);
swf_SetMatrix(t,&f->m);
break;
+ case FILL_LINEAR:
+ case FILL_RADIAL:
+ swf_SetMatrix(t,&f->m);
+ swf_SetGradient(t,&f->gradient,/*alpha?*/t->id==ST_DEFINESHAPE3?1:0);
+ break;
}
return 0;
return res;
}
-int swf_ShapeExport(int handle,SHAPE * s) // without Linestyle/Fillstyle Record
-{ int l;
- if (!s) return 0;
-
- l = sizeof(SHAPE);
-
- if (handle>=0)
- if (write(handle,s,sizeof(SHAPE))!=sizeof(SHAPE)) return -1;
-
- // Fillstyle, Linestyle ...
-
- if (s->data)
- { int ll = (s->bitlen+7)/8;
- l+=ll;
- if (handle>=0)
- if (write(handle,s->data,ll)!=ll) return -1;
- }
-
- return l;
-}
-
-int swf_ShapeImport(int handle,SHAPE * * shape)
-{ SHAPE * s;
-
- if (handle<0) return -1;
-
- s = (SHAPE *)malloc(sizeof(SHAPE)); shape[0] = s;
- if (!s) return -1;
-
- if (read(handle,s,sizeof(SHAPE))!=sizeof(SHAPE))
- { shape[0] = NULL;
- free(s);
- return -1;
- }
-
- if (s->data)
- { int ll = (s->bitlen+7)/8;
- s->data = (U8*)malloc(ll);
- if (!s->data)
- { shape[0] = NULL;
- free(s);
- return -1;
- }
- if (read(handle,s->data,ll)!=ll)
- { free(s->data);
- free(s);
- shape[0] = NULL;
- return -1;
- }
- }
-
- return 0;
-}
-
-int swf_ShapeAddFillStyle(SHAPE * s,U8 type,MATRIX * m,RGBA * color,U16 id_bitmap)
+int swf_ShapeAddFillStyle(SHAPE * s,U8 type,MATRIX * m,RGBA * color,U16 id_bitmap, GRADIENT*gradient)
{ RGBA def_c;
MATRIX def_m;
+ GRADIENT def_g;
// handle defaults
{ m = &def_m;
swf_GetMatrix(NULL,m);
}
+ if(!gradient)
+ {
+ gradient = &def_g;
+ swf_GetGradient(NULL, gradient, 1);
+ }
// handle memory
s->fillstyle.data[s->fillstyle.n].id_bitmap = id_bitmap;
memcpy(&s->fillstyle.data[s->fillstyle.n].m,m,sizeof(MATRIX));
memcpy(&s->fillstyle.data[s->fillstyle.n].color,color,sizeof(RGBA));
+ memcpy(&s->fillstyle.data[s->fillstyle.n].gradient,gradient,sizeof(GRADIENT));
return (++s->fillstyle.n);
}
int swf_ShapeAddSolidFillStyle(SHAPE * s,RGBA * color)
-{ return swf_ShapeAddFillStyle(s,FILL_SOLID,NULL,color,0);
+{ return swf_ShapeAddFillStyle(s,FILL_SOLID,NULL,color,0,0);
}
int swf_ShapeAddBitmapFillStyle(SHAPE * s,MATRIX * m,U16 id_bitmap,int clip)
-{ return swf_ShapeAddFillStyle(s,clip?FILL_CLIPPED:FILL_TILED,m,NULL,id_bitmap);
+{ return swf_ShapeAddFillStyle(s,clip?FILL_CLIPPED:FILL_TILED,m,NULL,id_bitmap,0);
+}
+
+int swf_ShapeAddGradientFillStyle(SHAPE * s,MATRIX * m,GRADIENT* gradient,int radial)
+{ return swf_ShapeAddFillStyle(s,radial?FILL_RADIAL:FILL_LINEAR,m,NULL,0,gradient);
}
int swf_ShapeAddLineStyle(SHAPE * s,U16 width,RGBA * color)
{
SRECT r;
SHAPELINE*l = shape2->lines;
- int SCOORD_MAX = 0x7fffffff;
- int SCOORD_MIN = -0x80000000;
int lastx=0,lasty=0;
int valid = 0;
r.xmin = r.ymin = SCOORD_MAX;
RGBA rgb;
SRECT r;
int lines = 0;
- int ls,fs;
+ int ls=0,fs;
swf_ShapeNew(&shape);
rgb.b = rgb.g = rgb.r = 0xff;
if(lines)
swf_ShapeFree(shape);
}
+void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape)
+{
+ TAG*tag = swf_InsertTag(0,0);
+ SHAPELINE*l,*next;
+ int newx=0,newy=0,lastx=0,lasty=0,oldls=0,oldfs0=0,oldfs1=0;
+
+ memset(shape, 0, sizeof(SHAPE));
+
+ shape->linestyle.n = shape2->numlinestyles;
+ shape->linestyle.data = (LINESTYLE*)malloc(sizeof(LINESTYLE)*shape->linestyle.n);
+ memcpy(shape->linestyle.data, shape2->linestyles, sizeof(LINESTYLE)*shape->linestyle.n);
+
+ shape->fillstyle.n = shape2->numfillstyles;
+ shape->fillstyle.data = (FILLSTYLE*)malloc(sizeof(FILLSTYLE)*shape->fillstyle.n);
+ memcpy(shape->fillstyle.data, shape2->fillstyles, sizeof(FILLSTYLE)*shape->fillstyle.n);
+
+ swf_ShapeCountBits(shape,NULL,NULL);
+
+ l = shape2->lines;
+
+ while(l) {
+ int ls=0,fs0=0,fs1=0;
+
+ if(l->type != moveTo) {
+ if(oldls != l->linestyle) {oldls = ls = l->linestyle;if(!ls) ls=0x8000;}
+ if(oldfs0 != l->fillstyle0) {oldfs0 = fs0 = l->fillstyle0;if(!fs0) fs0=0x8000;}
+ if(oldfs1 != l->fillstyle1) {oldfs1 = fs1 = l->fillstyle1;if(!fs1) fs1=0x8000;}
+
+ if(ls || fs0 || fs1 || newx!=0x7fffffff || newy!=0x7fffffff) {
+ swf_ShapeSetAll(tag,shape,newx,newy,ls,fs0,fs1);
+ newx = 0x7fffffff;
+ newy = 0x7fffffff;
+ }
+ }
+
+ if(l->type == lineTo) {
+ swf_ShapeSetLine(tag,shape,l->x-lastx,l->y-lasty);
+ } else if(l->type == splineTo) {
+ swf_ShapeSetCurve(tag,shape, l->sx-lastx,l->sy-lasty, l->x-l->sx,l->y-l->sy);
+ }
+ if(l->type == moveTo) {
+ newx = l->x;
+ newy = l->y;
+ }
+
+ lastx = l->x;
+ lasty = l->y;
+ l = l->next;
+ }
+ swf_ShapeSetEnd(tag);
+ shape->data = tag->data;
+ shape->bitlen = tag->len*8;
+}
+
+void swf_SetShape2(TAG*tag, SHAPE2*shape2)
+{
+ SHAPE shape;
+ swf_Shape2ToShape(shape2, &shape);
+
+ swf_SetRect(tag,shape2->bbox);
+ swf_SetShapeStyles(tag, &shape);
+ swf_ShapeCountBits(&shape,NULL,NULL);
+ swf_SetShapeBits(tag,&shape);
+
+ swf_SetBlock(tag, shape.data, (shape.bitlen+7)/8);
+}
+
+static void parseFillStyleArray(TAG*tag, SHAPE2*shape)
+{
+ U16 count;
+ int t;
+ int num=0;
+ if(tag->id == ST_DEFINESHAPE)
+ num = 1;
+ else if(tag->id == ST_DEFINESHAPE2)
+ num = 2;
+ else if(tag->id == ST_DEFINESHAPE3)
+ num = 3;
+
+ count = swf_GetU8(tag);
+ if(count == 0xff && num>1) // defineshape2,3 only
+ count = swf_GetU16(tag);
+
+ shape->numfillstyles = count;
+ shape->fillstyles = malloc(sizeof(FILLSTYLE)*count);
+
+ for(t=0;t<count;t++)
+ {
+ int type;
+ U8*pos;
+ FILLSTYLE*dest = &shape->fillstyles[t];
+ type = swf_GetU8(tag); //type
+ shape->fillstyles[t].type = type;
+ if(type == 0) {
+ /* plain color */
+ if(num == 3)
+ swf_GetRGBA(tag, &dest->color);
+ else
+ swf_GetRGB(tag, &dest->color);
+ }
+ else if(type == 0x10 || type == 0x12)
+ {
+ /* linear/radial gradient fill */
+ swf_ResetReadBits(tag);
+ swf_GetMatrix(tag, &dest->m);
+ swf_ResetReadBits(tag);
+ swf_GetGradient(tag, &dest->gradient, num>=3?1:0);
+ }
+ else if(type == 0x40 || type == 0x41)
+ {
+ /* bitmap fill */
+ swf_ResetReadBits(tag);
+ dest->id_bitmap = swf_GetU16(tag); //id
+ swf_ResetReadBits(tag); //?
+ swf_GetMatrix(tag, &dest->m);
+ }
+ else {
+ fprintf(stderr, "rfxswf:swftools.c Unknown fillstyle:0x%02x\n",type);
+ }
+ }
+ swf_ResetReadBits(tag);
+ count = swf_GetU8(tag); // line style array
+ if(count == 0xff)
+ count = swf_GetU16(tag);
+
+ //if(verbose) printf("lnum: %d\n", count);
+
+ shape->numlinestyles = count;
+ shape->linestyles = malloc(sizeof(LINESTYLE)*count);
+ /* TODO: should we start with 1 and insert a correct definition of the
+ "built in" linestyle 0? */
+ for(t=0;t<count;t++)
+ {
+ shape->linestyles[t].width = swf_GetU16(tag);
+ if(num == 3)
+ swf_GetRGBA(tag, &shape->linestyles[t].color);
+ else
+ swf_GetRGB(tag, &shape->linestyles[t].color);
+ }
+ return;
+}
+
+void swf_ParseDefineShape(TAG*tag, SHAPE2*shape)
+{
+ int num = 0, id;
+ U16 fill,line;
+ SRECT r;
+ SRECT r2;
+ SHAPELINE*l;
+ if(tag->id == ST_DEFINESHAPE)
+ num = 1;
+ else if(tag->id == ST_DEFINESHAPE2)
+ num = 2;
+ else if(tag->id == ST_DEFINESHAPE3)
+ num = 3;
+ else {
+ fprintf(stderr, "parseDefineShape must be called with a shape tag");
+ }
+
+ id = swf_GetU16(tag); //id
+ memset(shape, 0, sizeof(SHAPE2));
+ shape->bbox = malloc(sizeof(SRECT));
+ swf_GetRect(tag, &r);
+
+ memcpy(shape->bbox, &r, sizeof(SRECT));
+ parseFillStyleArray(tag, shape);
+
+ swf_ResetReadBits(tag);
+ fill = (U16)swf_GetBits(tag,4);
+ line = (U16)swf_GetBits(tag,4);
+
+ shape->lines = swf_ParseShapeData(&tag->data[tag->pos], (tag->len - tag->pos)*8, fill, line);
+
+ l = shape->lines;
+}
+