X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_alias.c;h=13ea8bf3407f04de66a8a482563d526ee755e221;hb=064213f25fd7d96bf1608bdbdb1e604ff0efd9f5;hp=d1c336b691ed7378f7c75092f806bccc2ee62478;hpb=56eae4d377de01abc73974a1f4c92de714e2d741;p=xonotic%2Fdarkplaces.git diff --git a/model_alias.c b/model_alias.c index d1c336b6..13ea8bf3 100644 --- a/model_alias.c +++ b/model_alias.c @@ -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; } } @@ -3091,15 +3091,14 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) float biggestorigin; const int *inelements; int *outelements; - const float *inversebasepose; float *outvertex, *outnormal, *outtexcoord, *outsvector, *outtvector; pbase = (unsigned char *)buffer; 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"; @@ -3122,7 +3121,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); @@ -3211,9 +3209,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; @@ -3258,24 +3256,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_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 @@ -3285,16 +3287,13 @@ 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); @@ -3310,12 +3309,18 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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); @@ -3338,16 +3343,13 @@ void Mod_INTERQUAKEMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) 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) {