X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.c;h=3f050ab0a045aa62d95f351539d759752c27c25c;hp=b095d9bf8fc56f454a9857d4606abf2b602819a6;hb=a81420212fe295610d9266855ba2d7200db1b666;hpb=224f9edae92441767654e2c10eb568bb91f86eb1

diff --git a/model_alias.c b/model_alias.c
index b095d9bf..3f050ab0 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -22,11 +22,52 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "image.h"
 #include "r_shadow.h"
 
-static cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0"};
-
 void Mod_AliasInit (void)
 {
-	Cvar_RegisterVariable(&r_mipskins);
+}
+
+static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs, int hitsupercontentsmask)
+{
+	int i, framenum;
+	float segmentmins[3], segmentmaxs[3];
+	colbrushf_t *thisbrush_start, *thisbrush_end;
+	matrix4x4_t startmatrix, endmatrix;
+	memset(trace, 0, sizeof(*trace));
+	trace->fraction = 1;
+	trace->realfraction = 1;
+	trace->hitsupercontentsmask = hitsupercontentsmask;
+	segmentmins[0] = min(boxstartmins[0], boxendmins[0]);
+	segmentmins[1] = min(boxstartmins[1], boxendmins[1]);
+	segmentmins[2] = min(boxstartmins[2], boxendmins[2]);
+	segmentmaxs[0] = max(boxstartmaxs[0], boxendmaxs[0]);
+	segmentmaxs[1] = max(boxstartmaxs[1], boxendmaxs[1]);
+	segmentmaxs[2] = max(boxstartmaxs[2], boxendmaxs[2]);
+	if (VectorCompare(boxstartmins, boxstartmaxs) && VectorCompare(boxendmins, boxendmaxs))
+	{
+		// line trace
+		for (i = 0;i < model->alias.aliasnum_meshes;i++)
+		{
+			framenum = frame;
+			if (framenum < 0 || framenum > model->alias.aliasdata_meshes[i].num_frames)
+				framenum = 0;
+			Collision_TraceLineTriangleMeshFloat(trace, boxstartmins, boxendmins, model->alias.aliasdata_meshes[i].num_triangles, model->alias.aliasdata_meshes[i].data_element3i, model->alias.aliasdata_meshes[i].data_aliasvertex3f + framenum * model->alias.aliasdata_meshes[i].num_vertices * 3, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs);
+		}
+	}
+	else
+	{
+		// box trace, performed as brush trace
+		Matrix4x4_CreateIdentity(&startmatrix);
+		Matrix4x4_CreateIdentity(&endmatrix);
+		thisbrush_start = Collision_BrushForBox(&startmatrix, boxstartmins, boxstartmaxs);
+		thisbrush_end = Collision_BrushForBox(&endmatrix, boxendmins, boxendmaxs);
+		for (i = 0;i < model->alias.aliasnum_meshes;i++)
+		{
+			framenum = frame;
+			if (framenum < 0 || framenum > model->alias.aliasdata_meshes[i].num_frames)
+				framenum = 0;
+			Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, model->alias.aliasdata_meshes[i].num_triangles, model->alias.aliasdata_meshes[i].data_element3i, model->alias.aliasdata_meshes[i].data_aliasvertex3f + framenum * model->alias.aliasdata_meshes[i].num_vertices * 3, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs);
+		}
+	}
 }
 
 static void Mod_CalcAliasModelBBoxes (void)
@@ -34,25 +75,25 @@ static void Mod_CalcAliasModelBBoxes (void)
 	int vnum, meshnum;
 	float dist, yawradius, radius;
 	aliasmesh_t *mesh;
-	aliasvertex_t *v;
+	float *v;
 	VectorClear(loadmodel->normalmins);
 	VectorClear(loadmodel->normalmaxs);
 	yawradius = 0;
 	radius = 0;
-	for (meshnum = 0, mesh = loadmodel->aliasdata_meshes;meshnum < loadmodel->aliasnum_meshes;meshnum++, mesh++)
+	for (meshnum = 0, mesh = loadmodel->alias.aliasdata_meshes;meshnum < loadmodel->alias.aliasnum_meshes;meshnum++, mesh++)
 	{
-		for (vnum = 0, v = mesh->data_aliasvertex;vnum < mesh->num_vertices * mesh->num_frames;vnum++, v++)
+		for (vnum = 0, v = mesh->data_aliasvertex3f;vnum < mesh->num_vertices * mesh->num_frames;vnum++, v += 3)
 		{
-			if (loadmodel->normalmins[0] > v->origin[0]) loadmodel->normalmins[0] = v->origin[0];
-			if (loadmodel->normalmins[1] > v->origin[1]) loadmodel->normalmins[1] = v->origin[1];
-			if (loadmodel->normalmins[2] > v->origin[2]) loadmodel->normalmins[2] = v->origin[2];
-			if (loadmodel->normalmaxs[0] < v->origin[0]) loadmodel->normalmaxs[0] = v->origin[0];
-			if (loadmodel->normalmaxs[1] < v->origin[1]) loadmodel->normalmaxs[1] = v->origin[1];
-			if (loadmodel->normalmaxs[2] < v->origin[2]) loadmodel->normalmaxs[2] = v->origin[2];
-			dist = v->origin[0] * v->origin[0] + v->origin[1] * v->origin[1];
+			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->origin[2] * v->origin[2];
+			dist += v[2] * v[2];
 			if (radius < dist)
 				radius = dist;
 		}
@@ -69,7 +110,7 @@ static void Mod_CalcAliasModelBBoxes (void)
 	loadmodel->radius2 = radius * radius;
 }
 
-static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, aliasvertex_t *out, int *vertremap)
+static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate, trivertx_t *v, float *out3f, int *vertremap)
 {
 	int i, j;
 	vec3_t temp;
@@ -82,34 +123,17 @@ static void Mod_ConvertAliasVerts (int inverts, vec3_t scale, vec3_t translate,
 		temp[2] = v[i].v[2] * scale[2] + translate[2];
 		j = vertremap[i]; // not onseam
 		if (j >= 0)
-			VectorCopy(temp, out[j].origin);
+			VectorCopy(temp, out3f + j * 3);
 		j = vertremap[i+inverts]; // onseam
 		if (j >= 0)
-			VectorCopy(temp, out[j].origin);
+			VectorCopy(temp, out3f + j * 3);
 	}
 }
 
-static void Mod_BuildAliasVertexTextureVectors(int numverts, aliasvertex_t *vertices, const float *texcoords, float *vertexbuffer, float *svectorsbuffer, float *tvectorsbuffer, float *normalsbuffer, int numtriangles, const int *elements)
-{
-	int i;
-	for (i = 0;i < numverts;i++)
-		VectorCopy(vertices[i].origin, &vertexbuffer[i * 3]);
-	Mod_BuildTextureVectorsAndNormals(numverts, numtriangles, vertexbuffer, texcoords, elements, svectorsbuffer, tvectorsbuffer, normalsbuffer);
-	for (i = 0;i < numverts;i++)
-	{
-		vertices[i].normal[0] = normalsbuffer[i * 3 + 0];
-		vertices[i].normal[1] = normalsbuffer[i * 3 + 1];
-		vertices[i].normal[2] = normalsbuffer[i * 3 + 2];
-		vertices[i].svector[0] = svectorsbuffer[i * 3 + 0];
-		vertices[i].svector[1] = svectorsbuffer[i * 3 + 1];
-		vertices[i].svector[2] = svectorsbuffer[i * 3 + 2];
-	}
-}
-
-static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, int outverts, vec3_t scale, vec3_t translate, float *texcoords, aliasvertex_t *posedata, int numtris, int *elements, int *vertremap)
+static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, vec3_t translate, int *vertremap)
 {
 	int i, f, pose, groupframes;
-	float interval, *vertexbuffer, *svectorsbuffer, *tvectorsbuffer, *normalsbuffer;
+	float interval;
 	daliasframetype_t *pframetype;
 	daliasframe_t *pinframe;
 	daliasgroup_t *group;
@@ -117,10 +141,6 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, int outverts, v
 	animscene_t *scene;
 	pose = 0;
 	scene = loadmodel->animscenes;
-	vertexbuffer = Mem_Alloc(tempmempool, outverts * sizeof(float[3+3+3+3]));
-	svectorsbuffer = vertexbuffer + outverts * 3;
-	tvectorsbuffer = svectorsbuffer + outverts * 3;
-	normalsbuffer = tvectorsbuffer + outverts * 3;
 	for (f = 0;f < loadmodel->numframes;f++)
 	{
 		pframetype = (daliasframetype_t *)datapointer;
@@ -162,151 +182,141 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, int outverts, v
 		{
 			pinframe = (daliasframe_t *)datapointer;
 			datapointer += sizeof(daliasframe_t);
-			Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, posedata + pose * outverts, vertremap);
-			Mod_BuildAliasVertexTextureVectors(outverts, posedata + pose * outverts, texcoords, vertexbuffer, svectorsbuffer, tvectorsbuffer, normalsbuffer, numtris, elements);
+			Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, vertremap);
+			Mod_BuildTextureVectorsAndNormals(loadmodel->alias.aliasdata_meshes->num_vertices, loadmodel->alias.aliasdata_meshes->num_triangles, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_texcoord2f, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->data_aliassvector3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliastvector3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliasnormal3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3);
 			datapointer += sizeof(trivertx_t) * inverts;
 			pose++;
 		}
 	}
-	Mem_Free(vertexbuffer);
 }
 
