X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_alias.c;h=e0e786922b4223d3cdeb05f85f10da509f03f5f9;hb=1fd37f5239fe019e4d53c3e19b6fa9ff67da12e1;hp=b5d29195f93690dcb2e199c42ea6a9f872d5248c;hpb=6ccde0dc042d5f25cbc58f9d0ca1b0b6b76a43e1;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.c b/model_alias.c
index b5d29195..e0e78692 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -28,101 +28,393 @@ cvar_t r_skeletal_debugbonevalue = {0, "r_skeletal_debugbonevalue", "100", "deve
 cvar_t r_skeletal_debugtranslatex = {0, "r_skeletal_debugtranslatex", "1", "development cvar for testing skeletal model code"};
 cvar_t r_skeletal_debugtranslatey = {0, "r_skeletal_debugtranslatey", "1", "development cvar for testing skeletal model code"};
 cvar_t r_skeletal_debugtranslatez = {0, "r_skeletal_debugtranslatez", "1", "development cvar for testing skeletal model code"};
+cvar_t mod_alias_supporttagscale = {0, "mod_alias_supporttagscale", "1", "support scaling factors in bone/tag attachment matrices as supported by MD3"};
+
+float mod_md3_sin[320];
 
 void Mod_AliasInit (void)
 {
+	int i;
 	Cvar_RegisterVariable(&r_skeletal_debugbone);
 	Cvar_RegisterVariable(&r_skeletal_debugbonecomponent);
 	Cvar_RegisterVariable(&r_skeletal_debugbonevalue);
 	Cvar_RegisterVariable(&r_skeletal_debugtranslatex);
 	Cvar_RegisterVariable(&r_skeletal_debugtranslatey);
 	Cvar_RegisterVariable(&r_skeletal_debugtranslatez);
+	Cvar_RegisterVariable(&mod_alias_supporttagscale);
+	for (i = 0;i < 320;i++)
+		mod_md3_sin[i] = sin(i * M_PI * 2.0f / 256.0);
 }
 
-void Mod_Alias_GetMesh_Vertex3f(const model_t *model, const frameblend_t *frameblend, float *out3f)
+void Mod_Skeletal_AnimateVertices(const dp_model_t *model, const frameblend_t *frameblend, float *vertex3f, float *normal3f, float *svector3f, float *tvector3f)
 {
-	if (model->surfmesh.num_vertexboneweights)
-	{
-		int i, k, blends;
-		surfmeshvertexboneweight_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->num_bones;i++)
+#define MAX_BONES 256
+	// vertex weighted skeletal
+	int i, k;
+	int blends;
+	float desiredscale[3];
+	float boneposerelative[MAX_BONES][12];
+	float *matrix, m[12], bonepose[MAX_BONES][12];
+
+	// interpolate matrices and concatenate them to their parents
+	for (i = 0;i < model->num_bones;i++)
+	{
+		for (k = 0;k < 12;k++)
+			m[k] = 0;
+		VectorClear(desiredscale);
+		for (blends = 0;blends < MAX_FRAMEBLENDS && frameblend[blends].lerp > 0;blends++)
 		{
+			matrix = model->data_poses + (frameblend[blends].subframe * model->num_bones + i) * 12;
 			for (k = 0;k < 12;k++)
-				m[k] = 0;
-			for (blends = 0;blends < 4 && frameblend[blends].lerp > 0;blends++)
+				m[k] += matrix[k] * frameblend[blends].lerp;
+			desiredscale[0] += frameblend[blends].lerp * VectorLength(matrix    );
+			desiredscale[1] += frameblend[blends].lerp * VectorLength(matrix + 4);
+			desiredscale[2] += frameblend[blends].lerp * VectorLength(matrix + 8);
+		}
+		VectorNormalize(m    );
+		VectorNormalize(m + 4);
+		VectorNormalize(m + 8);
+		VectorScale(m    , desiredscale[0], m    );
+		VectorScale(m + 4, desiredscale[1], m + 4);
+		VectorScale(m + 8, desiredscale[2], m + 8);
+		if (i == r_skeletal_debugbone.integer)
+			m[r_skeletal_debugbonecomponent.integer % 12] += r_skeletal_debugbonevalue.value;
+		m[3] *= r_skeletal_debugtranslatex.value;
+		m[7] *= r_skeletal_debugtranslatey.value;
+		m[11] *= r_skeletal_debugtranslatez.value;
+		if (model->data_bones[i].parent >= 0)
+			R_ConcatTransforms(bonepose[model->data_bones[i].parent], m, bonepose[i]);
+		else
+			for (k = 0;k < 12;k++)
+				bonepose[i][k] = m[k];
+		// create a relative deformation matrix to describe displacement
+		// from the base mesh, which is used by the actual weighting
+		R_ConcatTransforms(bonepose[i], model->data_baseboneposeinverse + i * 12, boneposerelative[i]);
+	}
+	// blend the vertex bone weights
+	// special case for the extremely common wf[0] == 1 because it saves 3 multiplies per array when compared to the other case (w[0] is always 1 if only one bone controls this vertex, artists only use multiple bones for certain special cases)
+	// special case for the first bone because it avoids the need to memset the arrays before filling
+	if (vertex3f)
+	{
+		const float *v = model->surfmesh.data_vertex3f;
+		const int *wi = model->surfmesh.data_vertexweightindex4i;
+		const float *wf = model->surfmesh.data_vertexweightinfluence4f;
+		memset(vertex3f, 0, sizeof(float[3]) * model->surfmesh.num_vertices);
+		for (i = 0;i < model->surfmesh.num_vertices;i++, v += 3, wi += 4, wf += 4, vertex3f += 3)
+		{
+			if (wf[0] == 1)
 			{
-				matrix = model->data_poses + (frameblend[blends].frame * model->num_bones + i) * 12;
-				for (k = 0;k < 12;k++)
-					m[k] += matrix[k] * frameblend[blends].lerp;
+				const float *m = boneposerelative[wi[0]];
+				vertex3f[0] = (v[0] * m[0] + v[1] * m[1] + v[2] * m[ 2] + m[ 3]);
+				vertex3f[1] = (v[0] * m[4] + v[1] * m[5] + v[2] * m[ 6] + m[ 7]);
+				vertex3f[2] = (v[0] * m[8] + v[1] * m[9] + v[2] * m[10] + m[11]);
 			}
-			if (i == r_skeletal_debugbone.integer)
-				m[r_skeletal_debugbonecomponent.integer % 12] += r_skeletal_debugbonevalue.value;
-			m[3] *= r_skeletal_debugtranslatex.value;
-			m[7] *= r_skeletal_debugtranslatey.value;
-			m[11] *= r_skeletal_debugtranslatez.value;
-			if (model->data_bones[i].parent >= 0)
-				R_ConcatTransforms(bonepose[model->data_bones[i].parent], m, bonepose[i]);
 			else
-				for (k = 0;k < 12;k++)
-					bonepose[i][k] = m[k];
+			{
+				const float *m = boneposerelative[wi[0]];
+				float f = wf[0];
+				vertex3f[0] = f * (v[0] * m[0] + v[1] * m[1] + v[2] * m[ 2] + m[ 3]);
+				vertex3f[1] = f * (v[0] * m[4] + v[1] * m[5] + v[2] * m[ 6] + m[ 7]);
+				vertex3f[2] = f * (v[0] * m[8] + v[1] * m[9] + v[2] * m[10] + m[11]);
+				for (k = 1;k < 4 && wf[k];k++)
+				{
+					const float *m = boneposerelative[wi[k]];
+					float f = wf[k];
+					vertex3f[0] += f * (v[0] * m[0] + v[1] * m[1] + v[2] * m[ 2] + m[ 3]);
+					vertex3f[1] += f * (v[0] * m[4] + v[1] * m[5] + v[2] * m[ 6] + m[ 7]);
+					vertex3f[2] += f * (v[0] * m[8] + v[1] * m[9] + v[2] * m[10] + m[11]);
+				}
+			}
 		}
-		// blend the vertex bone weights
-		memset(out3f, 0, model->surfmesh.num_vertices * sizeof(float[3]));
-		v = model->surfmesh.data_vertexboneweights;
-		for (i = 0;i < model->surfmesh.num_vertexboneweights;i++, v++)
+	}
+	if (normal3f)
+	{
+		const float *n = model->surfmesh.data_normal3f;
+		const int *wi = model->surfmesh.data_vertexweightindex4i;
+		const float *wf = model->surfmesh.data_vertexweightinfluence4f;
+		memset(normal3f, 0, sizeof(float[3]) * model->surfmesh.num_vertices);
+		for (i = 0;i < model->surfmesh.num_vertices;i++, n += 3, wi += 4, wf += 4, normal3f += 3)
 		{
-			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];
+			if (wf[0] == 1)
+			{
+				const float *m = boneposerelative[wi[0]];
+				normal3f[0] = (n[0] * m[0] + n[1] * m[1] + n[2] * m[ 2]);
+				normal3f[1] = (n[0] * m[4] + n[1] * m[5] + n[2] * m[ 6]);
+				normal3f[2] = (n[0] * m[8] + n[1] * m[9] + n[2] * m[10]);
+			}
+			else
+			{
+				const float *m = boneposerelative[wi[0]];
+				float f = wf[0];
+				normal3f[0] = f * (n[0] * m[0] + n[1] * m[1] + n[2] * m[ 2]);
+				normal3f[1] = f * (n[0] * m[4] + n[1] * m[5] + n[2] * m[ 6]);
+				normal3f[2] = f * (n[0] * m[8] + n[1] * m[9] + n[2] * m[10]);
+				for (k = 1;k < 4 && wf[k];k++)
+				{
+					const float *m = boneposerelative[wi[k]];
+					float f = wf[k];
+					normal3f[0] += f * (n[0] * m[0] + n[1] * m[1] + n[2] * m[ 2]);
+					normal3f[1] += f * (n[0] * m[4] + n[1] * m[5] + n[2] * m[ 6]);
+					normal3f[2] += f * (n[0] * m[8] + n[1] * m[9] + n[2] * m[10]);
+				}
+			}
 		}
 	}
-	else
+	if (svector3f)
 	{
-		int i, vertcount;
-		float lerp1, lerp2, lerp3, lerp4;
-		const float *vertsbase, *verts1, *verts2, *verts3, *verts4;
-		// vertex morph
-		if (!model->surfmesh.data_morphvertex3f)
-			Host_Error("model %s has no skeletal or vertex morph animation data", model->name);
-		vertsbase = model->surfmesh.data_morphvertex3f;
-		vertcount = model->surfmesh.num_vertices;
-		verts1 = vertsbase + frameblend[0].frame * vertcount * 3;
-		lerp1 = frameblend[0].lerp;
-		if (frameblend[1].lerp)
+		const float *sv = model->surfmesh.data_svector3f;
+		const int *wi = model->surfmesh.data_vertexweightindex4i;
+		const float *wf = model->surfmesh.data_vertexweightinfluence4f;
+		memset(svector3f, 0, sizeof(float[3]) * model->surfmesh.num_vertices);
+		for (i = 0;i < model->surfmesh.num_vertices;i++, sv += 3, wi += 4, wf += 4, svector3f += 3)
 		{
-			verts2 = vertsbase + frameblend[1].frame * vertcount * 3;
-			lerp2 = frameblend[1].lerp;
-			if (frameblend[2].lerp)
+			if (wf[0] == 1)
+			{
+				const float *m = boneposerelative[wi[0]];
+				svector3f[0] = (sv[0] * m[0] + sv[1] * m[1] + sv[2] * m[ 2]);
+				svector3f[1] = (sv[0] * m[4] + sv[1] * m[5] + sv[2] * m[ 6]);
+				svector3f[2] = (sv[0] * m[8] + sv[1] * m[9] + sv[2] * m[10]);
+			}
+			else
 			{
-				verts3 = vertsbase + frameblend[2].frame * vertcount * 3;
-				lerp3 = frameblend[2].lerp;
-				if (frameblend[3].lerp)
+				const float *m = boneposerelative[wi[0]];
+				float f = wf[0];
+				svector3f[0] = f * (sv[0] * m[0] + sv[1] * m[1] + sv[2] * m[ 2]);
+				svector3f[1] = f * (sv[0] * m[4] + sv[1] * m[5] + sv[2] * m[ 6]);
+				svector3f[2] = f * (sv[0] * m[8] + sv[1] * m[9] + sv[2] * m[10]);
+				for (k = 1;k < 4 && wf[k];k++)
 				{
-					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);
+					const float *m = boneposerelative[wi[k]];
+					float f = wf[k];
+					svector3f[0] += f * (sv[0] * m[0] + sv[1] * m[1] + sv[2] * m[ 2]);
+					svector3f[1] += f * (sv[0] * m[4] + sv[1] * m[5] + sv[2] * m[ 6]);
+					svector3f[2] += f * (sv[0] * m[8] + sv[1] * m[9] + sv[2] * m[10]);
+				}
+			}
+		}
+	}
+	if (tvector3f)
+	{
+		const float *tv = model->surfmesh.data_tvector3f;
+		const int *wi = model->surfmesh.data_vertexweightindex4i;
+		const float *wf = model->surfmesh.data_vertexweightinfluence4f;
+		memset(tvector3f, 0, sizeof(float[3]) * model->surfmesh.num_vertices);
+		for (i = 0;i < model->surfmesh.num_vertices;i++, tv += 3, wi += 4, wf += 4, tvector3f += 3)
+		{
+			if (wf[0] == 1)
+			{
+				const float *m = boneposerelative[wi[0]];
+				tvector3f[0] = (tv[0] * m[0] + tv[1] * m[1] + tv[2] * m[ 2]);
+				tvector3f[1] = (tv[0] * m[4] + tv[1] * m[5] + tv[2] * m[ 6]);
+				tvector3f[2] = (tv[0] * m[8] + tv[1] * m[9] + tv[2] * m[10]);
+			}
+			else
+			{
+				const float *m = boneposerelative[wi[0]];
+				float f = wf[0];
+				tvector3f[0] = f * (tv[0] * m[0] + tv[1] * m[1] + tv[2] * m[ 2]);
+				tvector3f[1] = f * (tv[0] * m[4] + tv[1] * m[5] + tv[2] * m[ 6]);
+				tvector3f[2] = f * (tv[0] * m[8] + tv[1] * m[9] + tv[2] * m[10]);
+				for (k = 1;k < 4 && wf[k];k++)
+				{
+					const float *m = boneposerelative[wi[k]];
+					float f = wf[k];
+					tvector3f[0] += f * (tv[0] * m[0] + tv[1] * m[1] + tv[2] * m[ 2]);
+					tvector3f[1] += f * (tv[0] * m[4] + tv[1] * m[5] + tv[2] * m[ 6]);
+					tvector3f[2] += f * (tv[0] * m[8] + tv[1] * m[9] + tv[2] * m[10]);
+				}
+			}
+		}
+	}
+}
+
+void Mod_MD3_AnimateVertices(const dp_model_t *model, const frameblend_t *frameblend, float *vertex3f, float *normal3f, float *svector3f, float *tvector3f)
+{
+	// vertex morph
+	int i, numblends, blendnum;
+	int numverts = model->surfmesh.num_vertices;
+	numblends = 0;
+	for (blendnum = 0;blendnum < MAX_FRAMEBLENDS;blendnum++)
+	{
+		//VectorMA(translate, model->surfmesh.num_morphmdlframetranslate, frameblend[blendnum].lerp, translate);
+		if (frameblend[blendnum].lerp > 0)
+			numblends = blendnum + 1;
+	}
+	// special case for the first blend because it avoids some adds and the need to memset the arrays first
+	for (blendnum = 0;blendnum < numblends;blendnum++)
+	{
+		const md3vertex_t *verts = model->surfmesh.data_morphmd3vertex + numverts * frameblend[blendnum].subframe;
+		if (vertex3f)
+		{
+			float scale = frameblend[blendnum].lerp * (1.0f / 64.0f);
+			if (blendnum == 0)
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					vertex3f[i * 3 + 0] = verts[i].origin[0] * scale;
+					vertex3f[i * 3 + 1] = verts[i].origin[1] * scale;
+					vertex3f[i * 3 + 2] = verts[i].origin[2] * scale;
+				}
+			}
+			else
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					vertex3f[i * 3 + 0] += verts[i].origin[0] * scale;
+					vertex3f[i * 3 + 1] += verts[i].origin[1] * scale;
+					vertex3f[i * 3 + 2] += verts[i].origin[2] * scale;
+				}
+			}
+		}
+		// the yaw and pitch stored in md3 models are 8bit quantized angles
+		// (0-255), and as such a lookup table is very well suited to
+		// decoding them, and since cosine is equivilant to sine with an
+		// extra 45 degree rotation, this uses one lookup table for both
+		// sine and cosine with a +64 bias to get cosine.
+		if (normal3f)
+		{
+			float lerp = frameblend[blendnum].lerp;
+			if (blendnum == 0)
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					normal3f[i * 3 + 0] = mod_md3_sin[verts[i].yaw + 64] * mod_md3_sin[verts[i].pitch     ] * lerp;
+					normal3f[i * 3 + 1] = mod_md3_sin[verts[i].yaw     ] * mod_md3_sin[verts[i].pitch     ] * lerp;
+					normal3f[i * 3 + 2] =                                  mod_md3_sin[verts[i].pitch + 64] * lerp;
+				}
+			}
+			else
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					normal3f[i * 3 + 0] += mod_md3_sin[verts[i].yaw + 64] * mod_md3_sin[verts[i].pitch     ] * lerp;
+					normal3f[i * 3 + 1] += mod_md3_sin[verts[i].yaw     ] * mod_md3_sin[verts[i].pitch     ] * lerp;
+					normal3f[i * 3 + 2] +=                                  mod_md3_sin[verts[i].pitch + 64] * lerp;
+				}
+			}
+		}
+		if (svector3f)
+		{
+			const texvecvertex_t *texvecvert = model->surfmesh.data_morphtexvecvertex + numverts * frameblend[blendnum].subframe;
+			float f = frameblend[blendnum].lerp * (1.0f / 127.0f);
+			if (blendnum == 0)
+			{
+				for (i = 0;i < numverts;i++, texvecvert++)
+				{
+					VectorScale(texvecvert->svec, f, svector3f + i*3);
+					VectorScale(texvecvert->tvec, f, tvector3f + i*3);
 				}
-				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);
+			{
+				for (i = 0;i < numverts;i++, texvecvert++)
+				{
+					VectorMA(svector3f + i*3, f, texvecvert->svec, svector3f + i*3);
+					VectorMA(tvector3f + i*3, f, texvecvert->tvec, tvector3f + i*3);
+				}
+			}
 		}
