]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_alias.c
optimized surface rendering to surface->groupmesh->data_* array pointers directly...
[xonotic/darkplaces.git] / model_alias.c
index d4fe29716cb2ca922009129b81e597a9675eef69..fcaa747c198c23c572a41fc0ff86516ba5b5a851 100644 (file)
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,841 +19,1321 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "image.h"
+#include "r_shadow.h"
 
-/*
-===============
-Mod_AliasInit
-===============
-*/
 void Mod_AliasInit (void)
 {
 }
 
-//aliashdr_t   *pheader;
-
-//typedef struct
-//{
-//     int v[3];
-//     vec3_t normal;
-//} temptris_t;
-//temptris_t *temptris;
-//stvert_t     stverts[MAXALIASVERTS];
-//mtriangle_t  triangles[MAXALIASTRIS];
-
-// a pose is a single set of vertexes.  a frame may be
-// an animating sequence of poses
-//trivertx_t   *poseverts[MAXALIASFRAMES];
-int                    posenum;
-
-byte           **player_8bit_texels_tbl;
-byte           *player_8bit_texels;
-
-float          aliasbboxmin[3], aliasbboxmax[3]; // LordHavoc: proper bounding box considerations
-
-#define MAXVERTS 8192
-float vertst[MAXVERTS][2];
-int vertusage[MAXVERTS];
-int vertonseam[MAXVERTS];
-int vertremap[MAXVERTS];
-unsigned short temptris[MAXVERTS][3];
-
-#define NUMVERTEXNORMALS       162
-extern float   r_avertexnormals[NUMVERTEXNORMALS][3];
-void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, trivert2 *out)
+void Mod_Alias_GetMesh_Vertex3f(const model_t *model, const frameblend_t *frameblend, const aliasmesh_t *mesh, float *out3f)
 {
-       int i, j;
-       vec3_t temp;
-       for (i = 0;i < inverts;i++)
+       if (mesh->num_vertexboneweights)
        {
-               if (vertremap[i] < 0 && vertremap[i+inverts] < 0) // only used vertices need apply...
-                       continue;
-               temp[0] = v[i].v[0] * scale[0] + translate[0];
-               temp[1] = v[i].v[1] * scale[1] + translate[1];
-               temp[2] = v[i].v[2] * scale[2] + translate[2];
-               // update bounding box
-               if (temp[0] < aliasbboxmin[0]) aliasbboxmin[0] = temp[0];
-               if (temp[1] < aliasbboxmin[1]) aliasbboxmin[1] = temp[1];
-               if (temp[2] < aliasbboxmin[2]) aliasbboxmin[2] = temp[2];
-               if (temp[0] > aliasbboxmax[0]) aliasbboxmax[0] = temp[0];
-               if (temp[1] > aliasbboxmax[1]) aliasbboxmax[1] = temp[1];
-               if (temp[2] > aliasbboxmax[2]) aliasbboxmax[2] = temp[2];
-               j = vertremap[i]; // not onseam
-               if (j >= 0)
+               int i, k, blends;
+               aliasvertexboneweight_t *v;
+               float *out, *matrix, m[12], bonepose[256][12];
+               // vertex weighted skeletal
+               // interpolate matrices and concatenate them to their parents
+               for (i = 0;i < model->alias.aliasnum_bones;i++)
                {
-                       VectorCopy(v[i].v, out[j].v);
-                       out[j].n[0] = (signed char) (r_avertexnormals[v[i].lightnormalindex][0] * 127.0);
-                       out[j].n[1] = (signed char) (r_avertexnormals[v[i].lightnormalindex][1] * 127.0);
-                       out[j].n[2] = (signed char) (r_avertexnormals[v[i].lightnormalindex][2] * 127.0);
+                       for (k = 0;k < 12;k++)
+                               m[k] = 0;
+                       for (blends = 0;blends < 4 && frameblend[blends].lerp > 0;blends++)
+                       {
+                               matrix = model->alias.aliasdata_poses + (frameblend[blends].frame * model->alias.aliasnum_bones + i) * 12;
+                               for (k = 0;k < 12;k++)
+                                       m[k] += matrix[k] * frameblend[blends].lerp;
+                       }
+                       if (model->alias.aliasdata_bones[i].parent >= 0)
+                               R_ConcatTransforms(bonepose[model->alias.aliasdata_bones[i].parent], m, bonepose[i]);
+                       else
+                               for (k = 0;k < 12;k++)
+                                       bonepose[i][k] = m[k];
                }
-               j = vertremap[i+inverts]; // onseam
-               if (j >= 0)
+               // blend the vertex bone weights
+               memset(out3f, 0, mesh->num_vertices * sizeof(float[3]));
+               v = mesh->data_vertexboneweights;
+               for (i = 0;i < mesh->num_vertexboneweights;i++, v++)
                {
-                       VectorCopy(v[i].v, out[j].v);
-                       out[j].n[0] = (signed char) (r_avertexnormals[v[i].lightnormalindex][0] * 127.0);
-                       out[j].n[1] = (signed char) (r_avertexnormals[v[i].lightnormalindex][1] * 127.0);
-                       out[j].n[2] = (signed char) (r_avertexnormals[v[i].lightnormalindex][2] * 127.0);
+                       out = out3f + v->vertexindex * 3;
+                       matrix = bonepose[v->boneindex];
+                       // FIXME: this can very easily be optimized with SSE or 3DNow
+                       out[0] += v->origin[0] * matrix[0] + v->origin[1] * matrix[1] + v->origin[2] * matrix[ 2] + v->origin[3] * matrix[ 3];
+                       out[1] += v->origin[0] * matrix[4] + v->origin[1] * matrix[5] + v->origin[2] * matrix[ 6] + v->origin[3] * matrix[ 7];
+                       out[2] += v->origin[0] * matrix[8] + v->origin[1] * matrix[9] + v->origin[2] * matrix[10] + v->origin[3] * matrix[11];
                }
        }
+       else
+       {
+               int i, vertcount;
+               float lerp1, lerp2, lerp3, lerp4;
+               const float *vertsbase, *verts1, *verts2, *verts3, *verts4;
+               // vertex morph
+               vertsbase = mesh->data_morphvertex3f;
+               vertcount = mesh->num_vertices;
+               verts1 = vertsbase + frameblend[0].frame * vertcount * 3;
+               lerp1 = frameblend[0].lerp;
+               if (frameblend[1].lerp)
+               {
+                       verts2 = vertsbase + frameblend[1].frame * vertcount * 3;
+                       lerp2 = frameblend[1].lerp;
+                       if (frameblend[2].lerp)
+                       {
+                               verts3 = vertsbase + frameblend[2].frame * vertcount * 3;
+                               lerp3 = frameblend[2].lerp;
+                               if (frameblend[3].lerp)
+                               {
+                                       verts4 = vertsbase + frameblend[3].frame * vertcount * 3;
+                                       lerp4 = frameblend[3].lerp;
+                                       for (i = 0;i < vertcount * 3;i++)
+                                               VectorMAMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, lerp4, verts4 + i, out3f + i);
+                               }
+                               else
+                                       for (i = 0;i < vertcount * 3;i++)
+                                               VectorMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, out3f + i);
+                       }
+                       else
+                               for (i = 0;i < vertcount * 3;i++)
+                                       VectorMAM(lerp1, verts1 + i, lerp2, verts2 + i, out3f + i);
+               }
+               else
+                       memcpy(out3f, verts1, vertcount * sizeof(float[3]));
+       }
 }
 
-/*
-=================
-Mod_LoadAliasFrame
-=================
-*/
-void * Mod_LoadAliasFrame (void *pin, maliasframe_t *frame, maliashdr_t *mheader, int inverts, int outverts, trivert2 **posevert)
-{
-       trivertx_t              *pinframe;
-       daliasframe_t   *pdaliasframe;
-       
-       pdaliasframe = (daliasframe_t *)pin;
-
-       strcpy(frame->name, pdaliasframe->name);
-       frame->start = posenum;
-       frame->length = 1;
-       frame->rate = 10.0f; // unnecessary but...
-
-       pinframe = (trivertx_t *)(pdaliasframe + 1);
-
-       Mod_ConvertAliasVerts(inverts, mheader->scale, mheader->scale_origin, pinframe, *posevert);
-       *posevert += outverts;
-       posenum++;
-
-       pinframe += inverts;
-
-       return (void *)pinframe;
-}
-
-
-/*
-=================
-Mod_LoadAliasGroup
-=================
-*/
-void *Mod_LoadAliasGroup (void *pin, maliasframe_t *frame, maliashdr_t *mheader, int inverts, int outverts, trivert2 **posevert)
+int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, matrix4x4_t *outmatrix)
 {
-       int             i, numframes;
-       void    *ptemp;
-       float   interval;
-       
-       numframes = LittleLong (((daliasgroup_t *)pin)->numframes);
-
-       strcpy(frame->name, "group");
-       frame->start = posenum;
-       frame->length = numframes;
-       interval = LittleFloat (((daliasinterval_t *)(((daliasgroup_t *)pin) + 1))->interval); // FIXME: support variable framerate groups?
-       if (interval < 0.01f)
-               Host_Error("Mod_LoadAliasGroup: invalid interval");
-       frame->rate = 1.0f / interval;
-
-       ptemp = (void *)(((daliasinterval_t *)(((daliasgroup_t *)pin) + 1)) + numframes);
-
-       for (i=0 ; i<numframes ; i++)
+       const float *boneframe;
+       float tempbonematrix[12], bonematrix[12];
+       Matrix4x4_CreateIdentity(outmatrix);
+       if (model->alias.aliasnum_bones)
        {
-               ((daliasframe_t *)ptemp)++;
-               Mod_ConvertAliasVerts(inverts, mheader->scale, mheader->scale_origin, ptemp, *posevert);
-               *posevert += outverts;
-               posenum++;
-               ptemp = (trivertx_t *)ptemp + inverts;
+               if (tagindex < 0 || tagindex >= model->alias.aliasnum_bones)
+                       return 4;
+               if (poseframe >= model->alias.aliasnum_poses)
+                       return 6;
+               boneframe = model->alias.aliasdata_poses + poseframe * model->alias.aliasnum_bones * 12;
+               memcpy(bonematrix, boneframe + tagindex * 12, sizeof(float[12]));
+               while (model->alias.aliasdata_bones[tagindex].parent >= 0)
+               {
+                       memcpy(tempbonematrix, bonematrix, sizeof(float[12]));
+                       R_ConcatTransforms(boneframe + model->alias.aliasdata_bones[tagindex].parent * 12, tempbonematrix, bonematrix);
+                       tagindex = model->alias.aliasdata_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;
        }
-
-       return ptemp;
+       else if (model->alias.aliasnum_tags)
+       {
+               if (tagindex < 0 || tagindex >= model->alias.aliasnum_tags)
+                       return 4;
+               if (poseframe >= model->alias.aliasnum_tagframes)
+                       return 6;
+               *outmatrix = model->alias.aliasdata_tags[poseframe * model->alias.aliasnum_tags + tagindex].matrix;
+       }
+       return 0;
 }
 
-//=========================================================
-
-/*
-=================
-Mod_FloodFillSkin
-
-Fill background pixels so mipmapping doesn't have haloes - Ed
-=================
-*/
-
-typedef struct
+int Mod_Alias_GetTagIndexForName(const model_t *model, unsigned int skin, const char *tagname)
 {
-       short           x, y;
-} floodfill_t;
-
-extern unsigned d_8to24table[];
-
-// must be a power of 2
-#define FLOODFILL_FIFO_SIZE 0x1000
-#define FLOODFILL_FIFO_MASK (FLOODFILL_FIFO_SIZE - 1)
-
-#define FLOODFILL_STEP( off, dx, dy ) \
-{ \
-       if (pos[off] == fillcolor) \
-       { \
-               pos[off] = 255; \
-               fifo[inpt].x = x + (dx), fifo[inpt].y = y + (dy); \
-               inpt = (inpt + 1) & FLOODFILL_FIFO_MASK; \
-       } \
-       else if (pos[off] != 255) fdc = pos[off]; \
+       int i;
+       if (model->data_overridetagnamesforskin && skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)skin].num_overridetagnames)
+               for (i = 0;i < model->data_overridetagnamesforskin[skin].num_overridetagnames;i++)
+                       if (!strcasecmp(tagname, model->data_overridetagnamesforskin[skin].data_overridetagnames[i].name))
+                               return i + 1;
+       if (model->alias.aliasnum_bones)
+               for (i = 0;i < model->alias.aliasnum_bones;i++)
+                       if (!strcasecmp(tagname, model->alias.aliasdata_bones[i].name))
+                               return i + 1;
+       if (model->alias.aliasnum_tags)
+               for (i = 0;i < model->alias.aliasnum_tags;i++)
+                       if (!strcasecmp(tagname, model->alias.aliasdata_tags[i].name))
+                               return i + 1;
+       return 0;
 }
 
