]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_alias.c
changed format of aliasvertex_t to use floats (hopefully this is a speedup, it sure...
[xonotic/darkplaces.git] / model_alias.c
index 14faa5f70674546588f8a165cc7d5f9ee2dcb6fe..a2d3d5e0570082cb7cf9f523633f25f04b92e10f 100644 (file)
@@ -37,9 +37,9 @@ static int vertonseam[MAXALIASVERTS];
 static int vertremap[MAXALIASVERTS];
 static int temptris[MAXALIASTRIS][3];
 
-static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, trivertx_t *out)
+static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, aliasvertex_t *out)
 {
-       int i, j, invalidnormals = 0;
+       int i, j;
        float dist;
        vec3_t temp;
        for (i = 0;i < inverts;i++)
@@ -66,32 +66,31 @@ static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate,
 
                j = vertremap[i]; // not onseam
                if (j >= 0)
-               {
-                       VectorCopy(v[i].v, out[j].v);
-                       out[j].lightnormalindex = v[i].lightnormalindex;
-                       if (out[j].lightnormalindex >= NUMVERTEXNORMALS)
-                       {
-                               invalidnormals++;
-                               out[j].lightnormalindex = 0;
-                       }
-               }
+                       VectorCopy(temp, out[j].origin);
                j = vertremap[i+inverts]; // onseam
                if (j >= 0)
-               {
-                       VectorCopy(v[i].v, out[j].v);
-                       out[j].lightnormalindex = v[i].lightnormalindex;
-                       if (out[j].lightnormalindex >= NUMVERTEXNORMALS)
-                       {
-                               invalidnormals++;
-                               out[j].lightnormalindex = 0;
-                       }
-               }
+                       VectorCopy(temp, out[j].origin);
+       }
+}
+
+static void Mod_BuildAliasVertexTextureVectors(int numtriangles, const int *elements, int numverts, aliasvertex_t *vertices, const float *texcoords, float *vertexbuffer, float *svectorsbuffer, float *tvectorsbuffer, float *normalsbuffer)
+{
+       int i;
+       for (i = 0;i < numverts;i++)
+               VectorCopy(vertices[i].origin, &vertexbuffer[i * 4]);
+       Mod_BuildTextureVectorsAndNormals(numverts, numtriangles, vertexbuffer, texcoords, elements, svectorsbuffer, tvectorsbuffer, normalsbuffer);
+       for (i = 0;i < numverts;i++)
+       {
+               vertices[i].normal[0] = normalsbuffer[i * 4 + 0];
+               vertices[i].normal[1] = normalsbuffer[i * 4 + 1];
+               vertices[i].normal[2] = normalsbuffer[i * 4 + 2];
+               vertices[i].svector[0] = svectorsbuffer[i * 4 + 0];
+               vertices[i].svector[1] = svectorsbuffer[i * 4 + 1];
+               vertices[i].svector[2] = svectorsbuffer[i * 4 + 2];
        }
-       if (invalidnormals)
-               Con_Printf("Mod_ConvertAliasVerts: \"%s\", %i invalid normal indices found\n", loadmodel->name, invalidnormals);
 }
 
-static void Mod_MDL_LoadFrames (qbyte * datapointer, int inverts, int outverts, vec3_t scale, vec3_t translate)
+static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, vec3_t translate)
 {
        daliasframetype_t       *pframetype;
        daliasframe_t           *pinframe;
@@ -100,8 +99,13 @@ static void Mod_MDL_LoadFrames (qbyte * datapointer, int inverts, int outverts,
        int                                     i, f, pose, groupframes;
        float                           interval;
        animscene_t                     *scene;
+       float                           *vertexbuffer, *svectorsbuffer, *tvectorsbuffer, *normalsbuffer;
        pose = 0;
        scene = loadmodel->animscenes;
+       vertexbuffer = Mem_Alloc(tempmempool, loadmodel->numverts * sizeof(float[4]) * 4);
+       svectorsbuffer = vertexbuffer + loadmodel->numverts * 4;
+       tvectorsbuffer = svectorsbuffer + loadmodel->numverts * 4;
+       normalsbuffer = tvectorsbuffer + loadmodel->numverts * 4;
        for (f = 0;f < loadmodel->numframes;f++)
        {
                pframetype = (daliasframetype_t *)datapointer;
@@ -143,17 +147,13 @@ static void Mod_MDL_LoadFrames (qbyte * datapointer, int inverts, int outverts,
                {
                        pinframe = (daliasframe_t *)datapointer;
                        datapointer += sizeof(daliasframe_t);
-
-                       // convert to MD2 frame headers
-                       strcpy(loadmodel->mdlmd2data_frames[pose].name, pinframe->name);
-                       VectorCopy(scale, loadmodel->mdlmd2data_frames[pose].scale);
-                       VectorCopy(translate, loadmodel->mdlmd2data_frames[pose].translate);
-
-                       Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->mdlmd2data_pose + pose * outverts);
+                       Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->mdlmd2data_pose + pose * loadmodel->numverts);
+                       Mod_BuildAliasVertexTextureVectors(loadmodel->numtris, loadmodel->mdlmd2data_indices, loadmodel->numverts, loadmodel->mdlmd2data_pose + pose * loadmodel->numverts, loadmodel->mdlmd2data_texcoords, vertexbuffer, svectorsbuffer, tvectorsbuffer, normalsbuffer);
                        datapointer += sizeof(trivertx_t) * inverts;
                        pose++;
                }
        }
+       Mem_Free(vertexbuffer);
 }
 
 static rtexture_t *GL_TextureForSkinLayer(const qbyte *in, int width, int height, const char *name, const unsigned int *palette, int precache)