+static skinframe_t missingskinframe;
+aliaslayer_t mod_alias_layersbuffer[16]; // 7 currently used
 void Mod_BuildAliasSkinFromSkinFrame(aliasskin_t *skin, skinframe_t *skinframe)
 {
 	aliaslayer_t *layer;
-	skin->flags = 0;
-	// fog texture only exists if some pixels are transparent...
-	if (skinframe->fog != NULL)
-		skin->flags |= ALIASSKIN_TRANSPARENT;
-	// fog and gloss layers always exist
-	skin->num_layers = 2;
-	if (skinframe->glow != NULL)
-		skin->num_layers++;
-	if (skinframe->merged != NULL)
-		skin->num_layers += 2;
-	if (skinframe->base != NULL)
-		skin->num_layers += 2;
-	if (skinframe->pants != NULL)
-		skin->num_layers += 2;
-	if (skinframe->shirt != NULL)
-		skin->num_layers += 2;
-	layer = skin->data_layers = Mem_Alloc(loadmodel->mempool, skin->num_layers * sizeof(aliaslayer_t));
-	if (skinframe->glow != NULL)
-	{
-		layer->flags = 0;
-		layer->texture = skinframe->glow;
-		layer++;
-	}
-	if (skinframe->merged != NULL)
-	{
-		layer->flags = ALIASLAYER_NODRAW_IF_COLORMAPPED | ALIASLAYER_DIFFUSE;
-		if (skinframe->glow != NULL)
-			layer->flags |= ALIASLAYER_ADD;
-		layer->texture = skinframe->merged;
-		layer->nmap = skinframe->nmap;
-		layer++;
-	}
-	if (skinframe->base != NULL)
-	{
-		layer->flags = (skinframe->merged != NULL ? ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED : 0) | ALIASLAYER_DIFFUSE;
-		if (skinframe->glow != NULL)
-			layer->flags |= ALIASLAYER_ADD;
-		layer->texture = skinframe->base;
-		layer->nmap = skinframe->nmap;
-		layer++;
-	}
-	if (skinframe->pants != NULL)
+
+	// hack
+	if (skinframe == NULL)
 	{
-		layer->flags = ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_DIFFUSE | ALIASLAYER_COLORMAP_SHIRT;
-		if (skinframe->glow != NULL || skinframe->base != NULL)
-			layer->flags |= ALIASLAYER_ADD;
-		layer->texture = skinframe->pants;
-		layer->nmap = skinframe->nmap;
-		layer++;
+		skinframe = &missingskinframe;
+		memset(skinframe, 0, sizeof(*skinframe));
+		skinframe->base = r_notexture;
 	}
-	if (skinframe->shirt != NULL)
-	{
-		layer->flags = ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_DIFFUSE | ALIASLAYER_COLORMAP_SHIRT;
-		if (skinframe->glow != NULL || skinframe->base != NULL || skinframe->pants != NULL)
-			layer->flags |= ALIASLAYER_ADD;
-		layer->texture = skinframe->shirt;
-		layer->nmap = skinframe->nmap;
-		layer++;
-	}
-	layer->flags = ALIASLAYER_FOG;
-	layer->texture = skinframe->fog;
-	layer++;
-	layer->flags = ALIASLAYER_DRAW_PER_LIGHT | ALIASLAYER_SPECULAR;
+
+	memset(&mod_alias_layersbuffer, 0, sizeof(mod_alias_layersbuffer));
+	layer = mod_alias_layersbuffer;
+	layer->flags = ALIASLAYER_SPECULAR;
 	layer->texture = skinframe->gloss;
 	layer->nmap = skinframe->nmap;
 	layer++;
 	if (skinframe->merged != NULL)
 	{
-		layer->flags = ALIASLAYER_DRAW_PER_LIGHT | ALIASLAYER_NODRAW_IF_COLORMAPPED | ALIASLAYER_DIFFUSE;
+		layer->flags = ALIASLAYER_DIFFUSE | ALIASLAYER_NODRAW_IF_COLORMAPPED;
 		layer->texture = skinframe->merged;
 		layer->nmap = skinframe->nmap;
 		layer++;
 	}
 	if (skinframe->base != NULL)
 	{
-		layer->flags = ALIASLAYER_DRAW_PER_LIGHT | (skinframe->merged != NULL ? ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED : 0) | ALIASLAYER_DIFFUSE;
+		layer->flags = ALIASLAYER_DIFFUSE;
+		if (skinframe->merged != NULL)
+			layer->flags |= ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED;
 		layer->texture = skinframe->base;
 		layer->nmap = skinframe->nmap;
 		layer++;
 	}
 	if (skinframe->pants != NULL)
 	{
-		layer->flags = ALIASLAYER_DRAW_PER_LIGHT | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_DIFFUSE | ALIASLAYER_COLORMAP_PANTS;
+		layer->flags = ALIASLAYER_DIFFUSE | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_COLORMAP_PANTS;
 		layer->texture = skinframe->pants;
 		layer->nmap = skinframe->nmap;
 		layer++;
 	}
 	if (skinframe->shirt != NULL)
 	{
-		layer->flags = ALIASLAYER_DRAW_PER_LIGHT | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_DIFFUSE | ALIASLAYER_COLORMAP_SHIRT;
+		layer->flags = ALIASLAYER_DIFFUSE | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_COLORMAP_SHIRT;
 		layer->texture = skinframe->shirt;
 		layer->nmap = skinframe->nmap;
 		layer++;
 	}
+
+	if (skinframe->glow != NULL)
+	{
+		layer->flags = 0;
+		layer->texture = skinframe->glow;
+		layer++;
+	}
+
+	layer->flags = ALIASLAYER_FOG | ALIASLAYER_FORCEDRAW_IF_FIRSTPASS;
+	layer->texture = skinframe->fog;
+	layer++;
+
+	skin->flags = 0;
+	// fog texture only exists if some pixels are transparent...
+	if (skinframe->fog != NULL)
+		skin->flags |= ALIASSKIN_TRANSPARENT;
+
+	skin->num_layers = layer - mod_alias_layersbuffer;
+	skin->data_layers = Mem_Alloc(loadmodel->mempool, skin->num_layers * sizeof(aliaslayer_t));
+	memcpy(skin->data_layers, mod_alias_layersbuffer, skin->num_layers * sizeof(aliaslayer_t));
 }
 
-void Mod_BuildMDLMD2MeshInfo(int numverts, int numtris, int *elements, float *texcoord2f, aliasvertex_t *posedata)
+void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, char *meshname, char *shadername)
 {
 	int i;
-	aliasmesh_t *mesh;
-
-	loadmodel->aliasnum_meshes = 1;
-	mesh = loadmodel->aliasdata_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->aliasnum_meshes * sizeof(aliasmesh_t));
-	mesh->num_skins = 0;
-	mesh->num_frames = 0;
-	for (i = 0;i < loadmodel->numframes;i++)
-		mesh->num_frames += loadmodel->animscenes[i].framecount;
-	for (i = 0;i < loadmodel->numskins;i++)
-		mesh->num_skins += loadmodel->skinscenes[i].framecount;
-	mesh->num_triangles = numtris;
-	mesh->num_vertices = numverts;
-	mesh->data_skins = Mem_Alloc(loadmodel->mempool, mesh->num_skins * sizeof(aliasskin_t));
-	mesh->data_element3i = elements;
-	mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, numtris * sizeof(int[3]));
-	Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__);
-	Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
-	mesh->data_texcoord2f = texcoord2f;
-	mesh->data_aliasvertex = posedata;
-	for (i = 0;i < mesh->num_skins;i++)
-		Mod_BuildAliasSkinFromSkinFrame(mesh->data_skins + i, loadmodel->skinframes + i);
-	Mod_CalcAliasModelBBoxes();
+	skinfileitem_t *skinfileitem;
+	skinframe_t tempskinframe;
+	if (skinfile)
+	{
+		for (i = 0;skinfile;skinfile = skinfile->next, i++, skin++)
+		{
+			memset(skin, 0, sizeof(*skin));
+			for (skinfileitem = skinfile->items;skinfileitem;skinfileitem = skinfileitem->next)
+			{
+				// leave the skin unitialized (nodraw) if the replacement is "common/nodraw" or "textures/common/nodraw"
+				if (!strcmp(skinfileitem->name, meshname) && strcmp(skinfileitem->replacement, "common/nodraw") && strcmp(skinfileitem->replacement, "textures/common/nodraw"))
+				{
+					memset(&tempskinframe, 0, sizeof(tempskinframe));
+					if (Mod_LoadSkinFrame(&tempskinframe, skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true))
+						Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
+					else
+					{
+						Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\", falling back to mesh's internal shader name \"%s\"\n", meshname, i, skinfileitem->replacement, shadername);
+						if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true))
+							Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
+						else
+						{
+							Con_Printf("failed to load skin \"%s\"\n", shadername);
+							Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
+						}
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		memset(&tempskinframe, 0, sizeof(tempskinframe));
+		if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true))
+			Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
+		else
+		{
+			Con_Printf("failed to load mesh \"%s\" shader \"%s\"\n", meshname, shadername);
+			Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
+		}
+	}
 }
 
 #define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%d exceeds %d - %d)\n", loadmodel->name, VALUE, MIN, MAX);
 #define BOUNDF(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%f exceeds %f - %f)\n", loadmodel->name, VALUE, MIN, MAX);
 extern void R_Model_Alias_Draw(entity_render_t *ent);