-void Mod_FloodFillSkin( byte *skin, int skinwidth, int skinheight )
+static void Mod_Alias_Mesh_CompileFrameZero(aliasmesh_t *mesh)
 {
-       byte                            fillcolor = *skin; // assume this is the pixel to fill
-       floodfill_t                     fifo[FLOODFILL_FIFO_SIZE];
-       int                                     inpt = 0, outpt = 0;
-       int                                     filledcolor = -1;
-       int                                     i;
-
-       if (filledcolor == -1)
-       {
-               filledcolor = 0;
-               // attempt to find opaque black
-               for (i = 0; i < 256; ++i)
-                       if (d_8to24table[i] == (255 << 0)) // alpha 1.0
-                       {
-                               filledcolor = i;
-                               break;
-                       }
-       }
-
-       // can't fill to filled color or to transparent color (used as visited marker)
-       if ((fillcolor == filledcolor) || (fillcolor == 255))
-       {
-               //printf( "not filling skin from %d to %d\n", fillcolor, filledcolor );
-               return;
-       }
-
-       fifo[inpt].x = 0, fifo[inpt].y = 0;
-       inpt = (inpt + 1) & FLOODFILL_FIFO_MASK;
-
-       while (outpt != inpt)
-       {
-               int                     x = fifo[outpt].x, y = fifo[outpt].y;
-               int                     fdc = filledcolor;
-               byte            *pos = &skin[x + skinwidth * y];
-
-               outpt = (outpt + 1) & FLOODFILL_FIFO_MASK;
-
-               if (x > 0)                              FLOODFILL_STEP( -1, -1, 0 );
-               if (x < skinwidth - 1)  FLOODFILL_STEP( 1, 1, 0 );
-               if (y > 0)                              FLOODFILL_STEP( -skinwidth, 0, -1 );
-               if (y < skinheight - 1) FLOODFILL_STEP( skinwidth, 0, 1 );
-               skin[x + skinwidth * y] = fdc;
-       }
+       frameblend_t frameblend[4] = {{0, 1}, {0, 0}, {0, 0}, {0, 0}};
+       mesh->data_basevertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[3][4]));
+       mesh->data_basesvector3f = mesh->data_basevertex3f + mesh->num_vertices * 3;
+       mesh->data_basetvector3f = mesh->data_basevertex3f + mesh->num_vertices * 6;
+       mesh->data_basenormal3f = mesh->data_basevertex3f + mesh->num_vertices * 9;
+       Mod_Alias_GetMesh_Vertex3f(loadmodel, frameblend, mesh, mesh->data_basevertex3f);
+       Mod_BuildTextureVectorsAndNormals(0, mesh->num_vertices, mesh->num_triangles, mesh->data_basevertex3f, mesh->data_texcoord2f, mesh->data_element3i, mesh->data_basesvector3f, mesh->data_basetvector3f, mesh->data_basenormal3f);
 }
 
-int GL_SkinSplitShirt(byte *in, byte *out, int width, int height, unsigned short bits, char *name)
+static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs, int hitsupercontentsmask)
 {
-       int i, pixels, passed;
-       byte pixeltest[16];
-       for (i = 0;i < 16;i++)
-               pixeltest[i] = (bits & (1 << i)) != 0;
-       pixels = width*height;
-       passed = 0;
-       while(pixels--)
-       {
-               if (pixeltest[*in >> 4] && *in != 0 && *in != 255)
+       int i, framenum;
+       float segmentmins[3], segmentmaxs[3];
+       colbrushf_t *thisbrush_start, *thisbrush_end;
+       matrix4x4_t startmatrix, endmatrix;
+       memset(trace, 0, sizeof(*trace));
+       trace->fraction = 1;
+       trace->realfraction = 1;
+       trace->hitsupercontentsmask = hitsupercontentsmask;
+       segmentmins[0] = min(boxstartmins[0], boxendmins[0]);
+       segmentmins[1] = min(boxstartmins[1], boxendmins[1]);
+       segmentmins[2] = min(boxstartmins[2], boxendmins[2]);
+       segmentmaxs[0] = max(boxstartmaxs[0], boxendmaxs[0]);
+       segmentmaxs[1] = max(boxstartmaxs[1], boxendmaxs[1]);
+       segmentmaxs[2] = max(boxstartmaxs[2], boxendmaxs[2]);
+       if (VectorCompare(boxstartmins, boxstartmaxs) && VectorCompare(boxendmins, boxendmaxs))
+       {
+               // line trace
+               for (i = 0;i < model->alias.aliasnum_meshes;i++)
                {
-                       passed++;
-                       // turn to white while copying
-                       if (*in >= 128 && *in < 224) // backwards ranges
-                               *out = (*in & 15) ^ 15;
-                       else
-                               *out = *in & 15;
+                       framenum = frame;
+                       if (framenum < 0 || framenum > model->alias.aliasdata_meshes[i].num_morphframes)
+                               framenum = 0;
+                       if (model->alias.aliasdata_meshes[i].data_morphvertex3f)
+                               Collision_TraceLineTriangleMeshFloat(trace, boxstartmins, boxendmins, model->alias.aliasdata_meshes[i].num_triangles, model->alias.aliasdata_meshes[i].data_element3i, model->alias.aliasdata_meshes[i].data_morphvertex3f + framenum * model->alias.aliasdata_meshes[i].num_vertices * 3, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs);
+                       //else
+                               // FIXME!!!  this needs to handle skeletal!
                }
-               else
-                       *out = 0;
-               in++;
-               out++;
        }
-       if (passed)
-               return GL_LoadTexture (name, width, height, out - width*height, true, false, 1);
        else
-               return 0;
+       {
+               // box trace, performed as brush trace
+               Matrix4x4_CreateIdentity(&startmatrix);
+               Matrix4x4_CreateIdentity(&endmatrix);
+               thisbrush_start = Collision_BrushForBox(&startmatrix, boxstartmins, boxstartmaxs);
+               thisbrush_end = Collision_BrushForBox(&endmatrix, boxendmins, boxendmaxs);
+               for (i = 0;i < model->alias.aliasnum_meshes;i++)
+               {
+                       framenum = frame;
+                       if (framenum < 0 || framenum > model->alias.aliasdata_meshes[i].num_morphframes)
+                               framenum = 0;
+                       if (model->alias.aliasdata_meshes[i].data_morphvertex3f)
+                               Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, model->alias.aliasdata_meshes[i].num_triangles, model->alias.aliasdata_meshes[i].data_element3i, model->alias.aliasdata_meshes[i].data_morphvertex3f + framenum * model->alias.aliasdata_meshes[i].num_vertices * 3, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs);
+                       //else
+                               // FIXME!!!  this needs to handle skeletal!
+               }
+       }
 }
 
-int GL_SkinSplit(byte *in, byte *out, int width, int height, unsigned short bits, char *name)
+static void Mod_CalcAliasModelBBoxes (void)
 {
-       int i, pixels, passed;
-       byte pixeltest[16];
-       for (i = 0;i < 16;i++)
-               pixeltest[i] = (bits & (1 << i)) != 0;
-       pixels = width*height;
-       passed = 0;
-       while(pixels--)
-       {
-               if (pixeltest[*in >> 4] && *in != 0 && *in != 255)
+       int vnum, meshnum;
+       float dist, yawradius, radius;
+       aliasmesh_t *mesh;
+       float *v;
+       VectorClear(loadmodel->normalmins);
+       VectorClear(loadmodel->normalmaxs);
+       yawradius = 0;
+       radius = 0;
+       for (meshnum = 0, mesh = loadmodel->alias.aliasdata_meshes;meshnum < loadmodel->alias.aliasnum_meshes;meshnum++, mesh++)
+       {
+               for (vnum = 0, v = mesh->data_morphvertex3f;vnum < mesh->num_vertices * mesh->num_morphframes;vnum++, v += 3)
                {
-                       passed++;
-                       *out = *in;
+                       if (loadmodel->normalmins[0] > v[0]) loadmodel->normalmins[0] = v[0];
+                       if (loadmodel->normalmins[1] > v[1]) loadmodel->normalmins[1] = v[1];
+                       if (loadmodel->normalmins[2] > v[2]) loadmodel->normalmins[2] = v[2];
+                       if (loadmodel->normalmaxs[0] < v[0]) loadmodel->normalmaxs[0] = v[0];
+                       if (loadmodel->normalmaxs[1] < v[1]) loadmodel->normalmaxs[1] = v[1];
+                       if (loadmodel->normalmaxs[2] < v[2]) loadmodel->normalmaxs[2] = v[2];
+                       dist = v[0] * v[0] + v[1] * v[1];
+                       if (yawradius < dist)
+                               yawradius = dist;
+                       dist += v[2] * v[2];
+                       if (radius < dist)
+                               radius = dist;
                }
-               else
-                       *out = 0;
-               in++;
-               out++;
        }
-       if (passed)
-               return GL_LoadTexture (name, width, height, out - width*height, true, false, 1);
-       else
-               return 0;
+       radius = sqrt(radius);
+       yawradius = sqrt(yawradius);
+       loadmodel->yawmins[0] = loadmodel->yawmins[1] = -yawradius;
+       loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = yawradius;
+       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;
 }
 
-/*
-===============
-Mod_LoadAllSkins
-===============
-*/
-void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int width, int height)
+static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, float *out3f, int *vertremap)
 {
-       int             i, j;
-       char    name[32];
-       int             s;
-       byte    *skin;
-       daliasskingroup_t               *pinskingroup;
-       int             groupskins;
-       daliasskininterval_t    *pinskinintervals;
-       int             skinranges, skincount, *skintexnum, *skinrange, skinnum;
-       void    *temp;
-       byte    *skintemp = NULL;
-       
-       skin = (byte *)(pskintype + 1);
-
-       if (numskins < 1 || numskins > MAX_SKINS)
-               Host_Error ("Mod_LoadAliasModel: Invalid # of skins: %d\n", numskins);
-
-       s = width * height;
-       skintemp = malloc(s);
-
-       // LordHavoc: skim the data, measure the number of skins and number of groups
-       skinranges = numskins;
-       skincount = 0;
-       temp = pskintype;
-       for (i = 0;i < numskins;i++)
-       {
-               pskintype++;
-               if (pskintype[-1].type == ALIAS_SKIN_SINGLE)
-               {
-                       skincount++;
-                       (byte *)pskintype += s;
-               }
-               else
-               {
-                       groupskins = LittleLong (((daliasskingroup_t *)pskintype)->numskins);
-                       skincount += groupskins;
-                       (byte *)pskintype += (s + sizeof(daliasskininterval_t)) * groupskins + sizeof(daliasskingroup_t);
-               }
+       int i, j;
+       vec3_t temp;
+       for (i = 0;i < inverts;i++)
+       {
+               if (vertremap[i] < 0 && vertremap[i+inverts] < 0) // only used vertices need apply...
+                       continue;
+               temp[0] = v[i].v[0] * scale[0] + translate[0];
+               temp[1] = v[i].v[1] * scale[1] + translate[1];
+               temp[2] = v[i].v[2] * scale[2] + translate[2];
+               j = vertremap[i]; // not onseam
+               if (j >= 0)
+                       VectorCopy(temp, out3f + j * 3);
+               j = vertremap[i+inverts]; // onseam
+               if (j >= 0)
+                       VectorCopy(temp, out3f + j * 3);
        }
-       pskintype = temp;
+}
 
-       skinrange = loadmodel->skinanimrange;
-       skintexnum = loadmodel->skinanim;
-//     skinrange = Hunk_AllocName (sizeof(int) * (skinranges + skincount), loadname);  
-//     skintexnum = skinrange + skinranges * 2;
-//     loadmodel->skinanimrange = (int) skinrange - (int) pheader;
-//     loadmodel->skinanim = (int) skintexnum - (int) pheader;
-       skinnum = 0;
-       for (i = 0;i < numskins;i++)
+static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, vec3_t translate, int *vertremap)
+{
+       int i, f, pose, groupframes;
+       float interval;
+       daliasframetype_t *pframetype;
+       daliasframe_t *pinframe;
+       daliasgroup_t *group;
+       daliasinterval_t *intervals;
+       animscene_t *scene;
+       pose = 0;
+       scene = loadmodel->animscenes;
+       for (f = 0;f < loadmodel->numframes;f++)
        {
-               *skinrange++ = skinnum; // start of the range
-               pskintype++;
-               if (pskintype[-1].type == ALIAS_SKIN_SINGLE)
+               pframetype = (daliasframetype_t *)datapointer;
+               datapointer += sizeof(daliasframetype_t);
+               if (LittleLong (pframetype->type) == ALIAS_SINGLE)
                {
-                       *skinrange++ = 1; // single skin
-                       skinnum++;
-                       sprintf (name, "%s_%i", loadmodel->name, i);
-
-                       Mod_FloodFillSkin( skin, width, height );
-                       *skintexnum++ = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0x3FBD, va("%s_normal", name)); // normal (no special colors)
-                       *skintexnum++ = GL_SkinSplitShirt((byte *)pskintype, skintemp, width, height, 0x0040, va("%s_pants",  name)); // pants
-                       *skintexnum++ = GL_SkinSplitShirt((byte *)pskintype, skintemp, width, height, 0x0002, va("%s_shirt",  name)); // shirt
-                       *skintexnum++ = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0xC000, va("%s_glow",   name)); // glow
-                       *skintexnum++ = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0x3FFF, va("%s_body",   name)); // body (normal + pants + shirt, but not glow)
-                       pskintype = (daliasskintype_t *)((byte *)(pskintype) + s);
+                       // a single frame is still treated as a group
+                       interval = 0.1f;
+                       groupframes = 1;
                }
                else
                {
-                       // animating skin group.  yuck.
-                       pinskingroup = (daliasskingroup_t *)pskintype;
-                       groupskins = LittleLong (pinskingroup->numskins);
-                       pinskinintervals = (daliasskininterval_t *)(pinskingroup + 1);
+                       // read group header
+                       group = (daliasgroup_t *)datapointer;
+                       datapointer += sizeof(daliasgroup_t);
+                       groupframes = LittleLong (group->numframes);
 
-                       pskintype = (void *)(pinskinintervals + groupskins);
+                       // intervals (time per frame)
+                       intervals = (daliasinterval_t *)datapointer;
+                       datapointer += sizeof(daliasinterval_t) * groupframes;
 
-                       *skinrange++ = groupskins; // number of skins
-                       skinnum += groupskins;
-                       for (j = 0;j < groupskins;j++)
+                       interval = LittleFloat (intervals->interval); // FIXME: support variable framerate groups
+                       if (interval < 0.01f)
                        {
-                               sprintf (name, "%s_%i_%i", loadmodel->name, i,j);
-
-                               Mod_FloodFillSkin( skin, width, height );
-                               *skintexnum++ = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0x3FBD, va("%s_normal", name)); // normal (no special colors)
-                               *skintexnum++ = GL_SkinSplitShirt((byte *)pskintype, skintemp, width, height, 0x0040, va("%s_pants",  name)); // pants
-                               *skintexnum++ = GL_SkinSplitShirt((byte *)pskintype, skintemp, width, height, 0x0002, va("%s_shirt",  name)); // shirt
-                               *skintexnum++ = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0xC000, va("%s_glow",   name)); // glow
-                               *skintexnum++ = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0x3FFF, va("%s_body",   name)); // body (normal + pants + shirt, but not glow)
-                               pskintype = (daliasskintype_t *)((byte *)(pskintype) + s);
+                               Con_Printf("%s has an invalid interval %f, changing to 0.1\n", loadmodel->name, interval);
+                               interval = 0.1f;
                        }
                }
