static int override_outputname = 0;
static int do_cgi = 0;
static int change_sets_all = 0;
+static int do_exports = 0;
static struct options_t options[] = {
{"h", "help"},
SRECT oldrect;
TAG* cut;
+ SRECT scalegrid;
+
} stack[256];
static int stackpos = 0;
dictionary_free_all(&fonts, free_font);
dictionary_free_all(&sounds, free);
dictionary_free_all(&interpolations, free);
+ cleanUp = 0;
}
static void freeFontDictionary()
c->size = r;
dictionary_put2(&characters, name, c);
- tag = swf_InsertTag(tag, ST_NAMECHARACTER);
- swf_SetU16(tag, id);
- swf_SetString(tag, name);
- tag = swf_InsertTag(tag, ST_EXPORTASSETS);
- swf_SetU16(tag, 1);
- swf_SetU16(tag, id);
- swf_SetString(tag, name);
+ if(do_exports) {
+ tag = swf_InsertTag(tag, ST_NAMECHARACTER);
+ swf_SetU16(tag, id);
+ swf_SetString(tag, name);
+ tag = swf_InsertTag(tag, ST_EXPORTASSETS);
+ swf_SetU16(tag, 1);
+ swf_SetU16(tag, id);
+ swf_SetString(tag, name);
+ }
}
static void s_addimage(char*name, U16 id, TAG*ctag, SRECT r)
{
incrementid();
}
-void s_sprite(char*name)
+void s_sprite(char*name, SRECT*scalegrid)
{
tag = swf_InsertTag(tag, ST_DEFINESPRITE);
swf_SetU16(tag, id); //id
stack[stackpos].tag = tag;
stack[stackpos].id = id;
stack[stackpos].name = strdup(name);
+ if(scalegrid) {
+ stack[stackpos].scalegrid = *scalegrid;
+ } else {
+ memset(&stack[stackpos].scalegrid, 0, sizeof(SRECT));
+ }
/* FIXME: those four fields should be bundled together */
dictionary_init(&instances);
TAG*save = from->prev;
while(from!=to) {
TAG*next = from->next;
- swf_DeleteTag(from);
+ if(swf_isAllowedSpriteTag(from))
+ swf_DeleteTag(from);
from = next;
}
save->next = 0;
{
SRECT r = currentrect;
- if(stack[stackpos].cut)
- tag = removeFromTo(stack[stackpos].cut, tag);
-
stackpos--;
instance_t *i;
stringarray_t* index =dictionary_index(&instances);
writeInstance(i);
}
}
+
+ if(stack[stackpos].cut)
+ tag = removeFromTo(stack[stackpos].cut, tag);
+
+ // the writeInstance loop above may have inserted tags after what used yo be the current tag,
+ // so let's make sure 'tag' point to the current tag again.
while (tag->next)
tag = tag->next;
tag = stack[stackpos].tag;
swf_FoldSprite(tag);
+
+ if(stack[stackpos].scalegrid.xmin | stack[stackpos].scalegrid.ymin |
+ stack[stackpos].scalegrid.xmax | stack[stackpos].scalegrid.ymax)
+ {
+ tag = swf_InsertTag(tag, ST_DEFINESCALINGGRID);
+ swf_SetU16(tag, stack[stackpos].id);
+ swf_SetRect(tag, &stack[stackpos].scalegrid);
+ }
+
if(tag->next != 0)
syntaxerror("internal error(7)");
/* TODO: before clearing, prepend "<spritename>." to names and
swf = stack[stackpos].swf;
filename = stack[stackpos].filename;
+ // the writeInstance loop above may have inserted tags after what used yo be the current tag,
+ // so let's make sure 'tag' point to the current tag again.
+ while (tag->next)
+ tag = tag->next;
+
//if(tag->prev && tag->prev->id != ST_SHOWFRAME)
// tag = swf_InsertTag(tag, ST_SHOWFRAME);
tag = swf_InsertTag(tag, ST_SHOWFRAME);
}
if(do_cgi)
{if(swf_WriteCGI(swf)<0) syntaxerror("WriteCGI() failed.\n");}
- else if(swf->compressed)
- {if(swf_WriteSWC(fi, swf)<0) syntaxerror("WriteSWC() failed.\n");}
else
{if(swf_WriteSWF(fi, swf)<0) syntaxerror("WriteSWF() failed.\n");}
swf_FontCreateLayout(font);
}
font->id = id;
- swf_FontReduce_swfc(font);
+ swf_FontReduce_swfc(font);
tag = swf_InsertTag(tag, ST_DEFINEFONT2);
swf_FontSetDefine2(tag, font);
- tag = swf_InsertTag(tag, ST_EXPORTASSETS);
- swf_SetU16(tag, 1);
- swf_SetU16(tag, id);
- swf_SetString(tag, name);
+ if(do_exports) {
+ tag = swf_InsertTag(tag, ST_EXPORTASSETS);
+ swf_SetU16(tag, 1);
+ swf_SetU16(tag, id);
+ swf_SetString(tag, name);
+ }
incrementid();
}
else
swf_SetSoundDefine(tag, samples, numsamples);
- tag = swf_InsertTag(tag, ST_NAMECHARACTER);
- swf_SetU16(tag, id);
- swf_SetString(tag, name);
- tag = swf_InsertTag(tag, ST_EXPORTASSETS);
- swf_SetU16(tag, 1);
- swf_SetU16(tag, id);
- swf_SetString(tag, name);
+ if(do_exports) {
+ tag = swf_InsertTag(tag, ST_NAMECHARACTER);
+ swf_SetU16(tag, id);
+ swf_SetString(tag, name);
+ tag = swf_InsertTag(tag, ST_EXPORTASSETS);
+ swf_SetU16(tag, 1);
+ swf_SetU16(tag, id);
+ swf_SetString(tag, name);
+ }
sound = (sound_t*)malloc(sizeof(sound_t)); /* mem leak */
sound->tag = tag;
else
*p = i->parameters;
}
+
+void setStartparameters(instance_t* i, parameters_t* p, TAG* tag)
+{
+ history_begin(i->history, "x", currentframe, tag, p->x);
+ history_begin(i->history, "y", currentframe, tag, p->y);
+ history_begin(i->history, "scalex", currentframe, tag, p->scalex);
+ history_begin(i->history, "scaley", currentframe, tag, p->scaley);
+ history_begin(i->history, "cxform.r0", currentframe, tag, p->cxform.r0);
+ history_begin(i->history, "cxform.g0", currentframe, tag, p->cxform.g0);
+ history_begin(i->history, "cxform.b0", currentframe, tag, p->cxform.b0);
+ history_begin(i->history, "cxform.a0", currentframe, tag, p->cxform.a0);
+ history_begin(i->history, "cxform.r1", currentframe, tag, p->cxform.r1);
+ history_begin(i->history, "cxform.g1", currentframe, tag, p->cxform.g1);
+ history_begin(i->history, "cxform.b1", currentframe, tag, p->cxform.b1);
+ history_begin(i->history, "cxform.a1", currentframe, tag, p->cxform.a1);
+ history_begin(i->history, "rotate", currentframe, tag, p->rotate);
+ history_begin(i->history, "shear", currentframe, tag, p->shear);
+ history_begin(i->history, "pivot.x", currentframe, tag, p->pivot.x);
+ history_begin(i->history, "pivot.y", currentframe, tag, p->pivot.y);
+ history_begin(i->history, "pin.x", currentframe, tag, p->pin.x);
+ history_begin(i->history, "pin.y", currentframe, tag, p->pin.y);
+ history_begin(i->history, "blendmode", currentframe, tag, p->blendmode);
+ history_beginFilter(i->history, currentframe, tag, p->filters);
+ history_begin(i->history, "flags", currentframe, tag, 0);
+}
+
void s_startclip(char*instance, char*character, parameters_t p)
{
character_t* c = dictionary_lookup(&characters, character);
stack[stackpos].type = 2;
stackpos++;
+ setStartparameters(i, &p, tag);
currentdepth++;
}
void s_endClip()
swf_SetTagPos(stack[stackpos].tag, 0);
swf_GetPlaceObject(stack[stackpos].tag, &p);
p.clipdepth = currentdepth;
- p.name = 0;
+ //p.name = 0;
swf_ClearTag(stack[stackpos].tag);
swf_SetPlaceObject(stack[stackpos].tag, &p);
currentdepth++;
}
-void setStartparameters(instance_t* i, parameters_t* p, TAG* tag)
-{
- history_begin(i->history, "x", currentframe, tag, p->x);
- history_begin(i->history, "y", currentframe, tag, p->y);
- history_begin(i->history, "scalex", currentframe, tag, p->scalex);
- history_begin(i->history, "scaley", currentframe, tag, p->scaley);
- history_begin(i->history, "cxform.r0", currentframe, tag, p->cxform.r0);
- history_begin(i->history, "cxform.g0", currentframe, tag, p->cxform.g0);
- history_begin(i->history, "cxform.b0", currentframe, tag, p->cxform.b0);
- history_begin(i->history, "cxform.a0", currentframe, tag, p->cxform.a0);
- history_begin(i->history, "cxform.r1", currentframe, tag, p->cxform.r1);
- history_begin(i->history, "cxform.g1", currentframe, tag, p->cxform.g1);
- history_begin(i->history, "cxform.b1", currentframe, tag, p->cxform.b1);
- history_begin(i->history, "cxform.a1", currentframe, tag, p->cxform.a1);
- history_begin(i->history, "rotate", currentframe, tag, p->rotate);
- history_begin(i->history, "shear", currentframe, tag, p->shear);
- history_begin(i->history, "pivot.x", currentframe, tag, p->pivot.x);
- history_begin(i->history, "pivot.y", currentframe, tag, p->pivot.y);
- history_begin(i->history, "pin.x", currentframe, tag, p->pin.x);
- history_begin(i->history, "pin.y", currentframe, tag, p->pin.y);
- history_begin(i->history, "blendmode", currentframe, tag, p->blendmode);
- history_beginFilter(i->history, currentframe, tag, p->filters);
- history_begin(i->history, "flags", currentframe, tag, 0);
-}
-
void s_put(char*instance, char*character, parameters_t p)
{
character_t* c = dictionary_lookup(&characters, character);
syntaxerror("Not an Integer: \"%s\"", str);
return atoi(str);
}
-int parseTwip(char*str)
+int parseRawTwip(char*str)
{
char*dot;
int sign=1;
}
free(old);
if(l==0)
- return sign*atoi(str)*20;
+ return sign*(atoi(str)*20);
if(l==1)
- return sign*atoi(str)*20+atoi(dot)*2;
+ return sign*(atoi(str)*20+atoi(dot)*2);
if(l==2)
- return sign*atoi(str)*20+atoi(dot)/5;
+ return sign*(atoi(str)*20+atoi(dot)/5);
}
return 0;
}
+static dictionary_t defines;
+static int defines_initialized = 0;
+static mem_t define_values;
+
+int parseTwip(char*str)
+{
+ /* TODO: make this a proper expression parser */
+ char*p = str;
+ int val = 0;
+ char ex = 0;
+ char*lastpos = 0;
+ while(*p) {
+ if(*p == '+' || *p == '-' || *p == '/' || *p == '*')
+ ex = *p;
+ else if(!lastpos)
+ lastpos = p;
+ p++;
+ if((*p == '+' || *p == '-' || *p == '/' || *p == '*' || *p == 0) && lastpos) {
+ char save = *p;
+ *p = 0;
+
+ int l = 0;
+ int v = 0;
+ if(defines_initialized) {
+ l = (int)dictionary_lookup(&defines, lastpos);
+ }
+ if(l) {
+ v = *(int*)&define_values.buffer[l-1];
+ } else {
+ v = parseRawTwip(lastpos);
+ }
+ *p = save;
+ printf("%f %c= %f\n", val/20.0, ex, v/20.0);
+ if(ex == '+')
+ val += v;
+ else if(ex == '-')
+ val -= v;
+ else if(ex == '/')
+ val = (val*20) / v;
+ else if(ex == '*')
+ val = (val*v) / 20;
+ else
+ val += v;
+ ex = 0;
+ lastpos = 0;
+ }
+ }
+ printf("%s -> %.2f\n", str, val/20.0);
+ return val;
+}
+
int parseArc(char* str)
{
if (!strcmp(str, "short"))
char* filename = map_lookup(args, "filename");
char* compressstr = lu(args, "compress");
char* change_modestr = lu(args, "change-sets-all");
+ char* exportstr = lu(args, "export");
SRECT bbox = parseBox(lu(args, "bbox"));
int version = parseInt(lu(args, "version"));
int fps = (int)(parseFloat(lu(args, "fps"))*256);
if(strcmp(change_modestr, "no"))
syntaxerror("value \"%s\" not supported for the change-sets-all argument", change_modestr);
+ do_exports=atoi(exportstr);
+
s_swf(filename, bbox, version, fps, compress, color);
return 0;
}
syntaxerror("internal error (348)");
return 0;
}
+
static dictionary_t points;
static mem_t mpoints;
-int points_initialized = 0;
+static int points_initialized = 0;
static int c_interpolation(map_t *args)
{
{
int l=0;
if(!strcmp(name, "center")) {
- SPOINT p;
- p.x = (r.xmin + r.xmax)/2;
- p.y = (r.ymin + r.ymax)/2;
- return p;
- }
- if (!strcmp(name, "bottom-center"))
- {
- SPOINT p;
- p.x = (r.xmin + r.xmax)/2;
- p.y = r.ymax;
- return p;
+ SPOINT p;
+ p.x = (r.xmin + r.xmax)/2;
+ p.y = (r.ymin + r.ymax)/2;
+ return p;
+ }
+ if (!strcmp(name, "bottom-center")) {
+ SPOINT p;
+ p.x = (r.xmin + r.xmax)/2;
+ p.y = r.ymax;
+ return p;
+ }
+ if (!strcmp(name, "top-center")) {
+ SPOINT p;
+ p.x = (r.xmin + r.xmax)/2;
+ p.y = r.ymin;
+ return p;
+ }
+ if (!strcmp(name, "top-left")) {
+ SPOINT p;
+ p.x = r.xmin;
+ p.y = r.ymin;
+ return p;
+ }
+ if (!strcmp(name, "top-right")) {
+ SPOINT p;
+ p.x = r.xmax;
+ p.y = r.ymin;
+ return p;
+ }
+ if (!strcmp(name, "bottom-right")) {
+ SPOINT p;
+ p.x = r.xmax;
+ p.y = r.ymax;
+ return p;
+ }
+ if (!strcmp(name, "bottom-left")) {
+ SPOINT p;
+ p.x = r.xmin;
+ p.y = r.ymax;
+ return p;
+ }
+ if (!strcmp(name, "left-center")) {
+ SPOINT p;
+ p.x = r.xmin;
+ p.y = (r.ymin + r.ymax)/2;
+ return p;
+ }
+ if (!strcmp(name, "right-center")) {
+ SPOINT p;
+ p.x = r.xmax;
+ p.y = (r.ymin + r.ymax)/2;
+ return p;
}
if(points_initialized)
- l = (int)dictionary_lookup(&points, name);
+ l = (int)dictionary_lookup(&points, name);
if(l==0) {
- syntaxerror("Invalid point: \"%s\".", name);
+ syntaxerror("Invalid point: \"%s\".", name);
}
- l--;
- return *(SPOINT*)&mpoints.buffer[l];
+ return *(SPOINT*)&mpoints.buffer[l-1];
}
+
static int texture2(char*name, char*object, map_t*args, int errors)
{
SPOINT pos,size;
return 0;
}
+static int c_define(map_t*args)
+{
+ char*name = lu(args, "name");
+ char*value = lu(args, "value");
+
+ if(!defines_initialized) {
+ dictionary_init(&defines);
+ mem_init(&define_values);
+ defines_initialized = 1;
+ }
+ int val = parseTwip(value);
+ int pos = mem_put(&define_values, &val, sizeof(val));
+ string_t s;
+ string_set(&s, name);
+ dictionary_put(&defines, s, (void*)(pos+1));
+ return 0;
+}
static int c_point(map_t*args)
{
char*name = lu(args, "name");
p.y = parseTwip(lu(args, "y"));
pos = mem_put(&mpoints, &p, sizeof(p));
string_set(&s1, name);
- pos++;
- dictionary_put(&points, s1, (void*)pos);
+ dictionary_put(&points, s1, (void*)(pos+1));
return 0;
}
static int c_play(map_t*args)
static int c_sprite(map_t*args)
{
char* name = lu(args, "name");
- s_sprite(name);
+ char* scalinggrid = lu(args, "scalinggrid");
+
+ if(scalinggrid && *scalinggrid) {
+ SRECT r = parseBox(scalinggrid);
+ s_sprite(name, &r);
+ } else {
+ s_sprite(name, 0);
+ }
return 0;
}
static int c_frame(map_t*args)
command_func_t* func;
char*arguments;
} arguments[] =
-{{"flash", c_flash, "bbox=autocrop background=black version=6 fps=50 name= filename= @compress=default @change-sets-all=no"},
+{{"flash", c_flash, "bbox=autocrop background=black version=6 fps=50 name= filename= @compress=default @change-sets-all=no @export=1"},
{"frame", c_frame, "n=<plus>1 name= @cut=no @anchor=no"},
// "import" type stuff
{"swf", c_swf, "name filename"},
// generators of primitives
+ {"define", c_define, "name value=0"},
{"point", c_point, "name x=0 y=0"},
{"gradient", c_gradient, "name @radial=0 rotate=0 scale= scalex= scaley= x= y= width= height= r= shear="}, //extra parameters like .texture
{"interpolation", c_interpolation, "name function=linear speed=1.3 amplitude=0 bounces=2 growth=1.5 damping=2 slope=0"},
// commands which start a block
//startclip (see above)
- {"sprite", c_sprite, "name"},
+ {"sprite", c_sprite, "name scalinggrid="},
{"action", c_action, "filename="},
{"initaction", c_initaction, "name filename="},
map_t args;
char* fontfile;
int nr = -1;
+ U8* glyphs_to_include;
msg("<verbose> analyse Command: %s (line %d)", command, line);
for(t=0;t<sizeof(arguments)/sizeof(arguments[0]);t++)
font = (SWFFONT*)malloc(sizeof(SWFFONT));
memset(font, 0, sizeof(SWFFONT));
}
- swf_FontUseUTF8(font, lu(&args, "glyphs"));
- swf_FontPrepareForEditText(font);
+ else
+ {
+ swf_FontPrepareForEditText(font);
+ glyphs_to_include = lu(&args, "glyphs");
+ if (!strcmp(glyphs_to_include, "all"))
+ {
+ swf_FontUseAll(font);
+ font->use->glyphs_specified = 1;
+ }
+ else
+ {
+ if (strcmp (glyphs_to_include, ""))
+ {
+ swf_FontUseUTF8(font, glyphs_to_include);
+ font->use->glyphs_specified = 1;
+ }
+ else
+ swf_FontInitUsage(font);
+ }
+ }
dictionary_put2(&fonts, name, font);
}
else
if (!font)
syntaxerror("font %s is not known in line %d", lu(&args, "font"), line);
else
- if (!strcmp(command, "edittext"))
- swf_FontUseAll(font);
- else
- swf_FontUseUTF8(font, lu(&args, "text"));
+ if (font->use && !font->use->glyphs_specified)
+ {
+ if (!strcmp(command, "edittext"))
+ {
+ swf_FontUseAll(font);
+ font->use->glyphs_specified = 1;
+ }
+ else
+ swf_FontUseUTF8(font, lu(&args, "text"));
+ }
}
map_clear(&args);
return;
git.asbjorn.biz / swftools.git / blobdiff