X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=ff15257ff54490b464aee421cc865241b5810e2a;hb=f2edb50fa1420cc889950255d2c13b472fa25106;hp=4c1e7ad0049334a32e02fac8c672782104d77015;hpb=994d5705f3ab0c9c3bb57dcd9fa8bb2a5398de2c;p=swftools.git diff --git a/lib/rfxswf.h b/lib/rfxswf.h index 4c1e7ad..ff15257 100644 --- a/lib/rfxswf.h +++ b/lib/rfxswf.h @@ -22,9 +22,6 @@ #include "../config.h" #include "./bitio.h" -#define LAME -#include "lame/lame.h" - #define DEBUG_RFXSWF #ifndef TRUE @@ -40,8 +37,8 @@ //#define SWAP16(s) ((U16) ((U8*)&s)[0] | ((U16) ((U8*)&s)[1] << 8)) //#define SWAP32(s) ((U32) ((U8*)&s)[0] | ((U32) ((U8*)&s)[1] << 8) | ((U32) ((U8*)&s)[2] << 16) | ((U32) ((U8*)&s)[3] << 24)) -#define PUT16(ptr,x) ((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8); -#define PUT32(ptr,x) ((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8);((U8*)(ptr))[2]=(U8)((x)>>16);((U8*)(ptr))[3]=(U8)((x)>>24); +#define PUT16(ptr,x) {((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8);} +#define PUT32(ptr,x) {((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8);((U8*)(ptr))[2]=(U8)((x)>>16);((U8*)(ptr))[3]=(U8)((x)>>24);} #define GET16(ptr) (((U16)(((U8*)(ptr))[0]))+(((U16)(((U8*)(ptr))[1]))<<8)) #define GET32(ptr) (((U16)(((U8*)(ptr))[0]))+(((U16)(((U8*)(ptr))[1]))<<8)+(((U16)(((U8*)(ptr))[2]))<<16)+(((U16)(((U8*)(ptr))[3]))<<24)) @@ -129,22 +126,6 @@ typedef struct _TAG // NEVER access a Tag-Struct directly ! } TAG, * LPTAG; -typedef struct _ActionTAG -{ U8 op; - U16 len; - U8 * data; - - struct _ActionTAG * next; - struct _ActionTAG * prev; - - struct _ActionTAG * parent; - U8 tmp[4]; // store small operands here. -} ActionTAG; - -typedef struct _ActionMarker -{ - ActionTAG* atag; -} ActionMarker; typedef struct _SWF { U8 fileVersion; @@ -178,6 +159,8 @@ int swf_ReadHeader(struct reader_t*reader, SWF * swf); // Reads SWF Header vi void swf_FoldAll(SWF*swf); void swf_FoldSprite(TAG*tag); + +// basic routines: TAG * swf_InsertTag(TAG * after,U16 id); // updates frames, if necessary int swf_DeleteTag(TAG * t); @@ -336,6 +319,30 @@ typedef struct _SHAPE // NEVER access a Shape-Struct directly ! U32 bitlen; // length of data in bits } SHAPE, * LPSHAPE; +/* SHAPE can be converted into SHAPE2: */ + +struct _SHAPELINE; +typedef struct _SHAPE2 +{ + LINESTYLE * linestyles; + int numlinestyles; + FILLSTYLE* fillstyles; + int numfillstyles; + struct _SHAPELINE * lines; + SRECT* bbox; // may be NULL +} SHAPE2; + +typedef struct _SHAPELINE +{ + enum {moveTo, lineTo, splineTo} type; + SCOORD x,y; + SCOORD sx,sy; //only if type==splineTo + int fillstyle0; + int fillstyle1; + int linestyle; + struct _SHAPELINE * next; +} SHAPELINE; + // Shapes int swf_ShapeNew(SHAPE ** s); @@ -362,6 +369,12 @@ 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); +SHAPELINE* swf_ParseShapeData(U8*data, int bits, int fillbits, int linebits); +SHAPE2* swf_ShapeToShape2(SHAPE*shape); +SHAPE* swf_Shape2ToShape(SHAPE2*shape); +SRECT swf_GetShapeBoundingBox(SHAPELINE*shape); +int swf_SetShape2(TAG*tag, SHAPE2*shape); +void swf_Shape2Free(SHAPE2 * s); // swffont.c @@ -467,10 +480,6 @@ void swf_FontAddLayout(SWFFONT * f, int ascent, int descent, int leading); int swf_FontExtract_DefineTextCallback(int id,SWFFONT * f,TAG * t,int jobs, void(*callback)(int*chars, int nr, int id)); -// the following two functions are obsolete and will be removed soon -int swf_FontExport(int handle,SWFFONT * f); -int swf_FontImport(int handle,SWFFONT * * f); - void swf_WriteFont(SWFFONT* font, char* filename); SWFFONT* swf_ReadFont(char* filename); @@ -489,6 +498,8 @@ int swf_TextPrintDefineText(TAG * t,SWFFONT * f); void swf_SetEditText(TAG*tag, U16 flags, SRECT r, char*text, RGBA*color, int maxlength, U16 font, U16 height, EditTextLayout*layout, char*variable); +void swf_SetDefineText(TAG*tag, SWFFONT*font, RGBA*rgb, char*text, int scale); + // swfdump.c void swf_DumpHeader(FILE * f,SWF * swf); @@ -497,14 +508,6 @@ void swf_DumpTag(FILE * f,TAG * t); char* swf_TagGetName(TAG*tag); void swf_DumpFont(SWFFONT * font); -// swfobject.c - -// Always use ST_PLACEOBJECT2 !!! - -int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name); -int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction); -int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx); - // swfbutton.c // Button States @@ -637,6 +640,23 @@ void swf_uncgi(); // same behaviour as Steven Grimm's uncgi-library // swfaction.c +typedef struct _ActionTAG +{ U8 op; + U16 len; + U8 * data; + + struct _ActionTAG * next; + struct _ActionTAG * prev; + + struct _ActionTAG * parent; + U8 tmp[4]; // store small operands here. +} ActionTAG; + +typedef struct _ActionMarker +{ + ActionTAG* atag; +} ActionMarker; + ActionTAG* swf_ActionGet(TAG*tag); void swf_ActionFree(ActionTAG*tag); void swf_ActionSet(TAG*tag, ActionTAG*actions); @@ -744,4 +764,29 @@ ActionTAG* action_GotoFrame2(ActionTAG*atag, U8 method); ActionMarker action_setMarker(ActionTAG*atag); void action_fixjump(ActionMarker m1, ActionMarker m2); +// swfobject.c + +// The following routines only use placeobject2: + +int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name); +int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction); +int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx); + +typedef struct _SWFPLACEOBJECT { + U16 depth; + U16 id; // may be 0 + bool move; //true: move/replace character, false: set character + MATRIX matrix; + CXFORM cxform; + U16 ratio; + U8*name; + U16 clipdepth; + ActionTAG* actions; +} SWFPLACEOBJECT; + +void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj); +void swf_GetPlaceObject(TAG * t,SWFPLACEOBJECT* obj); +void swf_PlaceObjectFree(SWFPLACEOBJECT* obj); + #endif +