X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.c;h=9cf5e50c9e655c508700f962fc935ae784e5e5b5;hp=9d2ee14249b621918d9574036629b3768355bfd4;hb=09f884dd87cbb5b3da9e261d8c0841cdb9365c5b;hpb=1758371577bf14719f55b96d613055d06a421996 diff --git a/model_alias.c b/model_alias.c index 9d2ee142..9cf5e50c 100644 --- a/model_alias.c +++ b/model_alias.c @@ -129,9 +129,9 @@ void Mod_Skeletal_AnimateVertices(const dp_model_t * RESTRICT model, const frame 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; @@ -1323,7 +1323,7 @@ void Mod_IDP0_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; @@ -1580,7 +1580,7 @@ void Mod_IDP2_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; @@ -1760,7 +1760,7 @@ void Mod_IDP3_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; @@ -2132,7 +2132,7 @@ void Mod_ZYMOTICMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; @@ -2482,7 +2482,7 @@ void Mod_DARKPLACESMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; @@ -3010,7 +3010,7 @@ void Mod_PSKMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; } } @@ -3063,7 +3063,7 @@ void Mod_PSKMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; @@ -3075,7 +3075,7 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) { 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; @@ -3085,19 +3085,21 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) iqmanim_t *anim; iqmpose_t *pose; iqmmesh_t *mesh; + iqmbounds_t *bounds; + iqmvertexarray_t *va; unsigned short *framedata; float biggestorigin; const int *inelements; int *outelements; - const float *inversebasepose; - float *outnormal, *outtexcoord, *outsvector, *outtvector; + 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"; @@ -3120,7 +3122,6 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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); @@ -3128,6 +3129,7 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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); @@ -3144,39 +3146,65 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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++) { - iqmvertexarray_t *va = (iqmvertexarray_t *)(pbase + header->ofs_vertexarrays); - va->type = LittleLong(va->type); - va->flags = LittleLong(va->flags); - va->format = LittleLong(va->format); - va->size = LittleLong(va->size); - va->offset = LittleLong(va->offset); - switch (va->type) + 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 (va->format == IQM_FLOAT && va->size == 3) - vposition = (float *)(pbase + va->offset); + if (va[i].format == IQM_FLOAT && va[i].size == 3) + vposition = (float *)(pbase + va[i].offset); break; case IQM_TEXCOORD: - if (va->format == IQM_FLOAT && va->size == 2) - vtexcoord = (float *)(pbase + va->offset); + if (va[i].format == IQM_FLOAT && va[i].size == 2) + vtexcoord = (float *)(pbase + va[i].offset); break; case IQM_NORMAL: - if (va->format == IQM_FLOAT && va->size == 3) - vnormal = (float *)(pbase + va->offset); + if (va[i].format == IQM_FLOAT && va[i].size == 3) + vnormal = (float *)(pbase + va[i].offset); break; case IQM_TANGENT: - if (va->format == IQM_FLOAT && va->size == 4) - vtangent = (float *)(pbase + va->offset); + if (va[i].format == IQM_FLOAT && va[i].size == 4) + vtangent = (float *)(pbase + va[i].offset); break; case IQM_BLENDINDEXES: - if (va->format == IQM_UBYTE && va->size == 4) - vblendindexes = (unsigned char *)(pbase + va->offset); + if (va[i].format == IQM_UBYTE && va[i].size == 4) + vblendindexes = (unsigned char *)(pbase + va[i].offset); break; case IQM_BLENDWEIGHTS: - if (va->format == IQM_UBYTE && va->size == 4) - vblendweights = (unsigned char *)(pbase + va->offset); + if (va[i].format == IQM_UBYTE && va[i].size == 4) + vblendweights = (unsigned char *)(pbase + va[i].offset); break; } } @@ -3209,9 +3237,9 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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; @@ -3256,24 +3284,28 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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_ToArray12FloatD3D(&invbase, loadmodel->data_baseboneposeinverse[12*i]); - } + 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 @@ -3283,32 +3315,46 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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); biggestorigin = 0; for (i = 0;i < (int)header->num_poses;i++) { + float f; pose[i].parent = LittleLong(pose[i].parent); pose[i].channelmask = LittleLong(pose[i].channelmask); - for (j = 0;j < 6;j++) - { - pose[i].channeloffset[j] = LittleFloat(pose[i].channeloffset[j]); - pose[i].channelscale[j] = LittleFloat(pose[i].channelscale[j]); - } - biggestorigin = max(biggestorigin, pose[i].channeloffset[0] + 0xFFFF*pose[i].channelscale[0]); - biggestorigin = max(biggestorigin, pose[i].channeloffset[1] + 0xFFFF*pose[i].channelscale[1]); - biggestorigin = max(biggestorigin, pose[i].channeloffset[2] + 0xFFFF*pose[i].channelscale[2]); + pose[i].channeloffset[0] = LittleFloat(pose[i].channeloffset[0]); + pose[i].channeloffset[1] = LittleFloat(pose[i].channeloffset[1]); + pose[i].channeloffset[2] = LittleFloat(pose[i].channeloffset[2]); + 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); + f = fabs(pose[i].channeloffset[0] + 0xFFFF*pose[i].channelscale[0]); biggestorigin = max(biggestorigin, f); + f = fabs(pose[i].channeloffset[1] + 0xFFFF*pose[i].channelscale[1]); biggestorigin = max(biggestorigin, f); + f = fabs(pose[i].channeloffset[2] + 0xFFFF*pose[i].channelscale[2]); biggestorigin = max(biggestorigin, f); } loadmodel->num_posescale = biggestorigin / 32767.0f; loadmodel->num_poseinvscale = 1.0f / loadmodel->num_posescale; @@ -3319,22 +3365,65 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) { for (j = 0;j < (int)header->num_poses;j++, k++) { - loadmodel->data_poses6s[k*6 + 0] = loadmodel->num_poseinvscale * (pose[j].channeloffset[0] + (pose[j].channelmask&1 ? *framedata++ * pose[j].channelscale[0] : 0)); - loadmodel->data_poses6s[k*6 + 1] = loadmodel->num_poseinvscale * (pose[j].channeloffset[1] + (pose[j].channelmask&2 ? *framedata++ * pose[j].channelscale[1] : 0)); - loadmodel->data_poses6s[k*6 + 2] = loadmodel->num_poseinvscale * (pose[j].channeloffset[2] + (pose[j].channelmask&4 ? *framedata++ * pose[j].channelscale[2] : 0)); - loadmodel->data_poses6s[k*6 + 3] = 32767.0f * (pose[j].channeloffset[3] + (pose[j].channelmask&8 ? *framedata++ * pose[j].channelscale[3] : 0)); - loadmodel->data_poses6s[k*6 + 4] = 32767.0f * (pose[j].channeloffset[4] + (pose[j].channelmask&16 ? *framedata++ * pose[j].channelscale[4] : 0)); - loadmodel->data_poses6s[k*6 + 5] = 32767.0f * (pose[j].channeloffset[5] + (pose[j].channelmask&32 ? *framedata++ * pose[j].channelscale[5] : 0)); + loadmodel->data_poses6s[k*6 + 0] = loadmodel->num_poseinvscale * (pose[j].channeloffset[0] + (pose[j].channelmask&1 ? (unsigned short)LittleShort(*framedata++) * pose[j].channelscale[0] : 0)); + loadmodel->data_poses6s[k*6 + 1] = loadmodel->num_poseinvscale * (pose[j].channeloffset[1] + (pose[j].channelmask&2 ? (unsigned short)LittleShort(*framedata++) * pose[j].channelscale[1] : 0)); + loadmodel->data_poses6s[k*6 + 2] = loadmodel->num_poseinvscale * (pose[j].channeloffset[2] + (pose[j].channelmask&4 ? (unsigned short)LittleShort(*framedata++) * pose[j].channelscale[2] : 0)); + 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++; + } + } + + // load bounding box data + if (header->ofs_bounds) + { + float xyradius = 0, radius = 0; + bounds = (iqmbounds_t *) (pbase + header->ofs_bounds); + VectorClear(loadmodel->normalmins); + VectorClear(loadmodel->normalmaxs); + for (i = 0; i < (int)header->num_frames;i++) + { + bounds[i].mins[0] = LittleFloat(bounds[i].mins[0]); + bounds[i].mins[1] = LittleFloat(bounds[i].mins[1]); + bounds[i].mins[2] = LittleFloat(bounds[i].mins[2]); + bounds[i].maxs[0] = LittleFloat(bounds[i].maxs[0]); + bounds[i].maxs[1] = LittleFloat(bounds[i].maxs[1]); + bounds[i].maxs[2] = LittleFloat(bounds[i].maxs[2]); + bounds[i].xyradius = LittleFloat(bounds[i].xyradius); + bounds[i].radius = LittleFloat(bounds[i].radius); + if (!i) + { + VectorCopy(bounds[i].mins, loadmodel->normalmins); + VectorCopy(bounds[i].maxs, loadmodel->normalmaxs); + } + else + { + if (loadmodel->normalmins[0] > bounds[i].mins[0]) loadmodel->normalmins[0] = bounds[i].mins[0]; + if (loadmodel->normalmins[1] > bounds[i].mins[1]) loadmodel->normalmins[1] = bounds[i].mins[1]; + if (loadmodel->normalmins[2] > bounds[i].mins[2]) loadmodel->normalmins[2] = bounds[i].mins[2]; + if (loadmodel->normalmaxs[0] < bounds[i].maxs[0]) loadmodel->normalmaxs[0] = bounds[i].maxs[0]; + if (loadmodel->normalmaxs[1] < bounds[i].maxs[1]) loadmodel->normalmaxs[1] = bounds[i].maxs[1]; + if (loadmodel->normalmaxs[2] < bounds[i].maxs[2]) loadmodel->normalmaxs[2] = bounds[i].maxs[2]; + } + if (bounds[i].xyradius > xyradius) + xyradius = bounds[i].xyradius; + if (bounds[i].radius > radius) + radius = bounds[i].radius; } + loadmodel->yawmins[0] = loadmodel->yawmins[1] = -xyradius; + loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = xyradius; + loadmodel->yawmins[2] = loadmodel->normalmins[2]; + loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2]; + loadmodel->rotatedmins[0] = loadmodel->rotatedmins[1] = loadmodel->rotatedmins[2] = -radius; + loadmodel->rotatedmaxs[0] = loadmodel->rotatedmaxs[1] = loadmodel->rotatedmaxs[2] = radius; + loadmodel->radius = radius; + loadmodel->radius2 = radius * radius; } - if (header->ofs_inversebasepose) - { - inversebasepose = (const float *) (pbase + header->ofs_inversebasepose); - for (i = 0;i < 12*(int)header->num_poses;j++) - loadmodel->data_baseboneposeinverse[i] = LittleFloat(inversebasepose[i]); - } - // load triangle data inelements = (const int *) (pbase + header->ofs_triangles); outelements = loadmodel->surfmesh.data_element3i; @@ -3363,6 +3452,16 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) } // load vertex data + outvertex = loadmodel->surfmesh.data_vertex3f; + for (i = 0;i < (int)header->num_vertexes;i++) + { + outvertex[0] = LittleFloat(vposition[0]); + outvertex[1] = LittleFloat(vposition[1]); + outvertex[2] = LittleFloat(vposition[2]); + vposition += 3; + outvertex += 3; + } + outtexcoord = loadmodel->surfmesh.data_texcoordtexture2f; for (i = 0;i < (int)header->num_vertexes;i++) { @@ -3411,7 +3510,7 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) blendweights_t weights; memcpy(weights.index, vblendindexes + i*4, 4); memcpy(weights.influence, vblendweights + i*4, 4); - loadmodel->surfmesh.blends[j] = Mod_Skeletal_AddBlend(loadmodel, &weights); + loadmodel->surfmesh.blends[i] = Mod_Skeletal_AddBlend(loadmodel, &weights); } // load meshes @@ -3451,13 +3550,14 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true); if (!header->ofs_neighbors) Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles); - Mod_Alias_CalculateBoundingBox(); + if (!header->ofs_bounds) + Mod_Alias_CalculateBoundingBox(); loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1; 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;