+	}
+}
+
+void Mod_MDL_AnimateVertices(const dp_model_t *model, const frameblend_t *frameblend, float *vertex3f, float *normal3f, float *svector3f, float *tvector3f)
+{
+	// vertex morph
+	int i, numblends, blendnum;
+	int numverts = model->surfmesh.num_vertices;
+	float translate[3];
+	VectorClear(translate);
+	numblends = 0;
+	// blend the frame translates to avoid redundantly doing so on each vertex
+	// (a bit of a brain twister but it works)
+	for (blendnum = 0;blendnum < MAX_FRAMEBLENDS;blendnum++)
+	{
+		if (model->surfmesh.data_morphmd2framesize6f)
+			VectorMA(translate, frameblend[blendnum].lerp, model->surfmesh.data_morphmd2framesize6f + frameblend[blendnum].subframe * 6 + 3, translate);
 		else
-			memcpy(out3f, verts1, vertcount * sizeof(float[3]));
+			VectorMA(translate, frameblend[blendnum].lerp, model->surfmesh.num_morphmdlframetranslate, translate);
+		if (frameblend[blendnum].lerp > 0)
+			numblends = blendnum + 1;
+	}
+	// special case for the first blend because it avoids some adds and the need to memset the arrays first
+	for (blendnum = 0;blendnum < numblends;blendnum++)
+	{
+		const trivertx_t *verts = model->surfmesh.data_morphmdlvertex + numverts * frameblend[blendnum].subframe;
+		if (vertex3f)
+		{
+			float scale[3];
+			if (model->surfmesh.data_morphmd2framesize6f)
+				VectorScale(model->surfmesh.data_morphmd2framesize6f + frameblend[blendnum].subframe * 6, frameblend[blendnum].lerp, scale);
+			else
+				VectorScale(model->surfmesh.num_morphmdlframescale, frameblend[blendnum].lerp, scale);
+			if (blendnum == 0)
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					vertex3f[i * 3 + 0] = translate[0] + verts[i].v[0] * scale[0];
+					vertex3f[i * 3 + 1] = translate[1] + verts[i].v[1] * scale[1];
+					vertex3f[i * 3 + 2] = translate[2] + verts[i].v[2] * scale[2];
+				}
+			}
+			else
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					vertex3f[i * 3 + 0] += verts[i].v[0] * scale[0];
+					vertex3f[i * 3 + 1] += verts[i].v[1] * scale[1];
+					vertex3f[i * 3 + 2] += verts[i].v[2] * scale[2];
+				}
+			}
+		}
+		// the vertex normals in mdl models are an index into a table of
+		// 162 unique values, this very crude quantization reduces the
+		// vertex normal to only one byte, which saves a lot of space but
+		// also makes lighting pretty coarse
+		if (normal3f)
+		{
+			float lerp = frameblend[blendnum].lerp;
+			if (blendnum == 0)
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					const float *vn = m_bytenormals[verts[i].lightnormalindex];
+					VectorScale(vn, lerp, normal3f + i*3);
+				}
+			}
+			else
+			{
+				for (i = 0;i < numverts;i++)
+				{
+					const float *vn = m_bytenormals[verts[i].lightnormalindex];
+					VectorMA(normal3f + i*3, lerp, vn, normal3f + i*3);
+				}
+			}
+		}
+		if (svector3f)
+		{
+			const texvecvertex_t *texvecvert = model->surfmesh.data_morphtexvecvertex + numverts * frameblend[blendnum].subframe;
+			float f = frameblend[blendnum].lerp * (1.0f / 127.0f);
+			if (blendnum == 0)
+			{
+				for (i = 0;i < numverts;i++, texvecvert++)
+				{
+					VectorScale(texvecvert->svec, f, svector3f + i*3);
+					VectorScale(texvecvert->tvec, f, tvector3f + i*3);
+				}
+			}
+			else
+			{
+				for (i = 0;i < numverts;i++, texvecvert++)
+				{
+					VectorMA(svector3f + i*3, f, texvecvert->svec, svector3f + i*3);
+					VectorMA(tvector3f + i*3, f, texvecvert->tvec, tvector3f + i*3);
+				}
+			}
+		}
 	}
 }
 
-int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, matrix4x4_t *outmatrix)
+int Mod_Alias_GetTagMatrix(const dp_model_t *model, int poseframe, int tagindex, matrix4x4_t *outmatrix)
 {
 	const float *boneframe;
 	float tempbonematrix[12], bonematrix[12];
@@ -141,22 +433,7 @@ int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, ma
 			R_ConcatTransforms(boneframe + model->data_bones[tagindex].parent * 12, tempbonematrix, bonematrix);
 			tagindex = model->data_bones[tagindex].parent;
 		}
-		outmatrix->m[0][0] = bonematrix[0];
-		outmatrix->m[0][1] = bonematrix[1];
-		outmatrix->m[0][2] = bonematrix[2];
-		outmatrix->m[0][3] = bonematrix[3];
-		outmatrix->m[1][0] = bonematrix[4];
-		outmatrix->m[1][1] = bonematrix[5];
-		outmatrix->m[1][2] = bonematrix[6];
-		outmatrix->m[1][3] = bonematrix[7];
-		outmatrix->m[2][0] = bonematrix[8];
-		outmatrix->m[2][1] = bonematrix[9];
-		outmatrix->m[2][2] = bonematrix[10];
-		outmatrix->m[2][3] = bonematrix[11];
-		outmatrix->m[3][0] = 0;
-		outmatrix->m[3][1] = 0;
-		outmatrix->m[3][2] = 0;
-		outmatrix->m[3][3] = 1;
+		Matrix4x4_FromArray12FloatD3D(outmatrix, bonematrix);
 	}
 	else if (model->num_tags)
 	{
@@ -164,18 +441,55 @@ int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, ma
 			return 4;
 		if (poseframe >= model->num_tagframes)
 			return 6;
-		*outmatrix = model->data_tags[poseframe * model->num_tags + tagindex].matrix;
+		Matrix4x4_FromArray12FloatGL(outmatrix, model->data_tags[poseframe * model->num_tags + tagindex].matrixgl);
 	}
+
+	if(!mod_alias_supporttagscale.integer)
+		Matrix4x4_Normalize3(outmatrix, outmatrix);
+
 	return 0;
 }
 
-int Mod_Alias_GetTagIndexForName(const model_t *model, unsigned int skin, const char *tagname)
+int Mod_Alias_GetExtendedTagInfoForIndex(const dp_model_t *model, unsigned int skin, int poseframe, int tagindex, int *parentindex, const char **tagname, matrix4x4_t *tag_localmatrix)
+{
+	const float *boneframe;
+
+	if(skin >= (unsigned int)model->numskins)
+		skin = 0;
+
+	if (model->num_bones)
+	{
+		if(tagindex >= model->num_bones || tagindex < 0)
+			return 1;
+		if (poseframe >= model->num_poses)
+			return 2;
+
+		boneframe = model->data_poses + poseframe * model->num_bones * 12;
+		*parentindex = model->data_bones[tagindex].parent;
+		*tagname = model->data_bones[tagindex].name;
+		Matrix4x4_FromArray12FloatD3D(tag_localmatrix, boneframe + tagindex * 12);
+		return 0;
+	}
+
+	if (model->num_tags)
+	{
+		if(tagindex >= model->num_tags || tagindex < 0)
+			return 1;
+		if (poseframe >= model->num_tagframes)
+			return 2;
+		*tagname = model->data_tags[tagindex].name;
+		Matrix4x4_FromArray12FloatGL(tag_localmatrix, model->data_tags[poseframe * model->num_tags + tagindex].matrixgl);
+		return 0;
+	}
+
+	return 2;
+}
+
+int Mod_Alias_GetTagIndexForName(const dp_model_t *model, unsigned int skin, const char *tagname)
 {
 	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(skin >= (unsigned int)model->numskins)
+		skin = 0;
 	if (model->num_bones)
 		for (i = 0;i < model->num_bones;i++)
 			if (!strcasecmp(tagname, model->data_bones[i].name))
@@ -187,22 +501,144 @@ int Mod_Alias_GetTagIndexForName(const model_t *model, unsigned int skin, const
 	return 0;
 }
 
-static void Mod_Alias_Mesh_CompileFrameZero(void)
+static void Mod_BuildBaseBonePoses(void)
+{
+	int i, k;
+	double scale;
+	float *basebonepose;
+	float *in12f = loadmodel->data_poses;
+	float *out12f;
+	float *outinv12f = loadmodel->data_baseboneposeinverse;
+	if (!loadmodel->num_bones)
+		return;
+	out12f = basebonepose = (float *) Mem_Alloc(tempmempool, loadmodel->num_bones * sizeof(float[12]));
+	for (i = 0;i < loadmodel->num_bones;i++, in12f += 12, out12f += 12, outinv12f += 12)
+	{
+		if (loadmodel->data_bones[i].parent >= 0)
+			R_ConcatTransforms(basebonepose + 12 * loadmodel->data_bones[i].parent, in12f, out12f);
+		else
+			for (k = 0;k < 12;k++)
+				out12f[k] = in12f[k];
+
+		// invert The Matrix
+
+		// we only support uniform scaling, so assume the first row is enough
+		// (note the lack of sqrt here, because we're trying to undo the scaling,
+		// this means multiplying by the inverse scale twice - squaring it, which
+		// makes the sqrt a waste of time)
+		scale = 1.0 / (out12f[ 0] * out12f[ 0] + out12f[ 1] * out12f[ 1] + out12f[ 2] * out12f[ 2]);
+
+		// invert the rotation by transposing and multiplying by the squared
+		// recipricol of the input matrix scale as described above
+		outinv12f[ 0] = (float)(out12f[ 0] * scale);
+		outinv12f[ 1] = (float)(out12f[ 4] * scale);
+		outinv12f[ 2] = (float)(out12f[ 8] * scale);
+		outinv12f[ 4] = (float)(out12f[ 1] * scale);
+		outinv12f[ 5] = (float)(out12f[ 5] * scale);
+		outinv12f[ 6] = (float)(out12f[ 9] * scale);
+		outinv12f[ 8] = (float)(out12f[ 2] * scale);
+		outinv12f[ 9] = (float)(out12f[ 6] * scale);
+		outinv12f[10] = (float)(out12f[10] * scale);
+
+		// invert the translate
+		outinv12f[ 3] = -(out12f[ 3] * outinv12f[ 0] + out12f[ 7] * outinv12f[ 1] + out12f[11] * outinv12f[ 2]);
+		outinv12f[ 7] = -(out12f[ 3] * outinv12f[ 4] + out12f[ 7] * outinv12f[ 5] + out12f[11] * outinv12f[ 6]);
+		outinv12f[11] = -(out12f[ 3] * outinv12f[ 8] + out12f[ 7] * outinv12f[ 9] + out12f[11] * outinv12f[10]);
+	}
+	Mem_Free(basebonepose);
+}
+
+static void Mod_Alias_CalculateBoundingBox(void)
+{
+	int vnum;
+	qboolean firstvertex = true;
+	float dist, yawradius, radius;
+	float *v;
+	float *vertex3f;
+	frameblend_t frameblend[MAX_FRAMEBLENDS];
+	memset(frameblend, 0, sizeof(frameblend));
+	frameblend[0].lerp = 1;
+	vertex3f = (float *) Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(float[3]));
+	VectorClear(loadmodel->normalmins);
+	VectorClear(loadmodel->normalmaxs);
+	yawradius = 0;
+	radius = 0;
+	for (frameblend[0].subframe = 0;frameblend[0].subframe < loadmodel->num_poses;frameblend[0].subframe++)
+	{
+		loadmodel->AnimateVertices(loadmodel, frameblend, vertex3f, NULL, NULL, NULL);
+		for (vnum = 0, v = vertex3f;vnum < loadmodel->surfmesh.num_vertices;vnum++, v += 3)
+		{
+			if (firstvertex)
+			{
+				firstvertex = false;
+				VectorCopy(v, loadmodel->normalmins);
+				VectorCopy(v, loadmodel->normalmaxs);
+			}
+			else
+			{
+				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;
+		}
+	}
+	if (vertex3f)
+		Mem_Free(vertex3f);
+	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;
+}
+
+static void Mod_Alias_MorphMesh_CompileFrames(void)
 {
-	frameblend_t frameblend[4] = {{0, 1}, {0, 0}, {0, 0}, {0, 0}};
-	loadmodel->surfmesh.data_vertex3f = (float *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(float[3][4]));
-	loadmodel->surfmesh.data_svector3f = loadmodel->surfmesh.data_vertex3f + loadmodel->surfmesh.num_vertices * 3;
-	loadmodel->surfmesh.data_tvector3f = loadmodel->surfmesh.data_vertex3f + loadmodel->surfmesh.num_vertices * 6;
-	loadmodel->surfmesh.data_normal3f = loadmodel->surfmesh.data_vertex3f + loadmodel->surfmesh.num_vertices * 9;
-	Mod_Alias_GetMesh_Vertex3f(loadmodel, frameblend, loadmodel->surfmesh.data_vertex3f);
-	Mod_BuildTextureVectorsAndNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, loadmodel->surfmesh.data_normal3f, true);
+	int i, j;
+	frameblend_t frameblend[MAX_FRAMEBLENDS];
+	unsigned char *datapointer;
+	memset(frameblend, 0, sizeof(frameblend));
+	frameblend[0].lerp = 1;
+	datapointer = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * (sizeof(float[3]) * 4 + loadmodel->surfmesh.num_morphframes * sizeof(texvecvertex_t)));
+	loadmodel->surfmesh.data_vertex3f = (float *)datapointer;datapointer += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_svector3f = (float *)datapointer;datapointer += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_tvector3f = (float *)datapointer;datapointer += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_normal3f = (float *)datapointer;datapointer += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_morphtexvecvertex = (texvecvertex_t *)datapointer;datapointer += loadmodel->surfmesh.num_morphframes * loadmodel->surfmesh.num_vertices * sizeof(texvecvertex_t);
+	// this counts down from the last frame to the first so that the final data in surfmesh is for frame zero (which is what the renderer expects to be there)
+	for (i = loadmodel->surfmesh.num_morphframes-1;i >= 0;i--)
+	{
+		frameblend[0].subframe = i;
+		loadmodel->AnimateVertices(loadmodel, frameblend, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_normal3f, NULL, NULL);
+		Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, r_smoothnormals_areaweighting.integer != 0);
+		// encode the svector and tvector in 3 byte format for permanent storage
+		for (j = 0;j < loadmodel->surfmesh.num_vertices;j++)
+		{
+			VectorScaleCast(loadmodel->surfmesh.data_svector3f + j * 3, 127.0f, signed char, loadmodel->surfmesh.data_morphtexvecvertex[i*loadmodel->surfmesh.num_vertices+j].svec);
+			VectorScaleCast(loadmodel->surfmesh.data_tvector3f + j * 3, 127.0f, signed char, loadmodel->surfmesh.data_morphtexvecvertex[i*loadmodel->surfmesh.num_vertices+j].tvec);
+		}
+	}
 }
 
