]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_alias.c
alias mdl/md2 models now have a mdlmd2data_triangleneighbors array
[xonotic/darkplaces.git] / model_alias.c
index ba66d7241efe9b62b83df73e8bce0ad2d5781c59..8e4545de5ca65e014b067b367074e32af24481c6 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.
 
@@ -20,36 +20,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-/*
-===============
-Mod_AliasInit
-===============
-*/
+static cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0"};
+
 void Mod_AliasInit (void)
 {
+       Cvar_RegisterVariable(&r_mipskins);
 }
 
-int                    posenum;
-
-float          aliasbboxmin[3], aliasbboxmax[3]; // LordHavoc: proper bounding box considerations
+// LordHavoc: proper bounding box considerations
+static float aliasbboxmin[3], aliasbboxmax[3], modelyawradius, modelradius;
 
-#define MAXVERTS 8192
-float vertst[MAXVERTS][2];
-int vertusage[MAXVERTS];
-int vertonseam[MAXVERTS];
-int vertremap[MAXVERTS];
-unsigned short temptris[MAXVERTS][3];
+static float vertst[MAXALIASVERTS][2];
+static int vertusage[MAXALIASVERTS];
+static int vertonseam[MAXALIASVERTS];
+static int vertremap[MAXALIASVERTS];
+static int temptris[MAXALIASTRIS][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)
+static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, trivertx_t *out)
 {
-       int i, j;
+       int i, j, invalidnormals = 0;
+       float dist;
        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];
@@ -60,169 +56,109 @@ void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivert
                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];
+               dist = temp[0]*temp[0]+temp[1]*temp[1];
+               if (modelyawradius < dist)
+                       modelyawradius = dist;
+               dist += temp[2]*temp[2];
+               if (modelradius < dist)
+                       modelradius = dist;
+
                j = vertremap[i]; // not onseam
                if (j >= 0)
                {
                        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[j].lightnormalindex = v[i].lightnormalindex;
+                       if (out[j].lightnormalindex >= NUMVERTEXNORMALS)
+                       {
+                               invalidnormals++;
+                               out[j].lightnormalindex = 0;
+                       }
                }
                j = vertremap[i+inverts]; // onseam
                if (j >= 0)
                {
                        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[j].lightnormalindex = v[i].lightnormalindex;
+                       if (out[j].lightnormalindex >= NUMVERTEXNORMALS)
+                       {
+                               invalidnormals++;
+                               out[j].lightnormalindex = 0;
+                       }
                }
        }
+       if (invalidnormals)
+               Con_Printf("Mod_ConvertAliasVerts: \"%s\", %i invalid normal indices found\n", loadmodel->name, invalidnormals);
 }
 
-/*
-=================
-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             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++)
-       {
-               ((daliasframe_t *)ptemp)++;
-               Mod_ConvertAliasVerts(inverts, mheader->scale, mheader->scale_origin, ptemp, *posevert);
-               *posevert += outverts;
-               posenum++;
-               ptemp = (trivertx_t *)ptemp + inverts;
-       }
-
-       return ptemp;
-}
-
-//=========================================================
-
-/*
-=================
-Mod_FloodFillSkin
-
-Fill background pixels so mipmapping doesn't have haloes - Ed
-=================
-*/
-
-typedef struct
-{
-       short           x, y;
-} floodfill_t;
-
-// 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]; \
-}
-
-void Mod_FloodFillSkin( byte *skin, int skinwidth, int skinheight )
+static void Mod_MDL_LoadFrames (qbyte * datapointer, int inverts, int outverts, vec3_t scale, vec3_t translate)
 {
-       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;
-                       }
-       }
+       daliasframetype_t       *pframetype;
+       daliasframe_t           *pinframe;
+       daliasgroup_t           *group;
+       daliasinterval_t        *intervals;
+       int                                     i, f, pose, groupframes;
+       float                           interval;
+       animscene_t                     *scene;
+       pose = 0;
+       scene = loadmodel->animscenes;
+       for (f = 0;f < loadmodel->numframes;f++)
+       {
+               pframetype = (daliasframetype_t *)datapointer;
+               datapointer += sizeof(daliasframetype_t);
+               if (LittleLong (pframetype->type) == ALIAS_SINGLE)
+               {
+                       // a single frame is still treated as a group
+                       interval = 0.1f;
+                       groupframes = 1;
+               }
+               else
+               {
+                       // read group header
+                       group = (daliasgroup_t *)datapointer;
+                       datapointer += sizeof(daliasgroup_t);
+                       groupframes = LittleLong (group->numframes);
+
+                       // intervals (time per frame)
+                       intervals = (daliasinterval_t *)datapointer;
+                       datapointer += sizeof(daliasinterval_t) * groupframes;
+
+                       interval = LittleFloat (intervals->interval); // FIXME: support variable framerate groups
+                       if (interval < 0.01f)
+                               Host_Error("Mod_LoadAliasGroup: invalid interval");
+               }
 
-       // 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;
-       }
+               // get scene name from first frame
+               pinframe = (daliasframe_t *)datapointer;
 
-       fifo[inpt].x = 0, fifo[inpt].y = 0;
-       inpt = (inpt + 1) & FLOODFILL_FIFO_MASK;
+               strcpy(scene->name, pinframe->name);
+               scene->firstframe = pose;
+               scene->framecount = groupframes;
+               scene->framerate = 1.0f / interval;
+               scene->loop = true;
+               scene++;
 
-       while (outpt != inpt)
-       {
-               int                     x = fifo[outpt].x, y = fifo[outpt].y;
-               int                     fdc = filledcolor;
-               byte            *pos = &skin[x + skinwidth * y];
+               // read frames
+               for (i = 0;i < groupframes;i++)
+               {
+                       pinframe = (daliasframe_t *)datapointer;
+                       datapointer += sizeof(daliasframe_t);
 
-               outpt = (outpt + 1) & FLOODFILL_FIFO_MASK;
+                       // convert to MD2 frame headers
+                       strcpy(loadmodel->mdlmd2data_frames[pose].name, pinframe->name);
+                       VectorCopy(scale, loadmodel->mdlmd2data_frames[pose].scale);
+                       VectorCopy(translate, loadmodel->mdlmd2data_frames[pose].translate);
 
-               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;
+                       Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->mdlmd2data_pose + pose * outverts);
+                       datapointer += sizeof(trivertx_t) * inverts;
+                       pose++;
+               }
        }
 }
 
-int GL_SkinSplitShirt(byte *in, byte *out, int width, int height, unsigned short bits, char *name)
+static rtexture_t *GL_SkinSplitShirt(qbyte *in, qbyte *out, int width, int height, int bits, char *name, int precache)
 {
        int i, pixels, passed;
-       byte pixeltest[16];
+       qbyte pixeltest[16];
        for (i = 0;i < 16;i++)
                pixeltest[i] = (bits & (1 << i)) != 0;
        pixels = width*height;
@@ -244,15 +180,15 @@ int GL_SkinSplitShirt(byte *in, byte *out, int width, int height, unsigned short
                out++;
        }
        if (passed)
-               return GL_LoadTexture (name, width, height, out - width*height, true, false, 1);
+               return R_LoadTexture (loadmodel->texturepool, name, width, height, out - width*height, TEXTYPE_QPALETTE, (r_mipskins.integer ? TEXF_MIPMAP : 0) | (precache ? TEXF_PRECACHE : 0));
        else
-               return 0;
+               return NULL;
 }
 