-extern void R_Model_Alias_DrawFakeShadow(entity_render_t *ent);
 extern void R_Model_Alias_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius);
 extern void R_Model_Alias_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz);
-void Mod_LoadQ1AliasModel (model_t *mod, void *buffer)
+void Mod_IDP0_Load(model_t *mod, void *buffer)
 {
-	int i, j, version, totalposes, totalskins, skinwidth, skinheight, totalverts, groupframes, groupskins, *elements, numverts, numtris;
-	float scales, scalet, scale[3], translate[3], interval, *texcoords;
+	int i, j, version, totalskins, skinwidth, skinheight, groupframes, groupskins, numverts;
+	float scales, scalet, scale[3], translate[3], interval;
 	mdl_t *pinmodel;
 	stvert_t *pinstverts;
 	dtriangle_t *pintriangles;
@@ -315,14 +325,14 @@ void Mod_LoadQ1AliasModel (model_t *mod, void *buffer)
 	daliasskininterval_t *pinskinintervals;
 	daliasframetype_t *pinframetype;
 	daliasgroup_t *pinframegroup;
-	aliasvertex_t *posedata;
 	qbyte *datapointer, *startframes, *startskins;
 	char name[MAX_QPATH];
 	skinframe_t tempskinframe;
 	animscene_t *tempskinscenes;
-	skinframe_t *tempskinframes;
+	aliasskin_t *tempaliasskins;
 	float *vertst;
-	int *vertonseam, *vertusage, *vertremap, *temptris;
+	int *vertonseam, *vertremap;
+	skinfile_t *skinfiles;
 
 	datapointer = buffer;
 	pinmodel = (mdl_t *)datapointer;
@@ -334,12 +344,15 @@ void Mod_LoadQ1AliasModel (model_t *mod, void *buffer)
 				 loadmodel->name, version, ALIAS_VERSION);
 
 	loadmodel->type = mod_alias;
-	loadmodel->aliastype = ALIASTYPE_ALIAS;
+	loadmodel->alias.aliastype = ALIASTYPE_ALIAS;
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Alias_Draw;
-	loadmodel->DrawFakeShadow = R_Model_Alias_DrawFakeShadow;
 	loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
 	loadmodel->DrawLight = R_Model_Alias_DrawLight;
+	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+
+	loadmodel->alias.aliasnum_meshes = 1;
+	loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, sizeof(aliasmesh_t));
 
 	loadmodel->numskins = LittleLong(pinmodel->numskins);
 	BOUNDI(loadmodel->numskins,0,256);
@@ -349,8 +362,8 @@ void Mod_LoadQ1AliasModel (model_t *mod, void *buffer)
 	BOUNDI(skinheight,0,4096);
 	numverts = LittleLong(pinmodel->numverts);
 	BOUNDI(numverts,0,65536);
-	numtris = LittleLong(pinmodel->numtris);
-	BOUNDI(numtris,0,65536 / 3); // max elements limit, rather than max triangles limit
+	loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->numtris);
+	BOUNDI(loadmodel->alias.aliasdata_meshes->num_triangles,0,65536 / 3); // max elements limit, rather than max triangles limit
 	loadmodel->numframes = LittleLong(pinmodel->numframes);
 	BOUNDI(loadmodel->numframes,0,65536);
 	loadmodel->synctype = LittleLong (pinmodel->synctype);
@@ -390,10 +403,10 @@ void Mod_LoadQ1AliasModel (model_t *mod, void *buffer)
 	datapointer += sizeof(stvert_t) * numverts;
 
 	pintriangles = (dtriangle_t *)datapointer;
-	datapointer += sizeof(dtriangle_t) * numtris;
+	datapointer += sizeof(dtriangle_t) * loadmodel->alias.aliasdata_meshes->num_triangles;
 
 	startframes = datapointer;
-	totalposes = 0;
+	loadmodel->alias.aliasdata_meshes->num_frames = 0;
 	for (i = 0;i < loadmodel->numframes;i++)
 	{
 		pinframetype = (daliasframetype_t *)datapointer;
@@ -412,94 +425,15 @@ void Mod_LoadQ1AliasModel (model_t *mod, void *buffer)
 		{
 			datapointer += sizeof(daliasframe_t);
 			datapointer += sizeof(trivertx_t) * numverts;
-			totalposes++;
+			loadmodel->alias.aliasdata_meshes->num_frames++;
 		}
 	}
 
-	// load the skins
-	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
-	loadmodel->skinframes = Mem_Alloc(loadmodel->mempool, totalskins * sizeof(skinframe_t));
-	totalskins = 0;
-	datapointer = startskins;
-	for (i = 0;i < loadmodel->numskins;i++)
-	{
-		pinskintype = (daliasskintype_t *)datapointer;
-		datapointer += sizeof(daliasskintype_t);
-
-		if (pinskintype->type == ALIAS_SKIN_SINGLE)
-		{
-			groupskins = 1;
-			interval = 0.1f;
-		}
-		else
-		{
-			pinskingroup = (daliasskingroup_t *)datapointer;
-			datapointer += sizeof(daliasskingroup_t);
-
-			groupskins = LittleLong (pinskingroup->numskins);
-
-			pinskinintervals = (daliasskininterval_t *)datapointer;
-			datapointer += sizeof(daliasskininterval_t) * groupskins;
-
-			interval = LittleFloat(pinskinintervals[0].interval);
-			if (interval < 0.01f)
-				Host_Error("Mod_LoadQ1AliasModel: invalid interval\n");
-		}
-
-		sprintf(loadmodel->skinscenes[i].name, "skin %i", i);
-		loadmodel->skinscenes[i].firstframe = totalskins;
-		loadmodel->skinscenes[i].framecount = groupskins;
-		loadmodel->skinscenes[i].framerate = 1.0f / interval;
-		loadmodel->skinscenes[i].loop = true;
-
-		for (j = 0;j < groupskins;j++)
-		{
-			if (groupskins > 1)
-				sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
-			else
-				sprintf (name, "%s_%i", loadmodel->name, i);
-			if (!Mod_LoadSkinFrame(loadmodel->skinframes + totalskins, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA, true, false, true))
-				Mod_LoadSkinFrame_Internal(loadmodel->skinframes + totalskins, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA, true, false, true, (qbyte *)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)
-	for (;;)
-	{
-		sprintf (name, "%s_%i", loadmodel->name, loadmodel->numskins);
-		if (Mod_LoadSkinFrame (&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA, true, false, true))
-		{
-			// expand the arrays to make room
-			tempskinscenes = loadmodel->skinscenes;
-			tempskinframes = loadmodel->skinframes;
-			loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, (loadmodel->numskins + 1) * sizeof(animscene_t));
-			loadmodel->skinframes = Mem_Alloc(loadmodel->mempool, (totalskins + 1) * sizeof(skinframe_t));
-			memcpy(loadmodel->skinscenes, tempskinscenes, loadmodel->numskins * sizeof(animscene_t));
-			memcpy(loadmodel->skinframes, tempskinframes, totalskins * sizeof(skinframe_t));
-			Mem_Free(tempskinscenes);
-			Mem_Free(tempskinframes);
-			// store the info about the new skin
-			strcpy(loadmodel->skinscenes[loadmodel->numskins].name, name);
-			loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins;
-			loadmodel->skinscenes[loadmodel->numskins].framecount = 1;
-			loadmodel->skinscenes[loadmodel->numskins].framerate = 10.0f;
-			loadmodel->skinscenes[loadmodel->numskins].loop = true;
-			loadmodel->skinframes[totalskins] = tempskinframe;
-			loadmodel->numskins++;
-			totalskins++;
-		}
-		else
-			break;
-	}
-
-	// store texture coordinates into temporary array, they will be stored after usage is determined (triangle data)
+	// store texture coordinates into temporary array, they will be stored
+	// after usage is determined (triangle data)
 	vertst = Mem_Alloc(tempmempool, numverts * 2 * sizeof(float[2]));
-	vertonseam = Mem_Alloc(tempmempool, numverts * sizeof(int));
-	vertusage = Mem_Alloc(tempmempool, numverts * 2 * sizeof(int));
-	vertremap = Mem_Alloc(tempmempool, numverts * 2 * sizeof(int));
-	temptris = Mem_Alloc(tempmempool, numtris * sizeof(int[3]));
+	vertremap = Mem_Alloc(tempmempool, numverts * 3 * sizeof(int));
+	vertonseam = vertremap + numverts * 2;
 
 	scales = 1.0 / skinwidth;
 	scalet = 1.0 / skinheight;
@@ -510,87 +444,184 @@ void Mod_LoadQ1AliasModel (model_t *mod, void *buffer)
 		vertst[i*2+1] = (LittleLong(pinstverts[i].t) + 0.5) * scalet;
 		vertst[(i+numverts)*2+0] = vertst[i*2+0] + 0.5;
 		vertst[(i+numverts)*2+1] = vertst[i*2+1];
-		vertusage[i] = 0;
-		vertusage[i+numverts] = 0;
 	}
 
 // load triangle data
-	elements = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * numtris);
+	loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * loadmodel->alias.aliasdata_meshes->num_triangles);
 
