R_ConcatTransforms(boneframe + model->data_bones[tagindex].parent * 12, tempbonematrix, bonematrix);
tagindex = model->data_bones[tagindex].parent;
}
- outmatrix->m[0][0] = bonematrix[0];
- outmatrix->m[0][1] = bonematrix[1];
- outmatrix->m[0][2] = bonematrix[2];
- outmatrix->m[0][3] = bonematrix[3];
- outmatrix->m[1][0] = bonematrix[4];
- outmatrix->m[1][1] = bonematrix[5];
- outmatrix->m[1][2] = bonematrix[6];
- outmatrix->m[1][3] = bonematrix[7];
- outmatrix->m[2][0] = bonematrix[8];
- outmatrix->m[2][1] = bonematrix[9];
- outmatrix->m[2][2] = bonematrix[10];
- outmatrix->m[2][3] = bonematrix[11];
- outmatrix->m[3][0] = 0;
- outmatrix->m[3][1] = 0;
- outmatrix->m[3][2] = 0;
- outmatrix->m[3][3] = 1;
+ Matrix4x4_FromArray12FloatD3D(outmatrix, bonematrix);
}
else if (model->num_tags)
{
return 4;
if (poseframe >= model->num_tagframes)
return 6;
- *outmatrix = model->data_tags[poseframe * model->num_tags + tagindex].matrix;
+ Matrix4x4_FromArray12FloatGL(outmatrix, model->data_tags[poseframe * model->num_tags + tagindex].matrixgl);
}
return 0;
}
// get scene name from first frame
pinframe = (daliasframe_t *)datapointer;
- strcpy(scene->name, pinframe->name);
+ strlcpy(scene->name, pinframe->name, sizeof(scene->name));
scene->firstframe = pose;
scene->framecount = groupframes;
scene->framerate = 1.0f / interval;
// store the info about the new skin
Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe);
- strcpy(loadmodel->skinscenes[loadmodel->numskins].name, name);
+ strlcpy(loadmodel->skinscenes[loadmodel->numskins].name, name, sizeof(loadmodel->skinscenes[loadmodel->numskins].name));
loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins;
loadmodel->skinscenes[loadmodel->numskins].framecount = 1;
loadmodel->skinscenes[loadmodel->numskins].framerate = 10.0f;
out[k] = v[vertremap[k]];
datapointer += numxyz * sizeof(trivertx_t);
- strcpy(loadmodel->animscenes[i].name, pinframe->name);
+ strlcpy(loadmodel->animscenes[i].name, pinframe->name, sizeof(loadmodel->animscenes[i].name));
loadmodel->animscenes[i].firstframe = i;
loadmodel->animscenes[i].framecount = 1;
loadmodel->animscenes[i].framerate = 10;
loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
for (i = 0, pinframe = (md3frameinfo_t *)((unsigned char *)pinmodel + LittleLong(pinmodel->lump_frameinfo));i < loadmodel->numframes;i++, pinframe++)
{
- strcpy(loadmodel->animscenes[i].name, pinframe->name);
+ strlcpy(loadmodel->animscenes[i].name, pinframe->name, sizeof(loadmodel->animscenes[i].name));
loadmodel->animscenes[i].firstframe = i;
loadmodel->animscenes[i].framecount = 1;
loadmodel->animscenes[i].framerate = 10;
loadmodel->data_tags = (aliastag_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_tagframes * loadmodel->num_tags * sizeof(aliastag_t));
for (i = 0, pintag = (md3tag_t *)((unsigned char *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->num_tagframes * loadmodel->num_tags;i++, pintag++)
{
- strcpy(loadmodel->data_tags[i].name, pintag->name);
- loadmodel->data_tags[i].matrix = identitymatrix;
+ strlcpy(loadmodel->data_tags[i].name, pintag->name, sizeof(loadmodel->data_tags[i].name));
+ for (j = 0;j < 9;j++)
+ loadmodel->data_tags[i].matrixgl[j] = LittleFloat(pintag->rotationmatrix[j]);
for (j = 0;j < 3;j++)
- {
- for (k = 0;k < 3;k++)
- loadmodel->data_tags[i].matrix.m[j][k] = LittleFloat(pintag->rotationmatrix[k * 3 + j]);
- loadmodel->data_tags[i].matrix.m[j][3] = LittleFloat(pintag->origin[j]);
- }
+ loadmodel->data_tags[i].matrixgl[9+j] = LittleFloat(pintag->origin[j]);
//Con_Printf("model \"%s\" frame #%i tag #%i \"%s\"\n", loadmodel->name, i / loadmodel->num_tags, i % loadmodel->num_tags, loadmodel->data_tags[i].name);
}
loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1;
}
-static void Mod_PSKMODEL_AnimKeyToMatrix(float *origin, float *quat, matrix4x4_t *m)
-{
- float x = quat[0], y = quat[1], z = quat[2], w = quat[3];
- m->m[0][0]=1-2*(y*y+z*z);m->m[0][1]= 2*(x*y-z*w);m->m[0][2]= 2*(x*z+y*w);m->m[0][3]=origin[0];
- m->m[1][0]= 2*(x*y+z*w);m->m[1][1]=1-2*(x*x+z*z);m->m[1][2]= 2*(y*z-x*w);m->m[1][3]=origin[1];
- m->m[2][0]= 2*(x*z-y*w);m->m[2][1]= 2*(y*z+x*w);m->m[2][2]=1-2*(x*x+y*y);m->m[2][3]=origin[2];
- m->m[3][0]= 0 ;m->m[3][1]= 0 ;m->m[3][2]= 0 ;m->m[3][3]=1;
-}
-
// no idea why PSK/PSA files contain weird quaternions but they do...
#define PSKQUATNEGATIONS
void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
// load the poses from the animkeys
for (index = 0;index < numanimkeys;index++)
{
+ pskanimkeys_t *k = animkeys + index;
matrix4x4_t matrix;
- Mod_PSKMODEL_AnimKeyToMatrix(animkeys[index].origin, animkeys[index].quat, &matrix);
- loadmodel->data_poses[index*12+0] = matrix.m[0][0];
- loadmodel->data_poses[index*12+1] = matrix.m[0][1];
- loadmodel->data_poses[index*12+2] = matrix.m[0][2];
- loadmodel->data_poses[index*12+3] = matrix.m[0][3];
- loadmodel->data_poses[index*12+4] = matrix.m[1][0];
- loadmodel->data_poses[index*12+5] = matrix.m[1][1];
- loadmodel->data_poses[index*12+6] = matrix.m[1][2];
- loadmodel->data_poses[index*12+7] = matrix.m[1][3];
- loadmodel->data_poses[index*12+8] = matrix.m[2][0];
- loadmodel->data_poses[index*12+9] = matrix.m[2][1];
- loadmodel->data_poses[index*12+10] = matrix.m[2][2];
- loadmodel->data_poses[index*12+11] = matrix.m[2][3];
+ Matrix4x4_FromOriginQuat(&matrix, k->origin[0], k->origin[1], k->origin[2], k->quat[0], k->quat[1], k->quat[2], k->quat[3]);
+ Matrix4x4_ToArray12FloatD3D(&matrix, loadmodel->data_poses + index*12);
}
Mod_FreeSkinFiles(skinfiles);
Mem_Free(animfilebuffer);
projects / xonotic / darkplaces.git / blobdiff