+
+               // get scene name from first frame
+               pinframe = (daliasframe_t *)datapointer;
+
+               strcpy(scene->name, pinframe->name);
+               scene->firstframe = pose;
+               scene->framecount = groupframes;
+               scene->framerate = 1.0f / interval;
+               scene->loop = true;
+               scene++;
+
+               // read frames
+               for (i = 0;i < groupframes;i++)
+               {
+                       pinframe = (daliasframe_t *)datapointer;
+                       datapointer += sizeof(daliasframe_t);
+                       Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->alias.aliasdata_meshes->data_morphvertex3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, vertremap);
+                       datapointer += sizeof(trivertx_t) * inverts;
+                       pose++;
+               }
+       }
+}
+
+static skinframe_t missingskinframe;
+static void Mod_BuildAliasSkinFromSkinFrame(texture_t *skin, skinframe_t *skinframe)
+{
+       // hack
+       if (skinframe == NULL)
+       {
+               skinframe = &missingskinframe;
+               memset(skinframe, 0, sizeof(*skinframe));
+               skinframe->base = r_texture_notexture;
        }
-       loadmodel->numskins = numskins;
-       free(skintemp);
 
-       return (void *)pskintype;
+       skin->skin = *skinframe;
 }
 
-void *Mod_SkipAllSkins (int numskins, daliasskintype_t *pskintype, int skinsize)
+static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, char *meshname, char *shadername)
 {
-       int             i;
-       for (i = 0;i < numskins;i++)
+       int i;
+       skinfileitem_t *skinfileitem;
+       skinframe_t tempskinframe;
+       if (skinfile)
        {
-               pskintype++;
-               if (pskintype[-1].type == ALIAS_SKIN_SINGLE)
-                       (byte *)pskintype += skinsize;
+               for (i = 0;skinfile;skinfile = skinfile->next, i++, skin++)
+               {
+                       memset(skin, 0, sizeof(*skin));
+                       for (skinfileitem = skinfile->items;skinfileitem;skinfileitem = skinfileitem->next)
+                       {
+                               // leave the skin unitialized (nodraw) if the replacement is "common/nodraw" or "textures/common/nodraw"
+                               if (!strcmp(skinfileitem->name, meshname) && strcmp(skinfileitem->replacement, "common/nodraw") && strcmp(skinfileitem->replacement, "textures/common/nodraw"))
+                               {
+                                       memset(&tempskinframe, 0, sizeof(tempskinframe));
+                                       if (Mod_LoadSkinFrame(&tempskinframe, skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
+                                               Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
+                                       else
+                                       {
+                                               Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\", falling back to mesh's internal shader name \"%s\"\n", meshname, i, skinfileitem->replacement, shadername);
+                                               if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
+                                                       Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
+                                               else
+                                               {
+                                                       Con_Printf("failed to load skin \"%s\"\n", shadername);
+                                                       Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+       else
+       {
+               memset(&tempskinframe, 0, sizeof(tempskinframe));
+               if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
+                       Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
                else
-                       (byte *)pskintype += (skinsize + sizeof(daliasskininterval_t)) * LittleLong (((daliasskingroup_t *)pskintype)->numskins) + sizeof(daliasskingroup_t);
+               {
+                       Con_Printf("failed to load mesh \"%s\" shader \"%s\"\n", meshname, shadername);
+                       Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
+               }
        }
-       return pskintype;
 }
 
-//=========================================================================
-
-//void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr);
-
-/*
-=================
-Mod_LoadAliasModel
-=================
-*/
-#define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid VALUE (%d exceeds %d - %d)\n", mod->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", mod->name, VALUE, MIN, MAX);
-void Mod_LoadAliasModel (model_t *mod, void *buffer)
+#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);
+extern void R_Model_Alias_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
+extern void R_Model_Alias_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist);
+void Mod_IDP0_Load(model_t *mod, void *buffer)
 {
-       int                                     i, j, version, numframes, start, end, total, numverts, numtris, numposes, numskins, skinwidth, skinheight, f, totalverts;
-       mdl_t                           *pinmodel;
-       stvert_t                        *pinstverts;
-       dtriangle_t                     *pintriangles;
-       daliasframetype_t       *pframetype;
-       daliasskintype_t        *pskintype;
-       float                           *pouttexcoords, scales, scalet;
-       maliashdr_t                     *mheader;
-       unsigned short          *pouttris;
-       maliasframe_t           *frame;
-       trivert2                        *posevert;
-
-       start = Hunk_LowMark ();
-
-       pinmodel = (mdl_t *)buffer;
+       int i, j, version, totalskins, skinwidth, skinheight, groupframes, groupskins, numverts;
+       float scales, scalet, scale[3], translate[3], interval;
+       mdl_t *pinmodel;
+       stvert_t *pinstverts;
+       dtriangle_t *pintriangles;
+       daliasskintype_t *pinskintype;
+       daliasskingroup_t *pinskingroup;
+       daliasskininterval_t *pinskinintervals;
+       daliasframetype_t *pinframetype;
+       daliasgroup_t *pinframegroup;
+       qbyte *datapointer, *startframes, *startskins;
+       char name[MAX_QPATH];
+       skinframe_t tempskinframe;
+       animscene_t *tempskinscenes;
+       texture_t *tempaliasskins;
+       float *vertst;
+       int *vertonseam, *vertremap;
+       skinfile_t *skinfiles;
+
+       datapointer = buffer;
+       pinmodel = (mdl_t *)datapointer;
+       datapointer += sizeof(mdl_t);
 
        version = LittleLong (pinmodel->version);
        if (version != ALIAS_VERSION)
                Host_Error ("%s has wrong version number (%i should be %i)",
-                                mod->name, version, ALIAS_VERSION);
+                                loadmodel->name, version, ALIAS_VERSION);
 
-       mod->type = ALIASTYPE_MDL;
+       loadmodel->type = mod_alias;
+       loadmodel->DrawSky = NULL;
+       loadmodel->Draw = R_Model_Alias_Draw;
+       loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
+       loadmodel->DrawLight = R_Model_Alias_DrawLight;
+       loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
 
-       numframes = LittleLong(pinmodel->numframes);
-       BOUNDI(numframes,0,65536);
-       numverts = LittleLong(pinmodel->numverts);
-       BOUNDI(numverts,0,MAXALIASVERTS);
-       numtris = LittleLong(pinmodel->numtris);
-       BOUNDI(numtris,0,65536);
-       numskins = LittleLong(pinmodel->numskins);
-       BOUNDI(numskins,0,256);
+       loadmodel->alias.aliasnum_meshes = 1;
+       loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, sizeof(aliasmesh_t));
+
+       loadmodel->numskins = LittleLong(pinmodel->numskins);
+       BOUNDI(loadmodel->numskins,0,65536);
        skinwidth = LittleLong (pinmodel->skinwidth);
-       BOUNDI(skinwidth,0,4096);
+       BOUNDI(skinwidth,0,65536);
        skinheight = LittleLong (pinmodel->skinheight);
-       BOUNDI(skinheight,0,1024);
-       
-       pskintype = (daliasskintype_t *)&pinmodel[1];
-       pinstverts = (stvert_t *)Mod_SkipAllSkins (numskins, pskintype, skinwidth * skinheight);
-       pintriangles = (dtriangle_t *)&pinstverts[numverts];
-       pframetype = (daliasframetype_t *)&pintriangles[numtris];
+       BOUNDI(skinheight,0,65536);
+       numverts = LittleLong(pinmodel->numverts);
+       BOUNDI(numverts,0,65536);
+       loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->numtris);
+       BOUNDI(loadmodel->alias.aliasdata_meshes->num_triangles,0,65536);
+       loadmodel->numframes = LittleLong(pinmodel->numframes);
+       BOUNDI(loadmodel->numframes,0,65536);
+       loadmodel->synctype = LittleLong (pinmodel->synctype);
+       BOUNDI(loadmodel->synctype,0,2);
+       loadmodel->flags = LittleLong (pinmodel->flags);
+
+       for (i = 0;i < 3;i++)
+       {
+               scale[i] = LittleFloat (pinmodel->scale[i]);
+               translate[i] = LittleFloat (pinmodel->scale_origin[i]);
+       }
 
-       numposes = 0;
-       for (i=0 ; i<numframes ; i++)
+       startskins = datapointer;
+       totalskins = 0;
+       for (i = 0;i < loadmodel->numskins;i++)
        {
-               if ((aliasframetype_t) LittleLong (pframetype->type) == ALIAS_SINGLE)
+               pinskintype = (daliasskintype_t *)datapointer;
+               datapointer += sizeof(daliasskintype_t);
+               if (LittleLong(pinskintype->type) == ALIAS_SKIN_SINGLE)
+                       groupskins = 1;
+               else
                {
-                       numposes++;
-                       pframetype = (daliasframetype_t *)((int)pframetype + sizeof(daliasframetype_t)                         + (sizeof(daliasframe_t)                            + sizeof(trivertx_t) * numverts)    );
+                       pinskingroup = (daliasskingroup_t *)datapointer;
+                       datapointer += sizeof(daliasskingroup_t);
+                       groupskins = LittleLong(pinskingroup->numskins);
+                       datapointer += sizeof(daliasskininterval_t) * groupskins;
                }
-               else
+
+               for (j = 0;j < groupskins;j++)
                {
-                       f = LittleLong (((daliasgroup_t *)((int)pframetype + sizeof(daliasframetype_t)))->numframes);
-                       numposes += f;
-                       pframetype = (daliasframetype_t *)((int)pframetype + sizeof(daliasframetype_t) + sizeof(daliasgroup_t) + (sizeof(daliasframe_t) + sizeof(daliasinterval_t) + sizeof(trivertx_t) * numverts) * f);
+                       datapointer += skinwidth * skinheight;
+                       totalskins++;
                }
        }
 
-       // rebuild the model
-       mheader = Hunk_AllocName (sizeof(maliashdr_t), loadname);
-       mod->flags = LittleLong (pinmodel->flags);
-       mod->type = mod_alias;
-// endian-adjust and copy the data, starting with the alias model header
-       mheader->numverts = numverts;
-       mod->numtris = mheader->numtris = numtris;
-       mod->numframes = mheader->numframes = numframes;
-       mod->synctype = LittleLong (pinmodel->synctype);
-       BOUNDI(mod->synctype,0,2);
+       pinstverts = (stvert_t *)datapointer;
+       datapointer += sizeof(stvert_t) * numverts;
+
+       pintriangles = (dtriangle_t *)datapointer;
+       datapointer += sizeof(dtriangle_t) * loadmodel->alias.aliasdata_meshes->num_triangles;
 
-       for (i=0 ; i<3 ; i++)
+       startframes = datapointer;
+       loadmodel->alias.aliasdata_meshes->num_morphframes = 0;
+       for (i = 0;i < loadmodel->numframes;i++)
        {
-               mheader->scale[i] = LittleFloat (pinmodel->scale[i]);
-               BOUNDF(mheader->scale[i],0,65536);
-               mheader->scale_origin[i] = LittleFloat (pinmodel->scale_origin[i]);
-               BOUNDF(mheader->scale_origin[i],-65536,65536);
-       }
+               pinframetype = (daliasframetype_t *)datapointer;
+               datapointer += sizeof(daliasframetype_t);
+               if (LittleLong (pinframetype->type) == ALIAS_SINGLE)
+                       groupframes = 1;
+               else
+               {
+                       pinframegroup = (daliasgroup_t *)datapointer;
+                       datapointer += sizeof(daliasgroup_t);
+                       groupframes = LittleLong(pinframegroup->numframes);
+                       datapointer += sizeof(daliasinterval_t) * groupframes;
+               }
 
-       // load the skins
-       pskintype = (daliasskintype_t *)&pinmodel[1];
-       pskintype = Mod_LoadAllSkins(numskins, pskintype, skinwidth, skinheight);
+               for (j = 0;j < groupframes;j++)
+               {
+                       datapointer += sizeof(daliasframe_t);
+                       datapointer += sizeof(trivertx_t) * numverts;
+                       loadmodel->alias.aliasdata_meshes->num_morphframes++;
+               }
+       }
 
-       // store texture coordinates into temporary array, they will be stored after usage is determined (triangle data)
-       pinstverts = (stvert_t *)pskintype;
+       // store texture coordinates into temporary array, they will be stored
+       // after usage is determined (triangle data)
+       vertst = Mem_Alloc(tempmempool, numverts * 2 * sizeof(float[2]));
+       vertremap = Mem_Alloc(tempmempool, numverts * 3 * sizeof(int));
+       vertonseam = vertremap + numverts * 2;
 
-       // LordHavoc: byteswap and convert stvert data
        scales = 1.0 / skinwidth;
        scalet = 1.0 / skinheight;
        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+numverts][0] = vertst[i][0] + 0.5;
-               vertst[i+numverts][1] = vertst[i][1];
-               vertusage[i] = 0;
-               vertusage[i+numverts] = 0;
+               vertst[i*2+0] = (LittleLong(pinstverts[i].s) + 0.5) * scales;
+               vertst[i*2+1] = (LittleLong(pinstverts[i].t) + 0.5) * scalet;
+               vertst[(i+numverts)*2+0] = vertst[i*2+0] + 0.5;
+               vertst[(i+numverts)*2+1] = vertst[i*2+1];
        }
 
 // load triangle data
-       pouttris = Hunk_AllocName(sizeof(unsigned short[3]) * numtris, loadname);
-       mheader->tridata = (int) pouttris - (int) mheader;
-       pintriangles = (dtriangle_t *)&pinstverts[mheader->numverts];
+       loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * loadmodel->alias.aliasdata_meshes->num_triangles);
 