-int GL_SkinSplit(byte *in, byte *out, int width, int height, unsigned short bits, char *name)
+static rtexture_t *GL_SkinSplit(qbyte *in, qbyte *out, int width, int height, int bits, char *name, int precache)
 {
        int i, pixels, passed;
-       byte pixeltest[16];
+       qbyte pixeltest[16];
        for (i = 0;i < 16;i++)
                pixeltest[i] = (bits & (1 << i)) != 0;
        pixels = width*height;
@@ -270,307 +206,237 @@ int GL_SkinSplit(byte *in, byte *out, int width, int height, unsigned short bits
                out++;
        }
        if (passed)
-               return GL_LoadTexture (name, width, height, out - width*height, true, false, 1);
+               return R_LoadTexture (loadmodel->texturepool, name, width, height, out - width*height, TEXTYPE_QPALETTE, (r_mipskins.integer ? TEXF_MIPMAP : 0) | (precache ? TEXF_PRECACHE : 0));
        else
-               return 0;
+               return NULL;
 }
 
-int GL_SkinCheck(byte *in, int width, int height, unsigned short bits)
+static int Mod_LoadExternalSkin (char *basename, skinframe_t *skinframe, int precache)
 {
-       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--)
+       skinframe->base   = loadtextureimagewithmask(loadmodel->texturepool, va("%s_normal", basename), 0, 0, false, r_mipskins.integer, precache);
+       skinframe->fog    = image_masktex;
+       if (!skinframe->base)
+       {
+               skinframe->base   = loadtextureimagewithmask(loadmodel->texturepool, basename, 0, 0, false, r_mipskins.integer, precache);
+               skinframe->fog    = image_masktex;
+       }
+       skinframe->pants  = loadtextureimage(loadmodel->texturepool, va("%s_pants" , basename), 0, 0, false, r_mipskins.integer, precache);
+       skinframe->shirt  = loadtextureimage(loadmodel->texturepool, va("%s_shirt" , basename), 0, 0, false, r_mipskins.integer, precache);
+       skinframe->glow   = loadtextureimage(loadmodel->texturepool, va("%s_glow"  , basename), 0, 0, false, r_mipskins.integer, precache);
+       skinframe->merged = NULL;
+       return skinframe->base != NULL || skinframe->pants != NULL || skinframe->shirt != NULL || skinframe->glow != NULL;
+}
+
+static int Mod_LoadInternalSkin (char *basename, qbyte *skindata, qbyte *skintemp, int width, int height, skinframe_t *skinframe, int precache)
+{
+       if (!skindata || !skintemp)
+               return false;
+       skinframe->pants  = GL_SkinSplitShirt(skindata, skintemp, width, height, 0x0040, va("%s_pants", basename), false); // pants
+       skinframe->shirt  = GL_SkinSplitShirt(skindata, skintemp, width, height, 0x0002, va("%s_shirt", basename), false); // shirt
+       skinframe->glow   = GL_SkinSplit     (skindata, skintemp, width, height, 0xC000, va("%s_glow", basename), precache); // glow
+       if (skinframe->pants || skinframe->shirt)
        {
-               if (pixeltest[*in >> 4] && *in != 0 && *in != 255)
-                       return true;
-               in++;
+               skinframe->base   = GL_SkinSplit (skindata, skintemp, width, height, 0x3FBD, va("%s_normal", basename), false); // normal (no special colors)
+               skinframe->merged = GL_SkinSplit (skindata, skintemp, width, height, 0x3FFF, va("%s_body", basename), precache); // body (normal + pants + shirt, but not glow)
        }
-       return false;
+       else
+               skinframe->base   = GL_SkinSplit (skindata, skintemp, width, height, 0x3FFF, va("%s_base", basename), precache); // no special colors
+       // quake model skins don't have alpha
+       skinframe->fog = NULL;
+       return true;
 }
 
-void Mod_LoadSkin (maliashdr_t *mheader, char *basename, byte *skindata, byte *skintemp, int width, int height, int *skintexnum)
+#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);
+void Mod_LoadAliasModel (model_t *mod, void *buffer)
 {
-#if 0
-       int skin_normal, skin_pants, skin_shirt, skin_glow, skin_body, temp;
-       skin_normal = loadtextureimage(va("%s_normal", basename));
-       skin_pants  = loadtextureimage(va("%s_pants" , basename));
-       skin_shirt  = loadtextureimage(va("%s_shirt" , basename));
-       skin_glow   = loadtextureimage(va("%s_glow"  , basename));
-       skin_body   = loadtextureimage(va("%s_body"  , basename));
-       if (!(skin_normal || skin_pants || skin_shirt || skin_glow || skin_body))
-               skin_body = loadtextureimage(name);
-       if (skin_normal || skin_pants || skin_shirt || skin_glow || skin_body)
+       int                                             i, j, version, numverts, totalposes, totalskins, skinwidth, skinheight, totalverts, groupframes, groupskins;
+       mdl_t                                   *pinmodel;
+       stvert_t                                *pinstverts;
+       dtriangle_t                             *pintriangles;
+       daliasskintype_t                *pinskintype;
+       daliasskingroup_t               *pinskingroup;
+       daliasskininterval_t    *pinskinintervals;
+       daliasframetype_t               *pinframetype;
+       daliasgroup_t                   *pinframegroup;
+       float                                   scales, scalet, scale[3], translate[3], interval;
+       qbyte                                   *datapointer, *startframes, *startskins;
+       char                                    name[MAX_QPATH];
+       qbyte                                   *skintemp = NULL;
+       skinframe_t                             tempskinframe;
+       animscene_t                             *tempskinscenes;
+       skinframe_t                             *tempskinframes;
+       modelyawradius = 0;
+       modelradius = 0;
+
+       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)",
+                                loadmodel->name, version, ALIAS_VERSION);
+
+       loadmodel->type = mod_alias;
+       loadmodel->aliastype = ALIASTYPE_MDLMD2;
+
+       loadmodel->numskins = LittleLong(pinmodel->numskins);
+       BOUNDI(loadmodel->numskins,0,256);
+       skinwidth = LittleLong (pinmodel->skinwidth);
+       BOUNDI(skinwidth,0,4096);
+       skinheight = LittleLong (pinmodel->skinheight);
+       BOUNDI(skinheight,0,4096);
+       loadmodel->numverts = numverts = LittleLong(pinmodel->numverts);
+       BOUNDI(loadmodel->numverts,0,MAXALIASVERTS);
+       loadmodel->numtris = LittleLong(pinmodel->numtris);
+       BOUNDI(loadmodel->numtris,0,MAXALIASTRIS);
+       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++)
        {
-               skintexnum[0] = skin_normal;
-               skintexnum[1] = skin_pants;
-               skintexnum[2] = skin_shirt;
-               skintexnum[3] = skin_glow;
-               skintexnum[4] = skin_body;
+               scale[i] = LittleFloat (pinmodel->scale[i]);
+               translate[i] = LittleFloat (pinmodel->scale_origin[i]);
        }
