nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-14 00:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for unaligned IQM *_ofs fields (#221)

Browse source
This commit is contained in:
Luis Gutierrez 2023-09-11 06:55:05 -07:00 committed by GitHub
parent 25e1db29bf
commit 6a618bb8fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 111 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
iqm/iqm.cpp
View file

@ -4749,7 +4749,7 @@ bool writeiqm(const char *filename)
{ {
vector<iqmextension> extensions; vector<iqmextension> extensions;
stream *f = openfile(filename, "wb"); filestream *f = (filestream *) openfile(filename, "wb");
if(!f) return false; if(!f) return false;
iqmheader hdr; iqmheader hdr;
@ -4788,35 +4788,41 @@ bool writeiqm(const char *filename)
ext_skins_fte->num_data += skinframes.length()*sizeof(iqmext_fte_skin_skinframe); ext_skins_fte->num_data += skinframes.length()*sizeof(iqmext_fte_skin_skinframe);
ext_skins_fte->num_data += meshskins.length()*sizeof(iqmext_fte_skin_meshskin); ext_skins_fte->num_data += meshskins.length()*sizeof(iqmext_fte_skin_meshskin);
} }
if(stringdata.length()) hdr.ofs_text = pad_field_ofs(hdr.filesize), hdr.num_text = stringdata.length(), hdr.filesize = hdr.ofs_text + hdr.num_text;
if(stringdata.length()) hdr.ofs_text = hdr.filesize, hdr.num_text = stringdata.length(), hdr.filesize += hdr.num_text; hdr.num_meshes = meshes.length(); if(meshes.length()) hdr.ofs_meshes = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_meshes + meshes.length() * sizeof(iqmmesh);
hdr.num_meshes = meshes.length(); if(meshes.length()) hdr.ofs_meshes = hdr.filesize; hdr.filesize += meshes.length() * sizeof(iqmmesh); hdr.num_vertexarrays = varrays.length(); if(varrays.length()) hdr.ofs_vertexarrays = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_vertexarrays + varrays.length() * sizeof(iqmvertexarray);
uint voffset = hdr.filesize + varrays.length() * sizeof(iqmvertexarray);
hdr.num_vertexarrays = varrays.length(); if(varrays.length()) hdr.ofs_vertexarrays = hdr.filesize; hdr.filesize += varrays.length() * sizeof(iqmvertexarray);
uint valign = (8 - (hdr.filesize%8))%8; uint valign = (8 - (hdr.filesize%8))%8;
voffset += valign; uint voffset = hdr.filesize + valign;
hdr.filesize += valign + vdata.length(); hdr.filesize += valign + vdata.length();
hdr.num_vertexes = numfverts; hdr.num_vertexes = numfverts;
hdr.num_triangles = triangles.length(); if(triangles.length()) hdr.ofs_triangles = hdr.filesize; hdr.filesize += triangles.length() * sizeof(iqmtriangle); hdr.num_triangles = triangles.length(); if(triangles.length()) hdr.ofs_triangles = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_triangles + triangles.length() * sizeof(iqmtriangle);
if(neighbors.length()) hdr.ofs_adjacency = hdr.filesize, hdr.filesize += neighbors.length() * sizeof(iqmtriangle); if(neighbors.length()) hdr.ofs_adjacency = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_adjacency + neighbors.length() * sizeof(iqmtriangle);
hdr.num_joints = joints.length(); if(joints.length()) hdr.ofs_joints = hdr.filesize; hdr.filesize += joints.length() * sizeof(iqmjoint); hdr.num_joints = joints.length(); if(joints.length()) hdr.ofs_joints = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_joints + joints.length() * sizeof(iqmjoint);
hdr.num_poses = poses.length(); if(poses.length()) hdr.ofs_poses = hdr.filesize; hdr.filesize += poses.length() * sizeof(iqmpose); hdr.num_poses = poses.length(); if(poses.length()) hdr.ofs_poses = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_poses + poses.length() * sizeof(iqmpose);
hdr.num_anims = anims.length(); if(anims.length()) hdr.ofs_anims = hdr.filesize; hdr.filesize += anims.length() * sizeof(iqmanim); hdr.num_anims = anims.length(); if(anims.length()) hdr.ofs_anims = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_anims + anims.length() * sizeof(iqmanim);
hdr.num_frames = frames.length(); hdr.num_framechannels = framesize; hdr.num_frames = frames.length(); hdr.num_framechannels = framesize;
if(animdata.length()) hdr.ofs_frames = hdr.filesize, hdr.filesize += animdata.length() * sizeof(ushort); if(animdata.length()) hdr.ofs_frames = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_frames + animdata.length() * sizeof(ushort);
if(bounds.length()) hdr.ofs_bounds = hdr.filesize, hdr.filesize += bounds.length() * sizeof(float[8]); if(bounds.length()) hdr.ofs_bounds = pad_field_ofs(hdr.filesize), hdr.filesize = hdr.ofs_bounds + bounds.length() * sizeof(float[8]);
if(commentdata.length()) hdr.ofs_comment = hdr.filesize, hdr.num_comment = commentdata.length(), hdr.filesize += hdr.num_comment; if(commentdata.length()) hdr.ofs_comment = pad_field_ofs(hdr.filesize), hdr.num_comment = commentdata.length(), hdr.filesize = hdr.ofs_comment + hdr.num_comment;
if (extensions.length()) hdr.ofs_extensions = hdr.filesize, hdr.num_extensions = extensions.length(), hdr.filesize += sizeof(iqmextension) * hdr.num_extensions; if (extensions.length()) hdr.ofs_extensions = pad_field_ofs(hdr.filesize), hdr.num_extensions = extensions.length(), hdr.filesize = hdr.ofs_extensions + sizeof(iqmextension) * hdr.num_extensions;
if (ext_meshes_fte) ext_meshes_fte->ofs_data = hdr.filesize, ext_meshes_fte->num_data = meshes_fte.length()*sizeof(iqmext_fte_mesh), hdr.filesize += ext_meshes_fte->num_data; if (ext_meshes_fte) ext_meshes_fte->ofs_data = pad_field_ofs(hdr.filesize), ext_meshes_fte->num_data = meshes_fte.length()*sizeof(iqmext_fte_mesh), hdr.filesize = ext_meshes_fte->ofs_data + ext_meshes_fte->num_data;
if (ext_events_fte) ext_events_fte->ofs_data = hdr.filesize, ext_events_fte->num_data = events_fte.length()*sizeof(iqmext_fte_events), hdr.filesize += ext_events_fte->num_data; if (ext_events_fte) ext_events_fte->ofs_data = pad_field_ofs(hdr.filesize), ext_events_fte->num_data = events_fte.length()*sizeof(iqmext_fte_events), hdr.filesize = ext_events_fte->ofs_data + ext_events_fte->num_data;
if (ext_skins_fte) ext_skins_fte->ofs_data = hdr.filesize, hdr.filesize += ext_skins_fte->num_data; if (ext_skins_fte) ext_skins_fte->ofs_data = pad_field_ofs(hdr.filesize), hdr.filesize = ext_skins_fte->ofs_data + ext_skins_fte->num_data;
lilswap(&hdr.version, (sizeof(hdr) - sizeof(hdr.magic))/sizeof(uint)); lilswap(&hdr.version, (sizeof(hdr) - sizeof(hdr.magic))/sizeof(uint));
f->write(&hdr, sizeof(hdr)); f->write(&hdr, sizeof(hdr));
// Move file write position to location specified by ofs_text
for(int i = f->tell(); i < hdr.ofs_text; i++) {
f->putchar(0);
}
if(stringdata.length()) f->write(stringdata.getbuf(), stringdata.length()); if(stringdata.length()) f->write(stringdata.getbuf(), stringdata.length());
// Move file write position to location specified by ofs_meshes
for(int i = f->tell(); i < hdr.ofs_meshes; i++) {
f->putchar(0);
}
loopv(meshes) loopv(meshes)
{ {
mesh &m = meshes[i]; mesh &m = meshes[i];
@ -4828,6 +4834,10 @@ bool writeiqm(const char *filename)
f->putlil(m.numtris); f->putlil(m.numtris);
} }
// Move file write position to location specified by ofs_vertexarrays
for(int i = f->tell(); i < hdr.ofs_vertexarrays; i++) {
f->putchar(0);
}
loopv(varrays) loopv(varrays)
{ {
vertexarray &v = varrays[i]; vertexarray &v = varrays[i];
@ -4841,18 +4851,30 @@ bool writeiqm(const char *filename)
loopi(valign) f->putchar(0); loopi(valign) f->putchar(0);
f->write(vdata.getbuf(), vdata.length()); f->write(vdata.getbuf(), vdata.length());
// Move file write position to location specified by ofs_triangles
for(int i = f->tell(); i < hdr.ofs_triangles; i++) {
f->putchar(0);
}
loopv(triangles) loopv(triangles)
{ {
triangle &t = triangles[i]; triangle &t = triangles[i];
loopk(3) f->putlil(t.vert[k]); loopk(3) f->putlil(t.vert[k]);
} }
// Move file write position to location specified by ofs_adjacency
for(int i = f->tell(); i < hdr.ofs_adjacency; i++) {
f->putchar(0);
}
loopv(neighbors) loopv(neighbors)
{ {
triangle &t = neighbors[i]; triangle &t = neighbors[i];
loopk(3) f->putlil(t.vert[k]); loopk(3) f->putlil(t.vert[k]);
} }
// Move file write position to location specified by ofs_joints
for(int i = f->tell(); i < hdr.ofs_joints; i++) {
f->putchar(0);
}
loopv(joints) loopv(joints)
{ {
joint &j = joints[i]; joint &j = joints[i];
@ -4863,6 +4885,10 @@ bool writeiqm(const char *filename)
loopk(3) f->putlil(float(j.scale[k])); loopk(3) f->putlil(float(j.scale[k]));
} }
// Move file write position to location specified by ofs_poses
for(int i = f->tell(); i < hdr.ofs_poses; i++) {
f->putchar(0);
}
loopv(poses) loopv(poses)
{ {
pose &p = poses[i]; pose &p = poses[i];
@ -4872,6 +4898,10 @@ bool writeiqm(const char *filename)
loopk(10) f->putlil(p.scale[k]); loopk(10) f->putlil(p.scale[k]);
} }
// Move file write position to location specified by ofs_anims
for(int i = f->tell(); i < hdr.ofs_anims; i++) {
f->putchar(0);
}
loopv(anims) loopv(anims)
{ {
anim &a = anims[i]; anim &a = anims[i];
@ -4882,8 +4912,16 @@ bool writeiqm(const char *filename)
f->putlil(a.flags); f->putlil(a.flags);
} }
// Move file write position to location specified by ofs_frames
for(int i = f->tell(); i < hdr.ofs_frames; i++) {
f->putchar(0);
}
loopv(animdata) f->putlil(animdata[i]); loopv(animdata) f->putlil(animdata[i]);
// Move file write position to location specified by ofs_bounds
for(int i = f->tell(); i < hdr.ofs_bounds; i++) {
f->putchar(0);
}
loopv(bounds) loopv(bounds)
{ {
framebounds &b = bounds[i]; framebounds &b = bounds[i];
@ -4893,8 +4931,19 @@ bool writeiqm(const char *filename)
f->putlil(float(b.radius)); f->putlil(float(b.radius));
} }
if(commentdata.length()) f->write(commentdata.getbuf(), commentdata.length()); if(commentdata.length())
{
// Move file write position to location specified by ofs_comment
for(int i = f->tell(); i < hdr.ofs_comment; i++) {
f->putchar(0);
}
f->write(commentdata.getbuf(), commentdata.length());
}
// Move file write position to location specified by ofs_extensions
for(int i = f->tell(); i < hdr.ofs_extensions; i++) {
f->putchar(0);
}
loopv (extensions) loopv (extensions)
{ {
iqmextension &ext = extensions[i]; iqmextension &ext = extensions[i];
@ -4907,29 +4956,47 @@ bool writeiqm(const char *filename)
f->putlil((uint)(hdr.ofs_extensions + (i+1)*sizeof(ext))); f->putlil((uint)(hdr.ofs_extensions + (i+1)*sizeof(ext)));
} }
if (ext_meshes_fte) loopv(meshes_fte) if (ext_meshes_fte)
{ {
meshprop &mf = meshes_fte[i]; // Move file write position to location specified by ext_meshes_fte->ofs_data
f->putlil(mf.contents); for(int i = f->tell(); i < ext_meshes_fte->ofs_data; i++) {
f->putlil(mf.surfaceflags); f->putchar(0);
f->putlil(mf.body); }
f->putlil(mf.geomset); loopv(meshes_fte)
f->putlil(mf.geomid); {
f->putlil(mf.mindist); meshprop &mf = meshes_fte[i];
f->putlil(mf.maxdist); f->putlil(mf.contents);
f->putlil(mf.surfaceflags);
f->putlil(mf.body);
f->putlil(mf.geomset);
f->putlil(mf.geomid);
f->putlil(mf.mindist);
f->putlil(mf.maxdist);
}
} }
if (ext_events_fte) loopv(events_fte) if (ext_events_fte)
{ {
event_fte &ev = events_fte[i]; // Move file write position to location specified by ext_events_fte->ofs_data
f->putlil(ev.anim); for(int i = f->tell(); i < ext_events_fte->ofs_data; i++) {
f->putlil(ev.timestamp); f->putchar(0);
f->putlil(ev.evcode); }
f->putlil(ev.evdata_idx); loopv(events_fte)
{
event_fte &ev = events_fte[i];
f->putlil(ev.anim);
f->putlil(ev.timestamp);
f->putlil(ev.evcode);
f->putlil(ev.evdata_idx);
}
} }
if (ext_skins_fte) if (ext_skins_fte)
{ {
// Move file write position to location specified by ext_skins_fte->ofs_data
for(int i = f->tell(); i < ext_skins_fte->ofs_data; i++) {
f->putchar(0);
}
f->putlil(skinframes.length()); f->putlil(skinframes.length());
f->putlil(meshskins.length()); f->putlil(meshskins.length());
loopv(meshes) f->putlil(meshes[i].numskins); loopv(meshes) f->putlil(meshes[i].numskins);

9
iqm/util.h
View file

@ -1100,3 +1100,12 @@ void fatal(const char *s, ...) // failure exit
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
//
// According to IQM file spec, all field offsets must be 4-byte aligned.
// Given a desired destination pointer to write data to, add pad bytes
// to ensure 4-byte alignment.
//
unsigned int pad_field_ofs(unsigned int field_ofs)
{
return (field_ofs - 1) + 4 - ((field_ofs - 1) % 4);
}