-static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask)
+static void Mod_MDLMD2MD3_TraceBox(dp_model_t *model, int frame, trace_t *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask)
 {
 	int i;
+	vec3_t shiftstart, shiftend;
 	float segmentmins[3], segmentmaxs[3];
-	frameblend_t frameblend[4];
+	frameblend_t frameblend[MAX_FRAMEBLENDS];
 	msurface_t *surface;
 	static int maxvertices = 0;
 	static float *vertex3f = NULL;
@@ -211,28 +647,30 @@ static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, co
 	trace->realfraction = 1;
 	trace->hitsupercontentsmask = hitsupercontentsmask;
 	memset(frameblend, 0, sizeof(frameblend));
-	frameblend[0].frame = frame;
+	frameblend[0].subframe = frame;
 	frameblend[0].lerp = 1;
 	if (maxvertices < model->surfmesh.num_vertices)
 	{
 		if (vertex3f)
 			Z_Free(vertex3f);
 		maxvertices = (model->surfmesh.num_vertices + 255) & ~255;
-		vertex3f = Z_Malloc(maxvertices * sizeof(float[3]));
+		vertex3f = (float *)Z_Malloc(maxvertices * sizeof(float[3]));
 	}
-	if (VectorLength2(boxmins) + VectorLength2(boxmaxs) == 0)
+	if (VectorCompare(boxmins, boxmaxs))
 	{
 		// line trace
-		segmentmins[0] = min(start[0], end[0]) - 1;
-		segmentmins[1] = min(start[1], end[1]) - 1;
-		segmentmins[2] = min(start[2], end[2]) - 1;
-		segmentmaxs[0] = max(start[0], end[0]) + 1;
-		segmentmaxs[1] = max(start[1], end[1]) + 1;
-		segmentmaxs[2] = max(start[2], end[2]) + 1;
+		VectorAdd(start, boxmins, shiftstart);
+		VectorAdd(end, boxmins, shiftend);
+		segmentmins[0] = min(shiftstart[0], shiftend[0]) - 1;
+		segmentmins[1] = min(shiftstart[1], shiftend[1]) - 1;
+		segmentmins[2] = min(shiftstart[2], shiftend[2]) - 1;
+		segmentmaxs[0] = max(shiftstart[0], shiftend[0]) + 1;
+		segmentmaxs[1] = max(shiftstart[1], shiftend[1]) + 1;
+		segmentmaxs[2] = max(shiftstart[2], shiftend[2]) + 1;
 		for (i = 0, surface = model->data_surfaces;i < model->num_surfaces;i++, surface++)
 		{
-			Mod_Alias_GetMesh_Vertex3f(model, frameblend, vertex3f);
-			Collision_TraceLineTriangleMeshFloat(trace, start, end, model->surfmesh.num_triangles, model->surfmesh.data_element3i, vertex3f, SUPERCONTENTS_SOLID, 0, surface->texture, segmentmins, segmentmaxs);
+			model->AnimateVertices(model, frameblend, vertex3f, NULL, NULL, NULL);
+			Collision_TraceLineTriangleMeshFloat(trace, shiftstart, shiftend, model->surfmesh.num_triangles, model->surfmesh.data_element3i, vertex3f, 0, NULL, SUPERCONTENTS_SOLID | (surface->texture->basematerialflags & MATERIALFLAGMASK_TRANSLUCENT ? 0 : SUPERCONTENTS_OPAQUE), 0, surface->texture, segmentmins, segmentmaxs);
 		}
 	}
 	else
@@ -259,71 +697,31 @@ static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, co
 				if (vertex3f)
 					Z_Free(vertex3f);
 				maxvertices = (model->surfmesh.num_vertices + 255) & ~255;
-				vertex3f = Z_Malloc(maxvertices * sizeof(float[3]));
+				vertex3f = (float *)Z_Malloc(maxvertices * sizeof(float[3]));
 			}
-			Mod_Alias_GetMesh_Vertex3f(model, frameblend, vertex3f);
-			Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, model->surfmesh.num_triangles, model->surfmesh.data_element3i, vertex3f, SUPERCONTENTS_SOLID, 0, surface->texture, segmentmins, segmentmaxs);
+			model->AnimateVertices(model, frameblend, vertex3f, NULL, NULL, NULL);
+			Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, model->surfmesh.num_triangles, model->surfmesh.data_element3i, vertex3f, 0, NULL, SUPERCONTENTS_SOLID | (surface->texture->basematerialflags & MATERIALFLAGMASK_TRANSLUCENT ? 0 : SUPERCONTENTS_OPAQUE), 0, surface->texture, segmentmins, segmentmaxs);
 		}
 	}
 }
 
-static void Mod_CalcAliasModelBBoxes (void)
-{
-	int vnum;
-	float dist, yawradius, radius;
-	float *v;
-	VectorClear(loadmodel->normalmins);
-	VectorClear(loadmodel->normalmaxs);
-	yawradius = 0;
-	radius = 0;
-	for (vnum = 0, v = loadmodel->surfmesh.data_morphvertex3f;vnum < loadmodel->surfmesh.num_vertices * loadmodel->surfmesh.num_morphframes;vnum++, v += 3)
-	{
-		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;
-	}
-	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;
-}
-
-static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, float *out3f, int *vertremap)
+static void Mod_ConvertAliasVerts (int inverts, trivertx_t *v, trivertx_t *out, int *vertremap)
 {
 	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);
+			out[j] = v[i];
 		j = vertremap[i+inverts]; // onseam
 		if (j >= 0)
-			VectorCopy(temp, out3f + j * 3);
+			out[j] = v[i];
 	}
 }
 
-static void Mod_MDL_LoadFrames (unsigned char* datapointer, int inverts, vec3_t scale, vec3_t translate, int *vertremap)
+static void Mod_MDL_LoadFrames (unsigned char* datapointer, int inverts, int *vertremap)
 {
 	int i, f, pose, groupframes;
 	float interval;
@@ -366,7 +764,7 @@ static void Mod_MDL_LoadFrames (unsigned char* datapointer, int inverts, vec3_t
 		// get scene name from first frame
 		pinframe = (daliasframe_t *)datapointer;
 
-		strcpy(scene->name, pinframe->name);
+		strlcpy(scene->name, pinframe->name, sizeof(scene->name));
 		scene->firstframe = pose;
 		scene->framecount = groupframes;
 		scene->framerate = 1.0f / interval;
@@ -378,88 +776,79 @@ static void Mod_MDL_LoadFrames (unsigned char* datapointer, int inverts, vec3_t
 		{
 			pinframe = (daliasframe_t *)datapointer;
 			datapointer += sizeof(daliasframe_t);
-			Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->surfmesh.data_morphvertex3f + pose * loadmodel->surfmesh.num_vertices * 3, vertremap);
+			Mod_ConvertAliasVerts(inverts, (trivertx_t *)datapointer, loadmodel->surfmesh.data_morphmdlvertex + pose * loadmodel->surfmesh.num_vertices, vertremap);
 			datapointer += sizeof(trivertx_t) * inverts;
 			pose++;
 		}
 	}
 }
 
-static skinframe_t missingskinframe;
-static void Mod_BuildAliasSkinFromSkinFrame(texture_t *skin, skinframe_t *skinframe)
+static void Mod_BuildAliasSkinFromSkinFrame(texture_t *texture, skinframe_t *skinframe)
 {
+	if (cls.state == ca_dedicated)
+		return;
 	// hack
-	if (skinframe == NULL)
-	{
-		skinframe = &missingskinframe;
-		memset(skinframe, 0, sizeof(*skinframe));
-		skinframe->base = r_texture_notexture;
-	}
-
-	skin->skin = *skinframe;
-	skin->currentframe = skin;
-	skin->basematerialflags = MATERIALFLAG_WALL;
-	if (skin->skin.fog)
-		skin->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT;
-	skin->currentmaterialflags = skin->basematerialflags;
+	if (!skinframe)
+		skinframe = R_SkinFrame_LoadMissing();
+	memset(texture, 0, sizeof(*texture));
+	texture->currentframe = texture;
+	//texture->animated = false;
+	texture->numskinframes = 1;
+	texture->skinframerate = 1;
+	texture->skinframes[0] = skinframe;
+	texture->currentskinframe = skinframe;
+	//texture->backgroundnumskinframes = 0;
+	//texture->customblendfunc[0] = 0;
+	//texture->customblendfunc[1] = 0;
+	//texture->surfaceflags = 0;
+	//texture->supercontents = 0;
+	//texture->surfaceparms = 0;
+	//texture->textureflags = 0;
+
+	texture->basematerialflags = MATERIALFLAG_WALL;
+	if (texture->currentskinframe->fog)
+		texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+	texture->currentmaterialflags = texture->basematerialflags;
 }
 
-static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, char *meshname, char *shadername)
+static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, const char *meshname, const char *shadername)
 {
 	int i;
 	skinfileitem_t *skinfileitem;
-	skinframe_t tempskinframe;
 	if (skinfile)
 	{
 		// the skin += loadmodel->num_surfaces part of this is because data_textures on alias models is arranged as [numskins][numsurfaces]
 		for (i = 0;skinfile;skinfile = skinfile->next, i++, skin += loadmodel->num_surfaces)
 		{
 			memset(skin, 0, sizeof(*skin));
+			// see if a mesh
 			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"))
+				if (!strcmp(skinfileitem->name, meshname))
 				{
-					memset(&tempskinframe, 0, sizeof(tempskinframe));
-					if (Mod_LoadSkinFrame(&tempskinframe, skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, true))
-						Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
-					else
-					{
-						if (cls.state != ca_dedicated)
-							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_PRECACHE | TEXF_PICMIP, true, true))
-							Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
-						else
-						{
-							if (cls.state != ca_dedicated)
-								Con_Printf("failed to load skin \"%s\"\n", shadername);
-							Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
-						}
-					}
+					Mod_LoadTextureFromQ3Shader(skin, skinfileitem->replacement, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS);
+					break;
 				}
 			}
+			if (!skinfileitem)
+			{
+				// don't render unmentioned meshes
+				Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
+				skin->basematerialflags = skin->currentmaterialflags = MATERIALFLAG_NOSHADOW | MATERIALFLAG_NODRAW;
+			}
 		}
 	}
 	else
-	{
-		memset(&tempskinframe, 0, sizeof(tempskinframe));
-		if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, true))
-			Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
-		else
-		{
-			if (cls.state != ca_dedicated)
-				Con_Printf("Can't find texture \"%s\" for mesh \"%s\", using grey checkerboard\n", shadername, meshname);
-			Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
-		}
-	}
+		Mod_LoadTextureFromQ3Shader(skin, shadername, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS);
 }
 
 #define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%d exceeds %d - %d)", 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)", loadmodel->name, VALUE, MIN, MAX);
-void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_IDP0_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
 	int i, j, version, totalskins, skinwidth, skinheight, groupframes, groupskins, numverts;
-	float scales, scalet, scale[3], translate[3], interval;
+	float scales, scalet, interval;
 	msurface_t *surface;
 	unsigned char *data;
 	mdl_t *pinmodel;
@@ -472,7 +861,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 	daliasgroup_t *pinframegroup;
 	unsigned char *datapointer, *startframes, *startskins;
 	char name[MAX_QPATH];
-	skinframe_t tempskinframe;
+	skinframe_t *tempskinframe;
 	animscene_t *tempskinscenes;
 	texture_t *tempaliasskins;
 	float *vertst;
@@ -488,20 +877,27 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 		Host_Error ("%s has wrong version number (%i should be %i)",
 				 loadmodel->name, version, ALIAS_VERSION);
 
+	loadmodel->modeldatatypestring = "MDL";
+
 	loadmodel->type = mod_alias;
+	loadmodel->AnimateVertices = Mod_MDL_AnimateVertices;
 	loadmodel->DrawSky = NULL;
+	loadmodel->DrawAddWaterPlanes = NULL;
 	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawDepth = R_Q1BSP_DrawDepth;
+	loadmodel->DrawDebug = R_Q1BSP_DrawDebug;
 	loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
 	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
 	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+	loadmodel->PointSuperContents = NULL;
 
 	loadmodel->num_surfaces = 1;
 	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
 	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int));
 	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
-	loadmodel->surfacelist = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
-	loadmodel->surfacelist[0] = 0;
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->sortedmodelsurfaces[0] = 0;
 
 	loadmodel->numskins = LittleLong(pinmodel->numskins);
 	BOUNDI(loadmodel->numskins,0,65536);
@@ -517,12 +913,14 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 	BOUNDI(loadmodel->numframes,0,65536);
 	loadmodel->synctype = (synctype_t)LittleLong (pinmodel->synctype);
 	BOUNDI(loadmodel->synctype,0,2);
-	loadmodel->flags = LittleLong (pinmodel->flags);
+	// convert model flags to EF flags (MF_ROCKET becomes EF_ROCKET, etc)
+	i = LittleLong (pinmodel->flags);
+	loadmodel->effects = ((i & 255) << 24) | (i & 0x00FFFF00);
 
 	for (i = 0;i < 3;i++)
 	{
-		scale[i] = LittleFloat (pinmodel->scale[i]);
-		translate[i] = LittleFloat (pinmodel->scale_origin[i]);
+		loadmodel->surfmesh.num_morphmdlframescale[i] = LittleFloat (pinmodel->scale[i]);
+		loadmodel->surfmesh.num_morphmdlframetranslate[i] = LittleFloat (pinmodel->scale_origin[i]);
 	}
 
 	startskins = datapointer;
@@ -577,6 +975,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 			loadmodel->surfmesh.num_morphframes++;
 		}
 	}
+	loadmodel->num_poses = loadmodel->surfmesh.num_morphframes;
 
 	// store texture coordinates into temporary array, they will be stored
 	// after usage is determined (triangle data)
@@ -642,25 +1041,34 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 		loadmodel->surfmesh.data_texcoordtexture2f[i*2+1] = vertst[i*2+1];
 	}
 
+	// generate ushort elements array if possible
+	if (loadmodel->surfmesh.num_vertices <= 65536)
+	{
+		loadmodel->surfmesh.data_element3s = (unsigned short *)Mem_Alloc(loadmodel->mempool, sizeof(unsigned short[3]) * loadmodel->surfmesh.num_triangles);
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+	}
+
 // load the frames
 	loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
-	loadmodel->surfmesh.data_morphvertex3f = (float *)Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * loadmodel->surfmesh.num_morphframes * loadmodel->surfmesh.num_vertices);
+	loadmodel->surfmesh.data_morphmdlvertex = (trivertx_t *)Mem_Alloc(loadmodel->mempool, sizeof(trivertx_t) * loadmodel->surfmesh.num_morphframes * loadmodel->surfmesh.num_vertices);
 	loadmodel->surfmesh.data_neighbor3i = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_triangles * sizeof(int[3]));
-	Mod_MDL_LoadFrames (startframes, numverts, scale, translate, vertremap);
+	Mod_MDL_LoadFrames (startframes, numverts, vertremap);
 	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
-	Mod_CalcAliasModelBBoxes();
-	Mod_Alias_Mesh_CompileFrameZero();
+	Mod_Alias_CalculateBoundingBox();
+	Mod_Alias_MorphMesh_CompileFrames();
 
 	Mem_Free(vertst);
 	Mem_Free(vertremap);
 
 	// load the skins
 	skinfiles = Mod_LoadSkinFiles();
-	loadmodel->skinscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
-	loadmodel->num_textures = loadmodel->num_surfaces;
-	loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * totalskins * sizeof(texture_t));
 	if (skinfiles)
 	{
+		loadmodel->skinscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
+		loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
 		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures, skinfiles, "default", "");
 		Mod_FreeSkinFiles(skinfiles);
 		for (i = 0;i < loadmodel->numskins;i++)
@@ -673,6 +1081,10 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 	}
 	else
 	{
+		loadmodel->skinscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
+		loadmodel->num_textures = loadmodel->num_surfaces * totalskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * totalskins * sizeof(texture_t));
 		totalskins = 0;
 		datapointer = startskins;
 		for (i = 0;i < loadmodel->numskins;i++)
@@ -703,7 +1115,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 				}
 			}
 
-			sprintf(loadmodel->skinscenes[i].name, "skin %i", i);
+			dpsnprintf(loadmodel->skinscenes[i].name, sizeof(loadmodel->skinscenes[i].name), "skin %i", i);
 			loadmodel->skinscenes[i].firstframe = totalskins;
 			loadmodel->skinscenes[i].framecount = groupskins;
 			loadmodel->skinscenes[i].framerate = 1.0f / interval;