-       else
+
+       startskins = datapointer;
+       totalskins = 0;
+       for (i = 0;i < loadmodel->numskins;i++)
        {
-               Mod_FloodFillSkin(skin, width, height);
-               skin_normal = GL_SkinCheck((byte *)pskintype, width, height, 0x3FBD);
-               skin_pants = GL_SkinCheck((byte *)pskintype, width, height, 0x0040);
-               skin_shirt = GL_SkinCheck((byte *)pskintype, width, height, 0x0002);
-               skin_glow = GL_SkinCheck((byte *)pskintype, width, height, 0xC000);
-               skin_body = GL_SkinCheck((byte *)pskintype, width, height, 0x3FFF);
-               if (skin_pants || skin_shirt)
-               {
-                       byte *saveskin;
-                       saveskin = Hunk_AllocName(width*height, va("%s skin", loadname));
-                       memcpy((saveskin, byte *)pskintype, width*height);
-                       temp = (int) saveskin - (int) mheader;
-                       skintexnum[0] = skin_normal ? -temp : 0;
-                       skintexnum[1] = skin_pants ? -temp : 0;
-                       skintexnum[2] = skin_shirt ? -temp : 0;
-                       skintexnum[3] = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0xC000, va("%s_glow", basename)); // glow
-                       skintexnum[4] = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0x3FFF, va("%s_body", basename)); // body (normal + pants + shirt, but not glow)
-               }
+               pinskintype = (daliasskintype_t *)datapointer;
+               datapointer += sizeof(daliasskintype_t);
+               if (LittleLong(pinskintype->type) == ALIAS_SKIN_SINGLE)
+                       groupskins = 1;
                else
                {
-                       skintexnum[0] = 0;
-                       skintexnum[1] = 0;
-                       skintexnum[2] = 0;
-                       skintexnum[3] = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0xC000, va("%s_glow", basename)); // glow
-                       skintexnum[4] = GL_SkinSplit((byte *)pskintype, skintemp, width, height, 0x3FFF, va("%s_body", basename)); // body (normal + pants + shirt, but not glow)
+                       pinskingroup = (daliasskingroup_t *)datapointer;
+                       datapointer += sizeof(daliasskingroup_t);
+                       groupskins = LittleLong(pinskingroup->numskins);
+                       datapointer += sizeof(daliasskininterval_t) * groupskins;
                }
-       }
-#else
-       skintexnum[0] = loadtextureimage(va("%s_normal", basename), 0, 0, false, true);
-       skintexnum[1] = 0;
-       skintexnum[2] = 0;
-       skintexnum[3] = loadtextureimage(va("%s_glow"  , basename), 0, 0, false, true);
-       skintexnum[4] = 0;
-       if (skintexnum[0])
-       {
-               skintexnum[1] = loadtextureimage(va("%s_pants" , basename), 0, 0, false, true);
-               skintexnum[2] = loadtextureimage(va("%s_shirt" , basename), 0, 0, false, true);
-       }
-       else
-       {
-               skintexnum[0] = loadtextureimage(basename, 0, 0, false, true);
-               if (!skintexnum[0])
+
+               for (j = 0;j < groupskins;j++)
                {
-                       skintexnum[0] = GL_SkinSplit(skindata, skintemp, width, height, 0x3FBD, va("&%s_normal", basename)); // normal (no special colors)
-                       skintexnum[1] = GL_SkinSplitShirt(skindata, skintemp, width, height, 0x0040, va("&%s_pants", basename)); // pants
-                       skintexnum[2] = GL_SkinSplitShirt(skindata, skintemp, width, height, 0x0002, va("&%s_shirt", basename)); // shirt
-                       skintexnum[3] = GL_SkinSplit(skindata, skintemp, width, height, 0xC000, va("%s_glow", basename)); // glow
-                       skintexnum[4] = GL_SkinSplit(skindata, skintemp, width, height, 0x3FFF, va("%s_body", basename)); // body (normal + pants + shirt, but not glow)
+                       datapointer += skinwidth * skinheight;
+                       totalskins++;
                }
        }
-#endif
-}
 
-/*
-===============
-Mod_LoadAllSkins
-===============
-*/
-void *Mod_LoadAllSkins (maliashdr_t *mheader, int numskins, daliasskintype_t *pskintype, int width, int height)
-{
-       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 = qmalloc(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++)
+       pinstverts = (stvert_t *)datapointer;
+       datapointer += sizeof(stvert_t) * numverts;
+
+       pintriangles = (dtriangle_t *)datapointer;
+       datapointer += sizeof(dtriangle_t) * loadmodel->numtris;
+
+       startframes = datapointer;
+       totalposes = 0;
+       for (i = 0;i < loadmodel->numframes;i++)
        {
-               pskintype++;
-               if (pskintype[-1].type == ALIAS_SKIN_SINGLE)
+               pinframetype = (daliasframetype_t *)datapointer;
+               datapointer += sizeof(daliasframetype_t);
+               if (LittleLong (pinframetype->type) == ALIAS_SINGLE)
+                       groupframes = 1;
+               else
                {
-                       skincount++;
-                       (byte *)pskintype += s;
+                       pinframegroup = (daliasgroup_t *)datapointer;
+                       datapointer += sizeof(daliasgroup_t);
+                       groupframes = LittleLong(pinframegroup->numframes);
+                       datapointer += sizeof(daliasinterval_t) * groupframes;
                }
-               else
+
+               for (j = 0;j < groupframes;j++)
                {
-                       groupskins = LittleLong (((daliasskingroup_t *)pskintype)->numskins);
-                       skincount += groupskins;
-                       (byte *)pskintype += (s + sizeof(daliasskininterval_t)) * groupskins + sizeof(daliasskingroup_t);
+                       datapointer += sizeof(daliasframe_t);
+                       datapointer += sizeof(trivertx_t) * numverts;
+                       totalposes++;
                }
        }
-       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++)
+
+       // load the skins
+       skintemp = Mem_Alloc(tempmempool, skinwidth * skinheight);
+       loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
+       loadmodel->skinframes = Mem_Alloc(loadmodel->mempool, totalskins * sizeof(skinframe_t));
+       totalskins = 0;
+       datapointer = startskins;
+       for (i = 0;i < loadmodel->numskins;i++)
        {
-               *skinrange++ = skinnum; // start of the range
-               pskintype++;
-               if (pskintype[-1].type == ALIAS_SKIN_SINGLE)
+               pinskintype = (daliasskintype_t *)datapointer;
+               datapointer += sizeof(daliasskintype_t);
+
+               if (pinskintype->type == ALIAS_SKIN_SINGLE)
                {
-                       *skinrange++ = 1; // single skin
-                       skinnum++;
-                       sprintf (name, "%s_%i", loadmodel->name, i);
-                       Mod_LoadSkin(mheader, name, (byte *)pskintype, skintemp, width, height, skintexnum);
-                       skintexnum += 5;
-                       pskintype = (daliasskintype_t *)((byte *)(pskintype) + s);
+                       groupskins = 1;
+                       interval = 0.1f;
                }
                else
                {
-                       // animating skin group.  yuck.
-                       pinskingroup = (daliasskingroup_t *)pskintype;
+                       pinskingroup = (daliasskingroup_t *)datapointer;
+                       datapointer += sizeof(daliasskingroup_t);
+
                        groupskins = LittleLong (pinskingroup->numskins);
-                       pinskinintervals = (daliasskininterval_t *)(pinskingroup + 1);
 
-                       pskintype = (void *)(pinskinintervals + groupskins);
+                       pinskinintervals = (daliasskininterval_t *)datapointer;
+                       datapointer += sizeof(daliasskininterval_t) * groupskins;
 
-                       *skinrange++ = groupskins; // number of skins
-                       skinnum += groupskins;
-                       for (j = 0;j < groupskins;j++)
-                       {
-                               sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
-                               Mod_LoadSkin(mheader, name, (byte *)pskintype, skintemp, width, height, skintexnum);
-                               skintexnum += 5;
-                               pskintype = (daliasskintype_t *)((byte *)(pskintype) + s);
-                       }
+                       interval = LittleFloat(pinskinintervals[0].interval);
+                       if (interval < 0.01f)
+                               Host_Error("Mod_LoadAliasModel: invalid interval\n");
                }
-       }
-       loadmodel->numskins = numskins;
-       qfree(skintemp);
 
