if (maxbonepose < model->num_bones*2 + model->surfmesh.num_blends)
{
if (bonepose)
- Mem_Free(bonepose);
+ Z_Free(bonepose);
maxbonepose = model->num_bones*2 + model->surfmesh.num_blends;
- bonepose = (float (*)[12])Mem_Alloc(r_main_mempool, maxbonepose * sizeof(float[12]));
+ bonepose = (float (*)[12])Z_Malloc(maxbonepose * sizeof(float[12]));
}
boneposerelative = bonepose + model->num_bones;
if (!loadmodel->surfmesh.isanimated)
{
- Mod_MakeCollisionBIH(loadmodel, true);
+ Mod_MakeCollisionBIH(loadmodel, true, &loadmodel->collision_bih);
loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
if (!loadmodel->surfmesh.isanimated)
{
- Mod_MakeCollisionBIH(loadmodel, true);
+ Mod_MakeCollisionBIH(loadmodel, true, &loadmodel->collision_bih);
loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
if (!loadmodel->surfmesh.isanimated)
{
- Mod_MakeCollisionBIH(loadmodel, true);
+ Mod_MakeCollisionBIH(loadmodel, true, &loadmodel->collision_bih);
loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
if (!loadmodel->surfmesh.isanimated)
{
- Mod_MakeCollisionBIH(loadmodel, true);
+ Mod_MakeCollisionBIH(loadmodel, true, &loadmodel->collision_bih);
loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
if (!loadmodel->surfmesh.isanimated)
{
- Mod_MakeCollisionBIH(loadmodel, true);
+ Mod_MakeCollisionBIH(loadmodel, true, &loadmodel->collision_bih);
loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
loadmodel->animscenes[i].firstframe = i;
loadmodel->animscenes[i].framecount = 1;
loadmodel->animscenes[i].loop = true;
- loadmodel->animscenes[i].framerate = 10;
+ loadmodel->animscenes[i].framerate = anims[index].fps;
}
}
if (!loadmodel->surfmesh.isanimated)
{
- Mod_MakeCollisionBIH(loadmodel, true);
+ Mod_MakeCollisionBIH(loadmodel, true, &loadmodel->collision_bih);
loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
{
unsigned char *data;
const char *text;
- unsigned char *pbase;
+ unsigned char *pbase, *pend;
iqmheader_t *header;
skinfile_t *skinfiles;
int i, j, k, meshvertices, meshtriangles;
float biggestorigin;
const int *inelements;
int *outelements;
- const float *inversebasepose;
float *outvertex, *outnormal, *outtexcoord, *outsvector, *outtvector;
pbase = (unsigned char *)buffer;
+ pend = (unsigned char *)bufferend;
header = (iqmheader_t *)buffer;
if (memcmp(header->id, "INTERQUAKEMODEL", 16))
Host_Error ("Mod_INTERQUAKEMODEL_Load: %s is not an Inter-Quake Model", loadmodel->name);
- if (LittleLong(header->version) != 0)
- Host_Error ("Mod_INTERQUAKEMODEL_Load: only version 0 models are currently supported (name = %s)", loadmodel->name);
+ if (LittleLong(header->version) != 1)
+ Host_Error ("Mod_INTERQUAKEMODEL_Load: only version 1 models are currently supported (name = %s)", loadmodel->name);
loadmodel->modeldatatypestring = "IQM";
header->ofs_neighbors = LittleLong(header->ofs_neighbors);
header->num_joints = LittleLong(header->num_joints);
header->ofs_joints = LittleLong(header->ofs_joints);
- header->ofs_inversebasepose = LittleLong(header->ofs_inversebasepose);
header->num_poses = LittleLong(header->num_poses);
header->ofs_poses = LittleLong(header->ofs_poses);
header->num_anims = LittleLong(header->num_anims);
header->num_frames = LittleLong(header->num_frames);
header->num_framechannels = LittleLong(header->num_framechannels);
header->ofs_frames = LittleLong(header->ofs_frames);
+ header->ofs_bounds = LittleLong(header->ofs_bounds);
header->num_comment = LittleLong(header->num_comment);
header->ofs_comment = LittleLong(header->ofs_comment);
header->num_extensions = LittleLong(header->num_extensions);
return;
}
+ if (pbase + header->ofs_text + header->num_text > pend ||
+ pbase + header->ofs_meshes + header->num_meshes*sizeof(iqmmesh_t) > pend ||
+ pbase + header->ofs_vertexarrays + header->num_vertexarrays*sizeof(iqmvertexarray_t) > pend ||
+ pbase + header->ofs_triangles + header->num_triangles*sizeof(int[3]) > pend ||
+ (header->ofs_neighbors && pbase + header->ofs_neighbors + header->num_triangles*sizeof(int[3]) > pend) ||
+ pbase + header->ofs_joints + header->num_joints*sizeof(iqmjoint_t) > pend ||
+ pbase + header->ofs_poses + header->num_poses*sizeof(iqmpose_t) > pend ||
+ pbase + header->ofs_anims + header->num_anims*sizeof(iqmanim_t) > pend ||
+ pbase + header->ofs_frames + header->num_frames*header->num_framechannels*sizeof(unsigned short) > pend ||
+ (header->ofs_bounds && pbase + header->ofs_bounds + header->num_frames*sizeof(iqmbounds_t) > pend) ||
+ pbase + header->ofs_comment + header->num_comment > pend)
+ {
+ Con_Printf("%s has invalid size or offset information\n", loadmodel->name);
+ return;
+ }
+
va = (iqmvertexarray_t *)(pbase + header->ofs_vertexarrays);
for (i = 0;i < (int)header->num_vertexarrays;i++)
{
+ size_t vsize;
va[i].type = LittleLong(va[i].type);
va[i].flags = LittleLong(va[i].flags);
va[i].format = LittleLong(va[i].format);
va[i].size = LittleLong(va[i].size);
va[i].offset = LittleLong(va[i].offset);
+ vsize = header->num_vertexes*va[i].size;
+ switch (va[i].format)
+ {
+ case IQM_FLOAT: vsize *= sizeof(float); break;
+ case IQM_UBYTE: vsize *= sizeof(unsigned char); break;
+ default: continue;
+ }
+ if (pbase + va[i].offset + vsize > pend)
+ continue;
switch (va[i].type)
{
case IQM_POSITION:
if (loadmodel->numskins < 1)
loadmodel->numskins = 1;
- loadmodel->numframes = header->num_frames;
+ loadmodel->numframes = header->num_anims;
loadmodel->num_bones = header->num_joints;
- loadmodel->num_poses = loadmodel->numframes;
+ loadmodel->num_poses = header->num_frames;
loadmodel->nummodelsurfaces = loadmodel->num_surfaces = header->num_meshes;
loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
loadmodel->num_texturesperskin = loadmodel->num_surfaces;
joint = (iqmjoint_t *) (pbase + header->ofs_joints);
for (i = 0;i < loadmodel->num_bones;i++)
{
+ matrix4x4_t relbase, relinvbase, pinvbase, invbase;
joint[i].name = LittleLong(joint[i].name);
joint[i].parent = LittleLong(joint[i].parent);
for (j = 0;j < 3;j++)
{
joint[i].origin[j] = LittleFloat(joint[i].origin[j]);
joint[i].rotation[j] = LittleFloat(joint[i].rotation[j]);
+ joint[i].scale[j] = LittleFloat(joint[i].scale[j]);
}
strlcpy(loadmodel->data_bones[i].name, &text[joint[i].name], sizeof(loadmodel->data_bones[i].name));
loadmodel->data_bones[i].parent = joint[i].parent;
if (loadmodel->data_bones[i].parent >= i)
Host_Error("%s bone[%i].parent >= %i", loadmodel->name, i, i);
- if (!header->ofs_inversebasepose)
+ Matrix4x4_FromDoom3Joint(&relbase, joint[i].origin[0], joint[i].origin[1], joint[i].origin[2], joint[i].rotation[0], joint[i].rotation[1], joint[i].rotation[2]);
+ Matrix4x4_Invert_Simple(&relinvbase, &relbase);
+ if (loadmodel->data_bones[i].parent >= 0)
{
- matrix4x4_t base, invbase;
- Matrix4x4_FromDoom3Joint(&base, joint[i].origin[0], joint[i].origin[1], joint[i].origin[2], joint[i].rotation[0], joint[i].rotation[1], joint[i].rotation[2]);
- Matrix4x4_Invert_Simple(&invbase, &base);
+ Matrix4x4_FromArray12FloatD3D(&pinvbase, loadmodel->data_baseboneposeinverse + 12*loadmodel->data_bones[i].parent);
+ Matrix4x4_Concat(&invbase, &relinvbase, &pinvbase);
Matrix4x4_ToArray12FloatD3D(&invbase, loadmodel->data_baseboneposeinverse + 12*i);
- }
+ }
+ else Matrix4x4_ToArray12FloatD3D(&relinvbase, loadmodel->data_baseboneposeinverse + 12*i);
}
// set up the animscenes based on the anims
anim[i].name = LittleLong(anim[i].name);
anim[i].first_frame = LittleLong(anim[i].first_frame);
anim[i].num_frames = LittleLong(anim[i].num_frames);
- anim[i].framerate = LittleLong(anim[i].framerate);
+ anim[i].framerate = LittleFloat(anim[i].framerate);
anim[i].flags = LittleLong(anim[i].flags);
- for (j = anim[i].first_frame;j < (int)(anim[i].first_frame + anim[i].num_frames);j++)
- {
- dpsnprintf(loadmodel->animscenes[j].name, sizeof(loadmodel->animscenes[i].name), "%s_%d", &text[anim[i].name], j - anim[i].first_frame);
- loadmodel->animscenes[j].firstframe = j;
- loadmodel->animscenes[j].framecount = 1;
- loadmodel->animscenes[j].loop = true;
- loadmodel->animscenes[j].framerate = 10;
- }
+ strlcpy(loadmodel->animscenes[i].name, &text[anim[i].name], sizeof(loadmodel->animscenes[i].name));
+ loadmodel->animscenes[i].firstframe = anim[i].first_frame;
+ loadmodel->animscenes[i].framecount = anim[i].num_frames;
+ loadmodel->animscenes[i].loop = ((anim[i].flags & IQM_LOOP) != 0);
+ loadmodel->animscenes[i].framerate = anim[i].framerate;
}
pose = (iqmpose_t *) (pbase + header->ofs_poses);
pose[i].channeloffset[3] = LittleFloat(pose[i].channeloffset[3]);
pose[i].channeloffset[4] = LittleFloat(pose[i].channeloffset[4]);
pose[i].channeloffset[5] = LittleFloat(pose[i].channeloffset[5]);
+ pose[i].channeloffset[6] = LittleFloat(pose[i].channeloffset[6]);
+ pose[i].channeloffset[7] = LittleFloat(pose[i].channeloffset[7]);
+ pose[i].channeloffset[8] = LittleFloat(pose[i].channeloffset[8]);
pose[i].channelscale[0] = LittleFloat(pose[i].channelscale[0]);
pose[i].channelscale[1] = LittleFloat(pose[i].channelscale[1]);
pose[i].channelscale[2] = LittleFloat(pose[i].channelscale[2]);
pose[i].channelscale[3] = LittleFloat(pose[i].channelscale[3]);
pose[i].channelscale[4] = LittleFloat(pose[i].channelscale[4]);
pose[i].channelscale[5] = LittleFloat(pose[i].channelscale[5]);
+ pose[i].channelscale[6] = LittleFloat(pose[i].channelscale[6]);
+ pose[i].channelscale[7] = LittleFloat(pose[i].channelscale[7]);
+ pose[i].channelscale[8] = LittleFloat(pose[i].channelscale[8]);
f = fabs(pose[i].channeloffset[0]); biggestorigin = max(biggestorigin, f);
f = fabs(pose[i].channeloffset[1]); biggestorigin = max(biggestorigin, f);
f = fabs(pose[i].channeloffset[2]); biggestorigin = max(biggestorigin, f);
loadmodel->data_poses6s[k*6 + 3] = 32767.0f * (pose[j].channeloffset[3] + (pose[j].channelmask&8 ? (unsigned short)LittleShort(*framedata++) * pose[j].channelscale[3] : 0));
loadmodel->data_poses6s[k*6 + 4] = 32767.0f * (pose[j].channeloffset[4] + (pose[j].channelmask&16 ? (unsigned short)LittleShort(*framedata++) * pose[j].channelscale[4] : 0));
loadmodel->data_poses6s[k*6 + 5] = 32767.0f * (pose[j].channeloffset[5] + (pose[j].channelmask&32 ? (unsigned short)LittleShort(*framedata++) * pose[j].channelscale[5] : 0));
+ // skip scale data for now
+ if(pose[j].channelmask&64) framedata++;
+ if(pose[j].channelmask&128) framedata++;
+ if(pose[j].channelmask&256) framedata++;
}
}
- if (header->ofs_inversebasepose)
- {
- inversebasepose = (const float *) (pbase + header->ofs_inversebasepose);
- for (i = 0;i < 12*(int)header->num_poses;i++)
- loadmodel->data_baseboneposeinverse[i] = LittleFloat(inversebasepose[i]);
- }
-
// load bounding box data
if (header->ofs_bounds)
{
if (!loadmodel->surfmesh.isanimated)
{
- Mod_MakeCollisionBIH(loadmodel, true);
+ Mod_MakeCollisionBIH(loadmodel, true, &loadmodel->collision_bih);
loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
projects / xonotic / darkplaces.git / blobdiff