X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=512eaa951079e3bbde558a4718da37c660877fb5;hb=acd7d05a6a78e476f0b9fa7c3d395d4456e8a33a;hp=4c1e7ad0049334a32e02fac8c672782104d77015;hpb=994d5705f3ab0c9c3bb57dcd9fa8bb2a5398de2c;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 4c1e7ad..512eaa9 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);
@@ -206,6 +189,7 @@ 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_GetMorphGradient(TAG * tag, GRADIENT * gradient1, GRADIENT * gradient2);
 
 int   swf_SetU8(TAG * t,U8 v);              // resets Bitcount
 int   swf_SetU16(TAG * t,U16 v);
@@ -336,6 +320,19 @@ typedef struct _SHAPE           // NEVER access a Shape-Struct directly !
   U32           bitlen;         // length of data in bits
 } SHAPE, * LPSHAPE;
 
+/* data/bitlen can be expanded into a SHAPELINE record using
+   parseShapeData: */
+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 +359,8 @@ 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);
+SRECT	   swf_GetBoundingBox(SHAPELINE*shape);
 
 // swffont.c
 
@@ -497,14 +496,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 +628,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 +752,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
+