-       return (void *)pskintype;
-}
+               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;
 
-void *Mod_SkipAllSkins (int numskins, daliasskintype_t *pskintype, int skinsize)
-{
-       int             i;
-       for (i = 0;i < numskins;i++)
-       {
-               pskintype++;
-               if (pskintype[-1].type == ALIAS_SKIN_SINGLE)
-                       (byte *)pskintype += skinsize;
-               else
-                       (byte *)pskintype += (skinsize + sizeof(daliasskininterval_t)) * LittleLong (((daliasskingroup_t *)pskintype)->numskins) + sizeof(daliasskingroup_t);
+               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_LoadExternalSkin(name, loadmodel->skinframes + totalskins, i == 0))
+                               Mod_LoadInternalSkin(name, (qbyte *)datapointer, skintemp, skinwidth, skinheight, loadmodel->skinframes + totalskins, i == 0);
+                       datapointer += skinwidth * skinheight;
+                       totalskins++;
+               }
        }
-       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)
-{
-       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;
-
-       version = LittleLong (pinmodel->version);
-       if (version != ALIAS_VERSION)
-               Host_Error ("%s has wrong version number (%i should be %i)",
-                                mod->name, version, ALIAS_VERSION);
-
-       mod->type = mod_alias;
-       mod->aliastype = ALIASTYPE_MDL;
-
-       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);
-       skinwidth = LittleLong (pinmodel->skinwidth);
-       BOUNDI(skinwidth,0,4096);
-       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];
-
-       numposes = 0;
-       for (i=0 ; i<numframes ; i++)
+       Mem_Free(skintemp);
+       // 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)
+       for (;;)
        {
-               if ((aliasframetype_t) LittleLong (pframetype->type) == ALIAS_SINGLE)
+               sprintf (name, "%s_%i", loadmodel->name, loadmodel->numskins);
+               if (Mod_LoadExternalSkin(name, &tempskinframe, loadmodel->numskins == 0))
                {
-                       numposes++;
-                       pframetype = (daliasframetype_t *)((int)pframetype + sizeof(daliasframetype_t)                         + (sizeof(daliasframe_t)                            + sizeof(trivertx_t) * numverts)    );
+                       // expand the arrays to make room
+                       tempskinscenes = loadmodel->skinscenes;
+                       tempskinframes = loadmodel->skinframes;
+                       loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, (loadmodel->numskins + 1) * sizeof(animscene_t));
+                       loadmodel->skinframes = Mem_Alloc(loadmodel->mempool, (totalskins + 1) * sizeof(skinframe_t));
+                       memcpy(loadmodel->skinscenes, tempskinscenes, loadmodel->numskins * sizeof(animscene_t));
+                       memcpy(loadmodel->skinframes, tempskinframes, totalskins * sizeof(skinframe_t));
+                       Mem_Free(tempskinscenes);
+                       Mem_Free(tempskinframes);
+                       // store the info about the new skin
+                       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;
+                       loadmodel->skinframes[totalskins] = tempskinframe;
+                       loadmodel->numskins++;
+                       totalskins++;
                }
                else
-               {
-                       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);
-               }
+                       break;
        }
 
-       // rebuild the model
-       mheader = Hunk_AllocName (sizeof(maliashdr_t), va("%s model header", 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);
-
-       for (i=0 ; i<3 ; 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);
-       }
-
-       // load the skins
-       pskintype = (daliasskintype_t *)&pinmodel[1];
-       pskintype = Mod_LoadAllSkins(mheader, numskins, pskintype, skinwidth, skinheight);
-
        // store texture coordinates into temporary array, they will be stored after usage is determined (triangle data)
-       pinstverts = (stvert_t *)pskintype;
-
-       // LordHavoc: byteswap and convert stvert data
        scales = 1.0 / skinwidth;
        scalet = 1.0 / skinheight;
        for (i = 0;i < numverts;i++)
@@ -585,14 +451,12 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
        }
 
 // load triangle data
-       pouttris = Hunk_AllocName(sizeof(unsigned short[3]) * numtris, va("%s triangles", loadname));
-       mheader->tridata = (int) pouttris - (int) mheader;
-       pintriangles = (dtriangle_t *)&pinstverts[mheader->numverts];
+       loadmodel->mdlmd2data_indices = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * loadmodel->numtris);
 
        // count the vertices used
        for (i = 0;i < numverts*2;i++)
                vertusage[i] = 0;
-       for (i = 0;i < numtris;i++)
+       for (i = 0;i < loadmodel->numtris;i++)
        {
                temptris[i][0] = LittleLong(pintriangles[i].vertindex[0]);
                temptris[i][1] = LittleLong(pintriangles[i].vertindex[1]);
@@ -621,74 +485,67 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
                else
                        vertremap[i] = -1; // not used at all
        }
-       mheader->numverts = totalverts;
+       loadmodel->numverts = totalverts;
        // remap the triangle references
-       for (i = 0;i < numtris;i++)
+       for (i = 0;i < loadmodel->numtris;i++)
        {
-               *pouttris++ = vertremap[temptris[i][0]];
-               *pouttris++ = vertremap[temptris[i][1]];
-               *pouttris++ = vertremap[temptris[i][2]];
+               loadmodel->mdlmd2data_indices[i*3+0] = vertremap[temptris[i][0]];
+               loadmodel->mdlmd2data_indices[i*3+1] = vertremap[temptris[i][1]];
+               loadmodel->mdlmd2data_indices[i*3+2] = vertremap[temptris[i][2]];
        }
        // store the texture coordinates
-       pouttexcoords = Hunk_AllocName(sizeof(float[2]) * totalverts, va("%s texcoords", loadname));
-       mheader->texdata = (int) pouttexcoords - (int) mheader;
+       loadmodel->mdlmd2data_texcoords = Mem_Alloc(loadmodel->mempool, sizeof(float[2]) * totalverts);
        for (i = 0;i < totalverts;i++)
        {
-               *pouttexcoords++ = vertst[i][0];
-               *pouttexcoords++ = vertst[i][1];
+               loadmodel->mdlmd2data_texcoords[i*2+0] = vertst[i][0];
+               loadmodel->mdlmd2data_texcoords[i*2+1] = vertst[i][1];
        }
 
 // load the frames