-       // count the vertices used
-       for (i = 0;i < numverts*2;i++)
-               vertusage[i] = 0;
-       for (i = 0;i < numtris;i++)
-       {
-               temptris[i][0] = LittleLong(pintriangles[i].vertindex[0]);
-               temptris[i][1] = LittleLong(pintriangles[i].vertindex[1]);
-               temptris[i][2] = LittleLong(pintriangles[i].vertindex[2]);
+       // read the triangle elements
+       for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
+               for (j = 0;j < 3;j++)
+                       loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = LittleLong(pintriangles[i].vertindex[j]);
+       // validate (note numverts is used because this is the original data)
+       Mod_ValidateElements(loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles, numverts, __FILE__, __LINE__);
+       // now butcher the elements according to vertonseam and tri->facesfront
+       // and then compact the vertex set to remove duplicates
+       for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
                if (!LittleLong(pintriangles[i].facesfront)) // backface
-               {
-                       if (vertonseam[temptris[i][0]]) temptris[i][0] += numverts;
-                       if (vertonseam[temptris[i][1]]) temptris[i][1] += numverts;
-                       if (vertonseam[temptris[i][2]]) temptris[i][2] += numverts;
-               }
-               vertusage[temptris[i][0]]++;
-               vertusage[temptris[i][1]]++;
-               vertusage[temptris[i][2]]++;
-       }
+                       for (j = 0;j < 3;j++)
+                               if (vertonseam[loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j]])
+                                       loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] += numverts;
+       // count the usage
+       // (this uses vertremap to count usage to save some memory)
+       for (i = 0;i < numverts*2;i++)
+               vertremap[i] = 0;
+       for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles*3;i++)
+               vertremap[loadmodel->alias.aliasdata_meshes->data_element3i[i]]++;
        // build remapping table and compact array
-       totalverts = 0;
+       loadmodel->alias.aliasdata_meshes->num_vertices = 0;
        for (i = 0;i < numverts*2;i++)
        {
-               if (vertusage[i])
+               if (vertremap[i])
                {
-                       vertremap[i] = totalverts;
-                       vertst[totalverts][0] = vertst[i][0];
-                       vertst[totalverts][1] = vertst[i][1];
-                       totalverts++;
+                       vertremap[i] = loadmodel->alias.aliasdata_meshes->num_vertices;
+                       vertst[loadmodel->alias.aliasdata_meshes->num_vertices*2+0] = vertst[i*2+0];
+                       vertst[loadmodel->alias.aliasdata_meshes->num_vertices*2+1] = vertst[i*2+1];
+                       loadmodel->alias.aliasdata_meshes->num_vertices++;
                }
                else
                        vertremap[i] = -1; // not used at all
        }
-       mheader->numverts = totalverts;
-       // remap the triangle references
-       for (i = 0;i < numtris;i++)
-       {
-               *pouttris++ = vertremap[temptris[i][0]];
-               *pouttris++ = vertremap[temptris[i][1]];
-               *pouttris++ = vertremap[temptris[i][2]];
-       }
+       // remap the elements to the new vertex set
+       for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles * 3;i++)
+               loadmodel->alias.aliasdata_meshes->data_element3i[i] = vertremap[loadmodel->alias.aliasdata_meshes->data_element3i[i]];
        // store the texture coordinates
-       pouttexcoords = Hunk_AllocName(sizeof(float[2]) * totalverts, loadname);
-       mheader->texdata = (int) pouttexcoords - (int) mheader;
-       for (i = 0;i < totalverts;i++)
+       loadmodel->alias.aliasdata_meshes->data_texcoord2f = Mem_Alloc(loadmodel->mempool, sizeof(float[2]) * loadmodel->alias.aliasdata_meshes->num_vertices);
+       for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_vertices;i++)
        {
-               *pouttexcoords++ = vertst[i][0];
-               *pouttexcoords++ = vertst[i][1];
+               loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+0] = vertst[i*2+0];
+               loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+1] = vertst[i*2+1];
        }
 
 // load the frames
-       posenum = 0;
-       frame = Hunk_AllocName(sizeof(maliasframe_t) * numframes, loadname);
-       mheader->framedata = (int) frame - (int) mheader;
-       posevert = Hunk_AllocName(sizeof(trivert2) * numposes * totalverts, loadname);
-       mheader->posedata = (int) posevert - (int) mheader;
-       pframetype = (daliasframetype_t *)&pintriangles[numtris];
+       loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+       loadmodel->alias.aliasdata_meshes->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * loadmodel->alias.aliasdata_meshes->num_morphframes * loadmodel->alias.aliasdata_meshes->num_vertices);
+       loadmodel->alias.aliasdata_meshes->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
+       Mod_MDL_LoadFrames (startframes, numverts, scale, translate, vertremap);
+       Mod_BuildTriangleNeighbors(loadmodel->alias.aliasdata_meshes->data_neighbor3i, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles);
+       Mod_CalcAliasModelBBoxes();
+       Mod_Alias_Mesh_CompileFrameZero(loadmodel->alias.aliasdata_meshes);
 
-       // LordHavoc: doing proper bbox for model
-       aliasbboxmin[0] = aliasbboxmin[1] = aliasbboxmin[2] = 1000000000;
-       aliasbboxmax[0] = aliasbboxmax[1] = aliasbboxmax[2] = -1000000000;
+       Mem_Free(vertst);
+       Mem_Free(vertremap);
 
-       for (i=0 ; i<numframes ; i++)
+       // load the skins
+       if ((skinfiles = Mod_LoadSkinFiles()))
        {
-               if ((aliasframetype_t) LittleLong (pframetype->type) == ALIAS_SINGLE)
-                       pframetype = (daliasframetype_t *) Mod_LoadAliasFrame (pframetype + 1, frame++, mheader, numverts, totalverts, &posevert);
-               else
-                       pframetype = (daliasframetype_t *) Mod_LoadAliasGroup (pframetype + 1, frame++, mheader, numverts, totalverts, &posevert);
+               loadmodel->alias.aliasdata_meshes->num_skins = totalskins = loadmodel->numskins;
+               loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(texture_t));
+               Mod_BuildAliasSkinsFromSkinFiles(loadmodel->alias.aliasdata_meshes->data_skins, skinfiles, "default", "");
+               Mod_FreeSkinFiles(skinfiles);
+               loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+               for (i = 0;i < loadmodel->numskins;i++)
+               {
+                       loadmodel->skinscenes[i].firstframe = i;
+                       loadmodel->skinscenes[i].framecount = 1;
+                       loadmodel->skinscenes[i].loop = true;
+                       loadmodel->skinscenes[i].framerate = 10;
+               }
        }