-	// count the vertices used
-	for (i = 0;i < numverts*2;i++)
-		vertusage[i] = 0;
-	for (i = 0;i < numtris;i++)
-	{
-		temptris[i*3+0] = LittleLong(pintriangles[i].vertindex[0]);
-		temptris[i*3+1] = LittleLong(pintriangles[i].vertindex[1]);
-		temptris[i*3+2] = LittleLong(pintriangles[i].vertindex[2]);
+	// read the triangle elements
+	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
+		for (j = 0;j < 3;j++)
+			loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = LittleLong(pintriangles[i].vertindex[j]);
+	// validate (note numverts is used because this is the original data)
+	Mod_ValidateElements(loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles, numverts, __FILE__, __LINE__);
+	// now butcher the elements according to vertonseam and tri->facesfront
+	// and then compact the vertex set to remove duplicates
+	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
 		if (!LittleLong(pintriangles[i].facesfront)) // backface
-		{
-			if (vertonseam[temptris[i*3+0]]) temptris[i*3+0] += numverts;
-			if (vertonseam[temptris[i*3+1]]) temptris[i*3+1] += numverts;
-			if (vertonseam[temptris[i*3+2]]) temptris[i*3+2] += numverts;
-		}
-		vertusage[temptris[i*3+0]]++;
-		vertusage[temptris[i*3+1]]++;
-		vertusage[temptris[i*3+2]]++;
-	}
+			for (j = 0;j < 3;j++)
+				if (vertonseam[loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j]])
+					loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] += numverts;
+	// count the usage
+	// (this uses vertremap to count usage to save some memory)
+	for (i = 0;i < numverts*2;i++)
+		vertremap[i] = 0;
+	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles*3;i++)
+		vertremap[loadmodel->alias.aliasdata_meshes->data_element3i[i]]++;
 	// build remapping table and compact array
-	totalverts = 0;
+	loadmodel->alias.aliasdata_meshes->num_vertices = 0;
 	for (i = 0;i < numverts*2;i++)
 	{
-		if (vertusage[i])
+		if (vertremap[i])
 		{
-			vertremap[i] = totalverts;
-			vertst[totalverts*2+0] = vertst[i*2+0];
-			vertst[totalverts*2+1] = vertst[i*2+1];
-			totalverts++;
+			vertremap[i] = loadmodel->alias.aliasdata_meshes->num_vertices;
+			vertst[loadmodel->alias.aliasdata_meshes->num_vertices*2+0] = vertst[i*2+0];
+			vertst[loadmodel->alias.aliasdata_meshes->num_vertices*2+1] = vertst[i*2+1];
+			loadmodel->alias.aliasdata_meshes->num_vertices++;
 		}
 		else
 			vertremap[i] = -1; // not used at all
 	}
-	// remap the triangle references
-	for (i = 0;i < numtris * 3;i++)
-		elements[i] = vertremap[temptris[i]];
+	// remap the elements to the new vertex set
+	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles * 3;i++)
+		loadmodel->alias.aliasdata_meshes->data_element3i[i] = vertremap[loadmodel->alias.aliasdata_meshes->data_element3i[i]];
 	// store the texture coordinates
-	texcoords = Mem_Alloc(loadmodel->mempool, sizeof(float[2]) * totalverts);
-	for (i = 0;i < totalverts;i++)
+	loadmodel->alias.aliasdata_meshes->data_texcoord2f = Mem_Alloc(loadmodel->mempool, sizeof(float[2]) * loadmodel->alias.aliasdata_meshes->num_vertices);
+	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_vertices;i++)
 	{
-		texcoords[i*2+0] = vertst[i*2+0];
-		texcoords[i*2+1] = vertst[i*2+1];
+		loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+0] = vertst[i*2+0];
+		loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+1] = vertst[i*2+1];
 	}
 
 // load the frames
 	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
-	posedata = Mem_Alloc(loadmodel->mempool, sizeof(aliasvertex_t) * totalposes * totalverts);
-	Mod_MDL_LoadFrames (startframes, numverts, totalverts, scale, translate, texcoords, posedata, numtris, elements, vertremap);
-	Mod_BuildMDLMD2MeshInfo(totalverts, numtris, elements, texcoords, posedata);
+	loadmodel->alias.aliasdata_meshes->data_aliasvertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[4][3]) * loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices);
+	loadmodel->alias.aliasdata_meshes->data_aliassvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices * 3 * 1;
+	loadmodel->alias.aliasdata_meshes->data_aliastvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices * 3 * 2;
+	loadmodel->alias.aliasdata_meshes->data_aliasnormal3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices * 3 * 3;
+	Mod_MDL_LoadFrames (startframes, numverts, scale, translate, vertremap);
+	loadmodel->alias.aliasdata_meshes->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
+	Mod_BuildTriangleNeighbors(loadmodel->alias.aliasdata_meshes->data_neighbor3i, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles);
+	Mod_CalcAliasModelBBoxes();
 
 	Mem_Free(vertst);
-	Mem_Free(vertonseam);
-	Mem_Free(vertusage);
 	Mem_Free(vertremap);
-	Mem_Free(temptris);
+
+	// load the skins
+	if ((skinfiles = Mod_LoadSkinFiles()))
+	{
+		loadmodel->alias.aliasdata_meshes->num_skins = totalskins = loadmodel->numskins;
+		loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t));
+		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->alias.aliasdata_meshes->data_skins, skinfiles, "default", "");
+		Mod_FreeSkinFiles(skinfiles);
+		loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+		for (i = 0;i < loadmodel->numskins;i++)
+		{
+			loadmodel->skinscenes[i].firstframe = i;
+			loadmodel->skinscenes[i].framecount = 1;
+			loadmodel->skinscenes[i].loop = true;
+			loadmodel->skinscenes[i].framerate = 10;
+		}
+	}
+	else
+	{
+		loadmodel->alias.aliasdata_meshes->num_skins = totalskins;
+		loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t));
+		loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
+		totalskins = 0;
+		datapointer = startskins;
+		for (i = 0;i < loadmodel->numskins;i++)
+		{
+			pinskintype = (daliasskintype_t *)datapointer;
+			datapointer += sizeof(daliasskintype_t);
+
+			if (pinskintype->type == ALIAS_SKIN_SINGLE)
+			{
+				groupskins = 1;
+				interval = 0.1f;
+			}
+			else
+			{
+				pinskingroup = (daliasskingroup_t *)datapointer;
+				datapointer += sizeof(daliasskingroup_t);
+
+				groupskins = LittleLong (pinskingroup->numskins);
+
+				pinskinintervals = (daliasskininterval_t *)datapointer;
+				datapointer += sizeof(daliasskininterval_t) * groupskins;
+
+				interval = LittleFloat(pinskinintervals[0].interval);
+				if (interval < 0.01f)
+					Host_Error("Mod_IDP0_Load: invalid interval\n");
+			}
+
+			sprintf(loadmodel->skinscenes[i].name, "skin %i", i);
+			loadmodel->skinscenes[i].firstframe = totalskins;
+			loadmodel->skinscenes[i].framecount = groupskins;
+			loadmodel->skinscenes[i].framerate = 1.0f / interval;
+			loadmodel->skinscenes[i].loop = true;
+
+			for (j = 0;j < groupskins;j++)
+			{
+				if (groupskins > 1)
+					sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
+				else
+					sprintf (name, "%s_%i", loadmodel->name, i);
+				if (!Mod_LoadSkinFrame(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, true, false, true))
+					Mod_LoadSkinFrame_Internal(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, true, false, true, (qbyte *)datapointer, skinwidth, skinheight);
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe);
+				datapointer += skinwidth * skinheight;
+				totalskins++;
+			}
+		}
+		// check for skins that don't exist in the model, but do exist as external images
+		// (this was added because yummyluv kept pestering me about support for it)
+		while (Mod_LoadSkinFrame(&tempskinframe, va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, true, false, true))
+		{
+			// expand the arrays to make room
+			tempskinscenes = loadmodel->skinscenes;
+			loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, (loadmodel->numskins + 1) * sizeof(animscene_t));
+			memcpy(loadmodel->skinscenes, tempskinscenes, loadmodel->numskins * sizeof(animscene_t));
+			Mem_Free(tempskinscenes);
+
+			tempaliasskins = loadmodel->alias.aliasdata_meshes->data_skins;
+			loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, (totalskins + 1) * sizeof(aliasskin_t));
+			memcpy(loadmodel->alias.aliasdata_meshes->data_skins, tempaliasskins, totalskins * sizeof(aliasskin_t));
+			Mem_Free(tempaliasskins);
+
+			// store the info about the new skin
+			Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe);
+			strcpy(loadmodel->skinscenes[loadmodel->numskins].name, name);
+			loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins;
+			loadmodel->skinscenes[loadmodel->numskins].framecount = 1;
+			loadmodel->skinscenes[loadmodel->numskins].framerate = 10.0f;
+			loadmodel->skinscenes[loadmodel->numskins].loop = true;
+
+			//increase skin counts
+			loadmodel->alias.aliasdata_meshes->num_skins++;
+			loadmodel->numskins++;
+			totalskins++;
+		}
+	}
 }
 
-static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, aliasvertex_t *out, int numverts, int *vertremap)
+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++)
+	for (i = 0;i < numverts;i++, out3f += 3)
 	{
 		in = v + vertremap[i];
-		out[i].origin[0] = in->v[0] * scale[0] + translate[0];
-		out[i].origin[1] = in->v[1] * scale[1] + translate[1];
-		out[i].origin[2] = in->v[2] * scale[2] + translate[2];
+		out3f[0] = in->v[0] * scale[0] + translate[0];
+		out3f[1] = in->v[1] * scale[1] + translate[1];
+		out3f[2] = in->v[2] * scale[2] + translate[2];
 	}
 }
 