@@ -712,19 +1124,19 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 			for (j = 0;j < groupskins;j++)
 			{
 				if (groupskins > 1)
-					sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
+					dpsnprintf (name, sizeof(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_ALPHA | TEXF_PICMIP, true, true))
-					Mod_LoadSkinFrame_Internal(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_PICMIP, true, r_fullbrights.integer, (unsigned char *)datapointer, skinwidth, skinheight, 8, NULL, NULL);
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe);
+					dpsnprintf (name, sizeof(name), "%s_%i", loadmodel->name, i);
+				if (!Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, name, false, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS))
+					Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, R_SkinFrame_LoadInternalQuake(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_PICMIP, true, r_fullbrights.integer, (unsigned char *)datapointer, skinwidth, skinheight));
 				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_ALPHA | TEXF_PICMIP, true, true))
+		// TODO: support shaders here?
+		while ((tempskinframe = R_SkinFrame_LoadExternal(va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS, false)))
 		{
 			// expand the arrays to make room
 			tempskinscenes = loadmodel->skinscenes;
@@ -738,8 +1150,8 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 			Mem_Free(tempaliasskins);
 
 			// store the info about the new skin
-			Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe);
-			strcpy(loadmodel->skinscenes[loadmodel->numskins].name, name);
+			Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, tempskinframe);
+			strlcpy(loadmodel->skinscenes[loadmodel->numskins].name, name, sizeof(loadmodel->skinscenes[loadmodel->numskins].name));
 			loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins;
 			loadmodel->skinscenes[loadmodel->numskins].framecount = 1;
 			loadmodel->skinscenes[loadmodel->numskins].framerate = 10.0f;
@@ -748,6 +1160,11 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 			//increase skin counts
 			loadmodel->numskins++;
 			totalskins++;
+
+			// fix up the pointers since they are pointing at the old textures array
+			// FIXME: this is a hack!
+			for (j = 0;j < loadmodel->numskins * loadmodel->num_surfaces;j++)
+				loadmodel->data_textures[j].currentframe = &loadmodel->data_textures[j];
 		}
 	}
 
@@ -757,25 +1174,14 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
 	surface->num_triangles = loadmodel->surfmesh.num_triangles;
 	surface->num_firstvertex = 0;
 	surface->num_vertices = loadmodel->surfmesh.num_vertices;
-}
 
-static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, float *out3f, int numverts, int *vertremap)
-{
-	int i;
-	trivertx_t *in;
-	for (i = 0;i < numverts;i++, out3f += 3)
-	{
-		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];
-	}
+	loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1;
 }
 
-void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_IDP2_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
-	int i, j, k, hashindex, num, numxyz, numst, xyz, st, skinwidth, skinheight, *vertremap, version, end, numverts;
-	float *stverts, s, t, scale[3], translate[3];
+	int i, j, hashindex, numxyz, numst, xyz, st, skinwidth, skinheight, *vertremap, version, end;
+	float iskinwidth, iskinheight;
 	unsigned char *data;
 	msurface_t *surface;
 	md2_t *pinmodel;
@@ -787,11 +1193,10 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 	struct md2verthash_s
 	{
 		struct md2verthash_s *next;
-		int xyz;
-		float st[2];
+		unsigned short xyz;
+		unsigned short st;
 	}
 	*hash, **md2verthash, *md2verthashdata;
-	skinframe_t tempskinframe;
 	skinfile_t *skinfiles;
 
 	pinmodel = (md2_t *)buffer;
@@ -802,13 +1207,20 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 		Host_Error ("%s has wrong version number (%i should be %i)",
 			loadmodel->name, version, MD2ALIAS_VERSION);
 
+	loadmodel->modeldatatypestring = "MD2";
+
 	loadmodel->type = mod_alias;
+	loadmodel->AnimateVertices = Mod_MDL_AnimateVertices;
 	loadmodel->DrawSky = NULL;
+	loadmodel->DrawAddWaterPlanes = NULL;
 	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawDepth = R_Q1BSP_DrawDepth;
+	loadmodel->DrawDebug = R_Q1BSP_DrawDebug;
 	loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
 	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
 	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+	loadmodel->PointSuperContents = NULL;
 
 	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));
@@ -831,22 +1243,29 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 	if (LittleLong(pinmodel->ofs_glcmds) <= 0 || LittleLong(pinmodel->ofs_glcmds) >= end)
 		Host_Error ("%s is not a valid model", loadmodel->name);
 
-	loadmodel->num_surfaces = 1;
-	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
-	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int));
-	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
-	loadmodel->surfacelist = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
-	loadmodel->surfacelist[0] = 0;
-
 	loadmodel->numskins = LittleLong(pinmodel->num_skins);
 	numxyz = LittleLong(pinmodel->num_xyz);
 	numst = LittleLong(pinmodel->num_st);
 	loadmodel->surfmesh.num_triangles = LittleLong(pinmodel->num_tris);
 	loadmodel->numframes = LittleLong(pinmodel->num_frames);
 	loadmodel->surfmesh.num_morphframes = loadmodel->numframes;
-	loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
+	loadmodel->num_poses = loadmodel->surfmesh.num_morphframes;
+	skinwidth = LittleLong(pinmodel->skinwidth);
+	skinheight = LittleLong(pinmodel->skinheight);
+	iskinwidth = 1.0f / skinwidth;
+	iskinheight = 1.0f / skinheight;
+
+	loadmodel->num_surfaces = 1;
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->numframes * sizeof(animscene_t) + loadmodel->numframes * sizeof(float[6]) + loadmodel->surfmesh.num_triangles * sizeof(int[3]) + loadmodel->surfmesh.num_triangles * sizeof(int[3]));
+	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->sortedmodelsurfaces[0] = 0;
+	loadmodel->animscenes = (animscene_t *)data;data += loadmodel->numframes * sizeof(animscene_t);
+	loadmodel->surfmesh.data_morphmd2framesize6f = (float *)data;data += loadmodel->numframes * sizeof(float[6]);
+	loadmodel->surfmesh.data_element3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]);
+	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]);
 
-	loadmodel->flags = 0; // there are no MD2 flags
 	loadmodel->synctype = ST_RAND;
 
 	// load the skins
@@ -854,7 +1273,8 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 	skinfiles = Mod_LoadSkinFiles();
 	if (skinfiles)
 	{
-		loadmodel->num_textures = loadmodel->num_surfaces;
+		loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
 		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
 		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures, skinfiles, "default", "");
 		Mod_FreeSkinFiles(skinfiles);
@@ -862,24 +1282,18 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 	else if (loadmodel->numskins)
 	{
 		// skins found (most likely not a player model)
-		loadmodel->num_textures = loadmodel->num_surfaces;
+		loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
 		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * 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_PRECACHE | TEXF_PICMIP, true, true))
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, &tempskinframe);
-			else
-			{
-				Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin);
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, NULL);
-			}
-		}
+			Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i * loadmodel->num_surfaces, inskin, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS);
 	}
 	else
 	{
 		// no skins (most likely a player model)
 		loadmodel->numskins = 1;
-		loadmodel->num_textures = loadmodel->num_surfaces;
+		loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
 		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
 		Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures, NULL);
 	}
@@ -896,31 +1310,10 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 	// load the triangles and stvert data
 	inst = (unsigned short *)(base + LittleLong(pinmodel->ofs_st));
 	intri = (md2triangle_t *)(base + LittleLong(pinmodel->ofs_tris));
-	skinwidth = LittleLong(pinmodel->skinwidth);
-	skinheight = LittleLong(pinmodel->skinheight);
-
-	stverts = (float *)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 = (struct md2verthash_s **)Mem_Alloc(tempmempool, 256 * sizeof(hash));
+	md2verthash = (struct md2verthash_s **)Mem_Alloc(tempmempool, 65536 * sizeof(hash));
 	md2verthashdata = (struct md2verthash_s *)Mem_Alloc(tempmempool, loadmodel->surfmesh.num_triangles * 3 * sizeof(*hash));
 	// swap the triangle list
-	num = 0;
-	loadmodel->surfmesh.data_element3i = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_triangles * sizeof(int[3]));
+	loadmodel->surfmesh.num_vertices = 0;
 	for (i = 0;i < loadmodel->surfmesh.num_triangles;i++)
 	{
 		for (j = 0;j < 3;j++)
@@ -937,18 +1330,15 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 				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;
+			hashindex = (xyz * 256 + st) & 65535;
 			for (hash = md2verthash[hashindex];hash;hash = hash->next)
-				if (hash->xyz == xyz && hash->st[0] == s && hash->st[1] == t)
+				if (hash->xyz == xyz && hash->st == st)
 					break;
 			if (hash == NULL)
 			{
-				hash = md2verthashdata + num++;
+				hash = md2verthashdata + loadmodel->surfmesh.num_vertices++;
 				hash->xyz = xyz;
-				hash->st[0] = s;
-				hash->st[1] = t;
+				hash->st = st;
 				hash->next = md2verthash[hashindex];
 				md2verthash[hashindex] = hash;
 			}
@@ -956,39 +1346,61 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 		}
 	}
 
-	Mem_Free(stverts);
-
-	numverts = num;
-	loadmodel->surfmesh.num_vertices = numverts;
-	vertremap = (int *)Mem_Alloc(loadmodel->mempool, num * sizeof(int));
-	loadmodel->surfmesh.data_texcoordtexture2f = (float *)Mem_Alloc(loadmodel->mempool, num * sizeof(float[2]));
-	for (i = 0;i < num;i++)
+	vertremap = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(int));
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(float[2]) + loadmodel->surfmesh.num_vertices * loadmodel->surfmesh.num_morphframes * sizeof(trivertx_t));
+	loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[2]);
+	loadmodel->surfmesh.data_morphmdlvertex = (trivertx_t *)data;data += loadmodel->surfmesh.num_vertices * loadmodel->surfmesh.num_morphframes * sizeof(trivertx_t);
+	for (i = 0;i < loadmodel->surfmesh.num_vertices;i++)
 	{
+		int sts, stt;
 		hash = md2verthashdata + i;
 		vertremap[i] = hash->xyz;
-		loadmodel->surfmesh.data_texcoordtexture2f[i*2+0] = hash->st[0];
-		loadmodel->surfmesh.data_texcoordtexture2f[i*2+1] = hash->st[1];
+		sts = LittleShort(inst[hash->st*2+0]);
+		stt = LittleShort(inst[hash->st*2+1]);
+		if (sts < 0 || sts >= skinwidth || stt < 0 || stt >= skinheight)
+		{
+			Con_Printf("%s has an invalid skin coordinate (%i %i) on vert %i, changing to 0 0\n", loadmodel->name, sts, stt, i);
+			sts = 0;
+			stt = 0;
+		}
+		loadmodel->surfmesh.data_texcoordtexture2f[i*2+0] = sts * iskinwidth;
+		loadmodel->surfmesh.data_texcoordtexture2f[i*2+1] = stt * iskinheight;
 	}
 
 	Mem_Free(md2verthash);
 	Mem_Free(md2verthashdata);
 
+	// generate ushort elements array if possible
+	if (loadmodel->surfmesh.num_vertices <= 65536)
+	{
+		loadmodel->surfmesh.data_element3s = (unsigned short *)Mem_Alloc(loadmodel->mempool, sizeof(unsigned short[3]) * loadmodel->surfmesh.num_triangles);
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+	}
+
 	// load the frames
 	datapointer = (base + LittleLong(pinmodel->ofs_frames));
-	loadmodel->surfmesh.data_morphvertex3f = (float *)Mem_Alloc(loadmodel->mempool, numverts * loadmodel->surfmesh.num_morphframes * sizeof(float[3]));
 	for (i = 0;i < loadmodel->surfmesh.num_morphframes;i++)
 	{
+		int k;
+		trivertx_t *v;
+		trivertx_t *out;
 		pinframe = (md2frame_t *)datapointer;
 		datapointer += sizeof(md2frame_t);
+		// store the frame scale/translate into the appropriate array
 		for (j = 0;j < 3;j++)
 		{
-			scale[j] = LittleFloat(pinframe->scale[j]);
-			translate[j] = LittleFloat(pinframe->translate[j]);
+			loadmodel->surfmesh.data_morphmd2framesize6f[i*6+j] = LittleFloat(pinframe->scale[j]);
+			loadmodel->surfmesh.data_morphmd2framesize6f[i*6+3+j] = LittleFloat(pinframe->translate[j]);
 		}
-		Mod_MD2_ConvertVerts(scale, translate, (trivertx_t *)datapointer, loadmodel->surfmesh.data_morphvertex3f + i * numverts * 3, numverts, vertremap);
+		// convert the vertices
+		v = (trivertx_t *)datapointer;
+		out = loadmodel->surfmesh.data_morphmdlvertex + i * loadmodel->surfmesh.num_vertices;
+		for (k = 0;k < loadmodel->surfmesh.num_vertices;k++)
+			out[k] = v[vertremap[k]];
 		datapointer += numxyz * sizeof(trivertx_t);
 
-		strcpy(loadmodel->animscenes[i].name, pinframe->name);
+		strlcpy(loadmodel->animscenes[i].name, pinframe->name, sizeof(loadmodel->animscenes[i].name));
 		loadmodel->animscenes[i].firstframe = i;
 		loadmodel->animscenes[i].framecount = 1;
 		loadmodel->animscenes[i].framerate = 10;
@@ -997,10 +1409,9 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 
 	Mem_Free(vertremap);
 
-	loadmodel->surfmesh.data_neighbor3i = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_triangles * sizeof(int[3]));
 	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
-	Mod_CalcAliasModelBBoxes();
-	Mod_Alias_Mesh_CompileFrameZero();
+	Mod_Alias_CalculateBoundingBox();
+	Mod_Alias_MorphMesh_CompileFrames();
 
 	surface = loadmodel->data_surfaces;
 	surface->texture = loadmodel->data_textures;
@@ -1008,9 +1419,11 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
 	surface->num_triangles = loadmodel->surfmesh.num_triangles;
 	surface->num_firstvertex = 0;
 	surface->num_vertices = loadmodel->surfmesh.num_vertices;
+
+	loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1;
 }
 
-void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_IDP3_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
 	int i, j, k, version, meshvertices, meshtriangles;
 	unsigned char *data;
@@ -1034,15 +1447,24 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
 	if (loadmodel->numskins < 1)
 		loadmodel->numskins = 1;
 
+	loadmodel->modeldatatypestring = "MD3";
+
 	loadmodel->type = mod_alias;
+	loadmodel->AnimateVertices = Mod_MD3_AnimateVertices;
 	loadmodel->DrawSky = NULL;
+	loadmodel->DrawAddWaterPlanes = NULL;
 	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawDepth = R_Q1BSP_DrawDepth;
+	loadmodel->DrawDebug = R_Q1BSP_DrawDebug;
 	loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
 	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
 	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
-	loadmodel->flags = LittleLong(pinmodel->flags);
+	loadmodel->PointSuperContents = NULL;
 	loadmodel->synctype = ST_RAND;
+	// convert model flags to EF flags (MF_ROCKET becomes EF_ROCKET, etc)
+	i = LittleLong (pinmodel->flags);
+	loadmodel->effects = ((i & 255) << 24) | (i & 0x00FFFF00);
 
 	// set up some global info about the model
 	loadmodel->numframes = LittleLong(pinmodel->num_frames);
@@ -1062,7 +1484,7 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
 	loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
 	for (i = 0, pinframe = (md3frameinfo_t *)((unsigned char *)pinmodel + LittleLong(pinmodel->lump_frameinfo));i < loadmodel->numframes;i++, pinframe++)
 	{
-		strcpy(loadmodel->animscenes[i].name, pinframe->name);
+		strlcpy(loadmodel->animscenes[i].name, pinframe->name, sizeof(loadmodel->animscenes[i].name));
 		loadmodel->animscenes[i].firstframe = i;
 		loadmodel->animscenes[i].framecount = 1;
 		loadmodel->animscenes[i].framerate = 10;
@@ -1075,14 +1497,11 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
 	loadmodel->data_tags = (aliastag_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_tagframes * loadmodel->num_tags * sizeof(aliastag_t));
 	for (i = 0, pintag = (md3tag_t *)((unsigned char *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->num_tagframes * loadmodel->num_tags;i++, pintag++)
 	{
-		strcpy(loadmodel->data_tags[i].name, pintag->name);
-		loadmodel->data_tags[i].matrix = identitymatrix;
+		strlcpy(loadmodel->data_tags[i].name, pintag->name, sizeof(loadmodel->data_tags[i].name));
+		for (j = 0;j < 9;j++)
+			loadmodel->data_tags[i].matrixgl[j] = LittleFloat(pintag->rotationmatrix[j]);
 		for (j = 0;j < 3;j++)
-		{
-			for (k = 0;k < 3;k++)
-				loadmodel->data_tags[i].matrix.m[j][k] = LittleFloat(pintag->rotationmatrix[k * 3 + j]);
-			loadmodel->data_tags[i].matrix.m[j][3] = LittleFloat(pintag->origin[j]);
-		}
+			loadmodel->data_tags[i].matrixgl[9+j] = LittleFloat(pintag->origin[j]);
 		//Con_Printf("model \"%s\" frame #%i tag #%i \"%s\"\n", loadmodel->name, i / loadmodel->num_tags, i % loadmodel->num_tags, loadmodel->data_tags[i].name);
 	}
 
@@ -1100,18 +1519,26 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
 	}
 
 	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
-	loadmodel->num_textures = loadmodel->num_surfaces;
-	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + meshtriangles * sizeof(int[3]) + meshvertices * sizeof(float[2]) + meshvertices * loadmodel->numframes * sizeof(float[3]));
+	loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+	loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + meshtriangles * sizeof(int[3]) + (meshvertices <= 65536 ? meshtriangles * sizeof(unsigned short[3]) : 0) + meshvertices * sizeof(float[2]) + meshvertices * loadmodel->numframes * sizeof(md3vertex_t));
 	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
