X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfobject.c;h=349824d74cd7120c312d104de831afe88b785372;hb=879d0eec420fe0fd5ddcd56c8fe62b82a6744edd;hp=d108ade64d910226433100236ee9b0b8111864b3;hpb=83dfa8331972a9b9fc68ed321bce31f669094255;p=swftools.git

diff --git a/lib/modules/swfobject.c b/lib/modules/swfobject.c
index d108ade..349824d 100644
--- a/lib/modules/swfobject.c
+++ b/lib/modules/swfobject.c
@@ -21,14 +21,13 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#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_CLIPACTION   0x40
-#define PF_ACTIONEVENT  0x80
+#include "../rfxswf.h"
+
+
+char*blendModeNames[] = {"normal","normal2","layer","multiply",
+		       "screen","lighten", "darken","add",
+		       "substract","difference","invert","alpha",
+		       "erase","overlay","hardlight",0};
 
 int isUnitMatrix(MATRIX* m)
 {
@@ -58,64 +57,57 @@ int isUnitCXForm(CXFORM* cx)
     return 0;
 }
 
-int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name)
-{ U8 flags;
+static int objectplace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name, U16 clipaction, U8 blendmode, FILTERLIST*filters)
+{ U8 flags,flags2;
   if (!t) return -1;
 
-  if(cx && cx->r1==0 && cx->g1==0 && cx->b1==0 && cx->a1==0
-	&& cx->r0==256 && cx->g0==256 && cx->b0==256 && cx->a0==256)
+  if(cx && id && cx->r1==0 && cx->g1==0 && cx->b1==0 && cx->a1==0
+	      && cx->r0==256 && cx->g0==256 && cx->b0==256 && cx->a0==256)
       cx = 0;
 
-  if(m && isUnitMatrix(m)) 
+  if(m && id && isUnitMatrix(m)) 
       m = 0;
 
-  flags = (id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(name?PF_NAME:0)|((m||cx)&&(!id)?PF_MOVE:0);
+  flags = (id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(name?PF_NAME:0)|((m||cx)&&(!id)?PF_MOVE:0)|(clipaction?PF_CLIPDEPTH:0);
+  flags2 = (0?PF2_ASBITMAP:0)|(blendmode?PF2_BLENDMODE:0)|(filters?PF2_FILTERS:0);
 
   swf_SetU8(t,flags);
+  if(t->id == ST_PLACEOBJECT3)
+      swf_SetU8(t, flags2);
   swf_SetU16(t,depth);
   if (flags&PF_CHAR) swf_SetU16(t,id);
   if (flags&PF_MATRIX) swf_SetMatrix(t,m);
   if (flags&PF_CXFORM) swf_SetCXForm(t,cx,1);
   if (flags&PF_RATIO) swf_SetU16(t,0);
-  if (flags&PF_NAME) swf_SetString(t,name);
-  
-  return 0; 
-}
-
-int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction)
-{ U8 flags;
-  if (!t) return -1;
-  
-  if(cx && cx->r1==0 && cx->g1==0 && cx->b1==0 && cx->a1==0
-	&& cx->r0==256 && cx->g0==256 && cx->b0==256 && cx->a0==256)
-      cx = 0;
-  
-  if(m && isUnitMatrix(m)) 
-      m = 0;
-
-  flags = (id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(name?PF_NAME:0)|
-          ((m||cx)&&(!id)?PF_MOVE:0)|(clipaction?PF_CLIPACTION:0);
-
-  swf_SetU8(t,flags);
-  swf_SetU16(t,depth);
-  if (flags&PF_CHAR) swf_SetU16(t,id);
-  if (flags&PF_MATRIX) swf_SetMatrix(t,m);
-  if (flags&PF_CXFORM) swf_SetCXForm(t,cx,1);
-  if (flags&PF_RATIO) swf_SetU16(t,0);
-
   /* ??? The spec states that name comes first? */
-  if (flags&PF_CLIPACTION) swf_SetU16(t, clipaction);
+  if (flags&PF_CLIPDEPTH) swf_SetU16(t, clipaction);
   if (flags&PF_NAME) swf_SetString(t,name);
+	
+  if (flags2&PF2_BLENDMODE)
+    swf_SetU8(t,blendmode);
   return 0; 
 }
-
+int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name)
+{
+    return objectplace(t,id,depth,m,cx,name,0,0,0);
+}
+int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name, U16 clipaction)
+{ 
+    return objectplace(t,id,depth,m,cx,name,clipaction,0,0);
+}
+int swf_ObjectPlaceBlend(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name, U8 blend)
+{ 
+    if(t->id != ST_PLACEOBJECT3)
+	fprintf(stderr, "wrong tag- ignoring blend mode\n");
+    return objectplace(t,id,depth,m,cx,name,0,blend,0);
+}
 int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx)