-void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
+void Mod_IDP2_Load(model_t *mod, void *buffer)
 {
-	int i, j, k, hashindex, num, numxyz, numst, xyz, st, skinwidth, skinheight, *vertremap, version, end, *elements, numverts, numtris;
-	float *stverts, s, t, scale[3], translate[3], *vertexbuffer, *svectorsbuffer, *tvectorsbuffer, *normalsbuffer, *texcoords;
-	aliasvertex_t *posedata;
+	int i, j, k, hashindex, num, numxyz, numst, xyz, st, skinwidth, skinheight, *vertremap, version, end, numverts;
+	float *stverts, s, t, scale[3], translate[3];
 	md2_t *pinmodel;
 	qbyte *base, *datapointer;
 	md2frame_t *pinframe;
@@ -604,6 +635,8 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
 		float st[2];
 	}
 	*hash, **md2verthash, *md2verthashdata;
+	skinframe_t tempskinframe;
+	skinfile_t *skinfiles;
 
 	pinmodel = buffer;
 	base = buffer;
@@ -614,59 +647,90 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
 			loadmodel->name, version, MD2ALIAS_VERSION);
 
 	loadmodel->type = mod_alias;
-	loadmodel->aliastype = ALIASTYPE_ALIAS;
+	loadmodel->alias.aliastype = ALIASTYPE_ALIAS;
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Alias_Draw;
-	loadmodel->DrawFakeShadow = R_Model_Alias_DrawFakeShadow;
 	loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
 	loadmodel->DrawLight = R_Model_Alias_DrawLight;
+	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
 
-	if (LittleLong(pinmodel->num_tris < 1) || LittleLong(pinmodel->num_tris) > (65536 / 3))
+	if (LittleLong(pinmodel->num_tris) < 1 || LittleLong(pinmodel->num_tris) > (65536 / 3))
 		Host_Error ("%s has invalid number of triangles: %i", loadmodel->name, LittleLong(pinmodel->num_tris));
-	if (LittleLong(pinmodel->num_xyz < 1) || LittleLong(pinmodel->num_xyz) > 65536)
+	if (LittleLong(pinmodel->num_xyz) < 1 || LittleLong(pinmodel->num_xyz) > 65536)
 		Host_Error ("%s has invalid number of vertices: %i", loadmodel->name, LittleLong(pinmodel->num_xyz));
-	if (LittleLong(pinmodel->num_frames < 1) || LittleLong(pinmodel->num_frames) > 65536)
+	if (LittleLong(pinmodel->num_frames) < 1 || LittleLong(pinmodel->num_frames) > 65536)
 		Host_Error ("%s has invalid number of frames: %i", loadmodel->name, LittleLong(pinmodel->num_frames));
-	if (LittleLong(pinmodel->num_skins < 0) || LittleLong(pinmodel->num_skins) > 256)
+	if (LittleLong(pinmodel->num_skins) < 0 || LittleLong(pinmodel->num_skins) > 256)
 		Host_Error ("%s has invalid number of skins: %i", loadmodel->name, LittleLong(pinmodel->num_skins));
 
 	end = LittleLong(pinmodel->ofs_end);
-	if (LittleLong(pinmodel->num_skins) >= 1 && (LittleLong(pinmodel->ofs_skins <= 0) || LittleLong(pinmodel->ofs_skins) >= end))
+	if (LittleLong(pinmodel->num_skins) >= 1 && (LittleLong(pinmodel->ofs_skins) <= 0 || LittleLong(pinmodel->ofs_skins) >= end))
 		Host_Error ("%s is not a valid model", loadmodel->name);
-	if (LittleLong(pinmodel->ofs_st <= 0) || LittleLong(pinmodel->ofs_st) >= end)
+	if (LittleLong(pinmodel->ofs_st) <= 0 || LittleLong(pinmodel->ofs_st) >= end)
 		Host_Error ("%s is not a valid model", loadmodel->name);
-	if (LittleLong(pinmodel->ofs_tris <= 0) || LittleLong(pinmodel->ofs_tris) >= end)
+	if (LittleLong(pinmodel->ofs_tris) <= 0 || LittleLong(pinmodel->ofs_tris) >= end)
 		Host_Error ("%s is not a valid model", loadmodel->name);
-	if (LittleLong(pinmodel->ofs_frames <= 0) || LittleLong(pinmodel->ofs_frames) >= end)
+	if (LittleLong(pinmodel->ofs_frames) <= 0 || LittleLong(pinmodel->ofs_frames) >= end)
 		Host_Error ("%s is not a valid model", loadmodel->name);
-	if (LittleLong(pinmodel->ofs_glcmds <= 0) || LittleLong(pinmodel->ofs_glcmds) >= end)
+	if (LittleLong(pinmodel->ofs_glcmds) <= 0 || LittleLong(pinmodel->ofs_glcmds) >= end)
 		Host_Error ("%s is not a valid model", loadmodel->name);
 
+	loadmodel->alias.aliasnum_meshes = 1;
+	loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, sizeof(aliasmesh_t));
+
 	loadmodel->numskins = LittleLong(pinmodel->num_skins);
 	numxyz = LittleLong(pinmodel->num_xyz);
 	numst = LittleLong(pinmodel->num_st);
-	numtris = LittleLong(pinmodel->num_tris);
+	loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->num_tris);
 	loadmodel->numframes = LittleLong(pinmodel->num_frames);
+	loadmodel->alias.aliasdata_meshes->num_frames = loadmodel->numframes;
+	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
 
 	loadmodel->flags = 0; // there are no MD2 flags
 	loadmodel->synctype = ST_RAND;
 
 	// load the skins
 	inskin = (void*)(base + LittleLong(pinmodel->ofs_skins));
-	if (loadmodel->numskins)
+	if ((skinfiles = Mod_LoadSkinFiles()))
 	{
-		loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins + sizeof(skinframe_t) * loadmodel->numskins);
-		loadmodel->skinframes = (void *)(loadmodel->skinscenes + loadmodel->numskins);
-		for (i = 0;i < loadmodel->numskins;i++)
+		loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins;
+		loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t));
+		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->alias.aliasdata_meshes->data_skins, skinfiles, "default", "");
+		Mod_FreeSkinFiles(skinfiles);
+	}
+	else if (loadmodel->numskins)
+	{
+		// skins found (most likely not a player model)
+		loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins;
+		loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t));
+		for (i = 0;i < loadmodel->numskins;i++, inskin += MD2_SKINNAME)
 		{
-			loadmodel->skinscenes[i].firstframe = i;
-			loadmodel->skinscenes[i].framecount = 1;
-			loadmodel->skinscenes[i].loop = true;
-			loadmodel->skinscenes[i].framerate = 10;
-			Mod_LoadSkinFrame (loadmodel->skinframes + i, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE, true, false, true);
-			inskin += MD2_SKINNAME;
+			if (Mod_LoadSkinFrame(&tempskinframe, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true))
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, &tempskinframe);
+			else
+			{
+				Con_Printf("Mod_IDP2_Load: missing skin \"%s\"\n", inskin);
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, NULL);
+			}
 		}
 	}
+	else
+	{
+		// no skins (most likely a player model)
+		loadmodel->numskins = 1;
+		loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins;
+		loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t));
+		Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins, NULL);
+	}
+
+	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+	for (i = 0;i < loadmodel->numskins;i++)
+	{
+		loadmodel->skinscenes[i].firstframe = i;
+		loadmodel->skinscenes[i].framecount = 1;
+		loadmodel->skinscenes[i].loop = true;
+		loadmodel->skinscenes[i].framerate = 10;
+	}
 
 	// load the triangles and stvert data
 	inst = (void*)(base + LittleLong(pinmodel->ofs_st));
@@ -691,11 +755,11 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
 	}
 
 	md2verthash = Mem_Alloc(tempmempool, 256 * sizeof(hash));
-	md2verthashdata = Mem_Alloc(tempmempool, numtris * 3 * sizeof(*hash));
+	md2verthashdata = Mem_Alloc(tempmempool, loadmodel->alias.aliasdata_meshes->num_triangles * 3 * sizeof(*hash));
 	// swap the triangle list
 	num = 0;
-	elements = Mem_Alloc(loadmodel->mempool, numtris * sizeof(int[3]));
-	for (i = 0;i < numtris;i++)
+	loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
+	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
 	{
 		for (j = 0;j < 3;j++)
 		{
@@ -726,21 +790,22 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
 				hash->next = md2verthash[hashindex];
 				md2verthash[hashindex] = hash;
 			}
-			elements[i*3+j] = (hash - md2verthashdata);
+			loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = (hash - md2verthashdata);
 		}
 	}
 
 	Mem_Free(stverts);
 
 	numverts = num;
+	loadmodel->alias.aliasdata_meshes->num_vertices = numverts;
 	vertremap = Mem_Alloc(loadmodel->mempool, num * sizeof(int));
-	texcoords = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2]));
+	loadmodel->alias.aliasdata_meshes->data_texcoord2f = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2]));
 	for (i = 0;i < num;i++)
 	{
 		hash = md2verthashdata + i;
 		vertremap[i] = hash->xyz;
-		texcoords[i*2+0] = hash->st[0];
-		texcoords[i*2+1] = hash->st[1];
+		loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+0] = hash->st[0];
+		loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+1] = hash->st[1];
 	}
 
 	Mem_Free(md2verthash);