-	loadmodel->surfacelist = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
 	loadmodel->data_textures = (texture_t *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t);
 	loadmodel->surfmesh.num_vertices = meshvertices;
 	loadmodel->surfmesh.num_triangles = meshtriangles;
 	loadmodel->surfmesh.num_morphframes = loadmodel->numframes; // TODO: remove?
+	loadmodel->num_poses = loadmodel->surfmesh.num_morphframes;
 	loadmodel->surfmesh.data_element3i = (int *)data;data += meshtriangles * sizeof(int[3]);
 	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += meshtriangles * sizeof(int[3]);
 	loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += meshvertices * sizeof(float[2]);
-	loadmodel->surfmesh.data_morphvertex3f = (float *)data;data += meshvertices * loadmodel->numframes * sizeof(float[3]);
+	loadmodel->surfmesh.data_morphmd3vertex = (md3vertex_t *)data;data += meshvertices * loadmodel->numframes * sizeof(md3vertex_t);
+	if (meshvertices <= 65536)
+	{
+		loadmodel->surfmesh.data_element3s = (unsigned short *)data;data += meshtriangles * sizeof(unsigned short[3]);
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+	}
 
 	meshvertices = 0;
 	meshtriangles = 0;
@@ -1119,7 +1546,7 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
 	{
 		if (memcmp(pinmesh->identifier, "IDP3", 4))
 			Host_Error("Mod_IDP3_Load: invalid mesh identifier (not IDP3)");
-		loadmodel->surfacelist[i] = i;
+		loadmodel->sortedmodelsurfaces[i] = i;
 		surface = loadmodel->data_surfaces + i;
 		surface->texture = loadmodel->data_textures + i;
 		surface->num_firsttriangle = meshtriangles;
@@ -1136,33 +1563,40 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
 			loadmodel->surfmesh.data_texcoordtexture2f[(j + surface->num_firstvertex) * 2 + 0] = LittleFloat(((float *)((unsigned char *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 0]);
 			loadmodel->surfmesh.data_texcoordtexture2f[(j + surface->num_firstvertex) * 2 + 1] = LittleFloat(((float *)((unsigned char *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 1]);
 		}
-		for (j = 0;j < surface->num_vertices * loadmodel->numframes;j++)
+		for (j = 0;j < loadmodel->numframes;j++)
 		{
-			loadmodel->surfmesh.data_morphvertex3f[(j + surface->num_firstvertex) * 3 + 0] = LittleShort(((short *)((unsigned char *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 0]) * (1.0f / 64.0f);
-			loadmodel->surfmesh.data_morphvertex3f[(j + surface->num_firstvertex) * 3 + 1] = LittleShort(((short *)((unsigned char *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 1]) * (1.0f / 64.0f);
-			loadmodel->surfmesh.data_morphvertex3f[(j + surface->num_firstvertex) * 3 + 2] = LittleShort(((short *)((unsigned char *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 2]) * (1.0f / 64.0f);
+			const md3vertex_t *in = (md3vertex_t *)((unsigned char *)pinmesh + LittleLong(pinmesh->lump_framevertices)) + j * surface->num_vertices;
+			md3vertex_t *out = loadmodel->surfmesh.data_morphmd3vertex + surface->num_firstvertex + j * loadmodel->surfmesh.num_vertices;
+			for (k = 0;k < surface->num_vertices;k++, in++, out++)
+			{
+				out->origin[0] = LittleShort(in->origin[0]);
+				out->origin[1] = LittleShort(in->origin[1]);
+				out->origin[2] = LittleShort(in->origin[2]);
+				out->pitch = in->pitch;
+				out->yaw = in->yaw;
+			}
 		}
 
-		if (LittleLong(pinmesh->num_shaders) >= 1)
-			Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, pinmesh->name, ((md3shader_t *)((unsigned char *) pinmesh + LittleLong(pinmesh->lump_shaders)))->name);
-		else
-			for (j = 0;j < loadmodel->numskins;j++)
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i + j * loadmodel->num_surfaces, NULL);
+		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, pinmesh->name, LittleLong(pinmesh->num_shaders) >= 1 ? ((md3shader_t *)((unsigned char *) pinmesh + LittleLong(pinmesh->lump_shaders)))->name : "");
 
 		Mod_ValidateElements(loadmodel->surfmesh.data_element3i + surface->num_firsttriangle * 3, surface->num_triangles, surface->num_firstvertex, surface->num_vertices, __FILE__, __LINE__);
 	}
 	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
-	Mod_Alias_Mesh_CompileFrameZero();
-	Mod_CalcAliasModelBBoxes();
+	Mod_Alias_MorphMesh_CompileFrames();
+	Mod_Alias_CalculateBoundingBox();
 	Mod_FreeSkinFiles(skinfiles);
+	Mod_MakeSortedSurfaces(loadmodel);
+
+	loadmodel->surfmesh.isanimated = loadmodel->numframes > 1
+	     || (loadmodel->animscenes && loadmodel->animscenes[0].framecount > 1);
 }
 
-void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_ZYMOTICMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
 	zymtype1header_t *pinmodel, *pheader;
 	unsigned char *pbase;
-	int i, j, k, l, numposes, meshvertices, meshtriangles, numvertexboneweights, *bonecount, *vertbonecounts, count, *renderlist, *renderlistend, *outelements;
-	float modelradius, corner[2], *poses, *intexcoord2f, *outtexcoord2f;
+	int i, j, k, numposes, meshvertices, meshtriangles, *bonecount, *vertbonecounts, count, *renderlist, *renderlistend, *outelements;
+	float modelradius, corner[2], *poses, *intexcoord2f, *outtexcoord2f, *bonepose;
 	zymvertex_t *verts, *vertdata;
 	zymscene_t *scene;
 	zymbone_t *bone;
@@ -1174,12 +1608,13 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	pinmodel = (zymtype1header_t *)buffer;
 	pbase = (unsigned char *)buffer;
 	if (memcmp(pinmodel->id, "ZYMOTICMODEL", 12))
-		Host_Error ("Mod_ZYMOTICMODEL_Load: %s is not a zymotic model");
+		Host_Error ("Mod_ZYMOTICMODEL_Load: %s is not a zymotic model", loadmodel->name);
 	if (BigLong(pinmodel->type) != 1)
 		Host_Error ("Mod_ZYMOTICMODEL_Load: only type 1 (skeletal pose) models are currently supported (name = %s)", loadmodel->name);
 
+	loadmodel->modeldatatypestring = "ZYM";
+
 	loadmodel->type = mod_alias;
-	loadmodel->flags = 0; // there are no flags on zym models
 	loadmodel->synctype = ST_RAND;
 
 	// byteswap header
@@ -1219,21 +1654,26 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 
 	if (pheader->numtris < 1 || pheader->numverts < 3 || pheader->numshaders < 1)
 	{
-		Con_Printf("%s has no geometry\n");
+		Con_Printf("%s has no geometry\n", loadmodel->name);
 		return;
 	}
 	if (pheader->numscenes < 1 || pheader->lump_poses.length < (int)sizeof(float[3][4]))
 	{
-		Con_Printf("%s has no animations\n");
+		Con_Printf("%s has no animations\n", loadmodel->name);
 		return;
 	}
 
+	loadmodel->AnimateVertices = Mod_Skeletal_AnimateVertices;
 	loadmodel->DrawSky = NULL;
+	loadmodel->DrawAddWaterPlanes = NULL;
 	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawDepth = R_Q1BSP_DrawDepth;
+	loadmodel->DrawDebug = R_Q1BSP_DrawDebug;
 	loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
 	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
 	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+	loadmodel->PointSuperContents = NULL;
 
 	loadmodel->numframes = pheader->numscenes;
 	loadmodel->num_surfaces = pheader->numshaders;
@@ -1296,7 +1736,7 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 
 	//zymlump_t lump_bones; // zymbone_t bone[numbones];
 	loadmodel->num_bones = pheader->numbones;
-	loadmodel->data_bones = (aliasbone_t *)Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(aliasbone_t));
+	loadmodel->data_bones = (aliasbone_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_bones * sizeof(aliasbone_t));
 	bone = (zymbone_t *) (pheader->lump_bones.start + pbase);
 	for (i = 0;i < pheader->numbones;i++)
 	{
@@ -1313,30 +1753,41 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	for (i = 0;i < pheader->numverts;i++)
 	{
 		vertbonecounts[i] = BigLong(bonecount[i]);
-		if (vertbonecounts[i] < 1)
-			Host_Error("%s bonecount[%i] < 1", loadmodel->name, i);
+		if (vertbonecounts[i] != 1)
+			Host_Error("%s bonecount[%i] != 1 (vertex weight support is impossible in this format)", loadmodel->name, i);
 	}
 
-	loadmodel->num_poses = pheader->lump_poses.length / sizeof(float[3][4]);
+	loadmodel->num_poses = pheader->lump_poses.length / sizeof(float[3][4]) / loadmodel->num_bones;
 
 	meshvertices = pheader->numverts;
 	meshtriangles = pheader->numtris;
-	numvertexboneweights = pheader->lump_verts.length / sizeof(zymvertex_t);
 
 	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
-	loadmodel->num_textures = loadmodel->num_surfaces;
-	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + meshtriangles * sizeof(int[3]) + meshvertices * sizeof(float[2]) + numvertexboneweights * sizeof(surfmeshvertexboneweight_t) + loadmodel->num_poses * sizeof(float[3][4]));
+	loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+	loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + meshtriangles * sizeof(int[3]) + (meshvertices <= 65536 ? meshtriangles * sizeof(unsigned short[3]) : 0) + meshvertices * sizeof(float[14]) + meshvertices * sizeof(int[4]) + meshvertices * sizeof(float[4]) + loadmodel->num_poses * loadmodel->num_bones * sizeof(float[12]) + loadmodel->num_bones * sizeof(float[12]));
 	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
-	loadmodel->surfacelist = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
 	loadmodel->data_textures = (texture_t *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t);
 	loadmodel->surfmesh.num_vertices = meshvertices;
 	loadmodel->surfmesh.num_triangles = meshtriangles;
-	loadmodel->surfmesh.num_vertexboneweights = numvertexboneweights;
 	loadmodel->surfmesh.data_element3i = (int *)data;data += meshtriangles * sizeof(int[3]);
 	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += meshtriangles * sizeof(int[3]);
+	loadmodel->surfmesh.data_vertex3f = (float *)data;data += meshvertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_svector3f = (float *)data;data += meshvertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_tvector3f = (float *)data;data += meshvertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_normal3f = (float *)data;data += meshvertices * sizeof(float[3]);
 	loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += meshvertices * sizeof(float[2]);
-	loadmodel->surfmesh.data_vertexboneweights = (surfmeshvertexboneweight_t *)data;data += numvertexboneweights * sizeof(surfmeshvertexboneweight_t);
-	loadmodel->data_poses = (float *)data;data += loadmodel->num_poses * sizeof(float[3][4]);
+	loadmodel->surfmesh.data_vertexweightindex4i = (int *)data;data += meshvertices * sizeof(int[4]);
+	loadmodel->surfmesh.data_vertexweightinfluence4f = (float *)data;data += meshvertices * sizeof(float[4]);
+	loadmodel->data_poses = (float *)data;data += loadmodel->num_poses * loadmodel->num_bones * sizeof(float[12]);
+	loadmodel->data_baseboneposeinverse = (float *)data;data += loadmodel->num_bones * sizeof(float[12]);
+	if (loadmodel->surfmesh.num_vertices <= 65536)
+	{
+		loadmodel->surfmesh.data_element3s = (unsigned short *)data;data += loadmodel->surfmesh.num_triangles * sizeof(unsigned short[3]);
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+	}
 
 	//zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data
 	poses = (float *) (pheader->lump_poses.start + pbase);
@@ -1346,21 +1797,40 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	//zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct
 	verts = (zymvertex_t *)Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length);
 	vertdata = (zymvertex_t *) (pheader->lump_verts.start + pbase);
-	l = 0;
-	for (j = 0;j < pheader->numverts;j++)
+	// reconstruct frame 0 matrices to allow reconstruction of the base mesh
+	// (converting from weight-blending skeletal animation to
+	//  deformation-based skeletal animation)
+	bonepose = (float *)Z_Malloc(loadmodel->num_bones * sizeof(float[12]));
+	for (i = 0;i < loadmodel->num_bones;i++)
 	{
-		for (k = 0;k < vertbonecounts[j];k++, l++)
-		{
-			// this format really should have had a per vertexweight weight value...
-			float influence = 1.0f / vertbonecounts[j];
-			loadmodel->surfmesh.data_vertexboneweights[l].vertexindex = j;
-			loadmodel->surfmesh.data_vertexboneweights[l].boneindex = BigLong(vertdata[l].bonenum);
-			loadmodel->surfmesh.data_vertexboneweights[l].origin[0] = BigFloat(vertdata[l].origin[0]) * influence;
-			loadmodel->surfmesh.data_vertexboneweights[l].origin[1] = BigFloat(vertdata[l].origin[1]) * influence;
-			loadmodel->surfmesh.data_vertexboneweights[l].origin[2] = BigFloat(vertdata[l].origin[2]) * influence;
-			loadmodel->surfmesh.data_vertexboneweights[l].origin[3] = influence;
-		}
+		const float *m = loadmodel->data_poses + i * 12;
+		if (loadmodel->data_bones[i].parent >= 0)
+			R_ConcatTransforms(bonepose + 12 * loadmodel->data_bones[i].parent, m, bonepose + 12 * i);
+		else
+			for (k = 0;k < 12;k++)
+				bonepose[12*i+k] = m[k];
 	}
+	for (j = 0;j < pheader->numverts;j++)
+	{
+		// this format really should have had a per vertexweight weight value...
+		// but since it does not, the weighting is completely ignored and
+		// only one weight is allowed per vertex
+		int boneindex = BigLong(vertdata[j].bonenum);
+		const float *m = bonepose + 12 * boneindex;
+		float relativeorigin[3];
+		relativeorigin[0] = BigFloat(vertdata[j].origin[0]);
+		relativeorigin[1] = BigFloat(vertdata[j].origin[1]);
+		relativeorigin[2] = BigFloat(vertdata[j].origin[2]);
+		// transform the vertex bone weight into the base mesh
+		loadmodel->surfmesh.data_vertex3f[j*3+0] = relativeorigin[0] * m[0] + relativeorigin[1] * m[1] + relativeorigin[2] * m[ 2] + m[ 3];
+		loadmodel->surfmesh.data_vertex3f[j*3+1] = relativeorigin[0] * m[4] + relativeorigin[1] * m[5] + relativeorigin[2] * m[ 6] + m[ 7];
+		loadmodel->surfmesh.data_vertex3f[j*3+2] = relativeorigin[0] * m[8] + relativeorigin[1] * m[9] + relativeorigin[2] * m[10] + m[11];
+		// store the weight as the primary weight on this vertex
+		loadmodel->surfmesh.data_vertexweightindex4i[j*4+0] = boneindex;
+		loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+0] = 1;
+	}
+	Z_Free(bonepose);
+	// normals and tangents are calculated after elements are loaded
 
 	//zymlump_t lump_texcoords; // float texcoords[numvertices][2];
 	outtexcoord2f = loadmodel->surfmesh.data_texcoordtexture2f;
@@ -1387,84 +1857,83 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	meshtriangles = 0;
 	for (i = 0;i < loadmodel->num_surfaces;i++)
 	{
-		int lastvertex;
+		int firstvertex, lastvertex;
 		if (renderlist >= renderlistend)
 			Host_Error("%s corrupt renderlist (wrong size)", 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)", loadmodel->name);
 
-		loadmodel->surfacelist[i] = i;
+		loadmodel->sortedmodelsurfaces[i] = i;
 		surface = loadmodel->data_surfaces + i;
 		surface->texture = loadmodel->data_textures + i;
 		surface->num_firsttriangle = meshtriangles;
 		surface->num_triangles = count;
-		surface->num_firstvertex = meshvertices;
-		surface->num_vertices = meshvertices;
+		meshtriangles += surface->num_triangles;
 
-		// load the elements and find the used vertex range
-		lastvertex = 0;
+		// load the elements
 		outelements = loadmodel->surfmesh.data_element3i + surface->num_firsttriangle * 3;
-		for (j = 0;j < surface->num_triangles;j++)
+		for (j = 0;j < surface->num_triangles;j++, renderlist += 3)
 		{
-			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)
+			outelements[j*3+2] = BigLong(renderlist[0]);
+			outelements[j*3+1] = BigLong(renderlist[1]);
+			outelements[j*3+0] = BigLong(renderlist[2]);
+		}
+		// validate the elements and find the used vertex range
+		firstvertex = meshvertices;
+		lastvertex = 0;
+		for (j = 0;j < surface->num_triangles * 3;j++)
+		{
+			if ((unsigned int)outelements[j] >= (unsigned int)meshvertices)
 				Host_Error("%s corrupt renderlist (out of bounds index)", loadmodel->name);
-			if (vertbonecounts[outelements[0]] == 0 || vertbonecounts[outelements[1]] == 0 || vertbonecounts[outelements[2]] == 0)
-				Host_Error("%s corrupt renderlist (references vertex with no bone weights", loadmodel->name);
-			surface->num_firstvertex = min(surface->num_firstvertex, outelements[0]);
-			surface->num_firstvertex = min(surface->num_firstvertex, outelements[1]);
-			surface->num_firstvertex = min(surface->num_firstvertex, outelements[2]);
-			lastvertex = max(lastvertex, outelements[0]);
-			lastvertex = max(lastvertex, outelements[1]);
-			lastvertex = max(lastvertex, outelements[2]);
-			renderlist += 3;
-			outelements += 3;
+			firstvertex = min(firstvertex, outelements[j]);
+			lastvertex = max(lastvertex, outelements[j]);
 		}
-		surface->num_vertices = lastvertex + 1 - surface->num_firstvertex;
+		surface->num_firstvertex = firstvertex;
+		surface->num_vertices = lastvertex + 1 - firstvertex;
 
 		// 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(loadmodel->data_textures + i, skinfiles, shadername, shadername);
-		else
-			for (j = 0;j < loadmodel->numskins;j++)
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i + j * loadmodel->num_surfaces, NULL);
-
-		Mod_ValidateElements(loadmodel->surfmesh.data_element3i + surface->num_firsttriangle * 3, surface->num_triangles, surface->num_firstvertex, surface->num_vertices, __FILE__, __LINE__);
+		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, shadername, shadername);
 	}
