X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfshape.c;h=100132729679d9f07897efbbe75804be37f6ea0a;hb=74021a5785a3b96e71a515d25fb91cd4e8cbbea9;hp=ded2f6553538b998a8655d1e99bc5d46c221e704;hpb=aee9de2c6eb23628e54b6896f5b441d9b39317c1;p=swftools.git diff --git a/lib/modules/swfshape.c b/lib/modules/swfshape.c index ded2f65..1001327 100644 --- a/lib/modules/swfshape.c +++ b/lib/modules/swfshape.c @@ -182,6 +182,11 @@ int swf_SetFillStyle(TAG * t,FILLSTYLE * f) 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; @@ -252,63 +257,10 @@ int swf_SetShapeHeader(TAG * t,SHAPE * s) 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 @@ -322,6 +274,11 @@ int swf_ShapeAddFillStyle(SHAPE * s,U8 type,MATRIX * m,RGBA * color,U16 id_bitma { m = &def_m; swf_GetMatrix(NULL,m); } + if(!gradient) + { + gradient = &def_g; + swf_GetGradient(NULL, gradient, 1); + } // handle memory @@ -342,16 +299,21 @@ int swf_ShapeAddFillStyle(SHAPE * s,U8 type,MATRIX * m,RGBA * color,U16 id_bitma 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) @@ -395,7 +357,7 @@ int swf_ShapeSetMove(TAG * t,SHAPE * s,S32 x,S32 y) return 0; } -int swf_ShapeSetStyle(TAG * t,SHAPE * s,U16 line,U16 fill0,U16 fill1) +int swf_ShapeSetStyle(TAG * t,SHAPE * s,int line,int fill0,int fill1) { if ((!t)||(!s)) return -1; swf_SetBits(t,0,1); @@ -414,11 +376,9 @@ int swf_ShapeSetStyle(TAG * t,SHAPE * s,U16 line,U16 fill0,U16 fill1) these defines are a workaround (they also reduce the maximal number of fill styles to 32768) */ -#define FILL_RESET 0x8000 -#define LINE_RESET 0x8000 #define UNDEFINED_COORD 0x7fffffff -int swf_ShapeSetAll(TAG * t,SHAPE * s,S32 x,S32 y,U16 line,U16 fill0,U16 fill1) +int swf_ShapeSetAll(TAG * t,SHAPE * s,S32 x,S32 y,int line,int fill0,int fill1) { U8 b; U8 hasmove = 0; if ((!t)||(!s)) return -1; @@ -732,7 +692,7 @@ void swf_ShapeSetBitmapRect(TAG*tag, U16 gfxid, int width, int height) 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)