@@ -748,14 +813,11 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
 
 	// load the frames
 	datapointer = (base + LittleLong(pinmodel->ofs_frames));
-	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
-	posedata = Mem_Alloc(loadmodel->mempool, numverts * loadmodel->numframes * sizeof(trivertx_t));
-
-	vertexbuffer = Mem_Alloc(tempmempool, numverts * sizeof(float[3+3+3+3]));
-	svectorsbuffer = vertexbuffer + numverts * 3;
-	tvectorsbuffer = svectorsbuffer + numverts * 3;
-	normalsbuffer = tvectorsbuffer + numverts * 3;
-	for (i = 0;i < loadmodel->numframes;i++)
+	loadmodel->alias.aliasdata_meshes->data_aliasvertex3f = Mem_Alloc(loadmodel->mempool, numverts * loadmodel->alias.aliasdata_meshes->num_frames * sizeof(float[4][3]));
+	loadmodel->alias.aliasdata_meshes->data_aliassvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + numverts * loadmodel->alias.aliasdata_meshes->num_frames * 3 * 1;
+	loadmodel->alias.aliasdata_meshes->data_aliastvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + numverts * loadmodel->alias.aliasdata_meshes->num_frames * 3 * 2;
+	loadmodel->alias.aliasdata_meshes->data_aliasnormal3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + numverts * loadmodel->alias.aliasdata_meshes->num_frames * 3 * 3;
+	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_frames;i++)
 	{
 		pinframe = (md2frame_t *)datapointer;
 		datapointer += sizeof(md2frame_t);
@@ -764,8 +826,8 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
 			scale[j] = LittleFloat(pinframe->scale[j]);
 			translate[j] = LittleFloat(pinframe->translate[j]);
 		}
-		Mod_MD2_ConvertVerts(scale, translate, (void *)datapointer, posedata + i * numverts, numverts, vertremap);
-		Mod_BuildAliasVertexTextureVectors(numverts, posedata + i * numverts, texcoords, vertexbuffer, svectorsbuffer, tvectorsbuffer, normalsbuffer, numtris, elements);
+		Mod_MD2_ConvertVerts(scale, translate, (void *)datapointer, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + i * numverts * 3, numverts, vertremap);
+		Mod_BuildTextureVectorsAndNormals(loadmodel->alias.aliasdata_meshes->num_vertices, loadmodel->alias.aliasdata_meshes->num_triangles, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_texcoord2f, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->data_aliassvector3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliastvector3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliasnormal3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3);
 		datapointer += numxyz * sizeof(trivertx_t);
 
 		strcpy(loadmodel->animscenes[i].name, pinframe->name);
@@ -774,22 +836,23 @@ void Mod_LoadQ2AliasModel (model_t *mod, void *buffer)
 		loadmodel->animscenes[i].framerate = 10;
 		loadmodel->animscenes[i].loop = true;
 	}
-	Mem_Free(vertexbuffer);
 
 	Mem_Free(vertremap);
 
-	Mod_BuildMDLMD2MeshInfo(numverts, numtris, elements, texcoords, posedata);
+	loadmodel->alias.aliasdata_meshes->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
+	Mod_BuildTriangleNeighbors(loadmodel->alias.aliasdata_meshes->data_neighbor3i, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles);
+	Mod_CalcAliasModelBBoxes();
 }
 
-void Mod_LoadQ3AliasModel(model_t *mod, void *buffer)
+void Mod_IDP3_Load(model_t *mod, void *buffer)
 {
-	int i, j, version;
-	float *vertexbuffer, *svectorsbuffer, *tvectorsbuffer, *normalsbuffer;
+	int i, j, k, version;
 	md3modelheader_t *pinmodel;
 	md3frameinfo_t *pinframe;
 	md3mesh_t *pinmesh;
+	md3tag_t *pintag;
 	aliasmesh_t *mesh;
-	skinframe_t tempskinframe;
+	skinfile_t *skinfiles;
 
 	pinmodel = buffer;
 
@@ -800,25 +863,33 @@ void Mod_LoadQ3AliasModel(model_t *mod, void *buffer)
 		Host_Error ("%s has wrong version number (%i should be %i)",
 			loadmodel->name, version, MD3VERSION);
 
+	skinfiles = Mod_LoadSkinFiles();
+	if (loadmodel->numskins < 1)
+		loadmodel->numskins = 1;
+
 	loadmodel->type = mod_alias;
-	loadmodel->aliastype = ALIASTYPE_ALIAS;
+	loadmodel->alias.aliastype = ALIASTYPE_ALIAS;
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Alias_Draw;
-	loadmodel->DrawFakeShadow = R_Model_Alias_DrawFakeShadow;
 	loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
 	loadmodel->DrawLight = R_Model_Alias_DrawLight;
-	loadmodel->flags = 0;
+	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
+	loadmodel->flags = LittleLong(pinmodel->flags);
 	loadmodel->synctype = ST_RAND;
 
 	// set up some global info about the model
 	loadmodel->numframes = LittleLong(pinmodel->num_frames);
-	loadmodel->numskins = 1;
-	loadmodel->aliasnum_meshes = LittleLong(pinmodel->num_meshes);
-	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
-	loadmodel->skinscenes[0].firstframe = 0;
-	loadmodel->skinscenes[0].framecount = 1;
-	loadmodel->skinscenes[0].loop = true;
-	loadmodel->skinscenes[0].framerate = 10;
+	loadmodel->alias.aliasnum_meshes = LittleLong(pinmodel->num_meshes);
+
+	// make skinscenes for the skins (no groups)
+	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+	for (i = 0;i < loadmodel->numskins;i++)
+	{
+		loadmodel->skinscenes[i].firstframe = i;
+		loadmodel->skinscenes[i].framecount = 1;
+		loadmodel->skinscenes[i].loop = true;
+		loadmodel->skinscenes[i].framerate = 10;
+	}
 
 	// load frameinfo
 	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
@@ -831,15 +902,30 @@ void Mod_LoadQ3AliasModel(model_t *mod, void *buffer)
 		loadmodel->animscenes[i].loop = true;
 	}
 
-	// tags are not loaded yet
+	// load tags
+	loadmodel->alias.aliasnum_tagframes = loadmodel->numframes;
+	loadmodel->alias.aliasnum_tags = LittleLong(pinmodel->num_tags);
+	loadmodel->alias.aliasdata_tags = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_tagframes * loadmodel->alias.aliasnum_tags * sizeof(aliastag_t));
+	for (i = 0, pintag = (md3tag_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->alias.aliasnum_tagframes * loadmodel->alias.aliasnum_tags;i++, pintag++)
+	{
+		strcpy(loadmodel->alias.aliasdata_tags[i].name, pintag->name);
+		Matrix4x4_CreateIdentity(&loadmodel->alias.aliasdata_tags[i].matrix);
+		for (j = 0;j < 3;j++)
+		{
+			for (k = 0;k < 3;k++)
+				loadmodel->alias.aliasdata_tags[i].matrix.m[j][k] = LittleFloat(pintag->rotationmatrix[k * 3 + j]);
+			loadmodel->alias.aliasdata_tags[i].matrix.m[j][3] = LittleFloat(pintag->origin[j]);
+		}
+		//Con_Printf("model \"%s\" frame #%i tag #%i \"%s\"\n", loadmodel->name, i / loadmodel->alias.aliasnum_tags, i % loadmodel->alias.aliasnum_tags, loadmodel->alias.aliasdata_tags[i].name);
+	}
 
 	// load meshes
-	loadmodel->aliasdata_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->aliasnum_meshes * sizeof(aliasmesh_t));
-	for (i = 0, pinmesh = (md3mesh_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_meshes));i < loadmodel->aliasnum_meshes;i++, pinmesh = (md3mesh_t *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_end)))
+	loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_meshes * sizeof(aliasmesh_t));
+	for (i = 0, pinmesh = (md3mesh_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_meshes));i < loadmodel->alias.aliasnum_meshes;i++, pinmesh = (md3mesh_t *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_end)))
 	{
 		if (memcmp(pinmesh->identifier, "IDP3", 4))
-			Host_Error("Mod_LoadQ3AliasModel: invalid mesh identifier (not IDP3)\n");
-		mesh = loadmodel->aliasdata_meshes + i;
+			Host_Error("Mod_IDP3_Load: invalid mesh identifier (not IDP3)\n");
+		mesh = loadmodel->alias.aliasdata_meshes + i;
 		mesh->num_skins = loadmodel->numskins;
 		mesh->num_frames = LittleLong(pinmesh->num_frames);
 		mesh->num_vertices = LittleLong(pinmesh->num_vertices);
@@ -848,44 +934,44 @@ void Mod_LoadQ3AliasModel(model_t *mod, void *buffer)
 		mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
 		mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
 		mesh->data_texcoord2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2]));
