X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=792ac14c03abaf4793cf2442865fb4bdd76e0539;hb=6cfa6f2326b39d3dee66a27cb77ad5e8fab021a1;hp=60b35619b734fe69bb016ab694250d7e10a26fc1;hpb=57c76fea2ab1652cb1727342ab7caf02569eeab7;p=swftools.git diff --git a/lib/rfxswf.h b/lib/rfxswf.h index 60b3561..792ac14 100644 --- a/lib/rfxswf.h +++ b/lib/rfxswf.h @@ -24,15 +24,13 @@ #ifndef __RFX_SWF_INCLUDED__ #define __RFX_SWF_INCLUDED__ -#ifdef __cplusplus -extern "C" { -#endif - #include #include #include #include +#ifndef WIN32 #include +#endif #include #include #include "../config.h" @@ -41,6 +39,10 @@ extern "C" { #include "./mem.h" #include "./types.h" +#ifdef __cplusplus +extern "C" { +#endif + #define DEBUG_RFXSWF #ifdef RFXSWF_DISABLESOUND #define NO_MP3 @@ -162,7 +164,6 @@ int swf_ReadSWF2(reader_t*reader, SWF * swf); // Reads SWF via callback int swf_ReadSWF(int handle,SWF * swf); // Reads SWF to memory (malloc'ed), returns length or <0 if fails int swf_WriteSWF2(writer_t*writer, SWF * swf); // Writes SWF via callback, returns length or <0 if fails int swf_WriteSWF(int handle,SWF * swf); // Writes SWF to file, returns length or <0 if fails -int swf_WriteSWC(int handle, SWF * swf); // for convenience, equal to swf->compressed=1;swf_WriteSWF(..) int swf_WriteCGI(SWF * swf); // Outputs SWF with valid CGI header to stdout void swf_FreeTags(SWF * swf); // Frees all malloc'ed memory for swf SWF* swf_CopySWF(SWF*swf); @@ -210,6 +211,8 @@ U8* swf_GetTagLenPtr(TAG * t); U32 swf_GetBits(TAG * t,int nbits); S32 swf_GetSBits(TAG * t,int nbits); int swf_SetBits(TAG * t,U32 v,int nbits); +int swf_CountUBits(U32 v,int nbits); +int swf_CountBits(U32 v,int nbits); int swf_GetBlock(TAG * t,U8 * b,int l); // resets Bitcount int swf_SetBlock(TAG * t,U8 * b,int l); @@ -221,13 +224,14 @@ U32 swf_GetU32(TAG * t); void swf_GetRGB(TAG * t, RGBA * col); void swf_GetRGBA(TAG * t, RGBA * col); void swf_GetGradient(TAG * t, GRADIENT * gradient, char alpha); +void swf_SetGradient(TAG * tag, GRADIENT * gradient, char alpha); void swf_FreeGradient(GRADIENT* gradient); char* swf_GetString(TAG*t); int swf_SetU8(TAG * t,U8 v); // resets Bitcount int swf_SetU16(TAG * t,U16 v); void swf_SetS16(TAG * t,int v); int swf_SetU32(TAG * t,U32 v); -#define swf_SetString(t,s) swf_SetBlock(t,s,strlen(s)+1) +#define swf_SetString(t,s) swf_SetBlock(t,s,strlen((const char *)s)+1) //int swf_GetPoint(TAG * t,SPOINT * p); // resets Bitcount int swf_GetRect(TAG * t,SRECT * r); @@ -326,11 +330,15 @@ SRECT swf_TurnRect(SRECT r, MATRIX* m); #define ST_DEFINEFONTALIGNZONES 73 /* version 8 */ #define ST_CSMTEXTSETTINGS 74 /* version 8 */ #define ST_DEFINEFONT3 75 /* version 8 */ +#define ST_SYMBOLCLASS 76 /* version 9 */ #define ST_METADATA 77 /* version 8 */ #define ST_DEFINESCALINGGRID 78 /* version 8 */ +#define ST_DOABC 82 /* version 9 */ #define ST_DEFINESHAPE4 83 /* version 8 */ #define ST_DEFINEMORPHSHAPE2 84 /* version 8 */ #define ST_SCENEDESCRIPTION 86 /* version 9 */ +#define ST_DEFINEBINARY 87 /* version 9 */ +#define ST_DEFINEFONTNAME 88 /* version 9 */ /* custom tags- only valid for swftools */ #define ST_REFLEX 777 /* to identify generator software */ @@ -393,9 +401,10 @@ typedef struct _SHAPE2 SRECT* bbox; // may be NULL } SHAPE2; +enum SHAPELINETYPE {moveTo, lineTo, splineTo}; typedef struct _SHAPELINE { - enum {moveTo, lineTo, splineTo} type; + enum SHAPELINETYPE type; SCOORD x,y; SCOORD sx,sy; //only if type==splineTo int fillstyle0; @@ -432,6 +441,10 @@ int swf_ShapeSetLine(TAG * t,SHAPE * s,S32 x,S32 y); int swf_ShapeSetCurve(TAG * t,SHAPE * s,S32 x,S32 y,S32 ax,S32 ay); int swf_ShapeSetCircle(TAG * t,SHAPE * s,S32 x,S32 y,S32 rx,S32 ry); int swf_ShapeSetEnd(TAG * t); +int swf_SetShapeStyleCount(TAG * t,U16 n); +int swf_SetFillStyle(TAG * t,FILLSTYLE * f); +int swf_SetLineStyle(TAG * t,LINESTYLE * l); + void swf_ShapeSetBitmapRect(TAG * t, U16 gfxid, int width, int height); @@ -554,6 +567,10 @@ int swf_FontEnumerate(SWF * swf,void (*FontCallback) (void*,U16,U8*), void*self) int swf_FontExtract(SWF * swf,int id,SWFFONT ** f); // Fetches all available information from DefineFont, DefineFontInfo, DefineText, ... // id = FontID, id=0 -> Extract first Font +int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag); +int swf_FontExtract_DefineFontInfo(int id, SWFFONT * f, TAG * t); +int swf_FontExtract_DefineFont(int id, SWFFONT * f, TAG * t); +int swf_FontExtract_GlyphNames(int id, SWFFONT * f, TAG * tag); int swf_FontIsItalic(SWFFONT * f); int swf_FontIsBold(SWFFONT * f); @@ -882,7 +899,7 @@ ActionTAG* action_BitLShift(ActionTAG*atag); ActionTAG* action_BitRShift(ActionTAG*atag); ActionTAG* action_BitURShift(ActionTAG*atag); ActionTAG* action_GotoFrame(ActionTAG*atag, U16 frame); -ActionTAG* action_GetUrl(ActionTAG*atag, char* url, char* label); +ActionTAG* action_GetUrl(ActionTAG*atag, const char* url, char* label); ActionTAG* action_StoreRegister(ActionTAG*atag, U8 reg); ActionTAG* action_Constantpool(ActionTAG*atag, char* constantpool); ActionTAG* action_WaitForFrame(ActionTAG*atag, U16 frame, U8 skip); @@ -890,7 +907,7 @@ ActionTAG* action_SetTarget(ActionTAG*atag, char* target); ActionTAG* action_GotoLabel(ActionTAG*atag, char* label); ActionTAG* action_WaitForFrame2(ActionTAG*atag, U8 skip); ActionTAG* action_With(ActionTAG*atag, char*object); -ActionTAG* action_PushString(ActionTAG*atag, char*str); +ActionTAG* action_PushString(ActionTAG*atag, const char*str); ActionTAG* action_PushFloat(ActionTAG*atag, float f); ActionTAG* action_PushNULL(ActionTAG*atag); ActionTAG* action_PushRegister(ActionTAG*atag, U8 reg); @@ -918,6 +935,20 @@ int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * nam int swf_ObjectPlaceBlend(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U8 blendmode); int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx); +#define PF_MOVE 0x01 +#define PF_CHAR 0x02 +#define PF_MATRIX 0x04 +#define PF_CXFORM 0x08 +#define PF_RATIO 0x10 +#define PF_NAME 0x20 +#define PF_CLIPDEPTH 0x40 +#define PF_ACTIONEVENT 0x80 + +#define PF2_FILTERS 0x01 +#define PF2_BLENDMODE 0x02 +#define PF2_ASBITMAP 0x04 +//... + typedef struct _SWFPLACEOBJECT { U16 depth; U16 id; // may be 0 @@ -985,7 +1016,7 @@ void swf_Render_SetBackgroundColor(RENDERBUF*buf, RGBA color); RGBA* swf_Render(RENDERBUF*dest); void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 depth,U16 clipdepth); void swf_RenderSWF(RENDERBUF*buf, SWF*swf); -void swf_Render_AddImage(RENDERBUF*buf, U16 id, RGBA*img, int width, int height); +void swf_Render_AddImage(RENDERBUF*buf, U16 id, RGBA*img, int width, int height); /* img is non-premultiplied */ void swf_Render_ClearCanvas(RENDERBUF*dest); void swf_Render_Delete(RENDERBUF*dest); @@ -1054,13 +1085,27 @@ typedef struct _FILTER_BLUR { int passes; } FILTER_BLUR; +typedef struct _FILTER_GLOW { + U8 type; + RGBA rgba; + double blurx; + double blury; + double strength; + int passes; + char innerglow; + char knockout; + char composite; +} FILTER_GLOW; + void swf_SetFilter(TAG*tag, FILTER*f); FILTER*swf_GetFilter(TAG*tag); FILTER*swf_NewFilter(U8 type); +void swf_DeleteFilter(FILTER*f); + +void AVM2_InsertStops(SWF*swf); #ifdef __cplusplus } #endif #endif -