-
-       // LordHavoc: fixed model bbox - was //FIXME: do this right
-       //mod->mins[0] = mod->mins[1] = mod->mins[2] = -16;
-       //mod->maxs[0] = mod->maxs[1] = mod->maxs[2] = 16;
-       for (j = 0;j < 3;j++)
+       else
        {
-               mod->mins[j] = aliasbboxmin[j];
-               mod->maxs[j] = aliasbboxmax[j];
-       }
+               loadmodel->alias.aliasdata_meshes->num_skins = totalskins;
+               loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(texture_t));
+               loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
+               totalskins = 0;
+               datapointer = startskins;
+               for (i = 0;i < loadmodel->numskins;i++)
+               {
+                       pinskintype = (daliasskintype_t *)datapointer;
+                       datapointer += sizeof(daliasskintype_t);
+
+                       if (pinskintype->type == ALIAS_SKIN_SINGLE)
+                       {
+                               groupskins = 1;
+                               interval = 0.1f;
+                       }
+                       else
+                       {
+                               pinskingroup = (daliasskingroup_t *)datapointer;
+                               datapointer += sizeof(daliasskingroup_t);
 
-// move the complete, relocatable alias model to the cache
-       end = Hunk_LowMark ();
-       total = end - start;
-       
-       Cache_Alloc (&mod->cache, total, loadname);
-       if (!mod->cache.data)
-               return;
-       memcpy (mod->cache.data, mheader, total);
+                               groupskins = LittleLong (pinskingroup->numskins);
 
-       Hunk_FreeToLowMark (start);
+                               pinskinintervals = (daliasskininterval_t *)datapointer;
+                               datapointer += sizeof(daliasskininterval_t) * groupskins;
+
+                               interval = LittleFloat(pinskinintervals[0].interval);
+                               if (interval < 0.01f)
+                               {
+                                       Con_Printf("%s has an invalid interval %f, changing to 0.1\n", loadmodel->name, interval);
+                                       interval = 0.1f;
+                               }
+                       }
+
+                       sprintf(loadmodel->skinscenes[i].name, "skin %i", i);
+                       loadmodel->skinscenes[i].firstframe = totalskins;
+                       loadmodel->skinscenes[i].framecount = groupskins;
+                       loadmodel->skinscenes[i].framerate = 1.0f / interval;
+                       loadmodel->skinscenes[i].loop = true;
+
+                       for (j = 0;j < groupskins;j++)
+                       {
+                               if (groupskins > 1)
+                                       sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
+                               else
+                                       sprintf (name, "%s_%i", loadmodel->name, i);
+                               if (!Mod_LoadSkinFrame(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA | TEXF_PICMIP, true, false, true))
+                                       Mod_LoadSkinFrame_Internal(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA | TEXF_PICMIP, true, false, r_fullbrights.integer, (qbyte *)datapointer, skinwidth, skinheight);
+                               Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe);
+                               datapointer += skinwidth * skinheight;
+                               totalskins++;
+                       }
+               }
+               // check for skins that don't exist in the model, but do exist as external images
+               // (this was added because yummyluv kept pestering me about support for it)
+               while (Mod_LoadSkinFrame(&tempskinframe, va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA | TEXF_PICMIP, true, false, true))
+               {
+                       // expand the arrays to make room
+                       tempskinscenes = loadmodel->skinscenes;
+                       loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, (loadmodel->numskins + 1) * sizeof(animscene_t));
+                       memcpy(loadmodel->skinscenes, tempskinscenes, loadmodel->numskins * sizeof(animscene_t));
+                       Mem_Free(tempskinscenes);
+
+                       tempaliasskins = loadmodel->alias.aliasdata_meshes->data_skins;
+                       loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, (totalskins + 1) * sizeof(texture_t));
+                       memcpy(loadmodel->alias.aliasdata_meshes->data_skins, tempaliasskins, totalskins * sizeof(texture_t));
+                       Mem_Free(tempaliasskins);
+
+                       // store the info about the new skin
+                       Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe);
+                       strcpy(loadmodel->skinscenes[loadmodel->numskins].name, name);
+                       loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins;
+                       loadmodel->skinscenes[loadmodel->numskins].framecount = 1;
+                       loadmodel->skinscenes[loadmodel->numskins].framerate = 10.0f;
+                       loadmodel->skinscenes[loadmodel->numskins].loop = true;
+
+                       //increase skin counts
+                       loadmodel->alias.aliasdata_meshes->num_skins++;
+                       loadmodel->numskins++;
+                       totalskins++;
+               }
+       }
 }
 
-void Mod_ConvertQ2AliasVerts (int numverts, vec3_t scale, vec3_t translate, trivertx_t *v, trivert2 *out)
+static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, float *out3f, int numverts, int *vertremap)
 {
        int i;
-       vec3_t temp;
-       for (i = 0;i < numverts;i++)
+       trivertx_t *in;
+       for (i = 0;i < numverts;i++, out3f += 3)
        {
-               VectorCopy(v[i].v, out[i].v);
-               temp[0] = v[i].v[0] * scale[0] + translate[0];
-               temp[1] = v[i].v[1] * scale[1] + translate[1];
-               temp[2] = v[i].v[2] * scale[2] + translate[2];
-               // update bounding box
-               if (temp[0] < aliasbboxmin[0]) aliasbboxmin[0] = temp[0];
-               if (temp[1] < aliasbboxmin[1]) aliasbboxmin[1] = temp[1];
-               if (temp[2] < aliasbboxmin[2]) aliasbboxmin[2] = temp[2];
-               if (temp[0] > aliasbboxmax[0]) aliasbboxmax[0] = temp[0];
-               if (temp[1] > aliasbboxmax[1]) aliasbboxmax[1] = temp[1];
-               if (temp[2] > aliasbboxmax[2]) aliasbboxmax[2] = temp[2];
-               out[i].n[0] = (signed char) (r_avertexnormals[v[i].lightnormalindex][0] * 127.0);
-               out[i].n[1] = (signed char) (r_avertexnormals[v[i].lightnormalindex][1] * 127.0);
-               out[i].n[2] = (signed char) (r_avertexnormals[v[i].lightnormalindex][2] * 127.0);
-       }               
-       /*
-       int i, j;
-       vec3_t t1, t2;
-       struct
-       {
-               vec3_t v;
-               vec3_t normal;
-               int count;
-       } tempvert[MD2MAX_VERTS];
-       temptris_t *tris;
-       // decompress vertices
-       for (i = 0;i < numverts;i++)
+               in = v + vertremap[i];
+               out3f[0] = in->v[0] * scale[0] + translate[0];
+               out3f[1] = in->v[1] * scale[1] + translate[1];
+               out3f[2] = in->v[2] * scale[2] + translate[2];
+       }
+}
+
+void Mod_IDP2_Load(model_t *mod, void *buffer)
+{
+       int i, j, k, hashindex, num, numxyz, numst, xyz, st, skinwidth, skinheight, *vertremap, version, end, numverts;
+       float *stverts, s, t, scale[3], translate[3];
+       md2_t *pinmodel;
+       qbyte *base, *datapointer;
+       md2frame_t *pinframe;
+       char *inskin;
+       md2triangle_t *intri;
+       unsigned short *inst;
+       struct md2verthash_s
+       {
+               struct md2verthash_s *next;
+               int xyz;
+               float st[2];
+       }
+       *hash, **md2verthash, *md2verthashdata;
+       skinframe_t tempskinframe;
+       skinfile_t *skinfiles;
+
+       pinmodel = buffer;
+       base = buffer;
+
+       version = LittleLong (pinmodel->version);
+       if (version != MD2ALIAS_VERSION)
+               Host_Error ("%s has wrong version number (%i should be %i)",
+                       loadmodel->name, version, MD2ALIAS_VERSION);
+
+       loadmodel->type = mod_alias;
+       loadmodel->DrawSky = NULL;
+       loadmodel->Draw = R_Model_Alias_Draw;
+       loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
+       loadmodel->DrawLight = R_Model_Alias_DrawLight;
+       loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+
+       if (LittleLong(pinmodel->num_tris) < 1 || LittleLong(pinmodel->num_tris) > 65536)
+               Host_Error ("%s has invalid number of triangles: %i", loadmodel->name, LittleLong(pinmodel->num_tris));
+       if (LittleLong(pinmodel->num_xyz) < 1 || LittleLong(pinmodel->num_xyz) > 65536)
+               Host_Error ("%s has invalid number of vertices: %i", loadmodel->name, LittleLong(pinmodel->num_xyz));
+       if (LittleLong(pinmodel->num_frames) < 1 || LittleLong(pinmodel->num_frames) > 65536)
+               Host_Error ("%s has invalid number of frames: %i", loadmodel->name, LittleLong(pinmodel->num_frames));
+       if (LittleLong(pinmodel->num_skins) < 0 || LittleLong(pinmodel->num_skins) > 256)
+               Host_Error ("%s has invalid number of skins: %i", loadmodel->name, LittleLong(pinmodel->num_skins));
+
+       end = LittleLong(pinmodel->ofs_end);
+       if (LittleLong(pinmodel->num_skins) >= 1 && (LittleLong(pinmodel->ofs_skins) <= 0 || LittleLong(pinmodel->ofs_skins) >= end))
+               Host_Error ("%s is not a valid model", loadmodel->name);
+       if (LittleLong(pinmodel->ofs_st) <= 0 || LittleLong(pinmodel->ofs_st) >= end)
+               Host_Error ("%s is not a valid model", loadmodel->name);
+       if (LittleLong(pinmodel->ofs_tris) <= 0 || LittleLong(pinmodel->ofs_tris) >= end)
+               Host_Error ("%s is not a valid model", loadmodel->name);
+       if (LittleLong(pinmodel->ofs_frames) <= 0 || LittleLong(pinmodel->ofs_frames) >= end)
+               Host_Error ("%s is not a valid model", loadmodel->name);
+       if (LittleLong(pinmodel->ofs_glcmds) <= 0 || LittleLong(pinmodel->ofs_glcmds) >= end)
+               Host_Error ("%s is not a valid model", loadmodel->name);
+
+       loadmodel->alias.aliasnum_meshes = 1;
+       loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, sizeof(aliasmesh_t));
+
+       loadmodel->numskins = LittleLong(pinmodel->num_skins);
+       numxyz = LittleLong(pinmodel->num_xyz);
+       numst = LittleLong(pinmodel->num_st);
+       loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->num_tris);
+       loadmodel->numframes = LittleLong(pinmodel->num_frames);
+       loadmodel->alias.aliasdata_meshes->num_morphframes = loadmodel->numframes;
+       loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
+
+       loadmodel->flags = 0; // there are no MD2 flags
+       loadmodel->synctype = ST_RAND;
+
+       // load the skins
+       inskin = (void*)(base + LittleLong(pinmodel->ofs_skins));
+       if ((skinfiles = Mod_LoadSkinFiles()))
+       {
+               loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins;
+               loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(texture_t));
+               Mod_BuildAliasSkinsFromSkinFiles(loadmodel->alias.aliasdata_meshes->data_skins, skinfiles, "default", "");
+               Mod_FreeSkinFiles(skinfiles);
+       }
+       else if (loadmodel->numskins)
+       {
+               // skins found (most likely not a player model)
+               loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins;
+               loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(texture_t));
+               for (i = 0;i < loadmodel->numskins;i++, inskin += MD2_SKINNAME)
+               {
+                       if (Mod_LoadSkinFrame(&tempskinframe, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
+                               Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, &tempskinframe);
+                       else
+                       {
+                               Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin);
+                               Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, NULL);
+                       }
+               }
+       }
+       else
+       {
+               // no skins (most likely a player model)
+               loadmodel->numskins = 1;
+               loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins;
+               loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(texture_t));
+               Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins, NULL);
+       }
+
+       loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+       for (i = 0;i < loadmodel->numskins;i++)
+       {
+               loadmodel->skinscenes[i].firstframe = i;
+               loadmodel->skinscenes[i].framecount = 1;
+               loadmodel->skinscenes[i].loop = true;
+               loadmodel->skinscenes[i].framerate = 10;
+       }
+
+       // load the triangles and stvert data
+       inst = (void*)(base + LittleLong(pinmodel->ofs_st));
+       intri = (void*)(base + LittleLong(pinmodel->ofs_tris));
+       skinwidth = LittleLong(pinmodel->skinwidth);
+       skinheight = LittleLong(pinmodel->skinheight);
+
+       stverts = Mem_Alloc(tempmempool, numst * sizeof(float[2]));
+       s = 1.0f / skinwidth;
+       t = 1.0f / skinheight;
+       for (i = 0;i < numst;i++)
+       {
+               j = (unsigned short) LittleShort(inst[i*2+0]);
+               k = (unsigned short) LittleShort(inst[i*2+1]);
+               if (j >= skinwidth || k >= skinheight)
+               {
+                       Con_Printf("%s has an invalid skin coordinate (%i %i) on vert %i, changing to 0 0\n", loadmodel->name, j, k, i);
+                       j = 0;
+                       k = 0;
+               }
+               stverts[i*2+0] = j * s;
+               stverts[i*2+1] = k * t;
+       }
+
+       md2verthash = Mem_Alloc(tempmempool, 256 * sizeof(hash));
+       md2verthashdata = Mem_Alloc(tempmempool, loadmodel->alias.aliasdata_meshes->num_triangles * 3 * sizeof(*hash));
+       // swap the triangle list
+       num = 0;
+       loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
+       for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
        {
-               VectorCopy(v[i].v, out[i].v);
-               tempvert[i].v[0] = v[i].v[0] * scale[0] + translate[0];
-               tempvert[i].v[1] = v[i].v[1] * scale[1] + translate[1];
-               tempvert[i].v[2] = v[i].v[2] * scale[2] + translate[2];
-               tempvert[i].normal[0] = tempvert[i].normal[1] = tempvert[i].normal[2] = 0;
-               tempvert[i].count = 0;
-               // update bounding box
-               if (tempvert[i].v[0] < aliasbboxmin[0]) aliasbboxmin[0] = tempvert[i].v[0];
-               if (tempvert[i].v[1] < aliasbboxmin[1]) aliasbboxmin[1] = tempvert[i].v[1];
-               if (tempvert[i].v[2] < aliasbboxmin[2]) aliasbboxmin[2] = tempvert[i].v[2];
-               if (tempvert[i].v[0] > aliasbboxmax[0]) aliasbboxmax[0] = tempvert[i].v[0];
-               if (tempvert[i].v[1] > aliasbboxmax[1]) aliasbboxmax[1] = tempvert[i].v[1];
-               if (tempvert[i].v[2] > aliasbboxmax[2]) aliasbboxmax[2] = tempvert[i].v[2];
-       }
-       // calculate surface normals
-       tris = temptris;
-       for (i = 0;i < numtris;i++)
-       {
-               VectorSubtract(tempvert[tris->v[0]].v, tempvert[tris->v[1]].v, t1);
-               VectorSubtract(tempvert[tris->v[2]].v, tempvert[tris->v[1]].v, t2);
-               CrossProduct(t1, t2, tris->normal);
-               VectorNormalize(tris->normal);
-               // add surface normal to vertices
                for (j = 0;j < 3;j++)
                {
-                       VectorAdd(tris->normal, tempvert[tris->v[j]].normal, tempvert[tris->v[j]].normal);
-                       tempvert[tris->v[j]].count++;
+                       xyz = (unsigned short) LittleShort (intri[i].index_xyz[j]);
+                       st = (unsigned short) LittleShort (intri[i].index_st[j]);
+                       if (xyz >= numxyz)
+                       {
+                               Con_Printf("%s has an invalid xyz index (%i) on triangle %i, resetting to 0\n", loadmodel->name, xyz, i);
+                               xyz = 0;
+                       }
+                       if (st >= numst)
+                       {
+                               Con_Printf("%s has an invalid st index (%i) on triangle %i, resetting to 0\n", loadmodel->name, st, i);
+                               st = 0;
+                       }
+                       s = stverts[st*2+0];
+                       t = stverts[st*2+1];
+                       hashindex = (xyz * 17 + st) & 255;
+                       for (hash = md2verthash[hashindex];hash;hash = hash->next)
+                               if (hash->xyz == xyz && hash->st[0] == s && hash->st[1] == t)
+                                       break;
+                       if (hash == NULL)
+                       {
+                               hash = md2verthashdata + num++;
+                               hash->xyz = xyz;
+                               hash->st[0] = s;
+                               hash->st[1] = t;
+                               hash->next = md2verthash[hashindex];
+                               md2verthash[hashindex] = hash;
+                       }
+                       loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = (hash - md2verthashdata);
                }
-               tris++;
        }
-       // average normals and write out 1.7bit format
-       for (i = 0;i < pheader->numtris;i++)
+
+       Mem_Free(stverts);
+
+       numverts = num;
+       loadmodel->alias.aliasdata_meshes->num_vertices = numverts;
+       vertremap = Mem_Alloc(loadmodel->mempool, num * sizeof(int));
+       loadmodel->alias.aliasdata_meshes->data_texcoord2f = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2]));
+       for (i = 0;i < num;i++)
        {
-               VectorNormalize(tempvert[i].normal);
-               out[i].n[0] = (signed char) (tempvert[i].normal[0] * 127.0);
-               out[i].n[1] = (signed char) (tempvert[i].normal[1] * 127.0);
-               out[i].n[2] = (signed char) (tempvert[i].normal[2] * 127.0);
+               hash = md2verthashdata + i;
+               vertremap[i] = hash->xyz;
+               loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+0] = hash->st[0];
+               loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+1] = hash->st[1];
        }
-       */
-}
 