-	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
-	Mod_Alias_Mesh_CompileFrameZero();
 	Mod_FreeSkinFiles(skinfiles);
 	Mem_Free(vertbonecounts);
 	Mem_Free(verts);
+	Mod_MakeSortedSurfaces(loadmodel);
+
+	// compute all the mesh information that was not loaded from the file
+	Mod_ValidateElements(loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles, 0, loadmodel->surfmesh.num_vertices, __FILE__, __LINE__);
+	Mod_BuildBaseBonePoses();
+	Mod_BuildNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_normal3f, true);
+	Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true);
+	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
+
+	loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1;
 }
 
-void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_DARKPLACESMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
 	dpmheader_t *pheader;
 	dpmframe_t *frame;
 	dpmbone_t *bone;
 	dpmmesh_t *dpmmesh;
 	unsigned char *pbase;
-	int i, j, k, meshvertices, meshtriangles, numvertexboneweights;
+	int i, j, k, meshvertices, meshtriangles;
 	skinfile_t *skinfiles;
 	unsigned char *data;
+	float *bonepose;
 
 	pheader = (dpmheader_t *)buffer;
 	pbase = (unsigned char *)buffer;
 	if (memcmp(pheader->id, "DARKPLACESMODEL\0", 16))
-		Host_Error ("Mod_DARKPLACESMODEL_Load: %s is not a darkplaces model");
+		Host_Error ("Mod_DARKPLACESMODEL_Load: %s is not a darkplaces model", loadmodel->name);
 	if (BigLong(pheader->type) != 2)
 		Host_Error ("Mod_DARKPLACESMODEL_Load: only type 2 (hierarchical skeletal pose) models are currently supported (name = %s)", loadmodel->name);
 
+	loadmodel->modeldatatypestring = "DPM";
+
 	loadmodel->type = mod_alias;
-	loadmodel->flags = 0; // there are no flags on zym models
 	loadmodel->synctype = ST_RAND;
 
 	// byteswap header
@@ -1487,21 +1956,26 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 
 	if (pheader->num_bones < 1 || pheader->num_meshs < 1)
 	{
-		Con_Printf("%s has no geometry\n");
+		Con_Printf("%s has no geometry\n", loadmodel->name);
 		return;
 	}
 	if (pheader->num_frames < 1)
 	{
-		Con_Printf("%s has no frames\n");
+		Con_Printf("%s has no frames\n", loadmodel->name);
 		return;
 	}
 
+	loadmodel->AnimateVertices = Mod_Skeletal_AnimateVertices;
 	loadmodel->DrawSky = NULL;
+	loadmodel->DrawAddWaterPlanes = NULL;
 	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawDepth = R_Q1BSP_DrawDepth;
+	loadmodel->DrawDebug = R_Q1BSP_DrawDebug;
 	loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
 	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
 	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+	loadmodel->PointSuperContents = NULL;
 
 	// model bbox
 	for (i = 0;i < 3;i++)
@@ -1523,48 +1997,50 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 
 	meshvertices = 0;
 	meshtriangles = 0;
-	numvertexboneweights = 0;
 
-	// load the meshes now
+	// gather combined statistics from the meshes
 	dpmmesh = (dpmmesh_t *) (pbase + pheader->ofs_meshs);
-	for (i = 0;i < loadmodel->num_surfaces;i++)
+	for (i = 0;i < (int)pheader->num_meshs;i++)
 	{
 		int numverts = BigLong(dpmmesh->num_verts);
-		meshvertices += numverts;;
+		meshvertices += numverts;
 		meshtriangles += BigLong(dpmmesh->num_tris);
-
-		// to find out how many weights exist we two a two-stage load...
-		data = (unsigned char *) (pbase + BigLong(dpmmesh->ofs_verts));
-		for (j = 0;j < numverts;j++)
-		{
-			int numweights = BigLong(((dpmvertex_t *)data)->numbones);
-			numvertexboneweights += numweights;
-			data += sizeof(dpmvertex_t);
-			data += numweights * sizeof(dpmbonevert_t);
-		}
 		dpmmesh++;
 	}
 
 	loadmodel->numframes = pheader->num_frames;
 	loadmodel->num_bones = pheader->num_bones;
-	loadmodel->num_poses = loadmodel->num_bones * loadmodel->numframes;
-	loadmodel->num_textures = loadmodel->nummodelsurfaces = loadmodel->num_surfaces = pheader->num_meshs;
+	loadmodel->num_poses = loadmodel->numframes;
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces = pheader->num_meshs;
+	loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+	loadmodel->num_texturesperskin = loadmodel->num_surfaces;
 	// do most allocations as one merged chunk
-	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + meshtriangles * sizeof(int[3]) + meshvertices * sizeof(float[2]) + numvertexboneweights * sizeof(surfmeshvertexboneweight_t) + loadmodel->num_poses * sizeof(float[3][4]) + loadmodel->numskins * sizeof(animscene_t) + loadmodel->num_bones * sizeof(aliasbone_t) + loadmodel->numframes * sizeof(animscene_t));
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + (meshvertices <= 65536 ? meshtriangles * sizeof(unsigned short[3]) : 0) + meshtriangles * sizeof(int[3]) + meshvertices * (sizeof(float[14]) + sizeof(int[4]) + sizeof(float[4])) + loadmodel->num_poses * loadmodel->num_bones * sizeof(float[12]) + loadmodel->num_bones * sizeof(float[12]) + loadmodel->numskins * sizeof(animscene_t) + loadmodel->num_bones * sizeof(aliasbone_t) + loadmodel->numframes * sizeof(animscene_t));
 	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
-	loadmodel->surfacelist = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
 	loadmodel->data_textures = (texture_t *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t);
 	loadmodel->surfmesh.num_vertices = meshvertices;
 	loadmodel->surfmesh.num_triangles = meshtriangles;
-	loadmodel->surfmesh.num_vertexboneweights = numvertexboneweights;
 	loadmodel->surfmesh.data_element3i = (int *)data;data += meshtriangles * sizeof(int[3]);
 	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += meshtriangles * sizeof(int[3]);
+	loadmodel->surfmesh.data_vertex3f = (float *)data;data += meshvertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_svector3f = (float *)data;data += meshvertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_tvector3f = (float *)data;data += meshvertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_normal3f = (float *)data;data += meshvertices * sizeof(float[3]);
 	loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += meshvertices * sizeof(float[2]);
-	loadmodel->surfmesh.data_vertexboneweights = (surfmeshvertexboneweight_t *)data;data += numvertexboneweights * sizeof(surfmeshvertexboneweight_t);
-	loadmodel->data_poses = (float *)data;data += loadmodel->num_poses * sizeof(float[3][4]);
+	loadmodel->surfmesh.data_vertexweightindex4i = (int *)data;data += meshvertices * sizeof(int[4]);
+	loadmodel->surfmesh.data_vertexweightinfluence4f = (float *)data;data += meshvertices * sizeof(float[4]);
+	loadmodel->data_poses = (float *)data;data += loadmodel->num_poses * loadmodel->num_bones * sizeof(float[12]);
+	loadmodel->data_baseboneposeinverse = (float *)data;data += loadmodel->num_bones * sizeof(float[12]);
 	loadmodel->skinscenes = (animscene_t *)data;data += loadmodel->numskins * sizeof(animscene_t);
 	loadmodel->data_bones = (aliasbone_t *)data;data += loadmodel->num_bones * sizeof(aliasbone_t);
 	loadmodel->animscenes = (animscene_t *)data;data += loadmodel->numframes * sizeof(animscene_t);
+	if (meshvertices <= 65536)
+	{
+		loadmodel->surfmesh.data_element3s = (unsigned short *)data;data += meshtriangles * sizeof(unsigned short[3]);
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+	}
 
 	for (i = 0;i < loadmodel->numskins;i++)
 	{
@@ -1607,7 +2083,19 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	dpmmesh = (dpmmesh_t *) (pbase + pheader->ofs_meshs);
 	meshvertices = 0;
 	meshtriangles = 0;
-	numvertexboneweights = 0;
+	// reconstruct frame 0 matrices to allow reconstruction of the base mesh
+	// (converting from weight-blending skeletal animation to
+	//  deformation-based skeletal animation)
+	bonepose = (float *)Z_Malloc(loadmodel->num_bones * sizeof(float[12]));
+	for (i = 0;i < loadmodel->num_bones;i++)
+	{
+		const float *m = loadmodel->data_poses + i * 12;
+		if (loadmodel->data_bones[i].parent >= 0)
+			R_ConcatTransforms(bonepose + 12 * loadmodel->data_bones[i].parent, m, bonepose + 12 * i);
+		else
+			for (k = 0;k < 12;k++)
+				bonepose[12*i+k] = m[k];
+	}
 	for (i = 0;i < loadmodel->num_surfaces;i++, dpmmesh++)
 	{
 		const int *inelements;
@@ -1615,7 +2103,7 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 		const float *intexcoord;
 		msurface_t *surface;
 
-		loadmodel->surfacelist[i] = i;
+		loadmodel->sortedmodelsurfaces[i] = i;
 		surface = loadmodel->data_surfaces + i;
 		surface->texture = loadmodel->data_textures + i;
 		surface->num_firsttriangle = meshtriangles;
@@ -1642,53 +2130,95 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 			loadmodel->surfmesh.data_texcoordtexture2f[j + surface->num_firstvertex * 2] = BigFloat(intexcoord[j]);
 
 		data = (unsigned char *) (pbase + BigLong(dpmmesh->ofs_verts));
-		for (j = 0;j < surface->num_vertices;j++)
+		for (j = surface->num_firstvertex;j < surface->num_firstvertex + surface->num_vertices;j++)
 		{
+			float sum;
+			int l;
 			int numweights = BigLong(((dpmvertex_t *)data)->numbones);
 			data += sizeof(dpmvertex_t);
 			for (k = 0;k < numweights;k++)
 			{
 				const dpmbonevert_t *vert = (dpmbonevert_t *) data;
-				// stuff not processed here: normal
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].vertexindex = j;
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].boneindex = BigLong(vert->bonenum);
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].origin[0] = BigFloat(vert->origin[0]);
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].origin[1] = BigFloat(vert->origin[1]);
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].origin[2] = BigFloat(vert->origin[2]);
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].origin[3] = BigFloat(vert->influence);
-				numvertexboneweights++;
+				int boneindex = BigLong(vert->bonenum);
+				const float *m = bonepose + 12 * boneindex;
+				float influence = BigFloat(vert->influence);
+				float relativeorigin[3], relativenormal[3];
+				relativeorigin[0] = BigFloat(vert->origin[0]);
+				relativeorigin[1] = BigFloat(vert->origin[1]);
+				relativeorigin[2] = BigFloat(vert->origin[2]);
+				relativenormal[0] = BigFloat(vert->normal[0]);
+				relativenormal[1] = BigFloat(vert->normal[1]);
+				relativenormal[2] = BigFloat(vert->normal[2]);
+				// blend the vertex bone weights into the base mesh
+				loadmodel->surfmesh.data_vertex3f[j*3+0] += relativeorigin[0] * m[0] + relativeorigin[1] * m[1] + relativeorigin[2] * m[ 2] + influence * m[ 3];
+				loadmodel->surfmesh.data_vertex3f[j*3+1] += relativeorigin[0] * m[4] + relativeorigin[1] * m[5] + relativeorigin[2] * m[ 6] + influence * m[ 7];
+				loadmodel->surfmesh.data_vertex3f[j*3+2] += relativeorigin[0] * m[8] + relativeorigin[1] * m[9] + relativeorigin[2] * m[10] + influence * m[11];
+				loadmodel->surfmesh.data_normal3f[j*3+0] += relativenormal[0] * m[0] + relativenormal[1] * m[1] + relativenormal[2] * m[ 2];
+				loadmodel->surfmesh.data_normal3f[j*3+1] += relativenormal[0] * m[4] + relativenormal[1] * m[5] + relativenormal[2] * m[ 6];
+				loadmodel->surfmesh.data_normal3f[j*3+2] += relativenormal[0] * m[8] + relativenormal[1] * m[9] + relativenormal[2] * m[10];
+				if (!k)
+				{
+					// store the first (and often only) weight
+					loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+0] = influence;
+					loadmodel->surfmesh.data_vertexweightindex4i[j*4+0] = boneindex;
+				}
+				else
+				{
+					// sort the new weight into this vertex's weight table
+					// (which only accepts up to 4 bones per vertex)
+					for (l = 0;l < 4;l++)
+					{
+						if (loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+l] < influence)
+						{
+							// move weaker influence weights out of the way first
+							int l2;
+							for (l2 = 3;l2 > l;l2--)
+							{
+								loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+l2] = loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+l2-1];
+								loadmodel->surfmesh.data_vertexweightindex4i[j*4+l2] = loadmodel->surfmesh.data_vertexweightindex4i[j*4+l2-1];
+							}
+							// store the new weight
+							loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+l] = influence;
+							loadmodel->surfmesh.data_vertexweightindex4i[j*4+l] = boneindex;
+							break;
+						}
+					}
+				}
 				data += sizeof(dpmbonevert_t);
 			}
+			sum = 0;
+			for (l = 0;l < 4;l++)
+				sum += loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+l];
+			if (sum && fabs(sum - 1) > (1.0f / 256.0f))
+			{
+				float f = 1.0f / sum;
+				for (l = 0;l < 4;l++)
+					loadmodel->surfmesh.data_vertexweightinfluence4f[j*4+l] *= f;
+			}
 		}
 
 		// since dpm models do not have named sections, reuse their shader name as the section name
-		if (dpmmesh->shadername[0])
-			Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, dpmmesh->shadername, dpmmesh->shadername);
-		else
-			for (j = 0;j < loadmodel->numskins;j++)
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i + j * loadmodel->num_surfaces, NULL);
+		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, dpmmesh->shadername, dpmmesh->shadername);
 
 		Mod_ValidateElements(loadmodel->surfmesh.data_element3i + surface->num_firsttriangle * 3, surface->num_triangles, surface->num_firstvertex, surface->num_vertices, __FILE__, __LINE__);
 	}