@@ -207,6 +207,104 @@ static int Mod_LoadInternalSkin (char *basename, qbyte *skindata, int width, int
        return true;
 }
 
+void Mod_BuildMDLMD2MeshInfo(void)
+{
+       int i;
+       aliasmesh_t *mesh;
+       aliasskin_t *skin;
+       aliaslayer_t *layer;
+       skinframe_t *skinframe;
+
+       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->mdlmd2num_meshes = 1;
+       mesh = loadmodel->mdlmd2data_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->mdlmd2num_meshes * sizeof(aliasmesh_t));
+       mesh->num_skins = 0;
+       mesh->num_frames = 0;
+       for (i = 0;i < loadmodel->numframes;i++)
+               mesh->num_frames += loadmodel->animscenes[i].framecount;
+       for (i = 0;i < loadmodel->numskins;i++)
+               mesh->num_skins += loadmodel->skinscenes[i].framecount;
+       mesh->num_triangles = loadmodel->numtris;
+       mesh->num_vertices = loadmodel->numverts;
+       mesh->data_skins = Mem_Alloc(loadmodel->mempool, mesh->num_skins * sizeof(aliasskin_t));
+       mesh->data_elements = loadmodel->mdlmd2data_indices;
+       mesh->data_neighbors = loadmodel->mdlmd2data_triangleneighbors;
+       mesh->data_texcoords = loadmodel->mdlmd2data_texcoords;
+       mesh->data_vertices = loadmodel->mdlmd2data_pose;
+       for (i = 0, skin = mesh->data_skins, skinframe = loadmodel->skinframes;i < mesh->num_skins;i++, skin++, skinframe++)
+       {
+               skin->flags = 0;
+               // fog texture only exists if some pixels are transparent...
+               if (skinframe->fog != NULL)
+                       skin->flags |= ALIASSKIN_TRANSPARENT;
+               // fog and gloss layers always exist
+               skin->num_layers = 2;
+               if (skinframe->glow != NULL)
+                       skin->num_layers++;
+               if (skinframe->merged != NULL)
+                       skin->num_layers++;
+               if (skinframe->base != NULL)
+                       skin->num_layers++;
+               if (skinframe->pants != NULL)
+                       skin->num_layers++;
+               if (skinframe->shirt != NULL)
+                       skin->num_layers++;
+               layer = skin->data_layers = Mem_Alloc(loadmodel->mempool, skin->num_layers * sizeof(aliaslayer_t));
+               if (skinframe->glow != NULL)
+               {
+                       layer->flags = ALIASLAYER_REALTIME_NODRAW;
+                       layer->texture = skinframe->glow;
+                       layer++;
+               }
+               if (skinframe->merged != NULL)
+               {
+                       layer->flags = ALIASLAYER_COLORMAP_NODRAW | ALIASLAYER_DIFFUSE;
+                       if (skinframe->glow != NULL)
+                               layer->flags |= ALIASLAYER_ADD;
+                       layer->texture = skinframe->merged;
+                       layer->nmap = skinframe->nmap;
+                       layer++;
+               }
+               if (skinframe->base != NULL)
+               {
+                       layer->flags = ALIASLAYER_COLORMAP_DRAW | ALIASLAYER_DIFFUSE;
+                       if (skinframe->glow != NULL)
+                               layer->flags |= ALIASLAYER_ADD;
+                       layer->texture = skinframe->base;
+                       layer->nmap = skinframe->nmap;
+                       layer++;
+               }
+               if (skinframe->pants != NULL)
+               {
+                       layer->flags = ALIASLAYER_COLORMAP_DRAW | ALIASLAYER_COLORMAP_DIFFUSE_SHIRT;
+                       if (skinframe->glow != NULL || skinframe->base != NULL)
+                               layer->flags |= ALIASLAYER_ADD;
+                       layer->texture = skinframe->pants;
+                       layer->nmap = skinframe->nmap;
+                       layer++;
+               }
+               if (skinframe->shirt != NULL)
+               {
+                       layer->flags = ALIASLAYER_COLORMAP_DRAW | ALIASLAYER_COLORMAP_DIFFUSE_SHIRT;
+                       if (skinframe->glow != NULL || skinframe->base != NULL || skinframe->pants != NULL)
+                               layer->flags |= ALIASLAYER_ADD;
+                       layer->texture = skinframe->shirt;
+                       layer->nmap = skinframe->nmap;
+                       layer++;
+               }
+               layer->flags = ALIASLAYER_REALTIME_DRAW | ALIASLAYER_SPECULAR;
+               layer->texture = skinframe->gloss;
+               layer->nmap = skinframe->nmap;
+               layer++;
+               layer->flags = ALIASLAYER_REALTIME_NODRAW | ALIASLAYER_FOG;
+               layer->texture = skinframe->fog;
+               layer++;
+       }
+}
+
 #define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%d exceeds %d - %d)\n", loadmodel->name, VALUE, MIN, MAX);
 #define BOUNDF(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%f exceeds %f - %f)\n", loadmodel->name, VALUE, MIN, MAX);
 extern void R_Model_Alias_Draw(entity_render_t *ent);