-/*
-=================
-Mod_LoadQ2AliasModel
-=================
-*/
-void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
-{
-       int                                     i, j, version, size, *pinglcmd, *poutglcmd, start, end, total, framesize;
-       md2_t                           *pinmodel;
-       md2mem_t                        *pheader;
-       md2triangle_t           *pintriangles, *pouttriangles;
-       md2frame_t                      *pinframe;
-       md2memframe_t           *poutframe;
-       char                            *pinskins;
-//     temptris_t                      *tris;
+       Mem_Free(md2verthash);
+       Mem_Free(md2verthashdata);
 
-       start = Hunk_LowMark ();
+       // load the frames
+       datapointer = (base + LittleLong(pinmodel->ofs_frames));
+       loadmodel->alias.aliasdata_meshes->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, numverts * loadmodel->alias.aliasdata_meshes->num_morphframes * sizeof(float[3]));
+       for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_morphframes;i++)
+       {
+               pinframe = (md2frame_t *)datapointer;
+               datapointer += sizeof(md2frame_t);
+               for (j = 0;j < 3;j++)
+               {
+                       scale[j] = LittleFloat(pinframe->scale[j]);
+                       translate[j] = LittleFloat(pinframe->translate[j]);
+               }
+               Mod_MD2_ConvertVerts(scale, translate, (void *)datapointer, loadmodel->alias.aliasdata_meshes->data_morphvertex3f + i * numverts * 3, numverts, vertremap);
+               datapointer += numxyz * sizeof(trivertx_t);
+
+               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;
+       }
 
-//     if (!temptris)
-//             temptris = malloc(sizeof(temptris_t) * MD2MAX_TRIANGLES);
+       Mem_Free(vertremap);
 
-       pinmodel = (md2_t *)buffer;
+       loadmodel->alias.aliasdata_meshes->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
+       Mod_BuildTriangleNeighbors(loadmodel->alias.aliasdata_meshes->data_neighbor3i, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles);
+       Mod_CalcAliasModelBBoxes();
+       Mod_Alias_Mesh_CompileFrameZero(loadmodel->alias.aliasdata_meshes);
+}
 