-	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
-	Mod_Alias_Mesh_CompileFrameZero();
+	Z_Free(bonepose);
 	Mod_FreeSkinFiles(skinfiles);
-}
+	Mod_MakeSortedSurfaces(loadmodel);
 
-static void Mod_PSKMODEL_AnimKeyToMatrix(float *origin, float *quat, matrix4x4_t *m)
-{
-	float x = quat[0], y = quat[1], z = quat[2], w = quat[3];
-	m->m[0][0]=1-2*(y*y+z*z);m->m[0][1]=  2*(x*y-z*w);m->m[0][2]=  2*(x*z+y*w);m->m[0][3]=origin[0];
-	m->m[1][0]=  2*(x*y+z*w);m->m[1][1]=1-2*(x*x+z*z);m->m[1][2]=  2*(y*z-x*w);m->m[1][3]=origin[1];
-	m->m[2][0]=  2*(x*z-y*w);m->m[2][1]=  2*(y*z+x*w);m->m[2][2]=1-2*(x*x+y*y);m->m[2][3]=origin[2];
-	m->m[3][0]=  0          ;m->m[3][1]=  0          ;m->m[3][2]=  0          ;m->m[3][3]=1;
+	// compute all the mesh information that was not loaded from the file
+	Mod_BuildBaseBonePoses();
+	Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true);
+	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
+
+	loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1;
 }
 
 // no idea why PSK/PSA files contain weird quaternions but they do...
 #define PSKQUATNEGATIONS
-void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_PSKMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
-	int i, j, index, version, recordsize, numrecords, meshvertices, meshtriangles, numvertexboneweights;
+	int i, j, index, version, recordsize, numrecords, meshvertices, meshtriangles;
 	int numpnts, numvtxw, numfaces, nummatts, numbones, numrawweights, numanimbones, numanims, numanimkeys;
 	fs_offset_t filesize;
 	pskpnts_t *pnts;
@@ -1705,19 +2235,26 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	pskchunk_t *pchunk;
 	skinfile_t *skinfiles;
 	char animname[MAX_QPATH];
+	size_t size;
 
 	pchunk = (pskchunk_t *)buffer;
 	if (strcmp(pchunk->id, "ACTRHEAD"))
-		Host_Error ("Mod_PSKMODEL_Load: %s is not an Unreal Engine ActorX (.psk + .psa) model");
+		Host_Error ("Mod_PSKMODEL_Load: %s is not an Unreal Engine ActorX (.psk + .psa) model", loadmodel->name);
+
+	loadmodel->modeldatatypestring = "PSK";
 
 	loadmodel->type = mod_alias;
+	loadmodel->AnimateVertices = Mod_Skeletal_AnimateVertices;
 	loadmodel->DrawSky = NULL;
+	loadmodel->DrawAddWaterPlanes = NULL;
 	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawDepth = R_Q1BSP_DrawDepth;
+	loadmodel->DrawDebug = R_Q1BSP_DrawDebug;
 	loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
 	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
 	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
-	loadmodel->flags = 0; // there are no flags on zym models
+	loadmodel->PointSuperContents = NULL;
 	loadmodel->synctype = ST_RAND;
 
 	FS_StripExtension(loadmodel->name, animname, sizeof(animname));
@@ -1838,6 +2375,7 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 			matts = (pskmatt_t *)buffer;
 			for (index = 0, p = (pskmatt_t *)buffer;index < numrecords;index++, p++)
 			{
+				// nothing to do
 			}
 			buffer = p;
 		}
@@ -1942,7 +2480,7 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 			// positions from the psk, but this is hard for me to implement
 			// and people can easily make animations that match.
 			if (numanimbones != numbones)
-				Host_Error("%s: this loader only supports animations with the same bones as the mesh");
+				Host_Error("%s: this loader only supports animations with the same bones as the mesh", loadmodel->name);
 			for (index = 0, p = (pskboneinfo_t *)animbuffer;index < numrecords;index++, p++)
 			{
 				p->numchildren = LittleLong(p->numchildren);
@@ -1999,9 +2537,7 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 				p->firstframe = LittleLong(p->firstframe);
 				p->numframes = LittleLong(p->numframes);
 				if (p->numbones != numbones)
-				{
 					Con_Printf("%s: animinfo->numbones != numbones, trying to load anyway!\n", animname);
-				}
 			}
 			animbuffer = p;
 		}
@@ -2047,20 +2583,6 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	if (!numpnts || !pnts || !numvtxw || !vtxw || !numfaces || !faces || !nummatts || !matts || !numbones || !bones || !numrawweights || !rawweights || !numanims || !anims || !numanimkeys || !animkeys)
 		Host_Error("%s: missing required chunks", loadmodel->name);
 
-	// FIXME: model bbox
-	// model bbox
-	for (i = 0;i < 3;i++)
-	{
-		loadmodel->normalmins[i] = -128;
-		loadmodel->normalmaxs[i] = 128;
-		loadmodel->yawmins[i] = -128;
-		loadmodel->yawmaxs[i] = 128;
-		loadmodel->rotatedmins[i] = -128;
-		loadmodel->rotatedmaxs[i] = 128;
-	}
-	loadmodel->radius = 128;
-	loadmodel->radius2 = loadmodel->radius * loadmodel->radius;
-
 	loadmodel->numframes = 0;
 	for (index = 0;index < numanims;index++)
 		loadmodel->numframes += anims[index].numframes;
@@ -2070,35 +2592,44 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 
 	meshvertices = numvtxw;
 	meshtriangles = numfaces;
-	numvertexboneweights = 0;
-	for (index = 0;index < numvtxw;index++)
-		for (j = 0;j < numrawweights;j++)
-			if (rawweights[j].pntsindex == vtxw[index].pntsindex)
-				numvertexboneweights++;
 
 	// load external .skin files if present
 	skinfiles = Mod_LoadSkinFiles();
 	if (loadmodel->numskins < 1)
 		loadmodel->numskins = 1;
 	loadmodel->num_bones = numbones;
-	loadmodel->num_poses = loadmodel->num_bones * loadmodel->numframes;
-	loadmodel->num_textures = loadmodel->nummodelsurfaces = loadmodel->num_surfaces = nummatts;
+	loadmodel->num_poses = loadmodel->numframes;
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces = nummatts;
+	loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+	loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+	loadmodel->surfmesh.num_vertices = meshvertices;
+	loadmodel->surfmesh.num_triangles = meshtriangles;
 	// do most allocations as one merged chunk
-	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + meshtriangles * sizeof(int[3]) + meshtriangles * sizeof(int[3]) + meshvertices * sizeof(float[2]) + numvertexboneweights * sizeof(surfmeshvertexboneweight_t) + loadmodel->num_poses * sizeof(float[3][4]) + loadmodel->numskins * sizeof(animscene_t) + loadmodel->num_bones * sizeof(aliasbone_t) + loadmodel->numframes * sizeof(animscene_t));
+	size = loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + loadmodel->surfmesh.num_triangles * sizeof(int[3]) + loadmodel->surfmesh.num_triangles * sizeof(int[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[3]) + loadmodel->surfmesh.num_vertices * sizeof(float[2]) + loadmodel->surfmesh.num_vertices * sizeof(int[4]) + loadmodel->surfmesh.num_vertices * sizeof(float[4]) + loadmodel->num_poses * loadmodel->num_bones * sizeof(float[12]) + loadmodel->num_bones * sizeof(float[12]) + loadmodel->numskins * sizeof(animscene_t) + loadmodel->num_bones * sizeof(aliasbone_t) + loadmodel->numframes * sizeof(animscene_t) + ((loadmodel->surfmesh.num_vertices <= 65536) ? (loadmodel->surfmesh.num_triangles * sizeof(unsigned short[3])) : 0);
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, size);
 	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
-	loadmodel->surfacelist = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
 	loadmodel->data_textures = (texture_t *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t);
-	loadmodel->surfmesh.num_vertices = meshvertices;
-	loadmodel->surfmesh.num_triangles = meshtriangles;
-	loadmodel->surfmesh.num_vertexboneweights = numvertexboneweights;
-	loadmodel->surfmesh.data_element3i = (int *)data;data += meshtriangles * sizeof(int[3]);
-	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += meshtriangles * sizeof(int[3]);
-	loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += meshvertices * sizeof(float[2]);
-	loadmodel->surfmesh.data_vertexboneweights = (surfmeshvertexboneweight_t *)data;data += numvertexboneweights * sizeof(surfmeshvertexboneweight_t);
-	loadmodel->data_poses = (float *)data;data += loadmodel->num_poses * sizeof(float[3][4]);
+	loadmodel->surfmesh.data_element3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]);
+	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]);
+	loadmodel->surfmesh.data_vertex3f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_svector3f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_tvector3f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_normal3f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[3]);
+	loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[2]);
+	loadmodel->surfmesh.data_vertexweightindex4i = (int *)data;data += loadmodel->surfmesh.num_vertices * sizeof(int[4]);
+	loadmodel->surfmesh.data_vertexweightinfluence4f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[4]);
+	loadmodel->data_poses = (float *)data;data += loadmodel->num_poses * loadmodel->num_bones * sizeof(float[12]);
+	loadmodel->data_baseboneposeinverse = (float *)data;data += loadmodel->num_bones * sizeof(float[12]);
 	loadmodel->skinscenes = (animscene_t *)data;data += loadmodel->numskins * sizeof(animscene_t);
 	loadmodel->data_bones = (aliasbone_t *)data;data += loadmodel->num_bones * sizeof(aliasbone_t);
 	loadmodel->animscenes = (animscene_t *)data;data += loadmodel->numframes * sizeof(animscene_t);
+	if (loadmodel->surfmesh.num_vertices <= 65536)
+	{
+		loadmodel->surfmesh.data_element3s = (unsigned short *)data;data += loadmodel->surfmesh.num_triangles * sizeof(unsigned short[3]);
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+	}
 
 	for (i = 0;i < loadmodel->numskins;i++)
 	{
@@ -2112,20 +2643,19 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	for (index = 0, i = 0;index < nummatts;index++)
 	{
 		// since psk models do not have named sections, reuse their shader name as the section name
-		if (matts[index].name[0])
-			Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + index, skinfiles, matts[index].name, matts[index].name);
-		else
-			for (j = 0;j < loadmodel->numskins;j++)
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + index + j * loadmodel->num_surfaces, NULL);
-		loadmodel->surfacelist[index] = index;
+		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + index, skinfiles, matts[index].name, matts[index].name);
+		loadmodel->sortedmodelsurfaces[index] = index;
 		loadmodel->data_surfaces[index].texture = loadmodel->data_textures + index;
 		loadmodel->data_surfaces[index].num_firstvertex = 0;
 		loadmodel->data_surfaces[index].num_vertices = loadmodel->surfmesh.num_vertices;
 	}
 
-	// copy over the texcoords
+	// copy over the vertex locations and texcoords
 	for (index = 0;index < numvtxw;index++)
 	{
+		loadmodel->surfmesh.data_vertex3f[index*3+0] = pnts[vtxw[index].pntsindex].origin[0];
+		loadmodel->surfmesh.data_vertex3f[index*3+1] = pnts[vtxw[index].pntsindex].origin[1];
+		loadmodel->surfmesh.data_vertex3f[index*3+2] = pnts[vtxw[index].pntsindex].origin[2];
 		loadmodel->surfmesh.data_texcoordtexture2f[index*2+0] = vtxw[index].texcoord[0];
 		loadmodel->surfmesh.data_texcoordtexture2f[index*2+1] = vtxw[index].texcoord[1];
 	}
@@ -2156,32 +2686,46 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 			Host_Error("%s bone[%i].parent >= %i", loadmodel->name, index, index);
 	}
 
-	// build bone-relative vertex weights from the psk point weights
-	numvertexboneweights = 0;
+	// sort the psk point weights into the vertex weight tables
+	// (which only accept up to 4 bones per vertex)
 	for (index = 0;index < numvtxw;index++)
 	{
+		int l;
+		float sum;
 		for (j = 0;j < numrawweights;j++)
 		{
 			if (rawweights[j].pntsindex == vtxw[index].pntsindex)
 			{
-				matrix4x4_t matrix, inversematrix;
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].vertexindex = index;
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].boneindex = rawweights[j].boneindex;
-				loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].weight = rawweights[j].weight;
-				matrix = identitymatrix;
-				for (i = rawweights[j].boneindex;i >= 0;i = loadmodel->data_bones[i].parent)
+				int boneindex = rawweights[j].boneindex;
+				float influence = rawweights[j].weight;
+				for (l = 0;l < 4;l++)
 				{
-					matrix4x4_t childmatrix, tempmatrix;
-					Mod_PSKMODEL_AnimKeyToMatrix(bones[i].basepose.origin, bones[i].basepose.quat, &tempmatrix);
-					childmatrix = matrix;
-					Matrix4x4_Concat(&matrix, &tempmatrix, &childmatrix);
+					if (loadmodel->surfmesh.data_vertexweightinfluence4f[index*4+l] < influence)
+					{
+						// move lower influence weights out of the way first
+						int l2;
+						for (l2 = 3;l2 > l;l2--)
+						{
+							loadmodel->surfmesh.data_vertexweightinfluence4f[index*4+l2] = loadmodel->surfmesh.data_vertexweightinfluence4f[index*4+l2-1];
+							loadmodel->surfmesh.data_vertexweightindex4i[index*4+l2] = loadmodel->surfmesh.data_vertexweightindex4i[index*4+l2-1];
+						}
+						// store the new weight
+						loadmodel->surfmesh.data_vertexweightinfluence4f[index*4+l] = influence;
+						loadmodel->surfmesh.data_vertexweightindex4i[index*4+l] = boneindex;
+						break;
+					}
 				}
-				Matrix4x4_Invert_Simple(&inversematrix, &matrix);
-				Matrix4x4_Transform(&inversematrix, pnts[rawweights[j].pntsindex].origin, loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].origin);
-				VectorScale(loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].origin, loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].weight, loadmodel->surfmesh.data_vertexboneweights[numvertexboneweights].origin);
-				numvertexboneweights++;
 			}
 		}
+		sum = 0;
+		for (l = 0;l < 4;l++)
+			sum += loadmodel->surfmesh.data_vertexweightinfluence4f[index*4+l];
+		if (sum && fabs(sum - 1) > (1.0f / 256.0f))
+		{
+			float f = 1.0f / sum;
+			for (l = 0;l < 4;l++)
+				loadmodel->surfmesh.data_vertexweightinfluence4f[index*4+l] *= f;
+		}
 	}
 
 	// set up the animscenes based on the anims
@@ -2200,28 +2744,450 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
 	// load the poses from the animkeys
 	for (index = 0;index < numanimkeys;index++)
 	{
+		pskanimkeys_t *k = animkeys + index;
 		matrix4x4_t matrix;
-		Mod_PSKMODEL_AnimKeyToMatrix(animkeys[index].origin, animkeys[index].quat, &matrix);
-		loadmodel->data_poses[index*12+0] = matrix.m[0][0];
-		loadmodel->data_poses[index*12+1] = matrix.m[0][1];
-		loadmodel->data_poses[index*12+2] = matrix.m[0][2];
-		loadmodel->data_poses[index*12+3] = matrix.m[0][3];
-		loadmodel->data_poses[index*12+4] = matrix.m[1][0];
-		loadmodel->data_poses[index*12+5] = matrix.m[1][1];
-		loadmodel->data_poses[index*12+6] = matrix.m[1][2];
-		loadmodel->data_poses[index*12+7] = matrix.m[1][3];
-		loadmodel->data_poses[index*12+8] = matrix.m[2][0];
-		loadmodel->data_poses[index*12+9] = matrix.m[2][1];
-		loadmodel->data_poses[index*12+10] = matrix.m[2][2];
-		loadmodel->data_poses[index*12+11] = matrix.m[2][3];
-	}
-
-	// compile extra data we want
+		Matrix4x4_FromOriginQuat(&matrix, k->origin[0], k->origin[1], k->origin[2], k->quat[0], k->quat[1], k->quat[2], k->quat[3]);
+		Matrix4x4_ToArray12FloatD3D(&matrix, loadmodel->data_poses + index*12);
+	}
+	Mod_FreeSkinFiles(skinfiles);
+	Mem_Free(animfilebuffer);
+	Mod_MakeSortedSurfaces(loadmodel);
+
+	// compute all the mesh information that was not loaded from the file
+	// TODO: honor smoothing groups somehow?
 	Mod_ValidateElements(loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles, 0, loadmodel->surfmesh.num_vertices, __FILE__, __LINE__);
