char merge;
char isframe;
int loglevel;
- int movex;
- int movey;
int sizex;
char hassizex;
int sizey;
char hassizey;
int framerate;
+ int movex;
+ int movey;
float scalex;
float scaley;
+ int mastermovex;
+ int mastermovey;
+ float masterscalex;
+ float masterscaley;
};
struct config_t config;
if(!master_filename) {
master_filename = filename;
master_name = myname;
+ config.mastermovex = config.movex;
+ config.mastermovey = config.movey;
+ config.masterscalex = config.scalex;
+ config.masterscaley = config.scaley;
+ config.movex = config.movey = 0;
+ config.scalex = config.scaley = 1.0;
} else {
logf("<verbose> slave entity %s (named \"%s\")\n", filename, myname);
printf("OR: %s [-rXYov] --cat [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name);
printf("OR: %s [-rXYomlcv] --dummy [-xys] [file]\n", name);
printf("\n");
- printf("-o outputfile --output explicitly specify output file. (otherwise, output.swf will be used\n");
+ printf("-o outputfile --output explicitly specify output file. (otherwise, output.swf will be used)\n");
printf("-t --stack place each slave in a seperate frame (no master movie)\n");
printf("-T --stack1 place each slave in the first frame (no master movie)\n");
printf("-m --merge Don't store the slaves in Sprites/MovieClips\n");
int t;
SRECT box;
int fileversion = 1;
+ int frameRate = 256;
+ RGBA rgb;
+ rgb.r=rgb.b=rgb.g=0;
memset(&box, 0, sizeof(box));
/* scan all slaves for bounding box */
- for(t=0;t<numslaves;t++)
+ for(t=numslaves-1;t>=0;t--)
{
SWF head;
int ret;
int fi=open(slave_filename[t],O_RDONLY);
+ TAG*tag;
if(fi<0 || swf_ReadSWF(fi, &head)<0) {
logf("<fatal> Couldn't open/read %s.", slave_filename[t]);
exit(1);
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
head.movieSize.xmax, head.movieSize.ymax);
+
+ tag = head.firstTag;
+ while(tag) {
+ if(tag->id == ST_SETBACKGROUNDCOLOR && tag->len>=3) {
+ rgb.r = tag->data[0];
+ rgb.g = tag->data[1];
+ rgb.b = tag->data[2];
+ }
+ tag=tag->next;
+ }
+ frameRate = head.frameRate;
if(head.fileVersion > fileversion)
fileversion = head.fileVersion;
if(!t)
}
memset(swf, 0, sizeof(SWF));
+ swf->fileVersion = fileversion;
+ swf->movieSize = box;
+ swf->frameRate = frameRate;
- swf->firstTag = swf_InsertTag(tag, ST_SETBACKGROUNDCOLOR);
+ swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
tag = swf->firstTag;
- swf_SetU8(tag, 0);
- swf_SetU8(tag, 0);
- swf_SetU8(tag, 0);
+ swf_SetRGB(tag, &rgb);
for(t=0;t<numslaves;t++)
{
}
}
tag = swf_InsertTag(tag, ST_END);
+ logf("<verbose> temporary SWF created");
}
static char* slavename = 0;
PUT16(&tag->data[0],GET16(&tag->data[0])+add);
}
-void matrix_adjust(MATRIX*m)
+void matrix_adjust(MATRIX*m, int movex, int movey, float scalex, float scaley)
{
- m->sx = (int)(m->sx*config.scalex);
- m->sy = (int)(m->sy*config.scaley);
- m->r0 = (int)(m->r0*config.scalex);
- m->r1 = (int)(m->r1*config.scaley);
- m->tx += config.movex;
- m->ty += config.movey;
+ m->sx = (int)(m->sx*scalex);
+ m->sy = (int)(m->sy*scaley);
+ m->r0 = (int)(m->r0*scalex);
+ m->r1 = (int)(m->r1*scaley);
+ m->tx += movex;
+ m->ty += movey;
}
-void write_changepos(TAG*output, TAG*tag)
+void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, float scaley)
{
- if(config.movex || config.movey || config.scalex != 1 || config.scaley != 1)
+ if(movex || movey || scalex != 1 || scaley != 1)
{
switch(tag->id)
{
MATRIX m;
U8 flags;
swf_GetMatrix(0, &m);
+ tag->pos = 0;
+ tag->readBit = 0;
flags = swf_GetU8(tag);
swf_SetU8(output, flags|4);
swf_SetU16(output, swf_GetU16(tag)); //id
}
// flags & 4
- swf_GetMatrix(tag, &m);
- matrix_adjust(&m);
+ if(flags&4) {
+ swf_GetMatrix(tag, &m);
+ } else {
+ swf_GetMatrix(0, &m);
+ }
+ matrix_adjust(&m, movex, movey, scalex, scaley);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
swf_SetU16(output, swf_GetU16(tag)); //depth
swf_GetMatrix(tag, &m);
- matrix_adjust(&m);
+ matrix_adjust(&m, movex, movey, scalex, scaley);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
if(config.overlay && !config.isframe) {
tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
swf_SetU8(tag, 2); //flags: character
- swf_SetU16(tag, 0); //depth
+ swf_SetU16(tag, 1); //depth
swf_SetU16(tag, replaceddefine); //id
}
logf("<debug> [sprite main] write tag %02x (%d bytes in body)",
rtag->id, rtag->len);
tag = swf_InsertTag(tag, rtag->id);
- write_changepos(tag, rtag);
-
- changedepth(tag, +1);
+ write_changepos(tag, rtag, config.movex, config.movey, config.scalex, config.scaley);
+
+ changedepth(tag, +2);
if(tag->id == ST_SHOWFRAME)
{
if(frame == slaveframe && !config.overlay)
dontwrite = 1;
case ST_REMOVEOBJECT:
-// case ST_REMOVEOBJECT2:
/* place/removetags for the object we replaced
should be discarded, too, as the object to insert
isn't a sprite
!config.isframe && config.merge)
dontwrite = 1;
break;
+ case ST_REMOVEOBJECT2:
+ break;
}
if(!dontwrite) {
logf("<debug> [master] write tag %02x (%d bytes in body)",
rtag->id, rtag->len);
tag = swf_InsertTag(tag, rtag->id);
- swf_SetBlock(tag, rtag->data, rtag->len);
+ write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley);
}
}
rtag = rtag->next;
logf("<warning> Frame \"%s\" doesn't exist in file. No substitution will occur",
slavename);
}
+ tag = swf_InsertTag(tag, ST_END);
return tag;
}
+void adjustheader(SWF*swf)
+{
+ if(config.framerate)
+ swf->frameRate = config.framerate;
+ if(config.hassizex) {
+ swf->movieSize.xmax =
+ swf->movieSize.xmin + config.sizex;
+ }
+ if(config.hassizey) {
+ swf->movieSize.ymax =
+ swf->movieSize.ymin + config.sizey;
+ }
+}
+
void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
{
char* depths;
logf("<debug> tagid %02x defines object %d", tag->id, defineid);
masterbitmap[defineid] = 1;
}
+ tag = tag->next;
}
swf_Relocate(slave, masterbitmap);
jpeg_assert(master, slave);
memcpy(newswf, master, sizeof(SWF));
- tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX);
+ adjustheader(newswf);
+
+ tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
depths = malloc(65536);
if(!depths) {
}
memset(depths, 0, 65536);
mtag = master->firstTag;
- while(mtag)
+ while(mtag && mtag->id!=ST_END)
{
int num=1;
U16 depth;
}
tag = swf_InsertTag(tag, mtag->id);
swf_SetBlock(tag, mtag->data, mtag->len);
+
+ mtag = mtag->next;
}
for(t=0;t<65536;t++)
free(depths);
stag = slave->firstTag;
- while(stag)
+ while(stag && stag->id!=ST_END)
{
logf("<debug> [slave] write tag %02x (%d bytes in body)",
stag->id, stag->len);
swf_SetBlock(tag, stag->data, stag->len);
stag = stag->next;
}
+ tag = swf_InsertTag(tag, ST_END);
+
+ tag = newswf->firstTag;
+ newswf->firstTag = newswf->firstTag->next; //remove temporary tag
+ swf_DeleteTag(tag);
}
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
int defineid = swf_GetDefineID(tag);
logf("<debug> tagid %02x defines object %d", tag->id, defineid);
masterbitmap[defineid] = 1;
+ if (!slavename && defineid==slaveid) {
+ if(defineid>=0) {
+ spriteid = defineid;
+ logf("<notice> Slave file attached to object %d.", defineid);
+ }
+ }
} else if(tag->id == ST_PLACEOBJECT2) {
char * name = swf_GetName(tag);
int id = swf_GetPlaceID(tag);
else
logf("<verbose> tagid %02x places object %d (no name)", tag->id, id);
- if ((name && slavename && !strcmp(name,slavename)) ||
- (!slavename && id==slaveid)) {
+ if (name && slavename && !strcmp(name,slavename)) {
if(id>=0) {
spriteid = id;
- logf("<notice> Slave file attached to object %d.", id);
+ logf("<notice> Slave file attached to named object %s (%d).", name, id);
}
}
} else if(tag->id == ST_SHOWFRAME) {
// write file
memcpy(newswf, master, sizeof(SWF));
- newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX);
+ adjustheader(newswf);
+
+ newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later
if (config.antistream) {
if (config.merge) {
} else {
if (config.merge)
tag = write_master(tag, master, slave, spriteid, replaceddefine,
- FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESLAVE);
+ FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESLAVE );
else
tag = write_master(tag, master, slave, spriteid, replaceddefine,
- FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESPRITE);
+ FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESPRITE );
}
+
+ tag = newswf->firstTag;
+ newswf->firstTag = newswf->firstTag->next; //remove temporary tag
+ swf_DeleteTag(tag);
}
void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
slaveid = -1;
} else {
/* if id wasn't given as either #number or number,
- the name is a frame label. BTW: The user wouldn't have
+ the name is a frame label. BTW: The user wouldn't necessarily have
needed to supply the -f option in this case */
}
}
logf("<debug> move y (%d)", config.movey);
logf("<debug> scale x (%f)", config.scalex);
logf("<debug> scale y (%f)", config.scaley);
+ logf("<debug> master move x (%d)", config.mastermovex);
+ logf("<debug> master move y (%d)", config.mastermovey);
+ logf("<debug> master scale x (%f)", config.masterscalex);
+ logf("<debug> master scale y (%f)", config.masterscaley);
logf("<debug> is frame (%d)", config.isframe);
memset(masterbitmap, 0, sizeof(masterbitmap));
config.scaley = 1.0;
config.sizex = 0;
config.sizey = 0;
+ config.masterscalex = 1.0;
+ config.masterscaley = 1.0;
+ config.mastermovex = 0;
+ config.mastermovey = 0;
config.hassizex = 0;
config.hassizey = 0;
config.framerate = 0;
}
}
- fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT);
+ fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT, 0777);
if(config.zlib)
swf_WriteSWC(fi, &newswf);
git.asbjorn.biz / swftools.git / blobdiff