+void Mod_IDP3_Load(model_t *mod, void *buffer)
+{
+       int i, j, k, version;
+       md3modelheader_t *pinmodel;
+       md3frameinfo_t *pinframe;
+       md3mesh_t *pinmesh;
+       md3tag_t *pintag;
+       aliasmesh_t *mesh;
+       skinfile_t *skinfiles;
+
+       pinmodel = buffer;
+
+       if (memcmp(pinmodel->identifier, "IDP3", 4))
+               Host_Error ("%s is not a MD3 (IDP3) file\n", loadmodel->name);
        version = LittleLong (pinmodel->version);
-       if (version != MD2ALIAS_VERSION)
+       if (version != MD3VERSION)
                Host_Error ("%s has wrong version number (%i should be %i)",
-                                mod->name, version, MD2ALIAS_VERSION);
-
-       mod->type = mod_alias;
-       mod->aliastype = ALIASTYPE_MD2;
-
-       framesize = sizeof(md2memframesize_t) + LittleLong(pinmodel->num_xyz) * sizeof(trivert2);
-       // LordHavoc: calculate size for in memory version
-       size = sizeof(md2mem_t)
-                + LittleLong(pinmodel->num_st) * sizeof(md2stvert_t)
-                + LittleLong(pinmodel->num_tris) * sizeof(md2triangle_t)
-                + LittleLong(pinmodel->num_frames) * framesize
-                + LittleLong(pinmodel->num_glcmds) * sizeof(int);
-       if (size <= 0 || size >= MD2MAX_SIZE)
-               Host_Error ("%s is not a valid model", mod->name);
-       pheader = Hunk_AllocName (size, loadname);
-       
-       mod->flags = 0; // there are no MD2 flags
-       mod->numframes = LittleLong(pinmodel->num_frames);
-       mod->synctype = ST_RAND;
-       mod->numtris = LittleLong(pinmodel->num_tris); // LordHavoc: to simplify renderer decisions
-
-       if (LittleLong(pinmodel->num_skins) >= 1 && (LittleLong(pinmodel->ofs_skins <= 0) || LittleLong(pinmodel->ofs_skins) >= LittleLong(pinmodel->ofs_end)))
-               Host_Error ("%s is not a valid model", mod->name);
-       if (LittleLong(pinmodel->ofs_st <= 0) || LittleLong(pinmodel->ofs_st) >= LittleLong(pinmodel->ofs_end))
-               Host_Error ("%s is not a valid model", mod->name);
-       if (LittleLong(pinmodel->ofs_tris <= 0) || LittleLong(pinmodel->ofs_tris) >= LittleLong(pinmodel->ofs_end))
-               Host_Error ("%s is not a valid model", mod->name);
-       if (LittleLong(pinmodel->ofs_frames <= 0) || LittleLong(pinmodel->ofs_frames) >= LittleLong(pinmodel->ofs_end))
-               Host_Error ("%s is not a valid model", mod->name);
-       if (LittleLong(pinmodel->ofs_glcmds <= 0) || LittleLong(pinmodel->ofs_glcmds) >= LittleLong(pinmodel->ofs_end))
-               Host_Error ("%s is not a valid model", mod->name);
-
-       if (LittleLong(pinmodel->num_tris < 1) || LittleLong(pinmodel->num_tris) > MD2MAX_TRIANGLES)
-               Host_Error ("%s has invalid number of triangles: %i", mod->name, LittleLong(pinmodel->num_tris));
-       if (LittleLong(pinmodel->num_xyz < 1) || LittleLong(pinmodel->num_xyz) > MD2MAX_VERTS)
-               Host_Error ("%s has invalid number of vertices: %i", mod->name, LittleLong(pinmodel->num_xyz));
-       if (LittleLong(pinmodel->num_frames < 1) || LittleLong(pinmodel->num_frames) > MD2MAX_FRAMES)
-               Host_Error ("%s has invalid number of frames: %i", mod->name, LittleLong(pinmodel->num_frames));
-       if (LittleLong(pinmodel->num_skins < 0) || LittleLong(pinmodel->num_skins) > MD2MAX_SKINS)
-               Host_Error ("%s has invalid number of skins: %i", mod->name, LittleLong(pinmodel->num_skins));
-
-       pheader->framesize = framesize;
-       pheader->num_skins = LittleLong(pinmodel->num_skins);
-       pheader->num_xyz = LittleLong(pinmodel->num_xyz);
-       pheader->num_st = LittleLong(pinmodel->num_st);
-       pheader->num_tris = LittleLong(pinmodel->num_tris);
-       pheader->num_frames = LittleLong(pinmodel->num_frames);
-       pheader->num_glcmds = LittleLong(pinmodel->num_glcmds);
-
-// load the skins
-       if (pheader->num_skins)
-       {
-               int *skin, *skinrange;
-               skinrange = loadmodel->skinanimrange;
-               skin = loadmodel->skinanim;
-//             skinrange = Hunk_AllocName (sizeof(int) * (pheader->num_skins * 2), loadname);  
-//             skin = skinrange + pheader->num_skins * 2;
-//             loadmodel->skinanimrange = (int) skinrange - (int) pheader;
-//             loadmodel->skinanim = (int) skin - (int) pheader;
-               pinskins = (void*)((int) pinmodel + LittleLong(pinmodel->ofs_skins));
-               for (i = 0;i < pheader->num_skins;i++)
+                       loadmodel->name, version, MD3VERSION);
+
+       skinfiles = Mod_LoadSkinFiles();
+       if (loadmodel->numskins < 1)
+               loadmodel->numskins = 1;
+
+       loadmodel->type = mod_alias;
+       loadmodel->DrawSky = NULL;
+       loadmodel->Draw = R_Model_Alias_Draw;
+       loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
+       loadmodel->DrawLight = R_Model_Alias_DrawLight;
+       loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+       loadmodel->flags = LittleLong(pinmodel->flags);
+       loadmodel->synctype = ST_RAND;
+
+       // set up some global info about the model
+       loadmodel->numframes = LittleLong(pinmodel->num_frames);
+       loadmodel->alias.aliasnum_meshes = LittleLong(pinmodel->num_meshes);
+
+       // make skinscenes for the skins (no groups)
+       loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+       for (i = 0;i < loadmodel->numskins;i++)
+       {
+               loadmodel->skinscenes[i].firstframe = i;
+               loadmodel->skinscenes[i].framecount = 1;
+               loadmodel->skinscenes[i].loop = true;
+               loadmodel->skinscenes[i].framerate = 10;
+       }
+
+       // load frameinfo
+       loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
+       for (i = 0, pinframe = (md3frameinfo_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_frameinfo));i < loadmodel->numframes;i++, pinframe++)
+       {
+               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;
+       }
+
+       // load tags
+       loadmodel->alias.aliasnum_tagframes = loadmodel->numframes;
+       loadmodel->alias.aliasnum_tags = LittleLong(pinmodel->num_tags);
+       loadmodel->alias.aliasdata_tags = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_tagframes * loadmodel->alias.aliasnum_tags * sizeof(aliastag_t));
+       for (i = 0, pintag = (md3tag_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->alias.aliasnum_tagframes * loadmodel->alias.aliasnum_tags;i++, pintag++)
+       {
+               strcpy(loadmodel->alias.aliasdata_tags[i].name, pintag->name);
+               Matrix4x4_CreateIdentity(&loadmodel->alias.aliasdata_tags[i].matrix);
+               for (j = 0;j < 3;j++)
                {
-                       *skinrange++ = i;
-                       *skinrange++ = 1;
-                       *skin++ = loadtextureimage (pinskins, 0, 0, true, true);
-                       *skin++ = 0; // the extra 4 layers are currently unused
-                       *skin++ = 0;
-                       *skin++ = 0;
-                       *skin++ = 0;
-                       pinskins += MD2MAX_SKINNAME;
+                       for (k = 0;k < 3;k++)
+                               loadmodel->alias.aliasdata_tags[i].matrix.m[j][k] = LittleFloat(pintag->rotationmatrix[k * 3 + j]);
+                       loadmodel->alias.aliasdata_tags[i].matrix.m[j][3] = LittleFloat(pintag->origin[j]);
                }
+               //Con_Printf("model \"%s\" frame #%i tag #%i \"%s\"\n", loadmodel->name, i / loadmodel->alias.aliasnum_tags, i % loadmodel->alias.aliasnum_tags, loadmodel->alias.aliasdata_tags[i].name);
        }
-       loadmodel->numskins = pheader->num_skins;
 
-// load triangles
-       pintriangles = (void*)((int) pinmodel + LittleLong(pinmodel->ofs_tris));
-       pouttriangles = (void*)&pheader[1];
-       pheader->ofs_tris = (int) pouttriangles - (int) pheader;
-//     tris = temptris;
-       // swap the triangle list
-       for (i=0 ; i<pheader->num_tris ; i++)
+       // load meshes
+       loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_meshes * sizeof(aliasmesh_t));
+       for (i = 0, pinmesh = (md3mesh_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_meshes));i < loadmodel->alias.aliasnum_meshes;i++, pinmesh = (md3mesh_t *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_end)))
        {
-               for (j=0 ; j<3 ; j++)
+               if (memcmp(pinmesh->identifier, "IDP3", 4))
+                       Host_Error("Mod_IDP3_Load: invalid mesh identifier (not IDP3)\n");
+               mesh = loadmodel->alias.aliasdata_meshes + i;
+               mesh->num_skins = loadmodel->numskins;
+               mesh->num_morphframes = LittleLong(pinmesh->num_frames);
+               mesh->num_vertices = LittleLong(pinmesh->num_vertices);
+               mesh->num_triangles = LittleLong(pinmesh->num_triangles);
+               mesh->data_skins = Mem_Alloc(loadmodel->mempool, mesh->num_skins * sizeof(texture_t));
+               mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
+               mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
+               mesh->data_texcoord2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2]));
+               mesh->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * mesh->num_morphframes * sizeof(float[3]));
+               for (j = 0;j < mesh->num_triangles * 3;j++)
+                       mesh->data_element3i[j] = LittleLong(((int *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_elements)))[j]);
+               for (j = 0;j < mesh->num_vertices;j++)
+               {
+                       mesh->data_texcoord2f[j * 2 + 0] = LittleFloat(((float *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 0]);
+                       mesh->data_texcoord2f[j * 2 + 1] = LittleFloat(((float *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 1]);
+               }
+               for (j = 0;j < mesh->num_vertices * mesh->num_morphframes;j++)
                {
-                       temptris[i][j] = pouttriangles->index_xyz[j] = LittleShort (pintriangles->index_xyz[j]);
-                       pouttriangles->index_st[j] = LittleShort (pintriangles->index_st[j]);
-                       if (pouttriangles->index_xyz[j] >= pheader->num_xyz)
-                               Host_Error ("%s has invalid vertex indices", mod->name);
-                       if (pouttriangles->index_st[j] >= pheader->num_st)
-                               Host_Error ("%s has invalid vertex indices", mod->name);
+                       mesh->data_morphvertex3f[j * 3 + 0] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 0]) * (1.0f / 64.0f);
+                       mesh->data_morphvertex3f[j * 3 + 1] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 1]) * (1.0f / 64.0f);
+                       mesh->data_morphvertex3f[j * 3 + 2] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 2]) * (1.0f / 64.0f);
                }
-               pintriangles++;
-               pouttriangles++;
+
+               Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__);
+               Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
+               Mod_Alias_Mesh_CompileFrameZero(mesh);
+
+               if (LittleLong(pinmesh->num_shaders) >= 1)
+                       Mod_BuildAliasSkinsFromSkinFiles(mesh->data_skins, skinfiles, pinmesh->name, ((md3shader_t *)((qbyte *) pinmesh + LittleLong(pinmesh->lump_shaders)))->name);
+               else
+                       for (j = 0;j < mesh->num_skins;j++)
+                               Mod_BuildAliasSkinFromSkinFrame(mesh->data_skins + j, NULL);
        }
+       Mod_CalcAliasModelBBoxes();
+       Mod_FreeSkinFiles(skinfiles);
+}
 
-       // LordHavoc: doing proper bbox for model
-       aliasbboxmin[0] = aliasbboxmin[1] = aliasbboxmin[2] = 1000000000;
-       aliasbboxmax[0] = aliasbboxmax[1] = aliasbboxmax[2] = -1000000000;
+void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
+{
+       zymtype1header_t *pinmodel, *pheader;
+       qbyte *pbase;
+       int i, j, k, l, numposes, *bonecount, *vertbonecounts, count, *renderlist, *renderlistend, *outelements, *remapvertices;
+       float modelradius, corner[2], *poses, *intexcoord2f, *outtexcoord2f;
+       zymvertex_t *verts, *vertdata;
+       zymscene_t *scene;
+       zymbone_t *bone;
+       char *shadername;
+       skinfile_t *skinfiles;
+       aliasmesh_t *mesh;
+
+       pinmodel = (void *)buffer;
+       pbase = buffer;
+       if (memcmp(pinmodel->id, "ZYMOTICMODEL", 12))
+               Host_Error ("Mod_ZYMOTICMODEL_Load: %s is not a zymotic model\n");
+       if (BigLong(pinmodel->type) != 1)
+               Host_Error ("Mod_ZYMOTICMODEL_Load: only type 1 (skeletal pose) models are currently supported (name = %s)\n", loadmodel->name);
+
+       loadmodel->type = mod_alias;
+       loadmodel->DrawSky = NULL;
+       loadmodel->Draw = R_Model_Alias_Draw;
+       loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
+       loadmodel->DrawLight = R_Model_Alias_DrawLight;
+       //loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox; // FIXME: implement collisions
+       loadmodel->flags = 0; // there are no flags on zym models
+       loadmodel->synctype = ST_RAND;
+
+       // byteswap header
+       pheader = pinmodel;
+       pheader->type = BigLong(pinmodel->type);
+       pheader->filesize = BigLong(pinmodel->filesize);
+       pheader->mins[0] = BigFloat(pinmodel->mins[0]);
+       pheader->mins[1] = BigFloat(pinmodel->mins[1]);
+       pheader->mins[2] = BigFloat(pinmodel->mins[2]);
+       pheader->maxs[0] = BigFloat(pinmodel->maxs[0]);
+       pheader->maxs[1] = BigFloat(pinmodel->maxs[1]);
+       pheader->maxs[2] = BigFloat(pinmodel->maxs[2]);
+       pheader->radius = BigFloat(pinmodel->radius);
+       pheader->numverts = BigLong(pinmodel->numverts);
+       pheader->numtris = BigLong(pinmodel->numtris);
+       pheader->numshaders = BigLong(pinmodel->numshaders);
+       pheader->numbones = BigLong(pinmodel->numbones);
+       pheader->numscenes = BigLong(pinmodel->numscenes);
+       pheader->lump_scenes.start = BigLong(pinmodel->lump_scenes.start);
+       pheader->lump_scenes.length = BigLong(pinmodel->lump_scenes.length);
+       pheader->lump_poses.start = BigLong(pinmodel->lump_poses.start);
+       pheader->lump_poses.length = BigLong(pinmodel->lump_poses.length);
+       pheader->lump_bones.start = BigLong(pinmodel->lump_bones.start);
+       pheader->lump_bones.length = BigLong(pinmodel->lump_bones.length);
+       pheader->lump_vertbonecounts.start = BigLong(pinmodel->lump_vertbonecounts.start);
+       pheader->lump_vertbonecounts.length = BigLong(pinmodel->lump_vertbonecounts.length);
+       pheader->lump_verts.start = BigLong(pinmodel->lump_verts.start);
+       pheader->lump_verts.length = BigLong(pinmodel->lump_verts.length);
+       pheader->lump_texcoords.start = BigLong(pinmodel->lump_texcoords.start);
+       pheader->lump_texcoords.length = BigLong(pinmodel->lump_texcoords.length);
+       pheader->lump_render.start = BigLong(pinmodel->lump_render.start);
+       pheader->lump_render.length = BigLong(pinmodel->lump_render.length);
+       pheader->lump_shaders.start = BigLong(pinmodel->lump_shaders.start);
+       pheader->lump_shaders.length = BigLong(pinmodel->lump_shaders.length);
+       pheader->lump_trizone.start = BigLong(pinmodel->lump_trizone.start);
+       pheader->lump_trizone.length = BigLong(pinmodel->lump_trizone.length);
+
+       loadmodel->numframes = pheader->numscenes;
+       loadmodel->alias.aliasnum_meshes = pheader->numshaders;
+
+       skinfiles = Mod_LoadSkinFiles();
+       if (loadmodel->numskins < 1)
+               loadmodel->numskins = 1;
+
+       // make skinscenes for the skins (no groups)
+       loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+       for (i = 0;i < loadmodel->numskins;i++)
+       {
+               loadmodel->skinscenes[i].firstframe = i;
+               loadmodel->skinscenes[i].framecount = 1;
+               loadmodel->skinscenes[i].loop = true;
+               loadmodel->skinscenes[i].framerate = 10;
+       }
 
-// load the frames
-       pinframe = (void*) ((int) pinmodel + LittleLong(pinmodel->ofs_frames));
-       poutframe = (void*) pouttriangles;
-       pheader->ofs_frames = (int) poutframe - (int) pheader;
-       for (i=0 ; i<pheader->num_frames ; i++)
+       // model bbox
+       modelradius = pheader->radius;
+       for (i = 0;i < 3;i++)
        {
-               for (j = 0;j < 3;j++)
-               {
-                       poutframe->scale[j] = LittleFloat(pinframe->scale[j]);
-                       poutframe->translate[j] = LittleFloat(pinframe->translate[j]);
-               }
-               Mod_ConvertQ2AliasVerts (pheader->num_xyz, poutframe->scale, poutframe->translate, &pinframe->verts[0], &poutframe->verts[0]);
-               pinframe = (void*) &pinframe->verts[j];
-               poutframe = (void*) &poutframe->verts[j];
+               loadmodel->normalmins[i] = pheader->mins[i];
+               loadmodel->normalmaxs[i] = pheader->maxs[i];
+               loadmodel->rotatedmins[i] = -modelradius;
+               loadmodel->rotatedmaxs[i] = modelradius;
+       }
+       corner[0] = max(fabs(loadmodel->normalmins[0]), fabs(loadmodel->normalmaxs[0]));
+       corner[1] = max(fabs(loadmodel->normalmins[1]), fabs(loadmodel->normalmaxs[1]));
+       loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = sqrt(corner[0]*corner[0]+corner[1]*corner[1]);
+       if (loadmodel->yawmaxs[0] > modelradius)
+               loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelradius;
+       loadmodel->yawmins[0] = loadmodel->yawmins[1] = -loadmodel->yawmaxs[0];
+       loadmodel->yawmins[2] = loadmodel->normalmins[2];
+       loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2];
+       loadmodel->radius = modelradius;
+       loadmodel->radius2 = modelradius * modelradius;
+
+       // go through the lumps, swapping things
+
+       //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);
+       scene = (void *) (pheader->lump_scenes.start + pbase);
+       numposes = pheader->lump_poses.length / pheader->numbones / sizeof(float[3][4]);
+       for (i = 0;i < pheader->numscenes;i++)
+       {
+               memcpy(loadmodel->animscenes[i].name, scene->name, 32);
+               loadmodel->animscenes[i].firstframe = BigLong(scene->start);
+               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 >= (unsigned int) numposes)
+                       Host_Error("%s scene->firstframe (%i) >= numposes (%i)\n", loadmodel->name, loadmodel->animscenes[i].firstframe, numposes);
+               if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > (unsigned int) numposes)
+                       Host_Error("%s scene->firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->name, loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes);
+               if (loadmodel->animscenes[i].framerate < 0)
+                       Host_Error("%s scene->framerate (%f) < 0\n", loadmodel->name, loadmodel->animscenes[i].framerate);
+               scene++;
        }
 