@@ -409,8 +507,8 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
        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;
@@ -470,14 +568,13 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
 
 // load the frames
        loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
-       loadmodel->mdlmd2data_frames = Mem_Alloc(loadmodel->mempool, sizeof(md2frame_t) * totalposes);
-       loadmodel->mdlmd2data_pose = Mem_Alloc(loadmodel->mempool, sizeof(trivertx_t) * totalposes * totalverts);
+       loadmodel->mdlmd2data_pose = Mem_Alloc(loadmodel->mempool, sizeof(aliasvertex_t) * totalposes * totalverts);
 
        // LordHavoc: doing proper bbox for model
        aliasbboxmin[0] = aliasbboxmin[1] = aliasbboxmin[2] = 1000000000;
        aliasbboxmax[0] = aliasbboxmax[1] = aliasbboxmax[2] = -1000000000;
 
-       Mod_MDL_LoadFrames (startframes, numverts, totalverts, scale, translate);
+       Mod_MDL_LoadFrames (startframes, numverts, scale, translate);
 
        modelyawradius = sqrt(modelyawradius);
        modelradius = sqrt(modelradius);
@@ -494,20 +591,18 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
        loadmodel->radius = modelradius;
        loadmodel->radius2 = modelradius * modelradius;
 
-       loadmodel->mdlmd2data_triangleneighbors = Mem_Alloc(loadmodel->mempool, loadmodel->numtris * sizeof(int[3]));
-       Mod_BuildTriangleNeighbors(loadmodel->mdlmd2data_triangleneighbors, loadmodel->mdlmd2data_indices, loadmodel->numtris);
+       Mod_BuildMDLMD2MeshInfo();
 }
 
-static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, trivertx_t *out, int *vertremap)
+static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, aliasvertex_t *out, int *vertremap)
 {
-       int i, invalidnormals = 0;
+       int i;
        float dist;
        trivertx_t *in;
        vec3_t temp;
        for (i = 0;i < loadmodel->numverts;i++)
        {
                in = v + vertremap[i];
-               VectorCopy(in->v, out[i].v);
                temp[0] = in->v[0] * scale[0] + translate[0];
                temp[1] = in->v[1] * scale[1] + translate[1];
                temp[2] = in->v[2] * scale[2] + translate[2];
@@ -524,15 +619,8 @@ static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v,
                dist += temp[2]*temp[2];
                if (modelradius < dist)
                        modelradius = dist;
-               out[i].lightnormalindex = in->lightnormalindex;
-               if (out[i].lightnormalindex >= NUMVERTEXNORMALS)
-               {
-                       invalidnormals++;
-                       out[i].lightnormalindex = 0;
-               }
+               VectorCopy(temp, out[i].origin);
        }
-       if (invalidnormals)
-               Con_Printf("Mod_MD2_ConvertVerts: \"%s\", %i invalid normal indices found\n", loadmodel->name, invalidnormals);
 }
 
 void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