-       posenum = 0;
-       frame = Hunk_AllocName(sizeof(maliasframe_t) * numframes, va("%s frame info", loadname));
-       mheader->framedata = (int) frame - (int) mheader;
-       posevert = Hunk_AllocName(sizeof(trivert2) * numposes * totalverts, va("%s vertex data", loadname));
-       mheader->posedata = (int) posevert - (int) mheader;
-       pframetype = (daliasframetype_t *)&pintriangles[numtris];
+       loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+       loadmodel->mdlmd2data_frames = Mem_Alloc(loadmodel->mempool, sizeof(md2frame_t) * totalposes);
+       loadmodel->mdlmd2data_pose = Mem_Alloc(loadmodel->mempool, sizeof(trivertx_t) * totalposes * totalverts);
 
        // LordHavoc: doing proper bbox for model
        aliasbboxmin[0] = aliasbboxmin[1] = aliasbboxmin[2] = 1000000000;
        aliasbboxmax[0] = aliasbboxmax[1] = aliasbboxmax[2] = -1000000000;
 
-       for (i=0 ; i<numframes ; i++)
-       {
-               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);
-       }
+       Mod_MDL_LoadFrames (startframes, numverts, totalverts, scale, translate);
 
-       // 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;
+       modelyawradius = sqrt(modelyawradius);
+       modelradius = sqrt(modelradius);
        for (j = 0;j < 3;j++)
        {
-               mod->mins[j] = aliasbboxmin[j];
-               mod->maxs[j] = aliasbboxmax[j];
+               loadmodel->normalmins[j] = aliasbboxmin[j];
+               loadmodel->normalmaxs[j] = aliasbboxmax[j];
+               loadmodel->rotatedmins[j] = -modelradius;
+               loadmodel->rotatedmaxs[j] = modelradius;
        }
+       loadmodel->yawmins[0] = loadmodel->yawmins[1] = -(loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelyawradius);
+       loadmodel->yawmins[2] = loadmodel->normalmins[2];
+       loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2];
 
-// 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);
+       loadmodel->Draw = R_DrawQ1Q2AliasModel;
+       loadmodel->DrawSky = NULL;
+       loadmodel->DrawShadow = NULL;
 
-       Hunk_FreeToLowMark (start);
+       loadmodel->mdlmd2data_triangleneighbors = Mem_Alloc(loadmodel->mempool, loadmodel->numtris * sizeof(int[3]));
+       Mod_BuildTriangleNeighbors(loadmodel->mdlmd2data_triangleneighbors, loadmodel->mdlmd2data_indices, loadmodel->numtris);
 }
 
-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, trivertx_t *out, int *vertremap)
 {
-       int i;
+       int i, invalidnormals = 0;
+       float dist;
+       trivertx_t *in;
        vec3_t temp;
-       for (i = 0;i < numverts;i++)
+       for (i = 0;i < loadmodel->numverts;i++)
        {
-               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];
+               in = v + vertremap[i];
+               VectorCopy(in->v, out[i].v);
+               temp[0] = in->v[0] * scale[0] + translate[0];
+               temp[1] = in->v[1] * scale[1] + translate[1];
+               temp[2] = in->v[2] * scale[2] + translate[2];
                // update bounding box
                if (temp[0] < aliasbboxmin[0]) aliasbboxmin[0] = temp[0];
                if (temp[1] < aliasbboxmin[1]) aliasbboxmin[1] = temp[1];
@@ -696,248 +553,262 @@ void Mod_ConvertQ2AliasVerts (int numverts, vec3_t scale, vec3_t translate, triv
                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++)
-       {
-               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++)
+               dist = temp[0]*temp[0]+temp[1]*temp[1];
+               if (modelyawradius < dist)
+                       modelyawradius = dist;
+               dist += temp[2]*temp[2];
+               if (modelradius < dist)
+                       modelradius = dist;
+               out[i].lightnormalindex = in->lightnormalindex;
+               if (out[i].lightnormalindex >= NUMVERTEXNORMALS)
                {
-                       VectorAdd(tris->normal, tempvert[tris->v[j]].normal, tempvert[tris->v[j]].normal);
-                       tempvert[tris->v[j]].count++;
+                       invalidnormals++;
+                       out[i].lightnormalindex = 0;
                }
-               tris++;
        }
-       // average normals and write out 1.7bit format
-       for (i = 0;i < pheader->numtris;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);
-       }
-       */
+       if (invalidnormals)
+               Con_Printf("Mod_MD2_ConvertVerts: \"%s\", %i invalid normal indices found\n", loadmodel->name, invalidnormals);
 }
 