-		mesh->data_aliasvertex = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * mesh->num_frames * sizeof(aliasvertex_t));
+		mesh->data_aliasvertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * mesh->num_frames * sizeof(float[4][3]));
+		mesh->data_aliassvector3f = mesh->data_aliasvertex3f + mesh->num_vertices * mesh->num_frames * 3 * 1;
+		mesh->data_aliastvector3f = mesh->data_aliasvertex3f + mesh->num_vertices * mesh->num_frames * 3 * 2;
+		mesh->data_aliasnormal3f = mesh->data_aliasvertex3f + mesh->num_vertices * mesh->num_frames * 3 * 3;
 		for (j = 0;j < mesh->num_triangles * 3;j++)
 			mesh->data_element3i[j] = LittleLong(((int *)((qbyte *)pinmesh + pinmesh->lump_elements))[j]);
 		for (j = 0;j < mesh->num_vertices;j++)
 		{
-			mesh->data_texcoord2f[j * 2 + 0] = LittleLong(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 0]);
-			mesh->data_texcoord2f[j * 2 + 1] = LittleLong(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 1]);
+			mesh->data_texcoord2f[j * 2 + 0] = LittleFloat(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 0]);
+			mesh->data_texcoord2f[j * 2 + 1] = LittleFloat(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 1]);
 		}
 		for (j = 0;j < mesh->num_vertices * mesh->num_frames;j++)
 		{
-			mesh->data_aliasvertex[j].origin[0] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 0]) * (1.0f / 64.0f);
-			mesh->data_aliasvertex[j].origin[1] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 1]) * (1.0f / 64.0f);
-			mesh->data_aliasvertex[j].origin[2] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 2]) * (1.0f / 64.0f);
+			mesh->data_aliasvertex3f[j * 3 + 0] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 0]) * (1.0f / 64.0f);
+			mesh->data_aliasvertex3f[j * 3 + 1] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 1]) * (1.0f / 64.0f);
+			mesh->data_aliasvertex3f[j * 3 + 2] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 2]) * (1.0f / 64.0f);
 		}
-		vertexbuffer = Mem_Alloc(tempmempool, mesh->num_vertices * sizeof(float[3+3+3+3]));
-		svectorsbuffer = vertexbuffer + mesh->num_vertices * 3;
-		tvectorsbuffer = svectorsbuffer + mesh->num_vertices * 3;
-		normalsbuffer = tvectorsbuffer + mesh->num_vertices * 3;
 		for (j = 0;j < mesh->num_frames;j++)
-			Mod_BuildAliasVertexTextureVectors(mesh->num_vertices, mesh->data_aliasvertex + j * mesh->num_vertices, mesh->data_texcoord2f, vertexbuffer, svectorsbuffer, tvectorsbuffer, normalsbuffer, mesh->num_triangles, mesh->data_element3i);
-		Mem_Free(vertexbuffer);
+			Mod_BuildTextureVectorsAndNormals(mesh->num_vertices, mesh->num_triangles, mesh->data_aliasvertex3f + j * mesh->num_vertices * 3, mesh->data_texcoord2f, mesh->data_element3i, mesh->data_aliassvector3f + j * mesh->num_vertices * 3, mesh->data_aliastvector3f + j * mesh->num_vertices * 3, mesh->data_aliasnormal3f + j * mesh->num_vertices * 3);
 
-		memset(&tempskinframe, 0, sizeof(tempskinframe));
-		if (LittleLong(pinmesh->num_shaders) >= 1 && ((md3shader_t *)((qbyte *) pinmesh + pinmesh->lump_shaders))->name[0])
-			Mod_LoadSkinFrame (&tempskinframe, ((md3shader_t *)((qbyte *) pinmesh + pinmesh->lump_shaders))->name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE, true, false, true);
 		Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__);
 		Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
-		Mod_BuildAliasSkinFromSkinFrame(mesh->data_skins, &tempskinframe);
+
+		if (LittleLong(pinmesh->num_shaders) >= 1 && ((md3shader_t *)((qbyte *) pinmesh + pinmesh->lump_shaders))->name[0])
+			Mod_BuildAliasSkinsFromSkinFiles(mesh->data_skins, skinfiles, pinmesh->name, ((md3shader_t *)((qbyte *) pinmesh + pinmesh->lump_shaders))->name);
+		else
+			for (j = 0;j < mesh->num_skins;j++)
+				Mod_BuildAliasSkinFromSkinFrame(mesh->data_skins + j, NULL);
 	}
 	Mod_CalcAliasModelBBoxes();
+	Mod_FreeSkinFiles(skinfiles);
 }
 
 extern void R_Model_Zymotic_DrawSky(entity_render_t *ent);
 extern void R_Model_Zymotic_Draw(entity_render_t *ent);
-extern void R_Model_Zymotic_DrawFakeShadow(entity_render_t *ent);
 extern void R_Model_Zymotic_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius);
 extern void R_Model_Zymotic_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz);
-void Mod_LoadZymoticModel(model_t *mod, void *buffer)
+void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
 {
 	zymtype1header_t *pinmodel, *pheader;
 	qbyte *pbase;
@@ -893,15 +979,14 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 	pinmodel = (void *)buffer;
 	pbase = buffer;
 	if (memcmp(pinmodel->id, "ZYMOTICMODEL", 12))
-		Host_Error ("Mod_LoadZymoticModel: %s is not a zymotic model\n");
+		Host_Error ("Mod_ZYMOTICMODEL_Load: %s is not a zymotic model\n");
 	if (BigLong(pinmodel->type) != 1)
-		Host_Error ("Mod_LoadZymoticModel: only type 1 (skeletal pose) models are currently supported (name = %s)\n", loadmodel->name);
+		Host_Error ("Mod_ZYMOTICMODEL_Load: only type 1 (skeletal pose) models are currently supported (name = %s)\n", loadmodel->name);
 
 	loadmodel->type = mod_alias;
-	loadmodel->aliastype = ALIASTYPE_ZYM;
+	loadmodel->alias.aliastype = ALIASTYPE_ZYM;
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Zymotic_Draw;
-	loadmodel->DrawFakeShadow = NULL;//R_Model_Zymotic_DrawFakeShadow;
 	loadmodel->DrawShadowVolume = NULL;//R_Model_Zymotic_DrawShadowVolume;
 	loadmodel->DrawLight = NULL;//R_Model_Zymotic_DrawLight;
 
@@ -916,11 +1001,11 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 	pheader->maxs[1] = BigFloat(pinmodel->maxs[1]);
 	pheader->maxs[2] = BigFloat(pinmodel->maxs[2]);
 	pheader->radius = BigFloat(pinmodel->radius);
-	pheader->numverts = loadmodel->zymnum_verts = BigLong(pinmodel->numverts);
-	pheader->numtris = loadmodel->zymnum_tris = BigLong(pinmodel->numtris);
-	pheader->numshaders = loadmodel->zymnum_shaders = BigLong(pinmodel->numshaders);
-	pheader->numbones = loadmodel->zymnum_bones = BigLong(pinmodel->numbones);
-	pheader->numscenes = loadmodel->zymnum_scenes = BigLong(pinmodel->numscenes);
+	pheader->numverts = loadmodel->alias.zymnum_verts = BigLong(pinmodel->numverts);
+	pheader->numtris = loadmodel->alias.zymnum_tris = BigLong(pinmodel->numtris);
+	pheader->numshaders = loadmodel->alias.zymnum_shaders = BigLong(pinmodel->numshaders);
+	pheader->numbones = loadmodel->alias.zymnum_bones = BigLong(pinmodel->numbones);
+	pheader->numscenes = loadmodel->alias.zymnum_scenes = BigLong(pinmodel->numscenes);
 	pheader->lump_scenes.start = BigLong(pinmodel->lump_scenes.start);
 	pheader->lump_scenes.length = BigLong(pinmodel->lump_scenes.length);
 	pheader->lump_poses.start = BigLong(pinmodel->lump_poses.start);
@@ -943,8 +1028,8 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 	loadmodel->flags = 0; // there are no flags
 	loadmodel->numframes = pheader->numscenes;
 	loadmodel->synctype = ST_SYNC;
-	//loadmodel->numtris = pheader->numtris;
-	//loadmodel->numverts = 0;
+	//loadmodel->num_triangles = pheader->num_triangles;
+	//loadmodel->num_vertices = 0;
 
 	{
 		unsigned int i;
@@ -972,12 +1057,11 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 
 	{
 		// FIXME: add shaders, and make them switchable shader sets and...
-		loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) + sizeof(skinframe_t));
+		loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t));
 		loadmodel->skinscenes[0].firstframe = 0;
 		loadmodel->skinscenes[0].framecount = 1;
 		loadmodel->skinscenes[0].loop = true;
 		loadmodel->skinscenes[0].framerate = 10;
-		loadmodel->skinframes = (void *)(loadmodel->skinscenes + 1);
 		loadmodel->numskins = 1;
 	}
 
@@ -998,11 +1082,11 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 			loadmodel->animscenes[i].framerate = BigFloat(scene->framerate);
 			loadmodel->animscenes[i].loop = (BigLong(scene->flags) & ZYMSCENEFLAG_NOLOOP) == 0;
 			if ((unsigned int) loadmodel->animscenes[i].firstframe >= (unsigned int) numposes)