-       // LordHavoc: model bbox
-       for (j = 0;j < 3;j++)
+       //zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data
+       loadmodel->alias.aliasnum_poses = pheader->lump_poses.length / sizeof(float[3][4]);
+       loadmodel->alias.aliasdata_poses = Mem_Alloc(loadmodel->mempool, pheader->lump_poses.length);
+       poses = (void *) (pheader->lump_poses.start + pbase);
+       for (i = 0;i < pheader->lump_poses.length / 4;i++)
+               loadmodel->alias.aliasdata_poses[i] = BigFloat(poses[i]);
+
+       //zymlump_t lump_bones; // zymbone_t bone[numbones];
+       loadmodel->alias.aliasnum_bones = pheader->numbones;
+       loadmodel->alias.aliasdata_bones = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(aliasbone_t));
+       bone = (void *) (pheader->lump_bones.start + pbase);
+       for (i = 0;i < pheader->numbones;i++)
        {
-               mod->mins[j] = aliasbboxmin[j];
-               mod->maxs[j] = aliasbboxmax[j];
+               memcpy(loadmodel->alias.aliasdata_bones[i].name, bone[i].name, sizeof(bone[i].name));
+               loadmodel->alias.aliasdata_bones[i].flags = BigLong(bone[i].flags);
+               loadmodel->alias.aliasdata_bones[i].parent = BigLong(bone[i].parent);
+               if (loadmodel->alias.aliasdata_bones[i].parent >= i)
+                       Host_Error("%s bone[%i].parent >= %i\n", loadmodel->name, i, i);
        }
 
-       // load the draw list
-       pinglcmd = (void*) ((int) pinmodel + LittleLong(pinmodel->ofs_glcmds));
-       poutglcmd = (void*) poutframe;
-       pheader->ofs_glcmds = (int) poutglcmd - (int) pheader;
-       for (i = 0;i < pheader->num_glcmds;i++)
-               *poutglcmd++ = LittleLong(*pinglcmd++);
+       //zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better)
+       vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int));
+       bonecount = (void *) (pheader->lump_vertbonecounts.start + pbase);
+       for (i = 0;i < pheader->numverts;i++)
+       {
+               vertbonecounts[i] = BigLong(bonecount[i]);
+               if (vertbonecounts[i] < 1)
+                       Host_Error("%s bonecount[%i] < 1\n", loadmodel->name, i);
+       }
 
-// move the complete, relocatable alias model to the cache
-       end = Hunk_LowMark ();
-       total = end - start;
-       
-       Cache_Alloc (&mod->cache, total, loadname);
-       if (!mod->cache.data)
-               return;
-       memcpy (mod->cache.data, pheader, total);
+       //zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct
+       verts = Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length);
+       vertdata = (void *) (pheader->lump_verts.start + pbase);
+       for (i = 0;i < pheader->lump_verts.length / (int) sizeof(zymvertex_t);i++)
+       {
+               verts[i].bonenum = BigLong(vertdata[i].bonenum);
+               verts[i].origin[0] = BigFloat(vertdata[i].origin[0]);
+               verts[i].origin[1] = BigFloat(vertdata[i].origin[1]);
+               verts[i].origin[2] = BigFloat(vertdata[i].origin[2]);
+       }
 
-       Hunk_FreeToLowMark (start);
+       //zymlump_t lump_texcoords; // float texcoords[numvertices][2];
+       outtexcoord2f = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(float[2]));
+       intexcoord2f = (void *) (pheader->lump_texcoords.start + pbase);
+       for (i = 0;i < pheader->numverts;i++)
+       {
+               outtexcoord2f[i*2+0] = BigFloat(intexcoord2f[i*2+0]);
+               // flip T coordinate for OpenGL
+               outtexcoord2f[i*2+1] = 1 - BigFloat(intexcoord2f[i*2+1]);
+       }
+
+       //zymlump_t lump_trizone; // byte trizone[numtris]; // see trizone explanation
+       //loadmodel->alias.zymdata_trizone = Mem_Alloc(loadmodel->mempool, pheader->numtris);
+       //memcpy(loadmodel->alias.zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris);
+
+       loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_meshes * sizeof(aliasmesh_t));
+
+       //zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model
+       //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)
+       // byteswap, validate, and swap winding order of tris
+       count = pheader->numshaders * sizeof(int) + pheader->numtris * sizeof(int[3]);
+       if (pheader->lump_render.length != count)
+               Host_Error("%s renderlist is wrong size (%i bytes, should be %i bytes)\n", loadmodel->name, pheader->lump_render.length, count);
+       renderlist = (void *) (pheader->lump_render.start + pbase);
+       renderlistend = (void *) ((qbyte *) renderlist + pheader->lump_render.length);
+       for (i = 0;i < loadmodel->alias.aliasnum_meshes;i++)
+       {
+               if (renderlist >= renderlistend)
+                       Host_Error("%s corrupt renderlist (wrong size)\n", loadmodel->name);
+               count = BigLong(*renderlist);renderlist++;
+               if (renderlist + count * 3 > renderlistend || (i == pheader->numshaders - 1 && renderlist + count * 3 != renderlistend))
+                       Host_Error("%s corrupt renderlist (wrong size)\n", loadmodel->name);
+               mesh = loadmodel->alias.aliasdata_meshes + i;
+               mesh->num_skins = loadmodel->numskins;
+               mesh->num_triangles = count;
+               mesh->data_skins = Mem_Alloc(loadmodel->mempool, mesh->num_skins * sizeof(texture_t));
+               mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
+               mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
+               outelements = mesh->data_element3i;
+               for (j = 0;j < mesh->num_triangles;j++)
+               {
+                       outelements[2] = BigLong(renderlist[0]);
+                       outelements[1] = BigLong(renderlist[1]);
+                       outelements[0] = BigLong(renderlist[2]);
+                       if ((unsigned int)outelements[0] >= (unsigned int)pheader->numverts
+                        || (unsigned int)outelements[1] >= (unsigned int)pheader->numverts
+                        || (unsigned int)outelements[2] >= (unsigned int)pheader->numverts)
+                               Host_Error("%s corrupt renderlist (out of bounds index)\n", loadmodel->name);
+                       renderlist += 3;
+                       outelements += 3;
+               }
+               remapvertices = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int));
+               mesh->num_vertices = Mod_BuildVertexRemapTableFromElements(mesh->num_triangles * 3, mesh->data_element3i, pheader->numverts, remapvertices);
+               for (j = 0;j < mesh->num_triangles * 3;j++)
+                       mesh->data_element3i[j] = remapvertices[mesh->data_element3i[j]];
+               Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
+               mesh->data_texcoord2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2]));
+               for (j = 0;j < pheader->numverts;j++)
+               {
+                       if (remapvertices[j] >= 0)
+                       {
+                               mesh->data_texcoord2f[remapvertices[j]*2+0] = outtexcoord2f[j*2+0];
+                               mesh->data_texcoord2f[remapvertices[j]*2+1] = outtexcoord2f[j*2+1];
+                       }
+               }
+               mesh->num_vertexboneweights = 0;
+               for (j = 0;j < mesh->num_vertices;j++)
+                       if (remapvertices[j] >= 0)
+                               mesh->num_vertexboneweights += vertbonecounts[remapvertices[j]];
+               mesh->data_vertexboneweights = Mem_Alloc(loadmodel->mempool, mesh->num_vertexboneweights * sizeof(aliasvertexboneweight_t));
+               mesh->num_vertexboneweights = 0;
+               // note this vertexboneweight ordering requires that the remapvertices array is sequential numbers (separated by -1 values for omitted vertices)
+               l = 0;
+               for (j = 0;j < mesh->num_vertices;j++)
+               {
+                       if (remapvertices[j] < 0)
+                       {
+                               l += vertbonecounts[j];
+                               continue;
+                       }
+                       for (k = 0;k < vertbonecounts[j];k++)
+                       {
+                               // this format really should have had a per vertexweight weight value...
+                               mesh->data_vertexboneweights[mesh->num_vertexboneweights].vertexindex = remapvertices[j];
+                               mesh->data_vertexboneweights[mesh->num_vertexboneweights].boneindex = verts[l].bonenum;
+                               mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3] = 1.0f / vertbonecounts[j];
+                               mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[0] = verts[l].origin[0] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3];
+                               mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[1] = verts[l].origin[1] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3];
+                               mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[2] = verts[l].origin[2] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3];
+                               mesh->num_vertexboneweights++;
+                               l++;
+                       }
+               }
+
+               Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__);
+               Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
+               Mod_Alias_Mesh_CompileFrameZero(mesh);
+
+               // since zym models do not have named sections, reuse their shader
+               // name as the section name
+               shadername = (char *) (pheader->lump_shaders.start + pbase) + i * 32;
+               if (shadername[0])
+                       Mod_BuildAliasSkinsFromSkinFiles(mesh->data_skins, skinfiles, shadername, shadername);
+               else
+                       for (j = 0;j < mesh->num_skins;j++)
+                               Mod_BuildAliasSkinFromSkinFrame(mesh->data_skins + j, NULL);
+       }
+
+       Mem_Free(vertbonecounts);
+       Mem_Free(verts);
+       Mem_Free(outtexcoord2f);
 }
+