+	Mod_BuildBaseBonePoses();
+	Mod_BuildNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_normal3f, true);
+	Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true);
 	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
-	Mod_Alias_Mesh_CompileFrameZero();
-	Mod_FreeSkinFiles(skinfiles);
+	Mod_Alias_CalculateBoundingBox();
 
-	Mem_Free(animfilebuffer);
+	loadmodel->surfmesh.isanimated = loadmodel->numframes > 1 || loadmodel->animscenes[0].framecount > 1;
 }
 
+void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+#if 0
+	const char *textbase = (char *)buffer, *text = textbase;
+	char *s;
+	char *argv[512];
+	char line[1024];
+	char materialname[MAX_QPATH];
+	int j, index1, index2, index3, first, prev, index;
+	int argc;
+	int linelen;
+	int numtriangles = 0;
+	int maxtriangles = 32768;
+	int *element3i = Mem_Alloc(tempmempool, maxtriangles * sizeof(int[3]));
+	int *oldelement3i;
+	int numsurfaces = 0;
+	int maxsurfaces = 0;
+	msurface_t *surfaces = NULL;
+	int linenumber = 0;
+	int hashindex;
+	float *v, *vt, *vn;
+	float *oldv, *oldvt, *oldvn;
+	int maxv = 65536, numv = 1;
+	int maxvt = 65536, numvt = 1;
+	int maxvn = 65536, numvn = 1;
+	int maxverthash = 65536, numverthash = 0;
+	int numhashindex = 65536;
+	struct objverthash_s
+	{
+		struct objverthash_s *next;
+		int s;
+		int v;
+		int vt;
+		int vn;
+	}
+	*hash, **verthash = Mem_Alloc(tempmempool, numhashindex * sizeof(*verthash)), *verthashdata = Mem_Alloc(tempmempool, maxverthash * sizeof(*verthashdata)), *oldverthashdata;
+	skinfile_t *skinfiles;
+
+	dpsnprintf(materialname, sizeof(materialname), "%s", loadmodel->name);
+
+	skinfiles = Mod_LoadSkinFiles();
+
+	loadmodel->modeldatatypestring = "OBJ";
+
+	loadmodel->type = mod_alias;
+	loadmodel->AnimateVertices = NULL;
+	loadmodel->DrawSky = NULL;
+	loadmodel->DrawAddWaterPlanes = NULL;
+	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawDepth = R_Q1BSP_DrawDepth;
+	loadmodel->DrawDebug = R_Q1BSP_DrawDebug;
+	loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
+	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+	loadmodel->DrawLight = R_Q1BSP_DrawLight;
+	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+	loadmodel->PointSuperContents = NULL;
+
+	// parse the OBJ text now
+	for(;;)
+	{
+		if (!*text)
+			break;
+		linenumber++;
+		linelen = 0;
+		for (linelen = 0;text[linelen] && text[linelen] != '\r' && text[linelen] != '\n';linelen++)
+			line[linelen] = text[linelen];
+		line[linelen] = 0;
+		for (argc = 0;argc < (int)(sizeof(argv)/sizeof(argv[0]));argc++)
+			argv[argc] = "";
+		argc = 0;
+		s = line;
+		while (*s == ' ' || *s == '\t')
+			s++;
+		while (*s)
+		{
+			argv[argc++] = s;
+			while (*s > ' ')
+				s++;
+			if (!*s)
+				break;
+			*s++ = 0;
+			while (*s == ' ' || *s == '\t')
+				s++;
+		}
+		if (!argc)
+			continue;
+		if (argv[0][0] == '#')
+			continue;
+		if (!strcmp(argv[0], "v"))
+		{
+			if (maxv <= numv)
+			{
+				maxv *= 2;
+				oldv = v;
+				v = Mem_Alloc(tempmempool, maxv * sizeof(float[3]));
+				if (oldv)
+				{
+					memcpy(v, oldv, numv * sizeof(float[3]));
+					Mem_Free(oldv);
+				}
+			}
+			v[numv*3+0] = atof(argv[1]);
+			v[numv*3+1] = atof(argv[2]);
+			v[numv*3+2] = atof(argv[3]);
+			numv++;
+		}
+		else if (!strcmp(argv[0], "vt"))
+		{
+			if (maxvt <= numvt)
+			{
+				maxvt *= 2;
+				oldvt = vt;
+				vt = Mem_Alloc(tempmempool, maxvt * sizeof(float[2]));
+				if (oldvt)
+				{
+					memcpy(vt, oldvt, numvt * sizeof(float[2]));
+					Mem_Free(oldvt);
+				}
+			}
+			vt[numvt*2+0] = atof(argv[1]);
+			vt[numvt*2+1] = atof(argv[2]);
+			numvt++;
+		}
+		else if (!strcmp(argv[0], "vn"))
+		{
+			if (maxvn <= numvn)
+			{
+				maxvn *= 2;
+				oldvn = vn;
+				vn = Mem_Alloc(tempmempool, maxvn * sizeof(float[3]));
+				if (oldvn)
+				{
+					memcpy(vn, oldvn, numvn * sizeof(float[3]));
+					Mem_Free(oldvn);
+				}
+			}
+			vn[numvn*3+0] = atof(argv[1]);
+			vn[numvn*3+1] = atof(argv[2]);
+			vn[numvn*3+2] = atof(argv[3]);
+			numvn++;
+		}
+		else if (!strcmp(argv[0], "f"))
+		{
+			if (!surface)
+			{
+				if (maxsurfaces <= numsurfaces)
+				{
+					maxsurfaces++;
+					oldsurfaces = surfaces;
+					surfaces = Mem_Alloc(tempmempool, maxsurfaces * sizeof(*surfaces));
+					if (oldsurfaces)
+					{
+						memcpy(surfaces, oldsurfaces, numsurfaces * sizeof(*surfaces));
+						Mem_Free(oldsurfaces);
+					}
+				}
+				surface = surfaces + numsurfaces++;
+				surface->
+			}
+			for (j = 1;j < argc;j++)
+			{
+				index1 = atoi(argv[j]);
+				while(argv[j][0] && argv[j][0] != '/')
+					argv[j]++;
+				if (argv[j][0])
+					argv[j]++;
+				if (index1 < 0)
+					index1 = numv + 1 - index1;
+				index2 = atoi(argv[j]);
+				if (index2 < 0)
+					index2 = numvt + 1 - index2;
+				while(argv[j][0] && argv[j][0] != '/')
+					argv[j]++;
+				if (argv[j][0])
+					argv[j]++;
+				index3 = atoi(argv[j]);
+				if (index3 < 0)
+					index3 = numvn + 1 - index3;
+				hashindex = (index1 + index2 * 3571 + index3 * 42589) & (numhashindex - 1);
+				for (hash = verthash[hashindex];hash;hash = hash->next)
+					if (hash->surface == numsurfaces-1 && hash->v == index1 && hash->vt == index2 && hash->vn == index3)
+						break;
+				if (!hash)
+				{
+					if (maxverthash <= numverthash)
+					{
+						maxverthash *= 2;
+						oldverthashdata = verthashdata;
+						verthashdata = Mem_Alloc(tempmempool, maxverthash * sizeof(*verthashdata));
+						if (oldverthashdata)
+						{
+							memcpy(verthashdata, oldverthashdata, numverthash * sizeof(*verthashdata));
+							Mem_Free(oldverthashdata);
+						}
+					}
+					hash = verthashdata + numverthash++;
+					hash->next = verthash[hashindex];
+					hash->s = numsurfaces;
+					hash->v = index1;
+					hash->vt = index2;
+					hash->vn = index3;
+					verthash[hashindex] = hash;
+				}
+				index = (int)((size_t)(hash - verthashdata));
+				if (j == 1)
+					first = index;
+				else if (j >= 3)
+				{
+					if (maxtriangles <= numtriangles)
+					{
+						maxtriangles *= 2;
+						oldelement3i = element3i;
+						element3i = Mem_Alloc(tempmempool, numtriangles * sizeof(int[3]));
+						if (oldelement3i)
+						{
+							memcpy(element3i, oldelement3i, numtriangles * sizeof(int[3]));
+							Mem_Free(oldelement3i);
+						}
+					}
+					element3i[numtriangles*3+0] = first;
+					element3i[numtriangles*3+1] = prev;
+					element3i[numtriangles*3+2] = index;
+					numtriangles++;
+				}
+				prev = index;
+			}
+		}
+		else if (!strcmp(argv[0], "o") || !strcmp(argv[0], "g"))
+			surface = NULL;
+		else if (!!strcmp(argv[0], "usemtl"))
+		{
+			surface = NULL;
+			strlcpy(materialname, argv[1], sizeof(materialname);
+		}
+		text += linelen;
+		if (*text == '\r')
+			text++;
+		if (*text == '\n')
+			text++;
+	}
+
+	if (skinfiles)
+		Mod_FreeSkinFiles(skinfiles);
+
+	// now that we have the OBJ data loaded as-is, we can convert it
+	loadmodel->numskins = LittleLong(pinmodel->num_skins);
+	numxyz = LittleLong(pinmodel->num_xyz);
+	numst = LittleLong(pinmodel->num_st);
+	loadmodel->surfmesh.num_triangles = LittleLong(pinmodel->num_tris);
+	loadmodel->numframes = LittleLong(pinmodel->num_frames);
+	loadmodel->surfmesh.num_morphframes = loadmodel->numframes;
+	loadmodel->num_poses = loadmodel->surfmesh.num_morphframes;
+	skinwidth = LittleLong(pinmodel->skinwidth);
+	skinheight = LittleLong(pinmodel->skinheight);
+	iskinwidth = 1.0f / skinwidth;
+	iskinheight = 1.0f / skinheight;
+
+	loadmodel->num_surfaces = 1;
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->numframes * sizeof(animscene_t) + loadmodel->numframes * sizeof(float[6]) + loadmodel->surfmesh.num_triangles * sizeof(int[3]) + loadmodel->surfmesh.num_triangles * sizeof(int[3]));
+	loadmodel->data_surfaces = (msurface_t *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->sortedmodelsurfaces[0] = 0;
+	loadmodel->animscenes = (animscene_t *)data;data += loadmodel->numframes * sizeof(animscene_t);
+	loadmodel->surfmesh.data_morphmd2framesize6f = (float *)data;data += loadmodel->numframes * sizeof(float[6]);
+	loadmodel->surfmesh.data_element3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]);
+	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += loadmodel->surfmesh.num_triangles * sizeof(int[3]);
+
+	loadmodel->synctype = ST_RAND;
+
+	// load the skins
+	inskin = (char *)(base + LittleLong(pinmodel->ofs_skins));
+	skinfiles = Mod_LoadSkinFiles();
+	if (skinfiles)
+	{
+		loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
+		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures, skinfiles, "default", "");
+		Mod_FreeSkinFiles(skinfiles);
+	}
+	else if (loadmodel->numskins)
+	{
+		// skins found (most likely not a player model)
+		loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
+		for (i = 0;i < loadmodel->numskins;i++, inskin += MD2_SKINNAME)
+			Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i * loadmodel->num_surfaces, inskin, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS);
+	}
+	else
+	{
+		// no skins (most likely a player model)
+		loadmodel->numskins = 1;
+		loadmodel->num_textures = loadmodel->num_surfaces * loadmodel->numskins;
+		loadmodel->num_texturesperskin = loadmodel->num_surfaces;
+		loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
+		Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures, NULL);
+	}
+
+	loadmodel->skinscenes = (animscene_t *)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 = (unsigned short *)(base + LittleLong(pinmodel->ofs_st));
+	intri = (md2triangle_t *)(base + LittleLong(pinmodel->ofs_tris));
+	md2verthash = (struct md2verthash_s **)Mem_Alloc(tempmempool, 65536 * sizeof(hash));
+	md2verthashdata = (struct md2verthash_s *)Mem_Alloc(tempmempool, loadmodel->surfmesh.num_triangles * 3 * sizeof(*hash));
+	// swap the triangle list
+	loadmodel->surfmesh.num_vertices = 0;
+	for (i = 0;i < loadmodel->surfmesh.num_triangles;i++)
+	{
+		for (j = 0;j < 3;j++)
+		{
+			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;
+			}
+			hashindex = (xyz * 256 + st) & 65535;
+			for (hash = md2verthash[hashindex];hash;hash = hash->next)
+				if (hash->xyz == xyz && hash->st == st)
+					break;
+			if (hash == NULL)
+			{
+				hash = md2verthashdata + loadmodel->surfmesh.num_vertices++;
+				hash->xyz = xyz;
+				hash->st = st;
+				hash->next = md2verthash[hashindex];
+				md2verthash[hashindex] = hash;
+			}
+			loadmodel->surfmesh.data_element3i[i*3+j] = (hash - md2verthashdata);
+		}
+	}
+
+	vertremap = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(int));
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->surfmesh.num_vertices * sizeof(float[2]) + loadmodel->surfmesh.num_vertices * loadmodel->surfmesh.num_morphframes * sizeof(trivertx_t));
+	loadmodel->surfmesh.data_texcoordtexture2f = (float *)data;data += loadmodel->surfmesh.num_vertices * sizeof(float[2]);
+	loadmodel->surfmesh.data_morphmdlvertex = (trivertx_t *)data;data += loadmodel->surfmesh.num_vertices * loadmodel->surfmesh.num_morphframes * sizeof(trivertx_t);
+	for (i = 0;i < loadmodel->surfmesh.num_vertices;i++)
+	{
+		int sts, stt;
+		hash = md2verthashdata + i;
+		vertremap[i] = hash->xyz;
+		sts = LittleShort(inst[hash->st*2+0]);
+		stt = LittleShort(inst[hash->st*2+1]);
+		if (sts < 0 || sts >= skinwidth || stt < 0 || stt >= skinheight)
+		{
+			Con_Printf("%s has an invalid skin coordinate (%i %i) on vert %i, changing to 0 0\n", loadmodel->name, sts, stt, i);
+			sts = 0;
+			stt = 0;
+		}
+		loadmodel->surfmesh.data_texcoordtexture2f[i*2+0] = sts * iskinwidth;
+		loadmodel->surfmesh.data_texcoordtexture2f[i*2+1] = stt * iskinheight;
+	}
+
+	Mem_Free(md2verthash);
+	Mem_Free(md2verthashdata);
+
+	// generate ushort elements array if possible
+	if (loadmodel->surfmesh.num_vertices <= 65536)
+	{
+		loadmodel->surfmesh.data_element3s = (unsigned short *)Mem_Alloc(loadmodel->mempool, sizeof(unsigned short[3]) * loadmodel->surfmesh.num_triangles);
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+	}
+
+	// load the frames
+	datapointer = (base + LittleLong(pinmodel->ofs_frames));
+	for (i = 0;i < loadmodel->surfmesh.num_morphframes;i++)
+	{
+		int k;
+		trivertx_t *v;
+		trivertx_t *out;
+		pinframe = (md2frame_t *)datapointer;
+		datapointer += sizeof(md2frame_t);
+		// store the frame scale/translate into the appropriate array
+		for (j = 0;j < 3;j++)
+		{
+			loadmodel->surfmesh.data_morphmd2framesize6f[i*6+j] = LittleFloat(pinframe->scale[j]);
+			loadmodel->surfmesh.data_morphmd2framesize6f[i*6+3+j] = LittleFloat(pinframe->translate[j]);
+		}
+		// convert the vertices
+		v = (trivertx_t *)datapointer;
+		out = loadmodel->surfmesh.data_morphmdlvertex + i * loadmodel->surfmesh.num_vertices;
+		for (k = 0;k < loadmodel->surfmesh.num_vertices;k++)
+			out[k] = v[vertremap[k]];
+		datapointer += numxyz * sizeof(trivertx_t);
+
+		strlcpy(loadmodel->animscenes[i].name, pinframe->name, sizeof(loadmodel->animscenes[i].name));
+		loadmodel->animscenes[i].firstframe = i;
+		loadmodel->animscenes[i].framecount = 1;
+		loadmodel->animscenes[i].framerate = 10;
+		loadmodel->animscenes[i].loop = true;
+	}
+
+	Mem_Free(vertremap);
+
+	Mod_MakeSortedSurfaces(loadmodel);
+	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
+	Mod_Alias_CalculateBoundingBox();
+	Mod_Alias_MorphMesh_CompileFrames();
+
+	surface = loadmodel->data_surfaces;
+	surface->texture = loadmodel->data_textures;
+	surface->num_firsttriangle = 0;
+	surface->num_triangles = loadmodel->surfmesh.num_triangles;
+	surface->num_firstvertex = 0;
+	surface->num_vertices = loadmodel->surfmesh.num_vertices;
+
+	loadmodel->surfmesh.isanimated = false;
+#endif
+}