X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfc.c;h=c07a8a0a317b63888973f39f5e79f97fe0a1e60c;hb=d0c255a3b63de4982e15f1c1c169ebdb08d4163c;hp=3f087891791d906840feec62262675784a01e9c7;hpb=dd82884b517bc64671897b9f6a988d6268270623;p=swftools.git diff --git a/src/swfc.c b/src/swfc.c index 3f08789..c07a8a0 100644 --- a/src/swfc.c +++ b/src/swfc.c @@ -4,7 +4,7 @@ Part of the swftools package. Copyright (c) 2001 Matthias Kramm - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -36,24 +36,27 @@ #include "../lib/wav.h" #include "parser.h" #include "../lib/png.h" +#include "swfc-feedback.h" +#include "swfc-interpolation.h" +#include "swfc-history.h" //#define DEBUG - -static char * filename = 0; static char * outputname = "output.swf"; static int verbose = 2; static int optimize = 0; static int override_outputname = 0; static int do_cgi = 0; +static int change_sets_all = 0; static struct options_t options[] = { {"h", "help"}, {"V", "version"}, +{"C", "cgi"}, {"v", "verbose"}, {"o", "output"}, {0,0} }; - + int args_callback_option(char*name,char*val) { if(!strcmp(name, "V")) { @@ -94,6 +97,7 @@ void args_callback_usage(char *name) printf("\n"); printf("-h , --help Print short help message and exit\n"); printf("-V , --version Print version info and exit\n"); + printf("-C , --cgi Output to stdout (for use in CGI environments)\n"); printf("-v , --verbose Increase verbosity. \n"); printf("-o , --output Set output file to .\n"); printf("\n"); @@ -114,29 +118,6 @@ static int pos; static char*text; static int textlen; static int type; -static int line; -static int column; - -static void syntaxerror(char*format, ...) -{ - char buf[1024]; - va_list arglist; - va_start(arglist, format); - vsprintf(buf, format, arglist); - va_end(arglist); - fprintf(stderr, "\"%s\", line %d column %d: error- %s\n", filename, line, column, buf); - exit(1); -} - -static void warning(char*format, ...) -{ - char buf[1024]; - va_list arglist; - va_start(arglist, format); - vsprintf(buf, format, arglist); - va_end(arglist); - fprintf(stderr, "\"%s\", line %d column %d: warning- %s\n", filename, line, column, buf); -} static void readToken() { @@ -173,6 +154,19 @@ static int noMoreTokens() return 0; } +enum +{ + PT_PUT = 0, + PT_CHANGE = 1, + PT_SCHANGE = 2, + PT_MOVE = 3, + PT_SMOVE = 4, + PT_SWEEP = 5, + PT_JUMP = 6, + PT_STARTCLIP = 7, + PT_BUTTON = 8 +}; + // ------------------------------ swf routines ---------------------------- struct _character; static struct level @@ -181,7 +175,7 @@ static struct level /* for swf (0): */ SWF*swf; - char*filename; + char*filename; /* for sprites (1): */ TAG*tag; @@ -201,6 +195,8 @@ static dictionary_t images; static dictionary_t textures; static dictionary_t outlines; static dictionary_t gradients; +static dictionary_t filters; +static dictionary_t interpolations; static char idmap[65536]; static TAG*tag = 0; //current tag @@ -211,15 +207,20 @@ static U16 currentdepth; static dictionary_t instances; static dictionary_t fonts; static dictionary_t sounds; +static dictionary_t fontUsage; typedef struct _parameters { - int x,y; - float scalex, scaley; + int x,y; + float scalex, scaley; CXFORM cxform; float rotate; float shear; SPOINT pivot; SPOINT pin; + U8 blendmode; //not interpolated + FILTERLIST* filters; + U16 set; // bits indicating wether a parameter was set in the c_placement function + U16 flags; // bits to toggle anything you may care to implement as a toggle } parameters_t; typedef struct _character { @@ -232,8 +233,7 @@ typedef struct _instance { character_t*character; U16 depth; parameters_t parameters; - TAG* lastTag; //last tag which set the object - U16 lastFrame; //frame lastTag is in + history_t* history; } instance_t; typedef struct _outline { @@ -247,14 +247,32 @@ typedef struct _gradient { int rotate; } gradient_t; +typedef struct _filter { + FILTER filter; +} filter_t; + typedef struct _texture { FILLSTYLE fs; } texture_t; +char* interpolationFunctions[] = {"linear", \ + "quadIn", "quadOut", "quadInOut", \ + "cubicIn", "cubicOut", "cubicInOut", \ + "quartIn", "quartOut", "quartInOut", \ + "quintIn", "quintOut", "quintInOut", \ + "circleIn", "circleOut", "circleInOut", \ + "exponentialIn", "exponentialOut", "exponentialInOut", \ + "sineIn", "sineOut", "sineInOut", \ + "elasticIn", "elasticOut", "elasticInOut", \ + "backIn", "backOut", "backInOut", \ + "bounceIn", "bounceOut", "bounceInOut", \ + "fastBounceIn", "fastBounceOut", "fastBounceInOut"}; + static void character_init(character_t*c) { memset(c, 0, sizeof(character_t)); } + static character_t* character_new() { character_t*c; @@ -262,10 +280,19 @@ static character_t* character_new() character_init(c); return c; } + static void instance_init(instance_t*i) { memset(i, 0, sizeof(instance_t)); + i->history = history_new(); +} + +static void instance_free(instance_t* i) +{ + history_free(i->history); + free(i); } + static instance_t* instance_new() { instance_t*c; @@ -274,6 +301,59 @@ static instance_t* instance_new() return c; } +static void free_instance(void* i) +{ + instance_free((instance_t*)i); +} + +static void free_font(void* f) +{ + swf_FontFree((SWFFONT*)f); +} + +static void gradient_free(GRADIENT* grad) +{ + free(grad->ratios); + free(grad->rgba); + free(grad); +} + +static void free_gradient(void* grad) +{ + gradient_free((GRADIENT*) grad); +} + +static void outline_free(outline_t* o) +{ + free(o->shape->data); + free(o->shape); + free(o); +} + +static void free_outline(void* o) +{ + outline_free((outline_t*)o); +} + +static void freeDictionaries() +{ + dictionary_free_all(&instances, free_instance); + dictionary_free_all(&characters, free); + dictionary_free_all(&images, free); + dictionary_free_all(&textures, free); + dictionary_free_all(&outlines, free_outline); + dictionary_free_all(&gradients, free_gradient); + dictionary_free_all(&filters, free); + dictionary_free_all(&fonts, free_font); + dictionary_free_all(&sounds, free); + dictionary_free_all(&interpolations, free); +} + +static void freeFontDictionary() +{ + dictionary_free_all(&fonts, free_font); +} + static void incrementid() { while(idmap[++id]) { @@ -285,13 +365,13 @@ static void incrementid() static void s_addcharacter(char*name, U16 id, TAG*ctag, SRECT r) { + if(dictionary_lookup(&characters, name)) + syntaxerror("character %s defined twice", name); character_t* c = character_new(); - + c->definingTag = ctag; c->id = id; c->size = r; - if(dictionary_lookup(&characters, name)) - syntaxerror("character %s defined twice", name); dictionary_put2(&characters, name, c); tag = swf_InsertTag(tag, ST_NAMECHARACTER); @@ -304,45 +384,38 @@ static void s_addcharacter(char*name, U16 id, TAG*ctag, SRECT r) } static void s_addimage(char*name, U16 id, TAG*ctag, SRECT r) { + if(dictionary_lookup(&images, name)) + syntaxerror("image %s defined twice", name); + character_t* c = character_new(); c->definingTag = ctag; c->id = id; c->size = r; - - if(dictionary_lookup(&images, name)) - syntaxerror("image %s defined twice", name); dictionary_put2(&images, name, c); } static instance_t* s_addinstance(char*name, character_t*c, U16 depth) { + if(dictionary_lookup(&instances, name)) + syntaxerror("object %s defined twice", name); instance_t* i = instance_new(); i->character = c; i->depth = depth; //swf_GetMatrix(0, &i->matrix); - if(dictionary_lookup(&instances, name)) - syntaxerror("object %s defined twice", name); dictionary_put2(&instances, name, i); return i; } -static void parameters_set(parameters_t*p, int x,int y, float scalex, float scaley, float rotate, float shear, SPOINT pivot, SPOINT pin, CXFORM cxform) -{ - p->x = x; p->y = y; - p->scalex = scalex; p->scaley = scaley; - p->pin = pin; p->pivot = pivot; - p->rotate = rotate; p->cxform = cxform; - p->shear = shear; -} - static void parameters_clear(parameters_t*p) { - p->x = 0; p->y = 0; + p->x = 0; p->y = 0; p->scalex = 1.0; p->scaley = 1.0; p->pin.x = 0; //1?? p->pin.y = 0; p->pivot.x = 0; p->pivot.y = 0; - p->rotate = 0; - p->shear = 0; + p->rotate = 0; + p->shear = 0; + p->blendmode = 0; + p->filters = 0; swf_GetCXForm(0, &p->cxform, 1); } @@ -351,14 +424,14 @@ static void makeMatrix(MATRIX*m, parameters_t*p) SPOINT h; float sx,r1,r0,sy; - /* /sx r1\ /x\ + /* /sx r1\ /x\ * \r0 sy/ \y/ */ - sx = p->scalex*cos(p->rotate/360*2*3.14159265358979); - r1 = -p->scalex*sin(p->rotate/360*2*3.14159265358979)+sx*p->shear; - r0 = p->scaley*sin(p->rotate/360*2*3.14159265358979); - sy = p->scaley*cos(p->rotate/360*2*3.14159265358979)+r0*p->shear; + sx = p->scalex*cos(p->rotate/360*2*M_PI); + r1 = -p->scalex*sin(p->rotate/360*2*M_PI)+sx*p->shear; + r0 = p->scaley*sin(p->rotate/360*2*M_PI); + sy = p->scaley*cos(p->rotate/360*2*M_PI)+r0*p->shear; m->sx = (int)(sx*65536+0.5); m->r1 = (int)(r1*65536+0.5); @@ -366,7 +439,7 @@ static void makeMatrix(MATRIX*m, parameters_t*p) m->sy = (int)(sy*65536+0.5); m->tx = m->ty = 0; - + h = swf_TurnPoint(p->pin, m); m->tx = p->x - h.x; m->ty = p->y - h.y; @@ -378,7 +451,7 @@ static MATRIX s_instancepos(SRECT rect, parameters_t*p) SRECT r; makeMatrix(&m, p); r = swf_TurnRect(rect, &m); - if(currentrect.xmin == 0 && currentrect.ymin == 0 && + if(currentrect.xmin == 0 && currentrect.ymin == 0 && currentrect.xmax == 0 && currentrect.ymax == 0) currentrect = r; else @@ -386,12 +459,140 @@ static MATRIX s_instancepos(SRECT rect, parameters_t*p) return m; } +void initBuiltIns() +{ + interpolation_t* new; + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_LINEAR; + dictionary_put2(&interpolations, "linear", new); + + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUAD_IN; + new->slope = 0; + dictionary_put2(&interpolations, "quadIn", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUAD_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "quadOut", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUAD_IN_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "quadInOut", new); + + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_CUBIC_IN; + new->slope = 0; + dictionary_put2(&interpolations, "cubicIn", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_CUBIC_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "cubicOut", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_CUBIC_IN_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "cubicInOut", new); + + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUART_IN; + new->slope = 0; + dictionary_put2(&interpolations, "quartIn", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUART_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "quartOut", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUART_IN_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "quartInOut", new); + + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUINT_IN; + new->slope = 0; + dictionary_put2(&interpolations, "quintIn", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUINT_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "quintOut", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_QUINT_IN_OUT; + new->slope = 0; + dictionary_put2(&interpolations, "quintInOut", new); + + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_CIRCLE_IN; + dictionary_put2(&interpolations, "circleIn", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_CIRCLE_OUT; + dictionary_put2(&interpolations, "circleOut", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_CIRCLE_IN_OUT; + dictionary_put2(&interpolations, "circleInOut", new); + + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_EXPONENTIAL_IN; + dictionary_put2(&interpolations, "exponentialIn", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_EXPONENTIAL_OUT; + dictionary_put2(&interpolations, "exponentialOut", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_EXPONENTIAL_IN_OUT; + dictionary_put2(&interpolations, "exponentialInOut", new); + + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_SINE_IN; + dictionary_put2(&interpolations, "sineIn", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_SINE_OUT; + dictionary_put2(&interpolations, "sineOut", new); + new = (interpolation_t*)malloc(sizeof(interpolation_t)); + new->function = IF_SINE_IN_OUT; + dictionary_put2(&interpolations, "sineInOut", new); + + RGBA c; + memset(&c, 0, sizeof(RGBA)); + gradient_t* noGradient = (gradient_t*)malloc(sizeof(gradient_t)); + noGradient->gradient.ratios = (U8*)malloc(16 * sizeof(U8)); + noGradient->gradient.rgba = (RGBA*)malloc(16 * sizeof(RGBA)); + noGradient->gradient.num = 2; + noGradient->gradient.rgba[0] = c; + noGradient->gradient.ratios[0] = 0; + noGradient->gradient.rgba[1] = c; + noGradient->gradient.ratios[1] = 255; + noGradient->radial = 0; + noGradient->rotate = 0; + dictionary_put2(&gradients, "no_gradient", noGradient); + + noFilters = 0; +// put a no_filters entry in the filters dictionary to provoce a message when a user tries +// to define a no_filters filter. The real filter=no_filters case is handled in parseFilters. + FILTER* dummy = (FILTER*)malloc(sizeof(FILTER)); + dictionary_put2(&filters, "no_filters", dummy); + noBlur = (FILTER_BLUR*) swf_NewFilter(FILTERTYPE_BLUR); + noBlur->passes = 1; + dictionary_put2(&filters, "no_blur", noBlur); + noBevel = (FILTER_BEVEL*) swf_NewFilter(FILTERTYPE_BEVEL); + noBevel->passes = 1; + noBevel->composite = 1; + dictionary_put2(&filters, "no_bevel", noBevel); + noDropshadow = (FILTER_DROPSHADOW*) swf_NewFilter(FILTERTYPE_DROPSHADOW); + noDropshadow->passes = 1; + noDropshadow->composite = 1; + dictionary_put2(&filters, "no_dropshadow", noDropshadow); + noGradientGlow = (FILTER_GRADIENTGLOW*) swf_NewFilter(FILTERTYPE_GRADIENTGLOW); + noGradientGlow->passes = 1; + noGradientGlow->composite = 1; + noGradientGlow->gradient = &noGradient->gradient; + dictionary_put2(&filters, "no_gradientglow", noGradientGlow); +} + void s_swf(char*name, SRECT r, int version, int fps, int compress, RGBA background) { - SWF*swf = (SWF*)malloc(sizeof(SWF)); - if(stackpos) - syntaxerror(".swf blocks can't be nested"); + syntaxerror(".swf blocks can't be nested"); + if(stackpos==sizeof(stack)/sizeof(stack[0])) + syntaxerror("too many levels of recursion"); + + SWF*swf = (SWF*)malloc(sizeof(SWF)); memset(swf, 0, sizeof(swf)); swf->fileVersion = version; @@ -401,17 +602,17 @@ void s_swf(char*name, SRECT r, int version, int fps, int compress, RGBA backgrou swf->compressed = compress; swf_SetRGB(tag,&background); - if(stackpos==sizeof(stack)/sizeof(stack[0])) - syntaxerror("too many levels of recursion"); - dictionary_init(&characters); dictionary_init(&images); dictionary_init(&textures); dictionary_init(&outlines); dictionary_init(&gradients); + dictionary_init(&filters); dictionary_init(&instances); - dictionary_init(&fonts); dictionary_init(&sounds); + dictionary_init(&interpolations); + initBuiltIns(); + cleanUp = &freeDictionaries; memset(&stack[stackpos], 0, sizeof(stack[0])); stack[stackpos].type = 0; @@ -419,12 +620,11 @@ void s_swf(char*name, SRECT r, int version, int fps, int compress, RGBA backgrou stack[stackpos].swf = swf; stack[stackpos].oldframe = -1; stackpos++; - id = 0; currentframe = 0; memset(¤trect, 0, sizeof(currentrect)); currentdepth = 1; - + memset(idmap, 0, sizeof(idmap)); incrementid(); } @@ -444,7 +644,7 @@ void s_sprite(char*name) stack[stackpos].tag = tag; stack[stackpos].id = id; stack[stackpos].name = strdup(name); - + /* FIXME: those four fields should be bundled together */ dictionary_init(&instances); currentframe = 0; @@ -507,7 +707,7 @@ void s_buttonput(char*character, char*as, parameters_t p) if(mybutton.endofshapes) { syntaxerror("a .do may not precede a .show", character, character); } - + m = s_instancepos(c->size, &p); r.id = c->id; @@ -534,7 +734,7 @@ static void setbuttonrecords(TAG*tag) int flags[] = {BS_UP,BS_OVER,BS_DOWN,BS_HIT}; if(!mybutton.endofshapes) { int t; - + if(!mybutton.records[3].set) { memcpy(&mybutton.records[3], &mybutton.records[0], sizeof(buttonrecord_t)); } @@ -556,7 +756,7 @@ void s_buttonaction(int flags, char*action) return; } setbuttonrecords(stack[stackpos-1].tag); - + a = swf_ActionCompile(text, stack[0].swf->fileVersion); if(!a) { syntaxerror("Couldn't compile ActionScript"); @@ -588,7 +788,7 @@ static void s_endButton() setbuttonrecords(stack[stackpos-1].tag); setactionend(stack[stackpos-1].tag); stackpos--; - + swf_ButtonPostProcess(stack[stackpos].tag, mybutton.nr_actions); r = currentrect; @@ -612,23 +812,154 @@ TAG* removeFromTo(TAG*from, TAG*to) return save; } +static int parametersChange(history_t* history, int frame) +{ + int willChange = 0; + + willChange = willChange || history_change(history, frame, "x"); + willChange = willChange || history_change(history, frame, "y"); + willChange = willChange || history_change(history, frame, "scalex"); + willChange = willChange || history_change(history, frame, "scaley"); + willChange = willChange || history_change(history, frame, "cxform.r0"); + willChange = willChange || history_change(history, frame, "cxform.g0"); + willChange = willChange || history_change(history, frame, "cxform.b0"); + willChange = willChange || history_change(history, frame, "cxform.a0"); + willChange = willChange || history_change(history, frame, "cxform.r1"); + willChange = willChange || history_change(history, frame, "cxform.g1"); + willChange = willChange || history_change(history, frame, "cxform.b1"); + willChange = willChange || history_change(history, frame, "cxform.a1"); + willChange = willChange || history_change(history, frame, "rotate"); + willChange = willChange || history_change(history, frame, "shear"); + willChange = willChange || history_change(history, frame, "pivot.x"); + willChange = willChange || history_change(history, frame, "pivot.y"); + willChange = willChange || history_change(history, frame, "pin.x"); + willChange = willChange || history_change(history, frame, "pin.y"); + willChange = willChange || history_change(history, frame, "blendmode"); + willChange = willChange || history_changeFilter(history, frame); + + return willChange; +} + +static void free_filterlist(FILTERLIST* f_list) +{ + int i; + for (i = 0; i < f_list->num; i++) + { + if (f_list->filter[i]->type == FILTERTYPE_GRADIENTGLOW) + gradient_free(((FILTER_GRADIENTGLOW*)f_list->filter[i])->gradient); + free(f_list->filter[i]); + } + free(f_list); +} + +static void readParameters(history_t* history, parameters_t* p, int frame) +{ + p->x = history_value(history, frame, "x"); + p->y = history_value(history, frame, "y"); + p->scalex = history_value(history, frame, "scalex"); + p->scaley = history_value(history, frame, "scaley"); + p->cxform.r0 = history_value(history, frame, "cxform.r0"); + p->cxform.g0 = history_value(history, frame, "cxform.g0"); + p->cxform.b0 = history_value(history, frame, "cxform.b0"); + p->cxform.a0 = history_value(history, frame, "cxform.a0"); + p->cxform.r1 = history_value(history, frame, "cxform.r1"); + p->cxform.g1 = history_value(history, frame, "cxform.g1"); + p->cxform.b1 = history_value(history, frame, "cxform.b1"); + p->cxform.a1 = history_value(history, frame, "cxform.a1"); + p->rotate = history_rotateValue(history, frame); + p->shear = history_value(history, frame, "shear"); + p->pivot.x = history_value(history, frame, "pivot.x"); + p->pivot.y = history_value(history, frame, "pivot.y"); + p->pin.x = history_value(history, frame, "pin.x"); + p->pin.y = history_value(history, frame, "pin.y"); + p->blendmode = history_value(history, frame, "blendmode"); + p->filters = history_filterValue(history, frame); +} + +void setPlacement(TAG*tag, U16 id, U16 depth, MATRIX m, char*name, parameters_t*p, char move) +{ + SWFPLACEOBJECT po; + FILTERLIST flist; + swf_GetPlaceObject(NULL, &po); + po.id = id; + po.depth = depth; + po.matrix = m; + po.cxform = p->cxform; + po.name = name; + po.move = move; + if(move) + po.id = 0; + if(p->blendmode) { + po.blendmode = p->blendmode; + } + if (p->filters) + po.filters = p->filters; + swf_SetPlaceObject(tag, &po); +} + +static void writeInstance(instance_t* i) +{ + parameters_t p; + MATRIX m; + int frame = i->history->firstFrame; + TAG* tag = i->history->firstTag; + history_processFlags(i->history); + while (frame < currentframe) + { + frame++; + while (tag->id != ST_SHOWFRAME) + tag = tag->next; + if (parametersChange(i->history, frame)) + { + readParameters(i->history, &p, frame); + m = s_instancepos(i->character->size, &p); + + if(p.blendmode || p.filters) + tag = swf_InsertTag(tag, ST_PLACEOBJECT3); + else + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + setPlacement(tag, 0, i->depth, m, 0, &p, 1); + if (p.filters) + free_filterlist(p.filters); + } + else + tag = tag->next; + } +} + +void dumpSWF(SWF*swf) +{ + TAG* tag = swf->firstTag; + printf("vvvvvvvvvvvvvvvvvvvvv\n"); + while(tag) { + printf("%8d %s\n", tag->len, swf_TagGetName(tag)); + tag = tag->next; + } + printf("^^^^^^^^^^^^^^^^^^^^^\n"); +} + static void s_endSprite() { SRECT r = currentrect; - + if(stack[stackpos].cut) tag = removeFromTo(stack[stackpos].cut, tag); stackpos--; - - /* TODO: before clearing, prepend "." to names and - copy into old instances dict */ - dictionary_clear(&instances); - - currentframe = stack[stackpos].oldframe; - currentrect = stack[stackpos].oldrect; - currentdepth = stack[stackpos].olddepth; - instances = stack[stackpos].oldinstances; + instance_t *i; + stringarray_t* index =dictionary_index(&instances); + int num; + for (num = 0; num < dictionary_count(&instances); num++) + { + char* name = stringarray_at(index, num); + if (name) + { + i = dictionary_lookup(&instances, name); + writeInstance(i); + } + } + while (tag->next) + tag = tag->next; tag = swf_InsertTag(tag, ST_SHOWFRAME); tag = swf_InsertTag(tag, ST_END); @@ -636,7 +967,15 @@ static void s_endSprite() tag = stack[stackpos].tag; swf_FoldSprite(tag); if(tag->next != 0) - syntaxerror("internal error(7)"); + syntaxerror("internal error(7)"); + /* TODO: before clearing, prepend "." to names and + copy into old instances dict */ + dictionary_free_all(&instances, free_instance); + + currentframe = stack[stackpos].oldframe; + currentrect = stack[stackpos].oldrect; + currentdepth = stack[stackpos].olddepth; + instances = stack[stackpos].oldinstances; s_addcharacter(stack[stackpos].name, stack[stackpos].id, stack[stackpos].tag, r); free(stack[stackpos].name); @@ -647,15 +986,28 @@ static void s_endSWF() int fi; SWF* swf; char*filename; - + + instance_t *i; + stringarray_t* index = dictionary_index(&instances); + int num; + for (num = 0; num < dictionary_count(&instances); num++) + { + char* name = stringarray_at(index, num); + if (name) + { + i = dictionary_lookup(&instances, name); + writeInstance(i); + } + } + if(stack[stackpos].cut) tag = removeFromTo(stack[stackpos].cut, tag); stackpos--; - + swf = stack[stackpos].swf; filename = stack[stackpos].filename; - + //if(tag->prev && tag->prev->id != ST_SHOWFRAME) // tag = swf_InsertTag(tag, ST_SHOWFRAME); tag = swf_InsertTag(tag, ST_SHOWFRAME); @@ -663,22 +1015,22 @@ static void s_endSWF() tag = swf_InsertTag(tag, ST_END); swf_OptimizeTagOrder(swf); - + if(optimize) { swf_Optimize(swf); } - + if(!(swf->movieSize.xmax-swf->movieSize.xmin) || !(swf->movieSize.ymax-swf->movieSize.ymin)) { swf->movieSize = currentrect; /* "autocrop" */ } - + if(!(swf->movieSize.xmax-swf->movieSize.xmin) || !(swf->movieSize.ymax-swf->movieSize.ymin)) { swf->movieSize.xmax += 20; /* 1 by 1 pixels */ swf->movieSize.ymax += 20; warning("Empty bounding box for movie"); } - - if(do_cgi) + + if(do_cgi || !strcmp(filename, "-")) fi = fileno(stdout); else fi = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644); @@ -687,21 +1039,12 @@ static void s_endSWF() } 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");} close(fi); - - dictionary_clear(&instances); - dictionary_clear(&characters); - dictionary_clear(&images); - dictionary_clear(&textures); - dictionary_clear(&outlines); - dictionary_clear(&gradients); - dictionary_clear(&fonts); - dictionary_clear(&sounds); + + freeDictionaries(); swf_FreeTags(swf); free(swf); @@ -730,7 +1073,7 @@ void s_frame(int nr, int cut, char*name, char anchor) int t; TAG*now = tag; - if(nr<1) + if(nr<1) syntaxerror("Illegal frame number"); nr--; // internally, frame 1 is frame 0 @@ -786,8 +1129,8 @@ int addFillStyle(SHAPE*s, SRECT*r, char*name) MATRIX rot,m; double ccos,csin; swf_GetMatrix(0, &rot); - ccos = cos(-gradient->rotate*2*3.14159265358979/360); - csin = sin(-gradient->rotate*2*3.14159265358979/360); + ccos = cos(-gradient->rotate*2*M_PI/360); + csin = sin(-gradient->rotate*2*M_PI/360); rot.sx = ccos*65536; rot.r1 = -csin*65536; rot.r0 = csin*65536; @@ -808,7 +1151,7 @@ int addFillStyle(SHAPE*s, SRECT*r, char*name) return 0; } } - + RGBA black={r:0,g:0,b:0,a:0}; void s_box(char*name, int width, int height, RGBA color, int linewidth, char*texture) { @@ -842,7 +1185,7 @@ void s_box(char*name, int width, int height, RGBA color, int linewidth, char*tex swf_ShapeSetLine(tag,s,0,-height); swf_ShapeSetEnd(tag); swf_ShapeFree(s); - + s_addcharacter(name, id, tag, r); incrementid(); } @@ -867,7 +1210,7 @@ void s_filled(char*name, char*outlinename, RGBA color, int linewidth, char*textu } if(texture) fs1 = addFillStyle(s, &r2, texture); - + swf_SetU16(tag,id); rect.xmin = r2.xmin-linewidth/2; rect.ymin = r2.ymin-linewidth/2; @@ -877,7 +1220,7 @@ void s_filled(char*name, char*outlinename, RGBA color, int linewidth, char*textu swf_SetRect(tag,&rect); swf_SetShapeStyles(tag, s); swf_ShapeCountBits(s,0,0); - swf_RecodeShapeData(outline->shape->data, outline->shape->bitlen, outline->shape->bits.fill, outline->shape->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); @@ -916,7 +1259,7 @@ void s_circle(char*name, int r, RGBA color, int linewidth, char*texture) swf_ShapeSetCircle(tag, s, r,r,r,r); swf_ShapeSetEnd(tag); swf_ShapeFree(s); - + s_addcharacter(name, id, tag, rect); incrementid(); } @@ -931,7 +1274,7 @@ void s_textshape(char*name, char*fontname, float size, char*_text) font = dictionary_lookup(&fonts, fontname); if(!font) syntaxerror("font \"%s\" not known!", fontname); - + if(text[0] >= font->maxascii || font->ascii2glyph[text[0]]<0) { warning("no character 0x%02x (%c) in font \"%s\"", text[0], text[0], fontname); s_box(name, 0, 0, black, 20, 0); @@ -943,7 +1286,7 @@ void s_textshape(char*name, char*fontname, float size, char*_text) memset(outline, 0, sizeof(outline_t)); outline->shape = font->glyph[g].shape; outline->bbox = font->layout->bounds[g]; - + { drawer_t draw; swf_Shape11DrawerInit(&draw, 0); @@ -967,7 +1310,7 @@ void s_text(char*name, char*fontname, char*text, int size, RGBA color) font = dictionary_lookup(&fonts, fontname); if(!font) syntaxerror("font \"%s\" not known!", fontname); - + tag = swf_InsertTag(tag, ST_DEFINETEXT2); swf_SetU16(tag, id); if(!font->numchars) { @@ -975,7 +1318,16 @@ void s_text(char*name, char*fontname, char*text, int size, RGBA color) return; } r = swf_SetDefineText(tag, font, &color, text, size); - + + if(stack[0].swf->fileVersion >= 8) { + tag = swf_InsertTag(tag, ST_CSMTEXTSETTINGS); + swf_SetU16(tag, id); + swf_SetU8(tag, /*grid*/(1<<3)|/*flashtype*/0x40); + swf_SetU32(tag, 0);//thickness + swf_SetU32(tag, 0);//sharpness + swf_SetU8(tag, 0);//reserved + } + s_addcharacter(name, id, tag, r); incrementid(); } @@ -986,11 +1338,11 @@ void s_quicktime(char*name, char*url) MATRIX _m,*m=0; memset(&r, 0, sizeof(r)); - + tag = swf_InsertTag(tag, ST_DEFINEMOVIE); swf_SetU16(tag, id); swf_SetString(tag, url); - + s_addcharacter(name, id, tag, r); incrementid(); } @@ -1018,7 +1370,7 @@ void s_edittext(char*name, char*fontname, int size, int width, int height, char* r.ymin = 0; r.xmax = width; r.ymax = height; - + swf_SetEditText(tag, flags, r, text, color, maxlength, font?font->id:0, size, &layout, variable); s_addcharacter(name, id, tag, r); @@ -1031,13 +1383,13 @@ void s_image(char*name, char*type, char*filename, int quality) { /* an image is actually two folded: 1st bitmap, 2nd character. Both of them can be used separately */ - + /* step 1: the bitmap */ SRECT r; int imageID = id; int width, height; if(!strcmp(type,"jpeg")) { -#ifndef HAVE_LIBJPEG +#ifndef HAVE_JPEGLIB warning("no jpeg support compiled in"); s_box(name, 0, 0, black, 20, 0); return; @@ -1073,6 +1425,7 @@ void s_image(char*name, char*type, char*filename, int quality) tag = swf_InsertTag(tag, ST_DEFINEBITSLOSSLESS); swf_SetU16(tag, imageID); swf_SetLosslessImage(tag, data, width, height); + free(data); r.xmin = 0; r.ymin = 0; @@ -1120,6 +1473,8 @@ void s_getBitmapSize(char*name, int*width, int*height) void s_texture(char*name, char*object, int x, int y, float scalex, float scaley, float rotate, float shear) { + if(dictionary_lookup(&textures, name)) + syntaxerror("texture %s defined twice", name); gradient_t* gradient = dictionary_lookup(&gradients, object); character_t* bitmap = dictionary_lookup(&images, object); texture_t* texture = (texture_t*)rfx_calloc(sizeof(texture_t)); @@ -1148,36 +1503,18 @@ void s_texture(char*name, char*object, int x, int y, float scalex, float scaley, fs->m.tx += p2.x; fs->m.ty += p2.y; } + if(bitmap) { + fs->m.sx *= 20; + fs->m.sy *= 20; + } - if(dictionary_lookup(&textures, name)) - syntaxerror("texture %s defined twice", name); dictionary_put2(&textures, name, texture); } -void dumpSWF(SWF*swf) -{ - TAG* tag = swf->firstTag; - printf("vvvvvvvvvvvvvvvvvvvvv\n"); - while(tag) { - printf("%8d %s\n", tag->len, swf_TagGetName(tag)); - tag = tag->next; - } - printf("^^^^^^^^^^^^^^^^^^^^^\n"); -} - void s_font(char*name, char*filename) { SWFFONT* font; - font = swf_LoadFont(filename); - - if(font == 0) { - warning("Couldn't open font file \"%s\"", filename); - font = (SWFFONT*)malloc(sizeof(SWFFONT)); - memset(font, 0, sizeof(SWFFONT)); - dictionary_put2(&fonts, name, font); - return; - } - + font = dictionary_lookup(&fonts, name); if(0) { /* fix the layout. Only needed for old fonts */ @@ -1188,21 +1525,16 @@ void s_font(char*name, char*filename) font->layout = 0; swf_FontCreateLayout(font); } - /* just in case this thing is used in .edittext later on */ - swf_FontPrepareForEditText(font); - font->id = id; + 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); - incrementid(); - if(dictionary_lookup(&fonts, name)) - syntaxerror("font %s defined twice", name); - dictionary_put2(&fonts, name, font); + incrementid(); } @@ -1219,46 +1551,53 @@ void s_sound(char*name, char*filename) struct MP3 mp3; sound_t* sound; U16*samples = NULL; - unsigned numsamples; + unsigned numsamples = 1; unsigned blocksize = 1152; int is_mp3 = 0; - if(wav_read(&wav, filename)) { + if(dictionary_lookup(&sounds, name)) + syntaxerror("sound %s defined twice", name); + + if(wav_read(&wav, filename)) + { int t; - wav_convert2mono(&wav, &wav2, 44100); - samples = (U16*)wav2.data; - numsamples = wav2.size/2; - free(wav.data); + wav_convert2mono(&wav, &wav2, 44100); + samples = (U16*)wav2.data; + numsamples = wav2.size/2; + free(wav.data); #ifdef WORDS_BIGENDIAN /* swap bytes */ - for(t=0;t>8)&0xff | (samples[t]<<8)&0xff00; - } + for(t=0;t>8)&0xff | (samples[t]<<8)&0xff00; #endif - } else if(mp3_read(&mp3, filename)) { - fprintf(stderr, "\"%s\" seems to work as a MP3 file...\n", filename); - blocksize = 1; - is_mp3 = 1; } else - { - warning("Couldn't read WAV/MP3 file \"%s\"", filename); - samples = 0; - numsamples = 0; - } - + if(mp3_read(&mp3, filename)) + { + fprintf(stderr, "\"%s\" seems to work as a MP3 file...\n", filename); + blocksize = 1; + is_mp3 = 1; + } + else + { + warning("Couldn't read WAV/MP3 file \"%s\"", filename); + samples = 0; + numsamples = 0; + } + if(numsamples%blocksize != 0) { // apply padding, so that block is a multiple of blocksize - int numblocks = (numsamples+blocksize-1)/blocksize; - int numsamples2; - U16* samples2; - numsamples2 = numblocks * blocksize; - samples2 = malloc(sizeof(U16)*numsamples2); - memcpy(samples2, samples, numsamples*sizeof(U16)); - memset(&samples2[numsamples], 0, sizeof(U16)*(numsamples2 - numsamples)); - numsamples = numsamples2; - samples = samples2; + int numblocks = (numsamples+blocksize-1)/blocksize; + int numsamples2; + U16* samples2; + numsamples2 = numblocks * blocksize; + samples2 = malloc(sizeof(U16)*numsamples2); + memcpy(samples2, samples, numsamples*sizeof(U16)); + memset(&samples2[numsamples], 0, sizeof(U16)*(numsamples2 - numsamples)); + numsamples = numsamples2; + free(samples); + samples = samples2; } tag = swf_InsertTag(tag, ST_DEFINESOUND); @@ -1270,13 +1609,11 @@ void s_sound(char*name, char*filename) mp3.SampRate, mp3.Channels, mp3.NumFrames); - mp3_clear(&mp3); + mp3_clear(&mp3); } else - { swf_SetSoundDefine(tag, samples, numsamples); - } - + tag = swf_InsertTag(tag, ST_NAMECHARACTER); swf_SetU16(tag, id); swf_SetString(tag, name); @@ -1289,14 +1626,12 @@ void s_sound(char*name, char*filename) sound->tag = tag; sound->id = id; - if(dictionary_lookup(&sounds, name)) - syntaxerror("sound %s defined twice", name); dictionary_put2(&sounds, name, sound); - + incrementid(); - if(samples) - free(samples); + if (samples) + free(samples); } static char* gradient_getToken(const char**p) @@ -1305,7 +1640,7 @@ static char* gradient_getToken(const char**p) char*result; while(**p && strchr(" \t\n\r", **p)) { (*p)++; - } + } start = *p; while(**p && !strchr(" \t\n\r", **p)) { (*p)++; @@ -1325,33 +1660,85 @@ GRADIENT parseGradient(const char*str) int lastpos = -1; const char* p = str; memset(&gradient, 0, sizeof(GRADIENT)); - while(*p) { - char*posstr,*colorstr; - int pos; - RGBA color; - posstr = gradient_getToken(&p); - if(!*posstr) - break; - 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); - if(gradient.num == sizeof(gradient.ratios)/sizeof(gradient.ratios[0])) { - warning("gradient record too big- max size is 8, rest ignored"); - break; + gradient.ratios = rfx_calloc(16*sizeof(U8)); + gradient.rgba = rfx_calloc(16*sizeof(RGBA)); + + while(*p) + { + char*posstr,*colorstr; + int pos; + RGBA color; + posstr = gradient_getToken(&p); + if(!*posstr) + { + free(posstr); + break; + } + pos = (int)(parsePercent(posstr)*255.0); + if(pos == lastpos) + pos++; + if(!*p) + { + rfx_free(gradient.ratios); + rfx_free(gradient.rgba); + free(posstr); + syntaxerror("Error in shape data: Color expected after %s", posstr); + } + colorstr = gradient_getToken(&p); + color = parseColor(colorstr); + if(gradient.num == 16) + { + warning("gradient record too big- max size is 16, rest ignored"); + break; + } + gradient.ratios[gradient.num] = pos; + gradient.rgba[gradient.num] = color; + gradient.num++; + free(posstr); + free(colorstr); + lastpos = pos; } - gradient.ratios[gradient.num] = pos; - gradient.rgba[gradient.num] = color; - gradient.num++; - free(posstr); - free(colorstr); - lastpos = pos; - } return gradient; } +FILTERLIST* parseFilters(char* list) +{ + if (!strcmp(list, "no_filters")) + return 0; + FILTER* f; + FILTERLIST* f_list = (FILTERLIST*)malloc(sizeof(FILTERLIST)); + f_list->num = 0; + char* f_start = list; + char* f_end; + while (f_start) + { + f_end = strchr(f_start, ','); + if (f_end) + *f_end = '\0'; + f = dictionary_lookup(&filters, f_start); + if (!f) + { + free(f_list); + syntaxerror("unknown filter %s", f_start); + } + if (f_list->num == 8) + { + warning("too many filters in filterlist, no more than 8 please, rest ignored"); + break; + } + f_list->filter[f_list->num] = f; + f_list->num++; + if (f_end) + { + *f_end = ','; + f_start = f_end + 1; + } + else + f_start = 0; + } + return f_list; +} + void s_gradient(char*name, const char*text, int radial, int rotate) { gradient_t* gradient; @@ -1361,17 +1748,107 @@ void s_gradient(char*name, const char*text, int radial, int rotate) gradient->radial = radial; gradient->rotate = rotate; - if(dictionary_lookup(&gradients, name)) - syntaxerror("gradient %s defined twice", name); dictionary_put2(&gradients, name, gradient); } +void s_gradientglow(char*name, char*gradient, float blurx, float blury, + float angle, float distance, float strength, char innershadow, + char knockout, char composite, char ontop, int passes) +{ + if(dictionary_lookup(&filters, name)) + syntaxerror("filter %s defined twice", name); + + gradient_t* g = dictionary_lookup(&gradients, gradient); + if(!g) + syntaxerror("unknown gradient %s", gradient); + + composite = 1; + + FILTER_GRADIENTGLOW* filter = rfx_calloc(sizeof(FILTER_GRADIENTGLOW)); + filter->type = FILTERTYPE_GRADIENTGLOW; + filter->gradient = &g->gradient; + filter->blurx = blurx; + filter->blury = blury; + filter->strength = strength; + filter->angle = angle; + filter->distance = distance; + filter->innershadow = innershadow; + filter->knockout = knockout; + filter->composite = composite; + filter->ontop = ontop; + filter->passes = passes; + + dictionary_put2(&filters, name, filter); +} + +void s_dropshadow(char*name, RGBA color, double blurx, double blury, double angle, double distance, double strength, char innershadow, char knockout, char composite, int passes) +{ + if(dictionary_lookup(&filters, name)) + syntaxerror("filter %s defined twice", name); + + composite = 1; + FILTER_DROPSHADOW* filter = rfx_calloc(sizeof(FILTER_DROPSHADOW)); + filter->type = FILTERTYPE_DROPSHADOW; + filter->color= color; + filter->blurx = blurx; + filter->blury = blury; + filter->strength = strength; + filter->angle = angle; + filter->distance = distance; + filter->innershadow = innershadow; + filter->knockout = knockout; + filter->composite = composite; + filter->passes = passes; + + dictionary_put2(&filters, name, filter); +} + +void s_bevel(char*name, RGBA shadow, RGBA highlight, double blurx, double blury, double angle, double distance, double strength, char innershadow, char knockout, char composite, char ontop, int passes) +{ + if(dictionary_lookup(&filters, name)) + syntaxerror("filter %s defined twice", name); + + composite = 1; + FILTER_BEVEL* filter = rfx_calloc(sizeof(FILTER_BEVEL)); + filter->type = FILTERTYPE_BEVEL; + filter->shadow = shadow; + filter->highlight = highlight; + filter->blurx = blurx; + filter->blury = blury; + filter->strength = strength; + filter->angle = angle; + filter->distance = distance; + filter->innershadow = innershadow; + filter->knockout = knockout; + filter->composite = composite; + filter->ontop = ontop; + filter->passes = passes; + + dictionary_put2(&filters, name, filter); +} + +void s_blur(char*name, double blurx, double blury, int passes) +{ + if(dictionary_lookup(&filters, name)) + syntaxerror("filter %s defined twice", name); + + FILTER_BLUR* filter = rfx_calloc(sizeof(FILTER_BLUR)); + filter->type = FILTERTYPE_BLUR; + filter->blurx = blurx; + filter->blury = blury; + filter->passes = passes; + + dictionary_put2(&filters, name, filter); +} + void s_action(const char*text) { ActionTAG* a = 0; a = swf_ActionCompile(text, stack[0].swf->fileVersion); - if(!a) { - syntaxerror("Couldn't compile ActionScript"); + if(!a) + { + swf_ActionFree(a); + syntaxerror("Couldn't compile ActionScript"); } tag = swf_InsertTag(tag, ST_DOACTION); @@ -1386,8 +1863,10 @@ 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"); + if(!a) + { + swf_ActionFree(a); + syntaxerror("Couldn't compile ActionScript"); } c = (character_t*)dictionary_lookup(&characters, character); @@ -1403,7 +1882,7 @@ int s_swf3action(char*name, char*action) { ActionTAG* a = 0; instance_t* object = 0; - if(name) + if(name) object = (instance_t*)dictionary_lookup(&instances, name); if(!object && name && *name) { /* we have a name, but couldn't find it. Abort. */ @@ -1425,13 +1904,16 @@ int s_swf3action(char*name, char*action) void s_outline(char*name, char*format, char*source) { + if(dictionary_lookup(&outlines, name)) + syntaxerror("outline %s defined twice", name); + outline_t* outline; drawer_t draw; SHAPE* shape; SHAPE2* shape2; SRECT bounds; - + //swf_Shape10DrawerInit(&draw, 0); swf_Shape11DrawerInit(&draw, 0); @@ -1440,13 +1922,11 @@ void s_outline(char*name, char*format, char*source) shape = swf_ShapeDrawerToShape(&draw); bounds = swf_ShapeDrawerGetBBox(&draw); draw.dealloc(&draw); - + outline = (outline_t*)rfx_calloc(sizeof(outline_t)); outline->shape = shape; outline->bbox = bounds; - - if(dictionary_lookup(&outlines, name)) - syntaxerror("outline %s defined twice", name); + dictionary_put2(&outlines, name, outline); } @@ -1480,25 +1960,25 @@ void s_includeswf(char*name, char*filename) int level = 0; U16 cutout[] = {ST_SETBACKGROUNDCOLOR, ST_PROTECT, ST_FREEALL, ST_REFLEX}; f = open(filename,O_RDONLY|O_BINARY); - if (f<0) { + if (f<0) { warning("Couldn't open file \"%s\": %s", filename, strerror(errno)); s_box(name, 0, 0, black, 20, 0); return; } - if (swf_ReadSWF(f,&swf)<0) { + if (swf_ReadSWF(f,&swf)<0) { warning("Only SWF files supported in .shape for now. File \"%s\" wasn't SWF.", filename); s_box(name, 0, 0, black, 20, 0); return; } close(f); - /* FIXME: The following sets the bounding Box for the character. + /* FIXME: The following sets the bounding Box for the character. It is wrong for two reasons: a) It may be too small (in case objects in the movie clip at the borders) b) it may be too big (because the poor movie never got autocropped) */ r = swf.movieSize; - + s = tag = swf_InsertTag(tag, ST_DEFINESPRITE); swf_SetU16(tag, id); swf_SetU16(tag, swf.frameCount); @@ -1524,7 +2004,7 @@ void s_includeswf(char*name, char*filename) if(ftag->id != ST_SETBACKGROUNDCOLOR) { /* We simply dump all tags right after the sprite header, relying on the fact that swf_OptimizeTagOrder() will - sort things out for us later. + sort things out for us later. We also rely on the fact that the imported SWF is well-formed. */ tag = swf_InsertTag(tag, ftag->id); @@ -1557,11 +2037,15 @@ SRECT s_getInstanceBBox(char*name) if(!c) syntaxerror("internal error(5)"); return c->size; } -parameters_t s_getParameters(char*name) +void s_getParameters(char*name, parameters_t* p) { instance_t * i = dictionary_lookup(&instances, name); - if(!i) syntaxerror("instance '%s' unknown(10)", name); - return i->parameters; + if(!i) + syntaxerror("instance '%s' unknown(10)", name); + if (change_sets_all) + readParameters(i->history, p, currentframe); + else + *p = i->parameters; } void s_startclip(char*instance, char*character, parameters_t p) { @@ -1574,12 +2058,10 @@ void s_startclip(char*instance, char*character, parameters_t p) i = s_addinstance(instance, c, currentdepth); i->parameters = p; m = s_instancepos(i->character->size, &p); - + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); /* TODO: should be ObjectPlaceClip, with clipdepth backpatched */ swf_ObjectPlace(tag, c->id, currentdepth, &m, &p.cxform, instance); - i->lastTag = tag; - i->lastFrame= currentframe; stack[stackpos].tag = tag; stack[stackpos].type = 2; @@ -1600,153 +2082,186 @@ void s_endClip() 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); instance_t* i; MATRIX m; - if(!c) { - syntaxerror("character %s not known (in .put %s=%s)", character, instance, character); - } - + if(!c) + syntaxerror("character %s not known (in .put %s=%s)", character, instance, character); + i = s_addinstance(instance, c, currentdepth); i->parameters = p; m = s_instancepos(i->character->size, &p); - - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectPlace(tag, c->id, currentdepth, &m, &p.cxform, instance); - i->lastTag = tag; - i->lastFrame = currentframe; + + if(p.blendmode || p.filters) + { + if(stack[0].swf->fileVersion < 8) + { + if(p.blendmode) + warning("blendmodes only supported for flash version>=8"); + else + warning("filters only supported for flash version>=8"); + } + tag = swf_InsertTag(tag, ST_PLACEOBJECT3); + } + else + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + setPlacement(tag, c->id, currentdepth, m, instance, &p, 0); + setStartparameters(i, &p, tag); currentdepth++; } -void s_jump(char*instance, parameters_t p) +void recordChanges(history_t* history, parameters_t p, int changeFunction, interpolation_t* inter) { - instance_t* i = dictionary_lookup(&instances, instance); - MATRIX m; - if(!i) { - syntaxerror("instance %s not known", instance); + if (p.set & SF_X) + history_remember(history, "x", currentframe, changeFunction, p.x, inter); + if (p.set & SF_Y) + history_remember(history, "y", currentframe, changeFunction, p.y, inter); + if (p.set & SF_SCALEX) + history_remember(history, "scalex", currentframe, changeFunction, p.scalex, inter); + if (p.set & SF_SCALEY) + history_remember(history, "scaley", currentframe, changeFunction, p.scaley, inter); + if (p.set & SF_CX_R) + { + history_remember(history, "cxform.r0", currentframe, changeFunction, p.cxform.r0, inter); + history_remember(history, "cxform.r1", currentframe, changeFunction, p.cxform.r1, inter); + } + if (p.set & SF_CX_G) + { + history_remember(history, "cxform.g0", currentframe, changeFunction, p.cxform.g0, inter); + history_remember(history, "cxform.g1", currentframe, changeFunction, p.cxform.g1, inter); + } + if (p.set & SF_CX_B) + { + history_remember(history, "cxform.b0", currentframe, changeFunction, p.cxform.b0, inter); + history_remember(history, "cxform.b1", currentframe, changeFunction, p.cxform.b1, inter); } + if (p.set & SF_CX_A) + { + history_remember(history, "cxform.a0", currentframe, changeFunction, p.cxform.a0, inter); + history_remember(history, "cxform.a1", currentframe, changeFunction, p.cxform.a1, inter); + } + if (p.set & SF_ROTATE) + history_remember(history, "rotate", currentframe, changeFunction, p.rotate, inter); + if (p.set & SF_SHEAR) + history_remember(history, "shear", currentframe, changeFunction, p.shear, inter); + if (p.set & SF_PIVOT) + { + history_remember(history, "pivot.x", currentframe, changeFunction, p.pivot.x, inter); + history_remember(history, "pivot.y", currentframe, changeFunction, p.pivot.y, inter); + } + if (p.set & SF_PIN) + { + history_remember(history, "pin.x", currentframe, changeFunction, p.pin.x, inter); + history_remember(history, "pin.y", currentframe, changeFunction, p.pin.y, inter); + } + if (p.set & SF_BLEND) + history_remember(history, "blendmode", currentframe, changeFunction, p.blendmode, inter); + if (p.set & SF_FILTER) + history_rememberFilter(history, currentframe, changeFunction, p.filters, inter); +} - i->parameters = p; - m = s_instancepos(i->character->size, &p); +void s_jump(char* instance, parameters_t p) +{ + instance_t* i = dictionary_lookup(&instances, instance); + if(!i) + syntaxerror("instance %s not known", instance); + recordChanges(i->history, p, CF_JUMP, 0); +} - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectMove(tag, i->depth, &m, &p.cxform); - i->lastTag = tag; - i->lastFrame = currentframe; +void s_change(char*instance, parameters_t p, interpolation_t* inter) +{ + instance_t* i = dictionary_lookup(&instances, instance); + if(!i) + syntaxerror("instance %s not known", instance); + recordChanges(i->history, p, CF_CHANGE, inter); } -parameters_t s_interpolate(parameters_t*p1, parameters_t*p2, int pos, int num) +void s_sweep(char* instance, parameters_t p, float radius, int clockwise, int short_arc, interpolation_t* inter) { - parameters_t p; - float ratio; - if(num==0 || num==1) - return *p1; - ratio = (float)pos/(float)num; - - p.x = (p2->x-p1->x)*ratio + p1->x; - p.y = (p2->y-p1->y)*ratio + p1->y; - p.scalex = (p2->scalex-p1->scalex)*ratio + p1->scalex; - p.scaley = (p2->scaley-p1->scaley)*ratio + p1->scaley; - p.rotate = (p2->rotate-p1->rotate)*ratio + p1->rotate; - p.shear = (p2->shear-p1->shear)*ratio + p1->shear; - - p.cxform.r0 = ((float)p2->cxform.r0-(float)p1->cxform.r0)*ratio + p1->cxform.r0; - p.cxform.g0 = ((float)p2->cxform.g0-(float)p1->cxform.g0)*ratio + p1->cxform.g0; - p.cxform.b0 = ((float)p2->cxform.b0-(float)p1->cxform.b0)*ratio + p1->cxform.b0; - p.cxform.a0 = ((float)p2->cxform.a0-(float)p1->cxform.a0)*ratio + p1->cxform.a0; - - p.cxform.r1 = (p2->cxform.r1-p1->cxform.r1)*ratio + p1->cxform.r1; - p.cxform.g1 = (p2->cxform.g1-p1->cxform.g1)*ratio + p1->cxform.g1; - p.cxform.b1 = (p2->cxform.b1-p1->cxform.b1)*ratio + p1->cxform.b1; - p.cxform.a1 = (p2->cxform.a1-p1->cxform.a1)*ratio + p1->cxform.a1; - - p.pivot.x = (p2->pivot.x-p1->pivot.x)*ratio + p1->pivot.x; - p.pivot.y = (p2->pivot.y-p1->pivot.y)*ratio + p1->pivot.y; - p.pin.x = (p2->pin.x-p1->pin.x)*ratio + p1->pin.x; - p.pin.y = (p2->pin.y-p1->pin.y)*ratio + p1->pin.y; - return p; + instance_t* i = dictionary_lookup(&instances, instance); + if(!i) + syntaxerror("instance %s not known", instance); + history_rememberSweep(i->history, currentframe, p.x, p.y, radius, clockwise, short_arc, inter); } -void s_change(char*instance, parameters_t p2) +void s_toggle(char* instance, U16 flagsOn, U16 flagsOff) { instance_t* i = dictionary_lookup(&instances, instance); - MATRIX m; - parameters_t p1; - TAG*t; - int frame, allframes; - if(!i) { - syntaxerror("instance %s not known", instance); - } - p1 = i->parameters; - - allframes = currentframe - i->lastFrame - 1; - if(allframes < 0) { - warning(".change ignored. can only .put/.change an object once per frame."); - return; - } - - m = s_instancepos(i->character->size, &p2); - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectMove(tag, i->depth, &m, &p2.cxform); - i->parameters = p2; - - /* o.k., we got the start and end point set. Now iterate though all the - tags in between, inserting object changes after each new frame */ - t = i->lastTag; - i->lastTag = tag; - if(!t) syntaxerror("internal error(6)"); - frame = 0; - while(frame < allframes) { - if(t->id == ST_SHOWFRAME) { - parameters_t p; - MATRIX m; - TAG*lt; - frame ++; - p = s_interpolate(&p1, &p2, frame, allframes); - m = s_instancepos(i->character->size, &p); //needed? - lt = swf_InsertTag(t, ST_PLACEOBJECT2); - i->lastFrame = currentframe; - swf_ObjectMove(lt, i->depth, &m, &p.cxform); - t = lt; - if(frame == allframes) - break; - } - t = t->next; - if(!t) - syntaxerror("internal error(8) (frame=%d/%d)", frame, allframes); - } + if (!i) + syntaxerror("instance %s not known", instance); + U16 flags = (U16)history_value(i->history, currentframe, "flags"); + flags |= flagsOn; + flags &= flagsOff; + history_remember(i->history, "flags", currentframe, CF_JUMP, flags, 0); } void s_delinstance(char*instance) { instance_t* i = dictionary_lookup(&instances, instance); - if(!i) { - syntaxerror("instance %s not known", instance); - } + if(!i) + syntaxerror("instance %s not known", instance); + writeInstance(i); tag = swf_InsertTag(tag, ST_REMOVEOBJECT2); swf_SetU16(tag, i->depth); dictionary_del(&instances, instance); } -void s_qchange(char*instance, parameters_t p) +void s_schange(char*instance, parameters_t p, interpolation_t* inter) { + instance_t* i = dictionary_lookup(&instances, instance); + if(!i) + syntaxerror("instance %s not known", instance); + recordChanges(i->history, p, CF_SCHANGE, inter); } void s_end() { if(!stackpos) syntaxerror(".end unexpected"); - if(stack[stackpos-1].type == 0) - s_endSWF(); - else if(stack[stackpos-1].type == 1) - s_endSprite(); - else if(stack[stackpos-1].type == 2) - s_endClip(); - else if(stack[stackpos-1].type == 3) - s_endButton(); - else syntaxerror("internal error 1"); + switch (stack[stackpos-1].type) + { + case 0: + s_endSWF(); + break; + case 1: + s_endSprite(); + break; + case 2: + s_endClip(); + break; + case 3: + s_endButton(); + break; + default: + syntaxerror("internal error 1"); + } } // ------------------------------------------------------------------------ @@ -1755,7 +2270,7 @@ typedef int command_func_t(map_t*args); SRECT parseBox(char*str) { - SRECT r; + SRECT r = {0,0,0,0}; float xmin, xmax, ymin, ymax; char*x = strchr(str, 'x'); char*d1=0,*d2=0; @@ -1830,12 +2345,17 @@ int parseTwip(char*str) char*s; *dot++ = 0; for(s=str;s'9') - syntaxerror("Not a coordinate: \"%s\"", str); - for(s=dot;*s;s++) { - if(*s<'0' || *s>'9') - syntaxerror("Not a coordinate: \"%s\"", str); - } + if(*s<'0' || *s>'9') + { + free(old); + syntaxerror("Not a coordinate: \"%s\"", str); + } + for(s=dot;*s;s++) + if(*s<'0' || *s>'9') + { + free(old); + syntaxerror("Not a coordinate: \"%s\"", str); + } if(l>2 || (l==2 && (dot[1]!='0' && dot[1]!='5'))) { dot[1] = ((dot[1]-0x30)/5)*5 + 0x30; dot[2] = 0; @@ -1853,6 +2373,26 @@ int parseTwip(char*str) return 0; } +int parseArc(char* str) +{ + if (!strcmp(str, "short")) + return 1; + if (!strcmp(str, "long")) + return 0; + syntaxerror("invalid value for the arc parameter: %s", str); + return 1; +} + +int parseDir(char* str) +{ + if (!strcmp(str, "clockwise")) + return 1; + if (!strcmp(str, "counterclockwise")) + return 0; + syntaxerror("invalid value for the dir parameter: %s", str); + return 1; +} + int isPoint(char*str) { if(strchr(str, '(')) @@ -1906,12 +2446,18 @@ int parseColor2(char*str, RGBA*color) color->r = r; color->g = g; color->b = b; color->a = a; return 1; } + int len=strlen(str); + U8 alpha = 255; + if(strchr(str, '/')) { + len = strchr(str, '/')-str; + sscanf(str+len+1,"%02x", &alpha); + } for(t=0;tr = r; color->g = g; color->b = b; color->a = a; return 1; } @@ -2026,15 +2572,16 @@ static char* lu(map_t* args, char*name) return value; } -static int c_flash(map_t*args) +static int c_flash(map_t*args) { char* filename = map_lookup(args, "filename"); char* compressstr = lu(args, "compress"); + char* change_modestr = lu(args, "change-sets-all"); SRECT bbox = parseBox(lu(args, "bbox")); int version = parseInt(lu(args, "version")); int fps = (int)(parseFloat(lu(args, "fps"))*256); - int compress = 0; RGBA color = parseColor(lu(args, "background")); + int compress = 0; if(!filename || !*filename) { /* for compatibility */ @@ -2049,15 +2596,21 @@ static int c_flash(map_t*args) if(!filename || override_outputname) filename = outputname; - + if(!strcmp(compressstr, "default")) - compress = version==6; + compress = version>=6; else if(!strcmp(compressstr, "yes") || !strcmp(compressstr, "compress")) compress = 1; else if(!strcmp(compressstr, "no")) compress = 0; else syntaxerror("value \"%s\" not supported for the compress argument", compressstr); + if(!strcmp(change_modestr, "yes")) + change_sets_all = 1; + else + if(strcmp(change_modestr, "no")) + syntaxerror("value \"%s\" not supported for the change-sets-all argument", change_modestr); + s_swf(filename, bbox, version, fps, compress, color); return 0; } @@ -2088,26 +2641,105 @@ static dictionary_t points; static mem_t mpoints; int points_initialized = 0; +static int c_interpolation(map_t *args) +{ + int i; + char* name = lu(args, "name"); + if (dictionary_lookup(&interpolations, name)) + syntaxerror("interpolation %s defined twice", name); + + interpolation_t* inter = (interpolation_t*)malloc(sizeof(interpolation_t)); + char* functionstr = lu(args, "function"); + inter->function = 0; + for (i = 0; i < sizeof(interpolationFunctions) / sizeof(interpolationFunctions[0]); i++) + if (!strcmp(functionstr,interpolationFunctions[i])) + { + inter->function = i + 1; + break; + } + if (!inter->function) + syntaxerror("unkown interpolation function %s", functionstr); + inter->speed = parseFloat(lu(args, "speed")); + inter->amplitude = parseTwip(lu(args, "amplitude")); + inter->growth = parseFloat(lu(args, "growth")); + inter->bounces = parseInt(lu(args, "bounces")); + inter->damping = parseFloat(lu(args, "damping")); + inter->slope = parseFloat(lu(args, "slope")); + + dictionary_put2(&interpolations, name, inter); + return 0; +} + SPOINT getPoint(SRECT r, char*name) { 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; + 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]; } -static int texture2(char*name, char*object, map_t*args, int errors) + +static int texture2(char*name, char*object, map_t*args, int errors) { SPOINT pos,size; char*xstr = map_lookup(args, "x"); @@ -2169,14 +2801,14 @@ static int texture2(char*name, char*object, map_t*args, int errors) return 0; } -static int c_texture(map_t*args) +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) +static int c_gradient(map_t*args) { char*name = lu(args, "name"); int radial= strcmp(lu(args, "radial"), "radial")?0:1; @@ -2184,7 +2816,10 @@ static int c_gradient(map_t*args) readToken(); if(type != RAWDATA) - syntaxerror("colon (:) expected"); + syntaxerror("colon (:) expected"); + + if(dictionary_lookup(&gradients, name)) + syntaxerror("gradient %s defined twice", name); s_gradient(name, text, radial, rotate); @@ -2196,7 +2831,126 @@ static int c_gradient(map_t*args) texture2(name, name, args, 0); return 0; } -static int c_point(map_t*args) + +static char* checkFiltername(map_t* args) +{ + char* name = lu(args, "name"); + if (strchr(name, ',')) + syntaxerror("the comma (,) is used to separate filters in filterlists. Please do not use in filternames."); + return name; +} + +static int c_blur(map_t*args) +{ + char*name = checkFiltername(args); + char*blurstr = lu(args, "blur"); + char*blurxstr = lu(args, "blurx"); + char*blurystr = lu(args, "blury"); + float blurx=1.0, blury=1.0; + if(blurstr[0]) { + blurx = parseFloat(blurstr); + blury = parseFloat(blurstr); + } + if(blurxstr[0]) + blurx = parseFloat(blurxstr); + if(blurystr[0]) + blury = parseFloat(blurystr); + int passes = parseInt(lu(args, "passes")); + s_blur(name, blurx, blury, passes); + return 0; +} + +static int c_gradientglow(map_t*args) +{ + char*name = checkFiltername(args); + char*gradient = lu(args, "gradient"); + char*blurstr = lu(args, "blur"); + char*blurxstr = lu(args, "blurx"); + char*blurystr = lu(args, "blury"); + float blurx=1.0, blury=1.0; + if(blurstr[0]) { + blurx = parseFloat(blurstr); + blury = parseFloat(blurstr); + } + if(blurxstr[0]) + blurx = parseFloat(blurxstr); + if(blurystr[0]) + blury = parseFloat(blurystr); + + float angle = parseFloat(lu(args, "angle")) / 180 * M_PI; + float distance = parseFloat(lu(args, "distance")); + float strength = parseFloat(lu(args, "strength")); + char innershadow = strcmp(lu(args, "innershadow"),"innershadow")?0:1; + char knockout = strcmp(lu(args, "knockout"),"knockout")?0:1; + char composite = strcmp(lu(args, "composite"),"composite")?0:1; + char ontop = strcmp(lu(args, "ontop"),"ontop")?0:1; + int passes = parseInt(lu(args, "passes")); + + s_gradientglow(name, gradient, blurx, blury, angle, distance, strength, innershadow, knockout, composite, ontop, passes); + return 0; +} + +static int c_dropshadow(map_t*args) +{ + char*name = checkFiltername(args); + RGBA color = parseColor(lu(args, "color")); + char*blurstr = lu(args, "blur"); + char*blurxstr = lu(args, "blurx"); + char*blurystr = lu(args, "blury"); + float blurx=1.0, blury=1.0; + if(blurstr[0]) { + blurx = parseFloat(blurstr); + blury = parseFloat(blurstr); + } + if(blurxstr[0]) + blurx = parseFloat(blurxstr); + if(blurystr[0]) + blury = parseFloat(blurystr); + + float angle = parseFloat(lu(args, "angle")) / 180 * M_PI; + float distance = parseFloat(lu(args, "distance")); + float strength = parseFloat(lu(args, "strength")); + char innershadow = strcmp(lu(args, "innershadow"),"innershadow")?0:1; + char knockout = strcmp(lu(args, "knockout"),"knockout")?0:1; + char composite = strcmp(lu(args, "composite"),"composite")?0:1; + int passes = parseInt(lu(args, "passes")); + + s_dropshadow(name, color, blurx, blury, angle, distance, strength, innershadow, knockout, composite, passes); + return 0; +} + +static int c_bevel(map_t*args) +{ + char*name = checkFiltername(args); + RGBA shadow = parseColor(lu(args, "shadow")); + RGBA highlight = parseColor(lu(args, "highlight")); + char*blurstr = lu(args, "blur"); + char*blurxstr = lu(args, "blurx"); + char*blurystr = lu(args, "blury"); + float blurx=1.0, blury=1.0; + if(blurstr[0]) { + blurx = parseFloat(blurstr); + blury = parseFloat(blurstr); + } + if(blurxstr[0]) + blurx = parseFloat(blurxstr); + if(blurystr[0]) + blury = parseFloat(blurystr); + + float angle = parseFloat(lu(args, "angle")) / 180 * M_PI; + float distance = parseFloat(lu(args, "distance")); + float strength = parseFloat(lu(args, "strength")); + char innershadow = strcmp(lu(args, "innershadow"),"innershadow")?0:1; + char knockout = strcmp(lu(args, "knockout"),"knockout")?0:1; + char composite = strcmp(lu(args, "composite"),"composite")?0:1; + char ontop = strcmp(lu(args, "ontop"),"ontop")?0:1; + int passes = parseInt(lu(args, "passes")); + + s_bevel(name, shadow, highlight, blurx, blury, angle, distance, strength, innershadow, knockout, composite, ontop, passes); + return 0; +} + +static int c_point(map_t*args) { char*name = lu(args, "name"); int pos; @@ -2215,7 +2969,7 @@ static int c_point(map_t*args) dictionary_put(&points, s1, (void*)pos); return 0; } -static int c_play(map_t*args) +static int c_play(map_t*args) { char*name = lu(args, "name"); char*loop = lu(args, "loop"); @@ -2234,20 +2988,19 @@ static int c_play(map_t*args) return 0; } -static int c_stop(map_t*args) +static int c_stop(map_t*args) { char*name = map_lookup(args, "name"); - if(s_playsound(name, 0,0,1)) { - return 0; - } else if(s_swf3action(name, "stop")) { - return 0; - } + if(s_playsound(name, 0,0,1)) + return 0; + else if(s_swf3action(name, "stop")) + return 0; syntaxerror("I don't know anything about sound/movie \"%s\"", name); - return 0; + return 0; } -static int c_nextframe(map_t*args) +static int c_nextframe(map_t*args) { char*name = lu(args, "name"); @@ -2258,7 +3011,7 @@ static int c_nextframe(map_t*args) return 0; } -static int c_previousframe(map_t*args) +static int c_previousframe(map_t*args) { char*name = lu(args, "name"); @@ -2269,9 +3022,99 @@ static int c_previousframe(map_t*args) return 0; } +static int c_movement(map_t*args, int type) +{ + char*instance = lu(args, "name"); + + char* xstr=""; + char* ystr=""; + SRECT oldbbox; + parameters_t p; + U16 set = 0x0000; + + xstr = lu(args, "x"); + ystr = lu(args, "y"); + + s_getParameters(instance, &p); + + /* x,y position */ + if(xstr[0]) + { + if(isRelative(xstr)) + { + if(type == PT_PUT || type == PT_STARTCLIP) + syntaxerror("relative x values not allowed for initial put or startclip"); + p.x += parseTwip(getOffset(xstr))*getSign(xstr); + } + else + { + p.x = parseTwip(xstr); + } + set = set | SF_X; + } + if(ystr[0]) + { + if(isRelative(ystr)) + { + if(type == PT_PUT || type == PT_STARTCLIP) + syntaxerror("relative y values not allowed for initial put or startclip"); + p.y += parseTwip(getOffset(ystr))*getSign(ystr); + } + else + { + p.y = parseTwip(ystr); + } + set = set | SF_Y; + } + + if (change_sets_all) + set = SF_ALL; + p.set = set; + + switch (type) + { + case PT_MOVE: + { + char* interstr = lu(args, "interpolation"); + interpolation_t* inter = (interpolation_t*)dictionary_lookup(&interpolations, interstr); + if (!inter) + syntaxerror("unkown interpolation %s", interstr); + s_change(instance, p, inter); + } + break; + case PT_SMOVE: + { + char* interstr = lu(args, "interpolation"); + interpolation_t* inter = (interpolation_t*)dictionary_lookup(&interpolations, interstr); + if (!inter) + syntaxerror("unkown interpolation %s", interstr); + s_schange(instance, p, inter); + } + break; + case PT_SWEEP: + { + char* rstr = lu(args, "r"); + int radius = parseTwip(rstr); + if (radius <= 0) + syntaxerror("sweep not possible: radius must be greater than 0."); + char* dirstr = lu(args, "dir"); + int clockwise = parseDir(dirstr); + char* arcstr = lu(args, "arc"); + int short_arc = parseArc(arcstr); + char* interstr = lu(args, "interpolation"); + interpolation_t* inter = (interpolation_t*)dictionary_lookup(&interpolations, interstr); + if (!inter) + syntaxerror("unkown interpolation %s", interstr); + s_sweep(instance, p, radius, clockwise, short_arc, inter); + } + break; + } + return 0; +} + static int c_placement(map_t*args, int type) { - char*instance = lu(args, (type==0||type==4)?"instance":"name"); + char*instance = lu(args, (type==PT_PUT||type==PT_STARTCLIP)?"instance":"name"); char*character = 0; char* luminancestr = lu(args, "luminance"); @@ -2290,235 +3133,368 @@ static int c_placement(map_t*args, int type) char* astr = lu(args, "alpha"); char* pinstr = lu(args, "pin"); char* as = map_lookup(args, "as"); + char* blendmode = lu(args, "blend"); + char* filterstr = lu(args, "filter"); + U8 blend; MULADD r,g,b,a; float oldwidth; float oldheight; SRECT oldbbox; MULADD luminance; parameters_t p; + U16 set = 0x0000; - if(type==9) { // (?) .rotate or .arcchange - pivotstr = lu(args, "pivot"); - anglestr = lu(args, "angle"); - } else { - xstr = lu(args, "x"); - ystr = lu(args, "y"); + if(type==9) + { // (?) .rotate or .arcchange + pivotstr = lu(args, "pivot"); + anglestr = lu(args, "angle"); } + else + { + xstr = lu(args, "x"); + ystr = lu(args, "y"); + } + if(luminancestr[0]) - luminance = parseMulAdd(luminancestr); - else { - luminance.add = 0; - luminance.mul = 256; + luminance = parseMulAdd(luminancestr); + else + { + luminance.add = 0; + luminance.mul = 256; } - if(scalestr[0]) { - if(scalexstr[0]||scaleystr[0]) - syntaxerror("scalex/scaley and scale cannot both be set"); - scalexstr = scaleystr = scalestr; + if(scalestr[0]) + { + if(scalexstr[0]||scaleystr[0]) + syntaxerror("scalex/scaley and scale cannot both be set"); + scalexstr = scaleystr = scalestr; } - - if(type == 0 || type == 4) { + + if(type == PT_PUT || type == PT_STARTCLIP) { // put or startclip character = lu(args, "character"); parameters_clear(&p); - } else if (type == 5) { + } else if (type == PT_BUTTON) { character = lu(args, "name"); parameters_clear(&p); // button's show } else { - p = s_getParameters(instance); + s_getParameters(instance, &p); } /* x,y position */ - if(xstr[0]) { - if(isRelative(xstr)) { - if(type == 0 || type == 4) - syntaxerror("relative x values not allowed for initial put or startclip"); - p.x += parseTwip(getOffset(xstr))*getSign(xstr); - } else { - p.x = parseTwip(xstr); - } - } - if(ystr[0]) { - if(isRelative(ystr)) { - if(type == 0 || type == 4) - syntaxerror("relative y values not allowed for initial put or startclip"); - p.y += parseTwip(getOffset(ystr))*getSign(ystr); - } else { - p.y = parseTwip(ystr); + if(xstr[0]) + { + if(isRelative(xstr)) + { + if(type == PT_PUT || type == PT_STARTCLIP) + syntaxerror("relative x values not allowed for initial put or startclip"); + p.x += parseTwip(getOffset(xstr))*getSign(xstr); + } + else + { + p.x = parseTwip(xstr); + } + set = set | SF_X; + } + if(ystr[0]) + { + if(isRelative(ystr)) + { + if(type == PT_PUT || type == PT_STARTCLIP) + syntaxerror("relative y values not allowed for initial put or startclip"); + p.y += parseTwip(getOffset(ystr))*getSign(ystr); + } + else + { + p.y = parseTwip(ystr); + } + set = set | SF_Y; } - } /* scale, scalex, scaley */ - if(character) { - oldbbox = s_getCharBBox(character); - } else { - oldbbox = s_getInstanceBBox(instance); - } + if(character) + oldbbox = s_getCharBBox(character); + else + oldbbox = s_getInstanceBBox(instance); oldwidth = oldbbox.xmax - oldbbox.xmin; oldheight = oldbbox.ymax - oldbbox.ymin; - if(scalexstr[0]) { - if(oldwidth==0) p.scalex = 1.0; - else { - if(scalexstr[0]) - p.scalex = (float)(parseNewSize(scalexstr, oldwidth))/oldwidth; - } - } - if(scaleystr[0]) { - if(oldheight==0) p.scaley = 1.0; - else { - if(scaleystr[0]) - p.scaley = (float)(parseNewSize(scaleystr, oldheight))/oldheight; - } - } - + if(scalexstr[0]) + { + if(oldwidth==0) + p.scalex = 1.0; + else + if(scalexstr[0]) + p.scalex = (float)(parseNewSize(scalexstr, oldwidth))/oldwidth; + set = set | SF_SCALEX; + } + if(scaleystr[0]) + { + if(oldheight==0) + p.scaley = 1.0; + else + if(scaleystr[0]) + p.scaley = (float)(parseNewSize(scaleystr, oldheight))/oldheight; + set = set | SF_SCALEY; + } + /* rotation */ - if(rotatestr[0]) { - if(isRelative(rotatestr)) { - p.rotate += parseFloat(getOffset(rotatestr))*getSign(rotatestr); - } else { - p.rotate = parseFloat(rotatestr); + if(rotatestr[0]) + { + if(isRelative(rotatestr)) + p.rotate += parseFloat(getOffset(rotatestr))*getSign(rotatestr); + else + p.rotate = parseFloat(rotatestr); + set = set | SF_ROTATE; } - } /* shearing */ - if(shearstr[0]) { - if(isRelative(shearstr)) { - p.shear += parseFloat(getOffset(shearstr))*getSign(shearstr); - } else { - p.shear = parseFloat(shearstr); - } + if(shearstr[0]) + { + if(isRelative(shearstr)) + p.shear += parseFloat(getOffset(shearstr))*getSign(shearstr); + else + p.shear = parseFloat(shearstr); + set = set | SF_SHEAR; } - if(pivotstr[0]) { - if(isPoint(pivotstr)) - p.pivot = parsePoint(pivotstr); - else - p.pivot = getPoint(oldbbox, pivotstr); + if(pivotstr[0]) + { + if(isPoint(pivotstr)) + p.pivot = parsePoint(pivotstr); + else + p.pivot = getPoint(oldbbox, pivotstr); + set = set | SF_PIVOT; } - if(pinstr[0]) { - if(isPoint(pinstr)) - p.pin = parsePoint(pinstr); - else - p.pin = getPoint(oldbbox, pinstr); + + if(pinstr[0]) + { + if(isPoint(pinstr)) + p.pin = parsePoint(pinstr); + else + p.pin = getPoint(oldbbox, pinstr); + set = set | SF_PIN; } - + /* color transform */ - if(rstr[0] || luminancestr[0]) { - MULADD r; - if(rstr[0]) - r = parseMulAdd(rstr); - else { - r.add = p.cxform.r0; - r.mul = p.cxform.r1; - } - r = mergeMulAdd(r, luminance); - p.cxform.r0 = r.mul;p.cxform.r1 = r.add; - } - if(gstr[0] || luminancestr[0]) { - MULADD g; - if(gstr[0]) - g = parseMulAdd(gstr); - else { - g.add = p.cxform.g0; - g.mul = p.cxform.g1; - } - g = mergeMulAdd(g, luminance); - p.cxform.g0 = g.mul;p.cxform.g1 = g.add; - } - if(bstr[0] || luminancestr[0]) { - MULADD b; - if(bstr[0]) - b = parseMulAdd(bstr); - else { - b.add = p.cxform.b0; - b.mul = p.cxform.b1; + if(rstr[0] || luminancestr[0]) + { + MULADD r; + if(rstr[0]) + r = parseMulAdd(rstr); + else + { + r.add = p.cxform.r0; + r.mul = p.cxform.r1; + } + r = mergeMulAdd(r, luminance); + p.cxform.r0 = r.mul; + p.cxform.r1 = r.add; + set = set | SF_CX_R; } - b = mergeMulAdd(b, luminance); - p.cxform.b0 = b.mul;p.cxform.b1 = b.add; - } - if(astr[0]) { - MULADD a = parseMulAdd(astr); - p.cxform.a0 = a.mul;p.cxform.a1 = a.add; - } - - if(type == 0) - s_put(instance, character, p); - else if(type == 1) - s_change(instance, p); - else if(type == 2) - s_qchange(instance, p); - else if(type == 3) - s_jump(instance, p); - else if(type == 4) - s_startclip(instance, character, p); - else if(type == 5) { - if(as && as[0]) { - s_buttonput(character, as, p); - } else { - s_buttonput(character, "shape", p); + if(gstr[0] || luminancestr[0]) + { + MULADD g; + if(gstr[0]) + g = parseMulAdd(gstr); + else + { + g.add = p.cxform.g0; + g.mul = p.cxform.g1; + } + g = mergeMulAdd(g, luminance); + p.cxform.g0 = g.mul; + p.cxform.g1 = g.add; + set = set | SF_CX_G; + } + if(bstr[0] || luminancestr[0]) + { + MULADD b; + if(bstr[0]) + b = parseMulAdd(bstr); + else + { + b.add = p.cxform.b0; + b.mul = p.cxform.b1; + } + b = mergeMulAdd(b, luminance); + p.cxform.b0 = b.mul; + p.cxform.b1 = b.add; + set = set | SF_CX_B; + } + if(astr[0]) + { + MULADD a = parseMulAdd(astr); + p.cxform.a0 = a.mul; + p.cxform.a1 = a.add; + set = set | SF_CX_A; + } + + if(blendmode[0]) + { + int t; + blend = 255; + for(t = 0; blendModeNames[t]; t++) + { + if(!strcmp(blendModeNames[t], blendmode)) + { + blend = t; + break; + } + } + if(blend == 255) + { + syntaxerror("unknown blend mode: '%s'", blendmode); + } + p.blendmode = blend; + set = set | SF_BLEND; } + + if(filterstr[0]) + { + p.filters = parseFilters(filterstr); + set = set | SF_FILTER; } + + if (type == PT_CHANGE && set & (SF_X | SF_Y)) + warning("As of version 0.8.2 using the .change command to modify an \ +object's position on the stage is considered deprecated. Future \ +versions may consider x and y parameters for the .change command \ +to be illegal; please use the .move command."); + + if (change_sets_all) + set = SF_ALL; + p.set = set; + + switch (type) + { + case PT_PUT: + s_put(instance, character, p); + break; + case PT_CHANGE: + { + char* interstr = lu(args, "interpolation"); + interpolation_t* inter = (interpolation_t*)dictionary_lookup(&interpolations, interstr); + if (!inter) + syntaxerror("unkown interpolation %s", interstr); + s_change(instance, p, inter); + } + break; + case PT_SCHANGE: + { + char* interstr = lu(args, "interpolation"); + interpolation_t* inter = (interpolation_t*)dictionary_lookup(&interpolations, interstr); + if (!inter) + syntaxerror("unkown interpolation %s", interstr); + s_schange(instance, p, inter); + } + break; + case PT_JUMP: + s_jump(instance, p); + break; + case PT_STARTCLIP: + s_startclip(instance, character, p); + break; + case PT_BUTTON: + if(as && as[0]) + s_buttonput(character, as, p); + else + s_buttonput(character, "shape", p); + break; +// default: + } return 0; } -static int c_put(map_t*args) +static int c_put(map_t*args) { - c_placement(args, 0); + c_placement(args, PT_PUT); + return 0; +} +static int c_change(map_t*args) +{ + if (currentframe == 0) + warning("change commands in frame 1 will be ignored, please use the put command to set object parameters"); + c_placement(args, PT_CHANGE); + return 0; +} +static int c_schange(map_t*args) +{ + c_placement(args, PT_SCHANGE); return 0; } -static int c_change(map_t*args) +static int c_move(map_t* args) { - c_placement(args, 1); + c_movement(args, PT_MOVE); return 0; } -static int c_qchange(map_t*args) +static int c_smove(map_t* args) { - c_placement(args, 2); + c_movement(args, PT_SMOVE); return 0; } -static int c_arcchange(map_t*args) +static int c_sweep(map_t* args) { - c_placement(args, 2); + c_movement(args, PT_SWEEP); return 0; } -static int c_jump(map_t*args) +static int c_arcchange(map_t*args) { - c_placement(args, 3); + c_placement(args, 0); + return 0; +} +static int c_jump(map_t*args) +{ + c_placement(args, PT_JUMP); + return 0; +} +static int c_startclip(map_t*args) +{ + c_placement(args, PT_STARTCLIP); return 0; } -static int c_startclip(map_t*args) +static int c_show(map_t*args) { - c_placement(args, 4); + c_placement(args, PT_BUTTON); return 0; } -static int c_show(map_t*args) +static int c_toggle(map_t* args) { - c_placement(args, 5); + char*instance = lu(args, "name"); + U16 flagsOn = 0x0000, flagsOff = 0xffff; + char* alignstr = lu(args, "fixed_alignment"); + if (!strcmp(alignstr, "on")) + flagsOn += IF_FIXED_ALIGNMENT; + else + if (!strcmp(alignstr, "off")) + flagsOff -= IF_FIXED_ALIGNMENT; + else + syntaxerror("values for toggle must be \"on\" or \"off\". %s is not legal.", alignstr); + s_toggle(instance, flagsOn, flagsOff); return 0; } -static int c_del(map_t*args) +static int c_del(map_t*args) { char*instance = lu(args, "name"); s_delinstance(instance); return 0; } -static int c_end(map_t*args) +static int c_end(map_t*args) { s_end(); return 0; } -static int c_sprite(map_t*args) +static int c_sprite(map_t*args) { char* name = lu(args, "name"); s_sprite(name); return 0; } -static int c_frame(map_t*args) +static int c_frame(map_t*args) { char*framestr = lu(args, "n"); char*cutstr = lu(args, "cut"); - + char*name = lu(args, "name"); char*anchor = lu(args, "anchor"); char buf[40]; @@ -2545,7 +3521,7 @@ static int c_frame(map_t*args) s_frame(frame, cut, name, !strcmp(anchor, "anchor")); return 0; } -static int c_primitive(map_t*args) +static int c_primitive(map_t*args) { char*name = lu(args, "name"); char*command = lu(args, "commandname"); @@ -2564,7 +3540,7 @@ static int c_primitive(map_t*args) type = 1; else if(!strcmp(command, "filled")) type = 2; - + if(type==0) { width = parseTwip(lu(args, "width")); height = parseTwip(lu(args, "height")); @@ -2580,14 +3556,14 @@ static int c_primitive(map_t*args) fillstr = 0; if(width<0 || height<0 || linewidth<0 || r<0) syntaxerror("values width, height, line, r must be positive"); - + if(type == 0) s_box(name, width, height, color, linewidth, fillstr); else if(type==1) s_circle(name, r, color, linewidth, fillstr); else if(type==2) s_filled(name, outline, color, linewidth, fillstr); return 0; } -static int c_textshape(map_t*args) +static int c_textshape(map_t*args) { char*name = lu(args, "name"); char*text = lu(args, "text"); @@ -2598,7 +3574,7 @@ static int c_textshape(map_t*args) return 0; } -static int c_swf(map_t*args) +static int c_swf(map_t*args) { char*name = lu(args, "name"); char*filename = lu(args, "filename"); @@ -2609,7 +3585,7 @@ static int c_swf(map_t*args) return 0; } -static int c_font(map_t*args) +static int c_font(map_t*args) { char*name = lu(args, "name"); char*filename = lu(args, "filename"); @@ -2617,7 +3593,7 @@ static int c_font(map_t*args) return 0; } -static int c_sound(map_t*args) +static int c_sound(map_t*args) { char*name = lu(args, "name"); char*filename = lu(args, "filename"); @@ -2625,7 +3601,7 @@ static int c_sound(map_t*args) return 0; } -static int c_text(map_t*args) +static int c_text(map_t*args) { char*name = lu(args, "name"); char*text = lu(args, "text"); @@ -2636,12 +3612,12 @@ static int c_text(map_t*args) return 0; } -static int c_soundtrack(map_t*args) +static int c_soundtrack(map_t*args) { return 0; } -static int c_quicktime(map_t*args) +static int c_quicktime(map_t*args) { char*name = lu(args, "name"); char*url = lu(args, "url"); @@ -2649,7 +3625,7 @@ static int c_quicktime(map_t*args) return 0; } -static int c_image(map_t*args) +static int c_image(map_t*args) { char*command = lu(args, "commandname"); char*name = lu(args, "name"); @@ -2663,7 +3639,7 @@ static int c_image(map_t*args) return 0; } -static int c_outline(map_t*args) +static int c_outline(map_t*args) { char*name = lu(args, "name"); char*format = lu(args, "format"); @@ -2788,7 +3764,7 @@ static int c_on_key(map_t*args) return 1; } } else { - /* TODO: + /* TODO: = 0x200*(x-'a') esc = = 0x3600 space = = 0x4000; @@ -2806,7 +3782,7 @@ static int c_on_key(map_t*args) return 0; } -static int c_edittext(map_t*args) +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 @autosize=0"}, char*name = lu(args, "name"); @@ -2856,7 +3832,7 @@ static char* readfile(const char*filename) FILE*fi = fopen(filename, "rb"); int l; char*text; - if(!fi) + if(!fi) syntaxerror("Couldn't find file %s: %s", filename, strerror(errno)); fseek(fi, 0, SEEK_END); l = ftell(fi); @@ -2868,7 +3844,7 @@ static char* readfile(const char*filename) return text; } -static int c_action(map_t*args) +static int c_action(map_t*args) { char* filename = map_lookup(args, "filename"); if(!filename ||!*filename) { @@ -2880,11 +3856,11 @@ static int c_action(map_t*args) } else { s_action(readfile(filename)); } - + return 0; } -static int c_initaction(map_t*args) +static int c_initaction(map_t*args) { char* character = lu(args, "name"); char* filename = map_lookup(args, "filename"); @@ -2897,7 +3873,7 @@ static int c_initaction(map_t*args) } else { s_initaction(character, readfile(filename)); } - + return 0; } @@ -2906,7 +3882,7 @@ static struct { command_func_t* func; char*arguments; } arguments[] = -{{"flash", c_flash, "bbox=autocrop background=black version=6 fps=50 name= filename= @compress=default"}, +{{"flash", c_flash, "bbox=autocrop background=black version=6 fps=50 name= filename= @compress=default @change-sets-all=no"}, {"frame", c_frame, "n=1 name= @cut=no @anchor=no"}, // "import" type stuff {"swf", c_swf, "name filename"}, @@ -2915,7 +3891,7 @@ static struct { {"png", c_image, "name filename"}, {"movie", c_movie, "name filename"}, {"sound", c_sound, "name filename"}, - {"font", c_font, "name filename"}, + {"font", c_font, "name filename glyphs="}, {"soundtrack", c_soundtrack, "filename"}, {"quicktime", c_quicktime, "url"}, @@ -2923,9 +3899,16 @@ static struct { {"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"}, {"outline", c_outline, "name format=simple"}, {"textshape", c_textshape, "name font size=100% text"}, + // filters + {"blur", c_blur, "name blur= blurx= blury= passes=1"}, + {"gradientglow", c_gradientglow, "name gradient blur= blurx= blury= angle=0.0 distance=0.0 strength=1.0 @innershadow=0 @knockout=0 @composite=0 @ontop=0 passes=1"}, + {"dropshadow", c_dropshadow, "name color blur= blurx= blury= angle=0.0 distance=0.0 strength=1.0 @innershadow=0 @knockout=0 @composite=0 passes=1"}, + {"bevel", c_bevel, "name shadow highlight blur= blurx= blury= angle=0.0 distance=0.0 strength=1.0 @innershadow=0 @knockout=0 @composite=0 @ontop=0 passes=1"}, + // character generators {"box", c_primitive, "name width height color=white line=1 @fill=none"}, {"circle", c_primitive, "name r color=white line=1 @fill=none"}, @@ -2936,13 +3919,13 @@ static struct { {"edittext", c_edittext, "name font= size=100% width height text="" color=white maxlength=0 variable="" @password=0 @wordwrap=0 @multiline=0 @html=0 @noselect=0 @readonly=0 @border=0 @autosize=0 align="}, {"morphshape", c_morphshape, "name start end"}, {"button", c_button, "name"}, - {"show", c_show, "name x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below= as="}, + {"show", c_show, "name x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= blend= filter= pivot= pin= shear= rotate= ratio= above= below= as="}, {"on_press", c_on_press, "position=inside"}, {"on_release", c_on_release, "position=anywhere"}, {"on_move_in", c_on_move_in, "state=not_pressed"}, {"on_move_out", c_on_move_out, "state=not_pressed"}, {"on_key", c_on_key, "key=any"}, - + // control tags {"play", c_play, "name loop=0 @nomultiple=0"}, {"stop", c_stop, "name= "}, @@ -2950,15 +3933,20 @@ static struct { {"previousframe", c_previousframe, "name"}, // object placement tags - {"put", c_put, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, - {"startclip", c_startclip, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, - {"change", c_change, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, - {"arcchange", c_arcchange, "name pivot= angle= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, - {"qchange", c_qchange, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, - {"jump", c_jump, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, + {"put", c_put, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= blend= filter= pivot= pin= shear= rotate= ratio= above= below="}, + {"startclip", c_startclip, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= blend= filter= pivot= pin= shear= rotate= ratio= above= below="}, + {"move", c_move, "name x= y= interpolation=linear"}, + {"smove", c_smove, "name x= y= interpolation=linear"}, + {"sweep", c_sweep, "name x= y= r= dir=counterclockwise arc=short interpolation=linear"}, + {"change", c_change, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= blend= filter= pivot= pin= shear= rotate= ratio= above= below= interpolation=linear"}, + //{"arcchange", c_arcchange, "name pivot= angle= red= green= blue= alpha= luminance= scale= scalex= scaley= blend= filter= pivot= pin= shear= rotate= ratio= above= below="}, + {"schange", c_schange, "name red= green= blue= alpha= luminance= scale= scalex= scaley= blend= filter= pivot= pin= shear= rotate= ratio= above= below= interpolation=linear"}, + {"jump", c_jump, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= blend= filter= pivot= pin= shear= rotate= ratio= above= below="}, {"del", c_del, "name"}, // virtual object placement {"texture", c_texture, " x=0 y=0 width= height= scale= scalex= scaley= r= shear= rotate="}, + // switching + {"toggle", c_toggle, "name fixed_alignment="}, // commands which start a block //startclip (see above) @@ -2974,7 +3962,7 @@ static map_t parseArguments(char*command, char*pattern) { char*x; char*d,*e; - + string_t name[64]; string_t value[64]; int set[64]; @@ -3034,7 +4022,7 @@ static map_t parseArguments(char*command, char*pattern) d=&x[strlen(x)]; set[pos] = 0; - if(!e || d analyse Command: %s (line %d)", command, line); + + for(t=0;t