X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfc.c;h=1a1afb4c71d5522eb63cb855bc95388c33127558;hb=12c0a48dd16767c28e87d21b2265ba1de9837f60;hp=9d9772a474a7215c7fe335370dd5d74aaab5c34f;hpb=feddb673cf8404df91270489b130a72c65195866;p=swftools.git

diff --git a/src/swfc.c b/src/swfc.c
index 9d9772a..1a1afb4 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -48,7 +48,6 @@ static struct options_t options[] = {
 {"V", "version"},
 {"v", "verbose"},
 {"o", "output"},
-{"O", "optimize"},
 {0,0}
 };
     
@@ -192,6 +191,7 @@ static int stackpos = 0;
 
 static dictionary_t characters;
 static dictionary_t images;
+static dictionary_t textures;
 static dictionary_t outlines;
 static dictionary_t gradients;
 static char idmap[65536];
@@ -240,6 +240,10 @@ typedef struct _gradient {
     int rotate;
 } gradient_t;
 
+typedef struct _texture {
+    FILLSTYLE fs;
+} texture_t;
+
 static void character_init(character_t*c)
 {
     memset(c, 0, sizeof(character_t));
@@ -395,6 +399,7 @@ void s_swf(char*name, SRECT r, int version, int fps, int compress, RGBA backgrou
     
     dictionary_init(&characters);
     dictionary_init(&images);
+    dictionary_init(&textures);
     dictionary_init(&outlines);
     dictionary_init(&gradients);
     dictionary_init(&instances);
@@ -680,6 +685,7 @@ static void s_endSWF()
     dictionary_clear(&instances);
     dictionary_clear(&characters);
     dictionary_clear(&images);
+    dictionary_clear(&textures);
     dictionary_clear(&outlines);
     dictionary_clear(&gradients);
     dictionary_clear(&fonts);
@@ -740,15 +746,18 @@ void s_frame(int nr, int cut, char*name)
 
 int parseColor2(char*str, RGBA*color);
 
-int addFillStyle(SHAPE*s, SRECT*r, char*texture)
+int addFillStyle(SHAPE*s, SRECT*r, char*name)
 {
     RGBA color;
     character_t*image;
     gradient_t*gradient;
-    if(texture[0] == '#') {
-	parseColor2(texture, &color);
+    texture_t*texture;
+    if(name[0] == '#') {
+	parseColor2(name, &color);
 	return swf_ShapeAddSolidFillStyle(s, &color);
-    } else if((image = dictionary_lookup(&images, texture))) {
+    } else if ((texture = dictionary_lookup(&textures, name))) {
+	return swf_ShapeAddFillStyle2(s, &texture->fs);
+    } else if((image = dictionary_lookup(&images, name))) {
 	MATRIX m;
 	swf_GetMatrix(0, &m);
 	m.sx = 65536.0*20.0*(r->xmax - r->xmin)/image->size.xmax;
@@ -756,8 +765,7 @@ int addFillStyle(SHAPE*s, SRECT*r, char*texture)
 	m.tx = r->xmin;
 	m.ty = r->ymin;
 	return swf_ShapeAddBitmapFillStyle(s, &m, image->id, 0);
-    } /*else if ((texture = dictionary_lookup(&textures, texture))) {
-    } */ else if ((gradient = dictionary_lookup(&gradients, texture))) {
+    }  else if ((gradient = dictionary_lookup(&gradients, name))) {
 	SRECT r2;
 	MATRIX rot,m;
 	double ccos,csin;
@@ -777,10 +785,10 @@ int addFillStyle(SHAPE*s, SRECT*r, char*texture)
 	m.tx = r->xmin + (r->xmax - r->xmin)/2;
 	m.ty = r->ymin + (r->ymax - r->ymin)/2;
 	return swf_ShapeAddGradientFillStyle(s, &m, &gradient->gradient, gradient->radial);
-    }  else if (parseColor2(texture, &color)) {
+    }  else if (parseColor2(name, &color)) {
 	return swf_ShapeAddSolidFillStyle(s, &color);
     } else {
-	syntaxerror("not a color/fillstyle: %s", texture);
+	syntaxerror("not a color/fillstyle: %s", name);
 	return 0;
     }
 }
@@ -797,16 +805,18 @@ void s_box(char*name, int width, int height, RGBA color, int linewidth, char*tex
     r2.ymax = height;
     tag = swf_InsertTag(tag, ST_DEFINESHAPE3);
     swf_ShapeNew(&s);
-    if(linewidth)
-        ls1 = swf_ShapeAddLineStyle(s,linewidth>=20?linewidth-20:0,&color);
+    if(linewidth) {
+	linewidth = linewidth>=20?linewidth-20:0;
+        ls1 = swf_ShapeAddLineStyle(s,linewidth,&color);
+    }
     if(texture)
 	fs1 = addFillStyle(s, &r2, texture);
 
     swf_SetU16(tag,id);
-    r.xmin = r2.xmin-linewidth-linewidth/2;
-    r.ymin = r2.ymin-linewidth-linewidth/2;
-    r.xmax = r2.xmax+linewidth+linewidth/2;
-    r.ymax = r2.ymax+linewidth+linewidth/2;
+    r.xmin = r2.xmin-linewidth/2;
+    r.ymin = r2.ymin-linewidth/2;
+    r.xmax = r2.xmax+linewidth/2;
+    r.ymax = r2.ymax+linewidth/2;
     swf_SetRect(tag,&r);
     swf_SetShapeHeader(tag,s);
     swf_ShapeSetAll(tag,s,0,0,ls1,fs1,0);
@@ -835,22 +845,24 @@ void s_filled(char*name, char*outlinename, RGBA color, int linewidth, char*textu
 
     tag = swf_InsertTag(tag, ST_DEFINESHAPE3);
     swf_ShapeNew(&s);
-    if(linewidth)
-        ls1 = swf_ShapeAddLineStyle(s,linewidth>=20?linewidth-20:0,&color);
+    if(linewidth) {
+	linewidth = linewidth>=20?linewidth-20:0;
+        ls1 = swf_ShapeAddLineStyle(s,linewidth,&color);
+    }
     if(texture)
 	fs1 = addFillStyle(s, &r2, texture);
     
     swf_SetU16(tag,id);
-    rect.xmin = r2.xmin-linewidth-linewidth/2;
-    rect.ymin = r2.ymin-linewidth-linewidth/2;
-    rect.xmax = r2.xmax+linewidth+linewidth/2;
-    rect.ymax = r2.ymax+linewidth+linewidth/2;
+    rect.xmin = r2.xmin-linewidth/2;
+    rect.ymin = r2.ymin-linewidth/2;
+    rect.xmax = r2.xmax+linewidth/2;
+    rect.ymax = r2.ymax+linewidth/2;
 
     swf_SetRect(tag,&rect);
     swf_SetShapeStyles(tag, s);
     swf_ShapeCountBits(s,0,0);
-    swf_RecodeShapeData(outline->shape->data, outline->shape->bitlen, 1,            1, 
-                        &s->data,             &s->bitlen,             s->bits.fill, s->bits.line);
+    swf_RecodeShapeData(outline->shape->data, outline->shape->bitlen, outline->shape->bits.fill, outline->shape->bits.line, 
+                        &s->data,             &s->bitlen,             s->bits.fill,              s->bits.line);
     swf_SetShapeBits(tag, s);
     swf_SetBlock(tag, s->data, (s->bitlen+7)/8);
     swf_ShapeFree(s);
@@ -870,15 +882,17 @@ void s_circle(char*name, int r, RGBA color, int linewidth, char*texture)
 
     tag = swf_InsertTag(tag, ST_DEFINESHAPE3);
     swf_ShapeNew(&s);
-    if(linewidth)
-        ls1 = swf_ShapeAddLineStyle(s,linewidth>=20?linewidth-20:0,&color);
+    if(linewidth) {
+	linewidth = linewidth>=20?linewidth-20:0;
+        ls1 = swf_ShapeAddLineStyle(s,linewidth,&color);
+    }
     if(texture)
 	fs1 = addFillStyle(s, &r2, texture);
     swf_SetU16(tag,id);
-    rect.xmin = r2.xmin-linewidth-linewidth/2;
-    rect.ymin = r2.ymin-linewidth-linewidth/2;
-    rect.xmax = r2.xmax+linewidth+linewidth/2;
-    rect.ymax = r2.ymax+linewidth+linewidth/2;
+    rect.xmin = r2.xmin-linewidth/2;
+    rect.ymin = r2.ymin-linewidth/2;
+    rect.xmax = r2.xmax+linewidth/2;
+    rect.ymax = r2.ymax+linewidth/2;
 
     swf_SetRect(tag,&rect);
     swf_SetShapeHeader(tag,s);
@@ -1045,6 +1059,63 @@ void s_image(char*name, char*type, char*filename, int quality)
     incrementid();
 }
 
+void s_getBitmapSize(char*name, int*width, int*height)
+{
+    character_t* image = dictionary_lookup(&images, name);
+    gradient_t* gradient = dictionary_lookup(&gradients,name);
+    if(image) {
+	*width = image->size.xmax;
+	*height = image->size.ymax;
+	return;
+    }
+    if(gradient) {
+	/* internal SWF gradient size */
+	if(gradient->radial) {
+	    *width = 16384;
+	    *height = 16384;
+	} else {
+	    *width = 32768;
+	    *height = 32768;
+	}
+	return;
+    }
+    syntaxerror("No such bitmap/gradient: %s", name);
+}
+
+void s_texture(char*name, char*object, int x, int y, float scalex, float scaley, float rotate, float shear)
+{
+    gradient_t* gradient = dictionary_lookup(&gradients, object);
+    character_t* bitmap = dictionary_lookup(&images, object);
+    texture_t* texture = (texture_t*)rfx_calloc(sizeof(texture_t));
+    parameters_t p;
+    FILLSTYLE*fs = &texture->fs;
+
+    if(bitmap) {
+	fs->type = FILL_TILED;
+	fs->id_bitmap = bitmap->id;
+    } else if(gradient) {
+	fs->type = gradient->radial?FILL_RADIAL:FILL_LINEAR;
+	fs->gradient = gradient->gradient;
+    }
+    p.x = x;p.y = y;p.scalex = scalex;p.scaley = scaley;p.rotate=rotate;p.shear=shear;
+    makeMatrix(&fs->m, &p);
+    if(gradient && !gradient->radial) {
+	MATRIX m = fs->m;
+	SPOINT p1,p2;
+	m.tx = 0;
+	m.ty = 0;
+	p1.x = 16384;
+	p1.y = 16384;
+	p2 = swf_TurnPoint(p1, &m);
+	fs->m.tx += p2.x;
+	fs->m.ty += p2.y;
+    }
+
+    if(dictionary_lookup(&textures, name))
+	syntaxerror("texture %s defined twice", name);
+    dictionary_put2(&textures, name, texture);
+}
+
 void dumpSWF(SWF*swf)
 {
     TAG* tag = swf->firstTag;
@@ -1166,16 +1237,19 @@ RGBA parseColor(char*str);
 GRADIENT parseGradient(const char*str)
 {
     GRADIENT gradient;
+    int lastpos = -1;
     const char* p = str;
     memset(&gradient, 0, sizeof(GRADIENT));
     while(*p) {
 	char*posstr,*colorstr;
-	float pos;
+	int pos;
 	RGBA color;
 	posstr = gradient_getToken(&p);
 	if(!*posstr)
 	    break;
-	pos = parsePercent(posstr);
+	pos = (int)(parsePercent(posstr)*255.0);
+	if(pos == lastpos)
+	    pos++;
 	if(!*p) syntaxerror("Error in shape data: Color expected after %s", posstr);
 	colorstr = gradient_getToken(&p);
 	color = parseColor(colorstr);
@@ -1183,11 +1257,12 @@ GRADIENT parseGradient(const char*str)
 	    warning("gradient record too big- max size is 8, rest ignored");
 	    break;
 	}
-	gradient.ratios[gradient.num] = (int)(pos*255.0);
+	gradient.ratios[gradient.num] = pos;
 	gradient.rgba[gradient.num] = color;
 	gradient.num++;
 	free(posstr);
 	free(colorstr);
+	lastpos = pos;
     }
     return gradient;
 }
@@ -1221,6 +1296,24 @@ void s_action(const char*text)
     swf_ActionFree(a);
 }
 
+void s_initaction(const char*character, const char*text)
+{
+    ActionTAG* a = 0;
+    character_t*c = 0;
+    a = swf_ActionCompile(text, stack[0].swf->fileVersion);
+    if(!a) {
+	syntaxerror("Couldn't compile ActionScript");
+    }
+
+    c = (character_t*)dictionary_lookup(&characters, character);
+
+    tag = swf_InsertTag(tag, ST_DOINITACTION);
+    swf_SetU16(tag, c->id);
+    swf_ActionSet(tag, a);
+
+    swf_ActionFree(a);
+}
+
 int s_swf3action(char*name, char*action)
 {
     ActionTAG* a = 0;
@@ -1254,7 +1347,9 @@ void s_outline(char*name, char*format, char*source)
     SHAPE2* shape2;
     SRECT bounds;
     
+    //swf_Shape10DrawerInit(&draw, 0);
     swf_Shape11DrawerInit(&draw, 0);
+
     draw_string(&draw, source);
     draw.finish(&draw);
     shape = swf_ShapeDrawerToShape(&draw);
@@ -1786,6 +1881,19 @@ MULADD mergeMulAdd(MULADD m1, MULADD m2)
     return r;
 }
 
+float parsePxOrPercent(char*fontname, char*str)
+{
+    int l = strlen(str);
+    if(strchr(str, '%'))
+	return parsePercent(str);
+    if(l>2 && str[l-2]=='p' && str[l-1]=='t') {
+	float p = atof(str);
+	return p/64.0; /*64 = FT_SUBPIXELS- see ../lib/modules/swffont.c */
+    }
+    syntaxerror("Expression '%s' is neither a point size (?pt) nor a percentage (?%)", str);
+    return 0;
+}
+
 float parsePercent(char*str)
 {
     int l = strlen(str);
@@ -1905,6 +2013,76 @@ SPOINT getPoint(SRECT r, char*name)
     l--;
     return *(SPOINT*)&mpoints.buffer[l];
 }
+
+static int texture2(char*name, char*object, map_t*args, int errors) 
+{
+    SPOINT pos,size;
+    char*xstr = map_lookup(args, "x");
+    char*ystr = map_lookup(args, "y");
+    char*widthstr = map_lookup(args, "width");
+    char*heightstr = map_lookup(args, "height");
+    char*scalestr = map_lookup(args, "scale");
+    char*scalexstr = map_lookup(args, "scalex");
+    char*scaleystr = map_lookup(args, "scaley");
+    char*rotatestr = map_lookup(args, "rotate");
+    char* shearstr = map_lookup(args, "shear");
+    char* radiusstr = map_lookup(args, "r");
+    float x=0,y=0;
+    float scalex = 1.0, scaley = 1.0;
+    float rotate=0, shear=0;
+    float r = 0;
+    if(!*xstr && !*ystr) {
+	if(errors)
+	    syntaxerror("x and y must be set");
+	return 0;
+    }
+    if(*scalestr && (*scalexstr || *scaleystr)) {
+	syntaxerror("scale and scalex/scaley can't both be set");
+	return 0;
+    }
+    if((*widthstr || *heightstr) && *radiusstr) {
+	syntaxerror("width/height and radius can't both be set");
+    }
+    if(*radiusstr) {
+	widthstr = radiusstr;
+	heightstr = radiusstr;
+    }
+    if(!*xstr) xstr="0";
+    if(!*ystr) ystr="0";
+    if(!*rotatestr) rotatestr="0";
+    if(!*shearstr) shearstr="0";
+
+    if(*scalestr) {
+	scalex = scaley = parsePercent(scalestr);
+    } else if(*scalexstr || *scaleystr) {
+	if(scalexstr) scalex = parsePercent(scalexstr);
+	if(scaleystr) scaley = parsePercent(scaleystr);
+    } else if(*widthstr || *heightstr) {
+	int width=0;
+	int height=0;
+	s_getBitmapSize(object, &width, &height);
+	if(*widthstr)
+	    scalex = (float)parseTwip(widthstr)/(float)width;
+	if(*heightstr)
+	    scaley = (float)parseTwip(heightstr)/(float)height;
+    }
+    x = parseTwip(xstr);
+    y = parseTwip(ystr);
+    rotate = parseFloat(rotatestr);
+    shear = parseFloat(shearstr);
+
+    s_texture(name, object, x,y,scalex,scaley,rotate, shear);
+
+    return 0;
+}
+
+static int c_texture(map_t*args) 
+{
+    char*name = lu(args, "instance");
+    char*object = lu(args, "character");
+    return texture2(name, object, args, 1);
+}
+
 static int c_gradient(map_t*args) 
 {
     char*name = lu(args, "name");
@@ -1915,7 +2093,14 @@ static int c_gradient(map_t*args)
     if(type != RAWDATA)
 	syntaxerror("colon (:) expected");
 
-    s_gradient(name, text, radial,rotate);
+    s_gradient(name, text, radial, rotate);
+
+    /* check whether we also have placement information,
+       which would make this a positioned gradient.
+       If there is placement information, texture2() will
+       add a texture, which has priority over the gradient.
+     */
+    texture2(name, name, args, 0);
     return 0;
 }
 static int c_point(map_t*args) 
@@ -2307,7 +2492,7 @@ static int c_textshape(map_t*args)
     char*name = lu(args, "name");
     char*text = lu(args, "text");
     char*font = lu(args, "font");
-    float size = parsePercent(lu(args, "size"));
+    float size = parsePxOrPercent(font, lu(args, "size"));
 
     s_textshape(name, font, size, text);
     return 0;
@@ -2345,7 +2530,7 @@ static int c_text(map_t*args)
     char*name = lu(args, "name");
     char*text = lu(args, "text");
     char*font = lu(args, "font");
-    float size = parsePercent(lu(args, "size"));
+    float size = parsePxOrPercent(font, lu(args, "size"));
     RGBA color = parseColor(lu(args, "color"));
     s_text(name, font, text, (int)(size*100), color);
     return 0;
@@ -2526,7 +2711,7 @@ static int c_edittext(map_t*args)
  //"name font size width height text="" color=black maxlength=0 variable="" @password=0 @wordwrap=0 @multiline=0 @html=0 @noselect=0 @readonly=0"},
     char*name = lu(args, "name");
     char*font = lu(args, "font");
-    int size = (int)(1024*parsePercent(lu(args, "size")));
+    int size = (int)(1024*parsePxOrPercent(font, lu(args, "size")));
     int width = parseTwip(lu(args, "width"));
     int height = parseTwip(lu(args, "height"));
     char*text  = lu(args, "text");
@@ -2557,7 +2742,22 @@ static int c_edittext(map_t*args)
 static int c_morphshape(map_t*args) {return fakechar(args);}
 static int c_movie(map_t*args) {return fakechar(args);}
 
-static int c_texture(map_t*args) {return 0;}
+static char* readfile(const char*filename)
+{
+    FILE*fi = fopen(filename, "rb");
+    int l;
+    char*text;
+    if(!fi) 
+	syntaxerror("Couldn't find file %s: %s", filename, strerror(errno));
+    fseek(fi, 0, SEEK_END);
+    l = ftell(fi);
+    fseek(fi, 0, SEEK_SET);
+    text = rfx_alloc(l+1);
+    fread(text, l, 1, fi);
+    text[l]=0;
+    fclose(fi);
+    return text;
+}
 
 static int c_action(map_t*args) 
 {
@@ -2569,20 +2769,24 @@ static int c_action(map_t*args)
 	}
 	s_action(text);
     } else {
-	FILE*fi = fopen(filename, "rb");
-	int l;
-	char*text;
-	if(!fi) 
-	    syntaxerror("Couldn't find file %s: %s", filename, strerror(errno));
-	fseek(fi, 0, SEEK_END);
-	l = ftell(fi);
-	fseek(fi, 0, SEEK_SET);
-	text = rfx_alloc(l+1);
-	fread(text, l, 1, fi);
-	text[l]=0;
-	fclose(fi);
+	s_action(readfile(filename));
+    }
+   
+    return 0;
+}
 
-	s_action(text);
+static int c_initaction(map_t*args) 
+{
+    char* character = lu(args, "name");
+    char* filename  = map_lookup(args, "filename");
+    if(!filename ||!*filename) {
+	readToken();
+	if(type != RAWDATA) {
+	    syntaxerror("colon (:) expected");
+	}
+	s_initaction(character, text);
+    } else {
+	s_initaction(character, readfile(filename));
     }
    
     return 0;
@@ -2609,7 +2813,7 @@ static struct {
     // generators of primitives
 
  {"point", c_point, "name x=0 y=0"},
- {"gradient", c_gradient, "name @radial=0 rotate=0"},
+ {"gradient", c_gradient, "name @radial=0 rotate=0 scale= scalex= scaley= x= y= width= height= r= shear="}, //extra parameters like .texture
  {"outline", c_outline, "name format=simple"},
  {"textshape", c_textshape, "name font size=100% text"},
 
@@ -2645,12 +2849,13 @@ static struct {
  {"jump", c_jump,       "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="},
  {"del", c_del, "name"},
     // virtual object placement
- {"texture", c_texture, "<i> x=0 y=0 scale= scalex=100% scaley=100% shear=0 rotate=0"},
+ {"texture", c_texture, "<i> x=0 y=0 width= height= scale= scalex= scaley= r= shear= rotate="},
 
     // commands which start a block
 //startclip (see above)
  {"sprite", c_sprite, "name"},
  {"action", c_action, "filename="},
+ {"initaction", c_initaction, "name filename="},
 
  {"end", c_end, ""}
 };