-/*
-=================
-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;
-
-       start = Hunk_LowMark ();
-
-//     if (!temptris)
-//             temptris = qmalloc(sizeof(temptris_t) * MD2MAX_TRIANGLES);
-
-       pinmodel = (md2_t *)buffer;
+       int *vertremap;
+       md2_t *pinmodel;
+       qbyte *base;
+       int version, end;
+       int i, j, k, hashindex, num, numxyz, numst, xyz, st;
+       float *stverts, s, t;
+       struct md2verthash_s
+       {
+               struct md2verthash_s *next;
+               int xyz;
+               float st[2];
+       }
+       *hash, **md2verthash, *md2verthashdata;
+       qbyte *datapointer;
+       md2frame_t *pinframe;
+       char *inskin;
+       md2triangle_t *intri;
+       unsigned short *inst;
+       int skinwidth, skinheight;
+
+       pinmodel = buffer;
+       base = buffer;
 
        version = LittleLong (pinmodel->version);
        if (version != MD2ALIAS_VERSION)
                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, va("%s Quake2 model", 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);
+                       loadmodel->name, version, MD2ALIAS_VERSION);
+
+       loadmodel->type = mod_alias;
+       loadmodel->aliastype = ALIASTYPE_MDLMD2;
+       loadmodel->Draw = R_DrawQ1Q2AliasModel;
+       loadmodel->DrawSky = NULL;
+       loadmodel->DrawShadow = NULL;
 
        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));
+               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) > MD2MAX_VERTS)
-               Host_Error ("%s has invalid number of vertices: %i", mod->name, LittleLong(pinmodel->num_xyz));
+               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) > 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)
+               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) > MAX_SKINS)
+               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->numskins = LittleLong(pinmodel->num_skins);
+       numxyz = LittleLong(pinmodel->num_xyz);
+       numst = LittleLong(pinmodel->num_st);
+       loadmodel->numtris = LittleLong(pinmodel->num_tris);
+       loadmodel->numframes = LittleLong(pinmodel->num_frames);
+
+       loadmodel->flags = 0; // there are no MD2 flags
+       loadmodel->synctype = ST_RAND;
+
+       // load the skins
+       inskin = (void*)(base + LittleLong(pinmodel->ofs_skins));
+       if (loadmodel->numskins)
+       {
+               loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+               loadmodel->skinframes = Mem_Alloc(loadmodel->mempool, sizeof(skinframe_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;
+                       loadmodel->skinframes[i].base = loadtextureimagewithmask (loadmodel->texturepool, inskin, 0, 0, true, r_mipskins.integer, true);
+                       loadmodel->skinframes[i].fog = image_masktex;
+                       loadmodel->skinframes[i].pants = NULL;
+                       loadmodel->skinframes[i].shirt = NULL;
+                       loadmodel->skinframes[i].glow = NULL;
+                       loadmodel->skinframes[i].merged = NULL;
+                       inskin += MD2MAX_SKINNAME;
+               }
+       }
+
+       // 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++)
        {
-               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++)
+               j = (unsigned short) LittleShort(inst[i*2+0]);
+               k = (unsigned short) LittleShort(inst[i*2+1]);
+               if (j >= skinwidth || k >= skinheight)
                {
-                       *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;
+                       Mem_Free(stverts);
+                       Host_Error("Mod_MD2_LoadGeometry: invalid skin coordinate (%i %i) on vert %i of model %s\n", j, k, i, loadmodel->name);
                }
+               stverts[i*2+0] = j * s;
+               stverts[i*2+1] = k * t;
        }
-       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;
+       md2verthash = Mem_Alloc(tempmempool, 256 * sizeof(hash));
+       md2verthashdata = Mem_Alloc(tempmempool, loadmodel->numtris * 3 * sizeof(*hash));
        // swap the triangle list
-       for (i=0 ; i<pheader->num_tris ; i++)
+       num = 0;
+       loadmodel->mdlmd2data_indices = Mem_Alloc(loadmodel->mempool, loadmodel->numtris * sizeof(int[3]));
+       for (i = 0;i < loadmodel->numtris;i++)
        {
-               for (j=0 ; j<3 ; j++)
+               for (j = 0;j < 3;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);
+                       xyz = (unsigned short) LittleShort (intri[i].index_xyz[j]);
+                       st = (unsigned short) LittleShort (intri[i].index_st[j]);
+                       if (xyz >= numxyz || st >= numst)
+                       {
+                               Mem_Free(md2verthash);
+                               Mem_Free(md2verthashdata);
+                               Mem_Free(stverts);
+                               if (xyz >= numxyz)
+                                       Host_Error("Mod_MD2_LoadGeometry: invalid xyz index (%i) on triangle %i of model %s\n", xyz, i, loadmodel->name);
+                               if (st >= numst)
+                                       Host_Error("Mod_MD2_LoadGeometry: invalid st index (%i) on triangle %i of model %s\n", st, i, loadmodel->name);
+                       }
+                       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->mdlmd2data_indices[i*3+j] = (hash - md2verthashdata);
                }
-               pintriangles++;
-               pouttriangles++;
        }
 
+       Mem_Free(stverts);
+
+       loadmodel->numverts = num;
+       vertremap = Mem_Alloc(loadmodel->mempool, num * sizeof(int));
+       loadmodel->mdlmd2data_texcoords = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2]));
+       for (i = 0;i < num;i++)
+       {
+               hash = md2verthashdata + i;
+               vertremap[i] = hash->xyz;
+               loadmodel->mdlmd2data_texcoords[i*2+0] = hash->st[0];
+               loadmodel->mdlmd2data_texcoords[i*2+1] = hash->st[1];
+       }
+
+       Mem_Free(md2verthash);
+       Mem_Free(md2verthashdata);
+
+       // load frames
        // LordHavoc: doing proper bbox for model
        aliasbboxmin[0] = aliasbboxmin[1] = aliasbboxmin[2] = 1000000000;
        aliasbboxmax[0] = aliasbboxmax[1] = aliasbboxmax[2] = -1000000000;
+       modelyawradius = 0;
+       modelradius = 0;
 
-// 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++)
+       datapointer = (base + LittleLong(pinmodel->ofs_frames));
+       // load the frames
+       loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
+       loadmodel->mdlmd2data_frames = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(md2frame_t));
+       loadmodel->mdlmd2data_pose = Mem_Alloc(loadmodel->mempool, loadmodel->numverts * loadmodel->numframes * sizeof(trivertx_t));
+
+       for (i = 0;i < loadmodel->numframes;i++)
        {
+               pinframe = (md2frame_t *)datapointer;
+               datapointer += sizeof(md2frame_t);
+               strcpy(loadmodel->mdlmd2data_frames[i].name, pinframe->name);
                for (j = 0;j < 3;j++)
                {
-                       strcpy(poutframe->name, pinframe->name);
-                       poutframe->scale[j] = LittleFloat(pinframe->scale[j]);
-                       poutframe->translate[j] = LittleFloat(pinframe->translate[j]);
+                       loadmodel->mdlmd2data_frames[i].scale[j] = LittleFloat(pinframe->scale[j]);
+                       loadmodel->mdlmd2data_frames[i].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];
+               Mod_MD2_ConvertVerts (loadmodel->mdlmd2data_frames[i].scale, loadmodel->mdlmd2data_frames[i].translate, (void *)datapointer, &loadmodel->mdlmd2data_pose[i * loadmodel->numverts], vertremap);
+               datapointer += numxyz * sizeof(trivertx_t);
+
+               strcpy(loadmodel->animscenes[i].name, loadmodel->mdlmd2data_frames[i].name);
+               loadmodel->animscenes[i].firstframe = i;
+               loadmodel->animscenes[i].framecount = 1;
+               loadmodel->animscenes[i].framerate = 10;
+               loadmodel->animscenes[i].loop = true;
        }
 
+       Mem_Free(vertremap);
+
        // LordHavoc: model bbox
+       modelyawradius = sqrt(modelyawradius);
+       modelradius = sqrt(modelradius);
        for (j = 0;j < 3;j++)
        {
-               mod->mins[j] = aliasbboxmin[j];
-               mod->maxs[j] = aliasbboxmax[j];
+               loadmodel->normalmins[j] = aliasbboxmin[j];
+               loadmodel->normalmaxs[j] = aliasbboxmax[j];
+               loadmodel->rotatedmins[j] = -modelradius;
+               loadmodel->rotatedmaxs[j] = modelradius;
        }
+       loadmodel->yawmins[0] = loadmodel->yawmins[1] = -(loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelyawradius);
+       loadmodel->yawmins[2] = loadmodel->normalmins[2];
+       loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2];
 
-       // 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++);
-
-// 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);
-
-       Hunk_FreeToLowMark (start);
+       loadmodel->mdlmd2data_triangleneighbors = Mem_Alloc(loadmodel->mempool, loadmodel->numtris * sizeof(int[3]));
+       Mod_BuildTriangleNeighbors(loadmodel->mdlmd2data_triangleneighbors, loadmodel->mdlmd2data_indices, loadmodel->numtris);
 }
 
-void swapintblock(int *m, int size)
+static void zymswapintblock(int *m, int size)
 {
        size /= 4;
        while(size--)
-               *m++ = BigLong(*m);
+       {
+               *m = BigLong(*m);
+               m++;
+       }
 }
 
-void Mod_LoadZymoticModel (model_t *mod, void *buffer)
+void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 {
-       int i, pbase, start, end, total, *skin, *skinrange, *texturenum;
+       int i, pbase, *bonecount, numposes;
+       unsigned int count, a, b, c, *renderlist, *renderlistend;
+       rtexture_t **texture;
        char *shadername;
        zymtype1header_t *pinmodel, *pheader;
        zymscene_t *scene;
        zymbone_t *bone;
-
-       start = Hunk_LowMark ();
+       float corner[2], modelradius;
 
        pinmodel = (void *)buffer;
 
@@ -945,140 +816,182 @@ void Mod_LoadZymoticModel (model_t *mod, void *buffer)
                Host_Error ("Mod_LoadZymoticModel: %s is not a zymotic model\n");
 
        if (BigLong(pinmodel->type) != 1)
-               Host_Error ("Mod_LoadZymoticModel: only type 1 (skeletal pose) models are currently supported\n");
+               Host_Error ("Mod_LoadZymoticModel: only type 1 (skeletal pose) models are currently supported (name = %s)\n", loadmodel->name);
 
-       mod->type = mod_alias;
-       mod->aliastype = ALIASTYPE_ZYM;
+       loadmodel->type = mod_alias;
+       loadmodel->aliastype = ALIASTYPE_ZYM;
 
-       pheader = Hunk_AllocName (BigLong(pinmodel->filesize), va("%s Zymotic model", loadname));
+       loadmodel->zymdata_header = pheader = Mem_Alloc(loadmodel->mempool, BigLong(pinmodel->filesize));
 
        pbase = (int) pheader;
 
        memcpy(pheader, pinmodel, BigLong(pinmodel->filesize));
 
        // byteswap header
-       memcpy(pheader->id, pinmodel->id, 12);
-       pheader->type = BigLong(pheader->type);
-       pheader->filesize = BigLong(pheader->filesize);
-       pheader->mins[0] = BigFloat(pheader->mins[0]);
-       pheader->mins[1] = BigFloat(pheader->mins[1]);
-       pheader->mins[2] = BigFloat(pheader->mins[2]);
-       pheader->maxs[0] = BigFloat(pheader->maxs[0]);
-       pheader->maxs[1] = BigFloat(pheader->maxs[1]);
-       pheader->maxs[2] = BigFloat(pheader->maxs[2]);
-       pheader->radius = BigFloat(pheader->radius);
-       pheader->numverts = BigLong(pheader->numverts);
-       pheader->numtris = BigLong(pheader->numtris);
-       pheader->numshaders = BigLong(pheader->numshaders);
-       pheader->numbones = BigLong(pheader->numbones);
-       pheader->numscenes = BigLong(pheader->numscenes);
-
-
-       pheader->lump_scenes.start = BigLong(pheader->lump_scenes.start);pheader->lump_scenes.length = BigLong(pheader->lump_scenes.length);
-       pheader->lump_poses.start = BigLong(pheader->lump_poses.start);pheader->lump_poses.length = BigLong(pheader->lump_poses.length);
-       pheader->lump_bones.start = BigLong(pheader->lump_bones.start);pheader->lump_bones.length = BigLong(pheader->lump_bones.length);
-       pheader->lump_vertbonecounts.start = BigLong(pheader->lump_vertbonecounts.start);pheader->lump_vertbonecounts.length = BigLong(pheader->lump_vertbonecounts.length);
-       pheader->lump_verts.start = BigLong(pheader->lump_verts.start);pheader->lump_verts.length = BigLong(pheader->lump_verts.length);
-       pheader->lump_texcoords.start = BigLong(pheader->lump_texcoords.start);pheader->lump_texcoords.length = BigLong(pheader->lump_texcoords.length);
-       pheader->lump_render.start = BigLong(pheader->lump_render.start);pheader->lump_render.length = BigLong(pheader->lump_render.length);
-       pheader->lump_shaders.start = BigLong(pheader->lump_shaders.start);pheader->lump_shaders.length = BigLong(pheader->lump_shaders.length);
-       pheader->lump_trizone.start = BigLong(pheader->lump_trizone.start);pheader->lump_trizone.length = BigLong(pheader->lump_trizone.length);
-
-       mod->flags = 0; // there are no flags
-       mod->numframes = pheader->numscenes;
-       mod->synctype = ST_SYNC;
-       mod->numtris = pheader->numtris;
+#define SWAPLONG(var) var = BigLong(var)
+#define SWAPFLOAT(var) var = BigFloat(var)
+#define SWAPVEC(var) SWAPFLOAT(var[0]);SWAPFLOAT(var[1]);SWAPFLOAT(var[2])
+       SWAPLONG(pheader->type);
+       SWAPLONG(pheader->filesize);
+       SWAPVEC(pheader->mins);
+       SWAPVEC(pheader->maxs);
+       SWAPFLOAT(pheader->radius);
+       SWAPLONG(pheader->numverts);
+       SWAPLONG(pheader->numtris);
+       SWAPLONG(pheader->numshaders);
+       SWAPLONG(pheader->numbones);
+       SWAPLONG(pheader->numscenes);
+
+#define SWAPLUMPINFO(var) SWAPLONG(pheader->lump_##var.start);SWAPLONG(pheader->lump_##var.length)
+       SWAPLUMPINFO(scenes);
+       SWAPLUMPINFO(poses);
+       SWAPLUMPINFO(bones);
+       SWAPLUMPINFO(vertbonecounts);
+       SWAPLUMPINFO(verts);
+       SWAPLUMPINFO(texcoords);
+       SWAPLUMPINFO(render);
+       SWAPLUMPINFO(shaders);
+       SWAPLUMPINFO(trizone);
+
+       loadmodel->flags = 0; // there are no flags
+       loadmodel->numframes = pheader->numscenes;
+       loadmodel->synctype = ST_SYNC;
+       loadmodel->numtris = pheader->numtris;
 
        // FIXME: add skin support and texturing and shaders and...
-// load the skins
-       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;
-       *skinrange++ = 0;
-       *skinrange++ = 1;
-       *skin++ = 0;
-       *skin++ = 0;
-       *skin++ = 0;
-       *skin++ = 0;
-       *skin++ = 0;
+       loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) + sizeof(skinframe_t));
+       loadmodel->skinscenes[0].firstframe = 0;
+       loadmodel->skinscenes[0].framecount = 1;
+       loadmodel->skinscenes[0].loop = true;
+       loadmodel->skinscenes[0].framerate = 10;
+       loadmodel->skinframes = (void *)(loadmodel->skinscenes + 1);
+       loadmodel->skinframes->base = NULL;
+       loadmodel->skinframes->fog = NULL;
+       loadmodel->skinframes->pants = NULL;
+       loadmodel->skinframes->shirt = NULL;
+       loadmodel->skinframes->glow = NULL;
+       loadmodel->skinframes->merged = NULL;
        loadmodel->numskins = 1;
+       numposes = pheader->lump_poses.length / sizeof(float[3][4]) / pheader->numbones;
 
        // go through the lumps, swapping things
 
 //     zymlump_t lump_scenes; // zymscene_t scene[numscenes]; // name and other information for each scene (see zymscene struct)
        scene = (void *) (pheader->lump_scenes.start + pbase);
+       loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
        for (i = 0;i < pheader->numscenes;i++)
        {
-               scene->mins[0] = BigFloat(scene->mins[0]);
-               scene->mins[1] = BigFloat(scene->mins[1]);
-               scene->mins[2] = BigFloat(scene->mins[2]);
-               scene->maxs[0] = BigFloat(scene->maxs[0]);
-               scene->maxs[1] = BigFloat(scene->maxs[1]);
-               scene->maxs[2] = BigFloat(scene->maxs[2]);
-               scene->radius = BigFloat(scene->radius);
-               scene->framerate = BigFloat(scene->framerate);
-               scene->flags = BigLong(scene->flags);
-               scene->start = BigLong(scene->start);
-               scene->length = BigLong(scene->length);
+               SWAPVEC(scene->mins);
+               SWAPVEC(scene->maxs);
+               SWAPFLOAT(scene->radius);
+               SWAPFLOAT(scene->framerate);
+               SWAPLONG(scene->flags);
+               SWAPLONG(scene->start);
+               SWAPLONG(scene->length);
+
+               memcpy(loadmodel->animscenes[i].name, scene->name, 32);
+               loadmodel->animscenes[i].firstframe = scene->start;
+               loadmodel->animscenes[i].framecount = scene->length;
+               loadmodel->animscenes[i].framerate = scene->framerate;
+               loadmodel->animscenes[i].loop = (scene->flags & ZYMSCENEFLAG_NOLOOP) == 0;
+
+               if ((unsigned int) loadmodel->animscenes[i].firstframe >= numposes)
+                       Host_Error("Mod_LoadZymoticModel: scene firstframe (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, numposes);
+               if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > numposes)
+                       Host_Error("Mod_LoadZymoticModel: scene firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes);
+               if (loadmodel->animscenes[i].framerate < 0)
+                       Host_Error("Mod_LoadZymoticModel: scene framerate (%f) < 0\n", loadmodel->animscenes[i].framerate);
                scene++;
        }
 
-//     zymlump_t lump_poses; // float pose[numposes][numbones][6]; // animation data
-       swapintblock((void *) (pheader->lump_poses.start + pbase), pheader->lump_poses.length);
+//     zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data
+       zymswapintblock((void *) (pheader->lump_poses.start + pbase), pheader->lump_poses.length);
 
 //     zymlump_t lump_bones; // zymbone_t bone[numbones];
        bone = (void *) (pheader->lump_bones.start + pbase);
        for (i = 0;i < pheader->numbones;i++)
        {
-               bone->flags = BigLong(bone->flags);
-               bone->parent = BigLong(bone->parent);
-               bone++;
+               SWAPLONG(bone[i].flags);
+               SWAPLONG(bone[i].parent);
+               if (bone[i].parent >= i)
+                       Host_Error("Mod_LoadZymoticModel: bone[i].parent >= i in %s\n", loadmodel->name);
        }
 
 //     zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better)
-       swapintblock((void *) (pheader->lump_vertbonecounts.start + pbase), pheader->lump_vertbonecounts.length);
+       zymswapintblock((void *) (pheader->lump_vertbonecounts.start + pbase), pheader->lump_vertbonecounts.length);
+       bonecount = (void *) (pheader->lump_vertbonecounts.start + pbase);
+       for (i = 0;i < pheader->numbones;i++)
+               if (bonecount[i] < 1)
+                       Host_Error("Mod_LoadZymoticModel: bone vertex count < 1 in %s\n", loadmodel->name);
 
 //     zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct
-       swapintblock((void *) (pheader->lump_verts.start + pbase), pheader->lump_verts.length);
+       zymswapintblock((void *) (pheader->lump_verts.start + pbase), pheader->lump_verts.length);
 
 //     zymlump_t lump_texcoords; // float texcoords[numvertices][2];
-       swapintblock((void *) (pheader->lump_texcoords.start + pbase), pheader->lump_texcoords.length);
-
-//     zymlump_t lump_render; // int renderlist[rendersize]; // sorted by shader with run lengths (int shader, count), each run can be used with glDrawElements (each triangle is 3 int indices)
-       swapintblock((void *) (pheader->lump_render.start + pbase), pheader->lump_render.length);
+       zymswapintblock((void *) (pheader->lump_texcoords.start + pbase), pheader->lump_texcoords.length);
+
+//     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)
+       zymswapintblock((void *) (pheader->lump_render.start + pbase), pheader->lump_render.length);
+       // validate renderlist and swap winding order of tris
+       renderlist = (void *) (pheader->lump_render.start + pbase);
+       renderlistend = (void *) ((qbyte *) renderlist + pheader->lump_render.length);
+       i = pheader->numshaders * sizeof(int) + pheader->numtris * sizeof(int[3]);
+       if (pheader->lump_render.length != i)
+               Host_Error("Mod_LoadZymoticModel: renderlist is wrong size in %s (is %i bytes, should be %i bytes)\n", loadmodel->name, pheader->lump_render.length, i);
+       for (i = 0;i < pheader->numshaders;i++)
+       {
+               if (renderlist >= renderlistend)
+                       Host_Error("Mod_LoadZymoticModel: corrupt renderlist in %s (wrong size)\n", loadmodel->name);
+               count = *renderlist++;
+               if (renderlist + count * 3 > renderlistend)
+                       Host_Error("Mod_LoadZymoticModel: corrupt renderlist in %s (wrong size)\n", loadmodel->name);
+               while (count--)
+               {
+                       a = renderlist[0];
+                       b = renderlist[1];
+                       c = renderlist[2];
+                       if (a >= pheader->numverts || b >= pheader->numverts || c >= pheader->numverts)
+                               Host_Error("Mod_LoadZymoticModel: corrupt renderlist in %s (out of bounds index)\n", loadmodel->name);
+                       renderlist[0] = c;
+                       renderlist[1] = b;
+                       renderlist[2] = a;
+                       renderlist += 3;
+               }
+       }
 
 //     zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model
        shadername = (void *) (pheader->lump_shaders.start + pbase);
-       texturenum = (void *) shadername;
+       texture = (void *) shadername;
        for (i = 0;i < pheader->numshaders;i++)
        {
-               int j;
-               j = loadtextureimage(shadername, 0, 0, true, true);
+               rtexture_t *rt;
+               rt = loadtextureimage(loadmodel->texturepool, shadername, 0, 0, true, r_mipskins.integer, true);
                shadername += 32;
-               *texturenum++ = j; // reuse shader name list for texture numbers
+               *texture++ = rt; // reuse shader name list for texture pointers
        }
 
 //     zymlump_t lump_trizone; // byte trizone[numtris]; // see trizone explanation
-       swapintblock((void *) (pheader->lump_trizone.start + pbase), pheader->lump_trizone.length);
+       zymswapintblock((void *) (pheader->lump_trizone.start + pbase), pheader->lump_trizone.length);
 
        // model bbox
+       modelradius = pheader->radius;
        for (i = 0;i < 3;i++)
        {
-               mod->mins[i] = pheader->mins[i];
-               mod->maxs[i] = pheader->maxs[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);
-
-       Hunk_FreeToLowMark (start);
+               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->Draw = R_DrawZymoticModel;
+       loadmodel->DrawSky = NULL;
+       loadmodel->DrawShadow = NULL;
 }