-				Host_Error("Mod_LoadZymoticModel: scene firstframe (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, numposes);
+				Host_Error("Mod_ZYMOTICMODEL_Load: scene firstframe (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, numposes);
 			if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > (unsigned int) numposes)
-				Host_Error("Mod_LoadZymoticModel: scene firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes);
+				Host_Error("Mod_ZYMOTICMODEL_Load: scene firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes);
 			if (loadmodel->animscenes[i].framerate < 0)
-				Host_Error("Mod_LoadZymoticModel: scene framerate (%f) < 0\n", loadmodel->animscenes[i].framerate);
+				Host_Error("Mod_ZYMOTICMODEL_Load: scene framerate (%f) < 0\n", loadmodel->animscenes[i].framerate);
 			scene++;
 		}
 	}
@@ -1011,38 +1095,38 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 		int i;
 		float *poses;
 	//	zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data
-		loadmodel->zymdata_poses = Mem_Alloc(loadmodel->mempool, pheader->lump_poses.length);
+		loadmodel->alias.zymdata_poses = Mem_Alloc(loadmodel->mempool, pheader->lump_poses.length);
 		poses = (void *) (pheader->lump_poses.start + pbase);
 		for (i = 0;i < pheader->lump_poses.length / 4;i++)
-			loadmodel->zymdata_poses[i] = BigFloat(poses[i]);
+			loadmodel->alias.zymdata_poses[i] = BigFloat(poses[i]);
 	}
 
 	{
 		int i;
 		zymbone_t *bone;
 	//	zymlump_t lump_bones; // zymbone_t bone[numbones];
-		loadmodel->zymdata_bones = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(zymbone_t));
+		loadmodel->alias.zymdata_bones = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(zymbone_t));
 		bone = (void *) (pheader->lump_bones.start + pbase);
 		for (i = 0;i < pheader->numbones;i++)
 		{
-			memcpy(loadmodel->zymdata_bones[i].name, bone[i].name, sizeof(bone[i].name));
-			loadmodel->zymdata_bones[i].flags = BigLong(bone[i].flags);
-			loadmodel->zymdata_bones[i].parent = BigLong(bone[i].parent);
-			if (loadmodel->zymdata_bones[i].parent >= i)
-				Host_Error("Mod_LoadZymoticModel: bone[%i].parent >= %i in %s\n", i, i, loadmodel->name);
+			memcpy(loadmodel->alias.zymdata_bones[i].name, bone[i].name, sizeof(bone[i].name));
+			loadmodel->alias.zymdata_bones[i].flags = BigLong(bone[i].flags);
+			loadmodel->alias.zymdata_bones[i].parent = BigLong(bone[i].parent);
+			if (loadmodel->alias.zymdata_bones[i].parent >= i)
+				Host_Error("Mod_ZYMOTICMODEL_Load: bone[%i].parent >= %i in %s\n", i, i, loadmodel->name);
 		}
 	}
 
 	{
 		int i, *bonecount;
 	//	zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better)
-		loadmodel->zymdata_vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int));
+		loadmodel->alias.zymdata_vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int));
 		bonecount = (void *) (pheader->lump_vertbonecounts.start + pbase);
 		for (i = 0;i < pheader->numverts;i++)
 		{
-			loadmodel->zymdata_vertbonecounts[i] = BigLong(bonecount[i]);
-			if (loadmodel->zymdata_vertbonecounts[i] < 1)
-				Host_Error("Mod_LoadZymoticModel: bone vertex count < 1 in %s\n", loadmodel->name);
+			loadmodel->alias.zymdata_vertbonecounts[i] = BigLong(bonecount[i]);
+			if (loadmodel->alias.zymdata_vertbonecounts[i] < 1)
+				Host_Error("Mod_ZYMOTICMODEL_Load: bone vertex count < 1 in %s\n", loadmodel->name);
 		}
 	}
 
@@ -1050,14 +1134,14 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 		int i;
 		zymvertex_t *vertdata;
 	//	zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct
-		loadmodel->zymdata_verts = Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length);
+		loadmodel->alias.zymdata_verts = Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length);
 		vertdata = (void *) (pheader->lump_verts.start + pbase);
 		for (i = 0;i < pheader->lump_verts.length / (int) sizeof(zymvertex_t);i++)
 		{
-			loadmodel->zymdata_verts[i].bonenum = BigLong(vertdata[i].bonenum);
-			loadmodel->zymdata_verts[i].origin[0] = BigFloat(vertdata[i].origin[0]);
-			loadmodel->zymdata_verts[i].origin[1] = BigFloat(vertdata[i].origin[1]);
-			loadmodel->zymdata_verts[i].origin[2] = BigFloat(vertdata[i].origin[2]);
+			loadmodel->alias.zymdata_verts[i].bonenum = BigLong(vertdata[i].bonenum);
+			loadmodel->alias.zymdata_verts[i].origin[0] = BigFloat(vertdata[i].origin[0]);
+			loadmodel->alias.zymdata_verts[i].origin[1] = BigFloat(vertdata[i].origin[1]);
+			loadmodel->alias.zymdata_verts[i].origin[2] = BigFloat(vertdata[i].origin[2]);
 		}
 	}
 
@@ -1065,7 +1149,7 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 		int i;
 		float *intexcoord2f, *outtexcoord2f;
 	//	zymlump_t lump_texcoords; // float texcoords[numvertices][2];
-		loadmodel->zymdata_texcoords = outtexcoord2f = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(float[2]));
+		loadmodel->alias.zymdata_texcoords = outtexcoord2f = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(float[2]));
 		intexcoord2f = (void *) (pheader->lump_texcoords.start + pbase);
 		for (i = 0;i < pheader->numverts;i++)
 		{
@@ -1078,21 +1162,21 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 	{
 		int i, count, *renderlist, *renderlistend, *outrenderlist;
 	//	zymlump_t lump_render; // int renderlist[rendersize]; // sorted by shader with run lengths (int count), shaders are sequentially used, each run can be used with glDrawElements (each triangle is 3 int indices)
-		loadmodel->zymdata_renderlist = Mem_Alloc(loadmodel->mempool, pheader->lump_render.length);
+		loadmodel->alias.zymdata_renderlist = Mem_Alloc(loadmodel->mempool, pheader->lump_render.length);
 		// byteswap, validate, and swap winding order of tris
 		count = pheader->numshaders * sizeof(int) + pheader->numtris * sizeof(int[3]);
 		if (pheader->lump_render.length != count)
-			Host_Error("Mod_LoadZymoticModel: renderlist is wrong size in %s (is %i bytes, should be %i bytes)\n", loadmodel->name, pheader->lump_render.length, count);
-		outrenderlist = loadmodel->zymdata_renderlist = Mem_Alloc(loadmodel->mempool, count);
+			Host_Error("Mod_ZYMOTICMODEL_Load: renderlist is wrong size in %s (is %i bytes, should be %i bytes)\n", loadmodel->name, pheader->lump_render.length, count);
+		outrenderlist = loadmodel->alias.zymdata_renderlist = Mem_Alloc(loadmodel->mempool, count);
 		renderlist = (void *) (pheader->lump_render.start + pbase);
 		renderlistend = (void *) ((qbyte *) renderlist + pheader->lump_render.length);
 		for (i = 0;i < pheader->numshaders;i++)
 		{
 			if (renderlist >= renderlistend)
-				Host_Error("Mod_LoadZymoticModel: corrupt renderlist in %s (wrong size)\n", loadmodel->name);
+				Host_Error("Mod_ZYMOTICMODEL_Load: corrupt renderlist in %s (wrong size)\n", loadmodel->name);
 			count = BigLong(*renderlist);renderlist++;
 			if (renderlist + count * 3 > renderlistend)
-				Host_Error("Mod_LoadZymoticModel: corrupt renderlist in %s (wrong size)\n", loadmodel->name);
+				Host_Error("Mod_ZYMOTICMODEL_Load: corrupt renderlist in %s (wrong size)\n", loadmodel->name);
 			*outrenderlist++ = count;
 			while (count--)
 			{
@@ -1102,7 +1186,7 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 				if ((unsigned int)outrenderlist[0] >= (unsigned int)pheader->numverts
 				 || (unsigned int)outrenderlist[1] >= (unsigned int)pheader->numverts
 				 || (unsigned int)outrenderlist[2] >= (unsigned int)pheader->numverts)
-					Host_Error("Mod_LoadZymoticModel: corrupt renderlist in %s (out of bounds index)\n", loadmodel->name);
+					Host_Error("Mod_ZYMOTICMODEL_Load: corrupt renderlist in %s (out of bounds index)\n", loadmodel->name);
 				renderlist += 3;
 				outrenderlist += 3;
 			}
@@ -1113,15 +1197,16 @@ void Mod_LoadZymoticModel(model_t *mod, void *buffer)
 		int i;
 		char *shadername;
 	//	zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model
-		loadmodel->zymdata_textures = Mem_Alloc(loadmodel->mempool, pheader->numshaders * sizeof(rtexture_t *));
+		loadmodel->alias.zymdata_textures = Mem_Alloc(loadmodel->mempool, pheader->numshaders * sizeof(rtexture_t *));
 		shadername = (void *) (pheader->lump_shaders.start + pbase);
 		for (i = 0;i < pheader->numshaders;i++)
-			loadmodel->zymdata_textures[i] = loadtextureimage(loadmodel->texturepool, shadername + i * 32, 0, 0, true, TEXF_ALPHA | TEXF_PRECACHE | (r_mipskins.integer ? TEXF_MIPMAP : 0));
+			loadmodel->alias.zymdata_textures[i] = loadtextureimage(loadmodel->texturepool, shadername + i * 32, 0, 0, true, TEXF_ALPHA | TEXF_PRECACHE | (r_mipskins.integer ? TEXF_MIPMAP : 0));
 	}
 
 	{
 	//	zymlump_t lump_trizone; // byte trizone[numtris]; // see trizone explanation
-		loadmodel->zymdata_trizone = Mem_Alloc(loadmodel->mempool, pheader->numtris);
-		memcpy(loadmodel->zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris);
+		loadmodel->alias.zymdata_trizone = Mem_Alloc(loadmodel->mempool, pheader->numtris);
+		memcpy(loadmodel->alias.zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris);
 	}
 }
+