-{ return swf_ObjectPlace(t,0,depth,m,cx,NULL);
+{
+    return objectplace(t,0,depth,m,cx,0,0,0,0);
 }
 
 void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 { 
-    U8 flags;
     if (!t) return ;
     if(t->id == ST_PLACEOBJECT) {
 	swf_SetU16(t, obj->id);
@@ -123,14 +115,18 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 	swf_SetMatrix(t, &obj->matrix);
 	swf_SetCXForm(t, &obj->cxform, 0);
     } else {
+	U8 flags,flags2;
 	int m = !isUnitMatrix(&obj->matrix);
 	int cx = !isUnitCXForm(&obj->cxform);
 
 	flags = (obj->id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(obj->ratio?PF_RATIO:0)|
 		(obj->name?PF_NAME:0)|(obj->move?PF_MOVE:0)|
-		(obj->clipdepth?PF_CLIPACTION:0);
+		(obj->clipdepth?PF_CLIPDEPTH:0);
+	flags2 = (0?PF2_ASBITMAP:0)|(obj->blendmode?PF2_BLENDMODE:0)|(obj->filters?PF2_FILTERS:0);
 
 	swf_SetU8(t,flags);
+	if(t->id == ST_PLACEOBJECT3) 
+	    swf_SetU8(t,flags2);
 	swf_SetU16(t,obj->depth);
 	if (flags&PF_CHAR) swf_SetU16(t,obj->id);
 	if (flags&PF_MATRIX) swf_SetMatrix(t,&obj->matrix);
@@ -138,8 +134,17 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 	if (flags&PF_RATIO) swf_SetU16(t,obj->ratio);
   
 	/* ??? The spec states that name comes first? */
-	if (flags&PF_CLIPACTION) swf_SetU16(t,obj->clipdepth);
+	if (flags&PF_CLIPDEPTH) swf_SetU16(t,obj->clipdepth);
 	if (flags&PF_NAME) swf_SetString(t,obj->name);
+
+	if (flags2&PF2_FILTERS) {
+	    swf_SetU8(t,obj->filters->num);
+	    int s;
+	    for(s=0;s<obj->filters->num;s++)
+		swf_SetFilter(t,obj->filters->filter[s]);
+	}
+	if (flags2&PF2_BLENDMODE)
+	    swf_SetU8(t,obj->blendmode);
 	if (flags&PF_ACTIONEVENT) {
 	    // ...
 	}
@@ -148,9 +153,10 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 
 void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
 {
-    U8 flags;
-    if(!tag) {
+    if(obj)
 	memset(obj, 0, sizeof(SWFPLACEOBJECT));
+
+    if(!tag) {
 	swf_GetMatrix(0, &obj->matrix);
 	swf_GetCXForm(0, &obj->cxform, 1);
 	//obj->internal = PF_CHAR|PF_MATRIX|PF_CXFORM;
@@ -164,8 +170,11 @@ void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
 	swf_GetMatrix(tag, &obj->matrix);
 	swf_GetCXForm(tag, &obj->cxform, 0);
 	//obj->internal = PF_CHAR|PF_MATRIX|PF_CXFORM;
-    } else if(tag->id == ST_PLACEOBJECT2) {
+    } else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
+	U8 flags,flags2=0;
         flags = swf_GetU8(tag);
+	if(tag->id == ST_PLACEOBJECT3)
+	    flags2 = swf_GetU8(tag);
         memset(obj,0,sizeof(SWFPLACEOBJECT));
             
         swf_GetMatrix(0,&obj->matrix);
@@ -173,25 +182,28 @@ void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
 
         obj->depth = swf_GetU16(tag);
 	//obj->internal = flags;
-        if(flags&1) obj->move = 1;
-        if(flags&2) obj->id = swf_GetU16(tag);
-        if(flags&4) swf_GetMatrix(tag, &obj->matrix);
-        if(flags&8) swf_GetCXForm(tag, &obj->cxform,1);
-        if(flags&16) obj->ratio = swf_GetU16(tag);
+        if(flags&PF_MOVE) obj->move = 1;
+        if(flags&PF_CHAR) obj->id = swf_GetU16(tag);
+        if(flags&PF_MATRIX) swf_GetMatrix(tag, &obj->matrix);
+        if(flags&PF_CXFORM) swf_GetCXForm(tag, &obj->cxform,1);
+        if(flags&PF_RATIO) obj->ratio = swf_GetU16(tag);
         /* if you modify the order of these operations, also
            modify it in ../src/swfcombine.c */
-        if(flags&64) 
+        if(flags&PF_CLIPDEPTH) 
             obj->clipdepth = swf_GetU16(tag); //clip
-        if(flags&32) {
+        if(flags&PF_NAME) {
             int l,t;
             U8*data;
             swf_ResetReadBits(tag);
-            l = strlen(&tag->data[tag->pos]);
+            l = strlen((const char *)&tag->data[tag->pos]);
             t = 0;
-            data = rfx_alloc(l+1);
-            obj->name = data;
+            data = (U8*)rfx_alloc(l+1);
+            obj->name = (char*)data;
             while((data[t++] = swf_GetU8(tag))); 
         }
+	if(flags2&PF2_BLENDMODE) {
+	    obj->blendmode = swf_GetU8(tag);
+	}
 
         /* Actionscript ignored (for now) */
         obj->actions = 0;