for (i = 0;i < numverts;i++)
{
vertonseam[i] = LittleLong(pinstverts[i].onseam);
- vertst[i][0] = LittleLong(pinstverts[i].s) * scales;
- vertst[i][1] = LittleLong(pinstverts[i].t) * scalet;
+ vertst[i][0] = (LittleLong(pinstverts[i].s) + 0.5) * scales;
+ vertst[i][1] = (LittleLong(pinstverts[i].t) + 0.5) * scalet;
vertst[i+numverts][0] = vertst[i][0] + 0.5;
vertst[i+numverts][1] = vertst[i][1];
vertusage[i] = 0;
loadmodel->radius2 = modelradius * modelradius;
loadmodel->mdlmd2data_triangleneighbors = Mem_Alloc(loadmodel->mempool, loadmodel->numtris * sizeof(int[3]));
+ Mod_ValidateElements(loadmodel->mdlmd2data_indices, loadmodel->numtris, loadmodel->numverts, __FILE__, __LINE__);
Mod_BuildTriangleNeighbors(loadmodel->mdlmd2data_triangleneighbors, loadmodel->mdlmd2data_indices, loadmodel->numtris);
}
loadmodel->radius2 = modelradius * modelradius;
loadmodel->mdlmd2data_triangleneighbors = Mem_Alloc(loadmodel->mempool, loadmodel->numtris * sizeof(int[3]));
+ Mod_ValidateElements(loadmodel->mdlmd2data_indices, loadmodel->numtris, loadmodel->numverts, __FILE__, __LINE__);
Mod_BuildTriangleNeighbors(loadmodel->mdlmd2data_triangleneighbors, loadmodel->mdlmd2data_indices, loadmodel->numtris);
}
// go through the lumps, swapping things
{
- unsigned int i, numposes;
+ int i, numposes;
zymscene_t *scene;
// zymlump_t lump_scenes; // zymscene_t scene[numscenes]; // name and other information for each scene (see zymscene struct)
loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
loadmodel->animscenes[i].framecount = BigLong(scene->length);
loadmodel->animscenes[i].framerate = BigFloat(scene->framerate);
loadmodel->animscenes[i].loop = (BigLong(scene->flags) & ZYMSCENEFLAG_NOLOOP) == 0;
- if ((unsigned int) loadmodel->animscenes[i].firstframe >= numposes)
+ if ((unsigned int) loadmodel->animscenes[i].firstframe >= (unsigned int) numposes)
Host_Error("Mod_LoadZymoticModel: scene firstframe (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, numposes);
- if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > numposes)
+ if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > (unsigned int) numposes)
Host_Error("Mod_LoadZymoticModel: scene firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes);
if (loadmodel->animscenes[i].framerate < 0)
Host_Error("Mod_LoadZymoticModel: scene framerate (%f) < 0\n", loadmodel->animscenes[i].framerate);
}
{
- unsigned int i;
+ int i;
float *poses;
// zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data
loadmodel->zymdata_poses = Mem_Alloc(loadmodel->mempool, pheader->lump_poses.length);
}
{
- unsigned int i;
+ int i;
zymbone_t *bone;
// zymlump_t lump_bones; // zymbone_t bone[numbones];
loadmodel->zymdata_bones = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(zymbone_t));
memcpy(loadmodel->zymdata_bones[i].name, bone[i].name, sizeof(bone[i].name));
loadmodel->zymdata_bones[i].flags = BigLong(bone[i].flags);
loadmodel->zymdata_bones[i].parent = BigLong(bone[i].parent);
- if (bone[i].parent >= i)
- Host_Error("Mod_LoadZymoticModel: bone[i].parent >= i in %s\n", loadmodel->name);
+ if (loadmodel->zymdata_bones[i].parent >= i)
+ Host_Error("Mod_LoadZymoticModel: bone[%i].parent >= %i in %s\n", i, i, loadmodel->name);
}
}
{
- unsigned int i, *bonecount;
+ int i, *bonecount;
// zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better)
- loadmodel->zymdata_vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(int));
+ loadmodel->zymdata_vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int));
bonecount = (void *) (pheader->lump_vertbonecounts.start + pbase);
- for (i = 0;i < pheader->numbones;i++)
+ for (i = 0;i < pheader->numverts;i++)
{
loadmodel->zymdata_vertbonecounts[i] = BigLong(bonecount[i]);
if (loadmodel->zymdata_vertbonecounts[i] < 1)
}
{
- unsigned int i;
+ int i;
zymvertex_t *vertdata;
// zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct
loadmodel->zymdata_verts = Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length);
vertdata = (void *) (pheader->lump_verts.start + pbase);
- for (i = 0;i < pheader->lump_verts.length / 4;i++)
+ for (i = 0;i < pheader->lump_verts.length / (int) sizeof(zymvertex_t);i++)
{
loadmodel->zymdata_verts[i].bonenum = BigLong(vertdata[i].bonenum);
- loadmodel->zymdata_verts[i].origin[0] = BigLong(vertdata[i].origin[0]);
- loadmodel->zymdata_verts[i].origin[1] = BigLong(vertdata[i].origin[1]);
- loadmodel->zymdata_verts[i].origin[2] = BigLong(vertdata[i].origin[2]);
+ loadmodel->zymdata_verts[i].origin[0] = BigFloat(vertdata[i].origin[0]);
+ loadmodel->zymdata_verts[i].origin[1] = BigFloat(vertdata[i].origin[1]);
+ loadmodel->zymdata_verts[i].origin[2] = BigFloat(vertdata[i].origin[2]);
}
}
{
- unsigned int i;
+ int i;
float *intexcoord, *outtexcoord;
// zymlump_t lump_texcoords; // float texcoords[numvertices][2];
loadmodel->zymdata_texcoords = outtexcoord = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(float[4]));
intexcoord = (void *) (pheader->lump_texcoords.start + pbase);
- for (i = 0;i < pheader->numverts;i++);
+ for (i = 0;i < pheader->numverts;i++)
{
outtexcoord[i*4+0] = BigFloat(intexcoord[i*2+0]);
// flip T coordinate for OpenGL
}
{
- unsigned int i, count, a, b, c, *renderlist, *renderlistend, *outrenderlist;
+ int i, count, *renderlist, *renderlistend, *outrenderlist;
// zymlump_t lump_render; // int renderlist[rendersize]; // sorted by shader with run lengths (int count), shaders are sequentially used, each run can be used with glDrawElements (each triangle is 3 int indices)
loadmodel->zymdata_renderlist = Mem_Alloc(loadmodel->mempool, pheader->lump_render.length);
// byteswap, validate, and swap winding order of tris
*outrenderlist++ = count;
while (count--)
{
- a = BigLong(renderlist[0]);
- b = BigLong(renderlist[1]);
- c = BigLong(renderlist[2]);
- renderlist += 3;
- if (a >= pheader->numverts || b >= pheader->numverts || c >= pheader->numverts)
+ outrenderlist[2] = BigLong(renderlist[0]);
+ outrenderlist[1] = BigLong(renderlist[1]);
+ outrenderlist[0] = BigLong(renderlist[2]);
+ if ((unsigned int)outrenderlist[0] >= (unsigned int)pheader->numverts
+ || (unsigned int)outrenderlist[1] >= (unsigned int)pheader->numverts
+ || (unsigned int)outrenderlist[2] >= (unsigned int)pheader->numverts)
Host_Error("Mod_LoadZymoticModel: corrupt renderlist in %s (out of bounds index)\n", loadmodel->name);
- *outrenderlist++ = c;
- *outrenderlist++ = b;
- *outrenderlist++ = a;
+ renderlist += 3;
+ outrenderlist += 3;
}
}
}
{
- unsigned int i;
+ int i;
char *shadername;
// zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model
+ loadmodel->zymdata_textures = Mem_Alloc(loadmodel->mempool, pheader->numshaders * sizeof(rtexture_t *));
shadername = (void *) (pheader->lump_shaders.start + pbase);
for (i = 0;i < pheader->numshaders;i++)
loadmodel->zymdata_textures[i] = loadtextureimage(loadmodel->texturepool, shadername + i * 32, 0, 0, true, TEXF_ALPHA | TEXF_PRECACHE | (r_mipskins.integer ? TEXF_MIPMAP : 0));
projects / xonotic / darkplaces.git / blobdiff