@@ -542,7 +630,7 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
        qbyte *base;
        int version, end;
        int i, j, k, hashindex, num, numxyz, numst, xyz, st;
-       float *stverts, s, t;
+       float *stverts, s, t, scale[3], translate[3];
        struct md2verthash_s
        {
                struct md2verthash_s *next;
@@ -556,6 +644,7 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
        md2triangle_t *intri;
        unsigned short *inst;
        int skinwidth, skinheight;
+       float *vertexbuffer, *svectorsbuffer, *tvectorsbuffer, *normalsbuffer;
 
        pinmodel = buffer;
        base = buffer;
@@ -715,28 +804,32 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
        datapointer = (base + LittleLong(pinmodel->ofs_frames));
        // load the frames
        loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
-       loadmodel->mdlmd2data_frames = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(md2frame_t));
        loadmodel->mdlmd2data_pose = Mem_Alloc(loadmodel->mempool, loadmodel->numverts * loadmodel->numframes * sizeof(trivertx_t));
 
+       vertexbuffer = Mem_Alloc(tempmempool, loadmodel->numverts * sizeof(float[4]) * 4);
+       svectorsbuffer = vertexbuffer + loadmodel->numverts * 4;
+       tvectorsbuffer = svectorsbuffer + loadmodel->numverts * 4;
+       normalsbuffer = tvectorsbuffer + loadmodel->numverts * 4;
        for (i = 0;i < loadmodel->numframes;i++)
        {
                pinframe = (md2frame_t *)datapointer;
                datapointer += sizeof(md2frame_t);
-               strcpy(loadmodel->mdlmd2data_frames[i].name, pinframe->name);
                for (j = 0;j < 3;j++)
                {
-                       loadmodel->mdlmd2data_frames[i].scale[j] = LittleFloat(pinframe->scale[j]);
-                       loadmodel->mdlmd2data_frames[i].translate[j] = LittleFloat(pinframe->translate[j]);
+                       scale[j] = LittleFloat(pinframe->scale[j]);
+                       translate[j] = LittleFloat(pinframe->translate[j]);
                }
-               Mod_MD2_ConvertVerts (loadmodel->mdlmd2data_frames[i].scale, loadmodel->mdlmd2data_frames[i].translate, (void *)datapointer, &loadmodel->mdlmd2data_pose[i * loadmodel->numverts], vertremap);
+               Mod_MD2_ConvertVerts(scale, translate, (void *)datapointer, loadmodel->mdlmd2data_pose + i * loadmodel->numverts, vertremap);
+               Mod_BuildAliasVertexTextureVectors(loadmodel->numtris, loadmodel->mdlmd2data_indices, loadmodel->numverts, loadmodel->mdlmd2data_pose + i * loadmodel->numverts, loadmodel->mdlmd2data_texcoords, vertexbuffer, svectorsbuffer, tvectorsbuffer, normalsbuffer);
                datapointer += numxyz * sizeof(trivertx_t);
 
-               strcpy(loadmodel->animscenes[i].name, loadmodel->mdlmd2data_frames[i].name);
+               strcpy(loadmodel->animscenes[i].name, pinframe->name);
                loadmodel->animscenes[i].firstframe = i;
                loadmodel->animscenes[i].framecount = 1;
                loadmodel->animscenes[i].framerate = 10;
                loadmodel->animscenes[i].loop = true;
        }
+       Mem_Free(vertexbuffer);
 
        Mem_Free(vertremap);
 
@@ -756,8 +849,7 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
        loadmodel->radius = modelradius;
        loadmodel->radius2 = modelradius * modelradius;
 
-       loadmodel->mdlmd2data_triangleneighbors = Mem_Alloc(loadmodel->mempool, loadmodel->numtris * sizeof(int[3]));
-       Mod_BuildTriangleNeighbors(loadmodel->mdlmd2data_triangleneighbors, loadmodel->mdlmd2data_indices, loadmodel->numtris);
+       Mod_BuildMDLMD2MeshInfo();
 }
 
 extern void R_Model_Zymotic_DrawSky(entity_render_t *ent);
@@ -870,7 +962,7 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
        // 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);
@@ -883,9 +975,9 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
                        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);
@@ -894,7 +986,7 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
        }
 
        {
-               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);
@@ -904,7 +996,7 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
        }
 
        {
-               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));
@@ -914,17 +1006,17 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
                        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)
@@ -933,27 +1025,27 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
        }
 
        {
-               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
@@ -962,7 +1054,7 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
        }
 
        {
-               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
@@ -982,23 +1074,24 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
                        *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));