X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.c;h=d869e14f3bc21c27085cb6aa41fc1568c81534b6;hp=e3c0345c650ae1a568f4f17e7b18437679a4c4ba;hb=c313816329efcb3d80304fc6b2fbc9507c3ed16c;hpb=e119924277152e9f2bb99b7d51fb6c83b622eda8

diff --git a/model_alias.c b/model_alias.c
index e3c0345c..d869e14f 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -26,14 +26,172 @@ void Mod_AliasInit (void)
 {
 }
 
+void Mod_Alias_GetMesh_Vertex3f(const model_t *model, const frameblend_t *frameblend, const surfmesh_t *mesh, float *out3f)
+{
+	if (mesh->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++)
+		{
+			for (k = 0;k < 12;k++)
+				m[k] = 0;
+			for (blends = 0;blends < 4 && frameblend[blends].lerp > 0;blends++)
+			{
+				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;
+			}
+			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];
+		}
+		// blend the vertex bone weights
+		memset(out3f, 0, mesh->num_vertices * sizeof(float[3]));
+		v = mesh->data_vertexboneweights;
+		for (i = 0;i < mesh->num_vertexboneweights;i++, v++)
+		{
+			out = out3f + v->vertexindex * 3;
+			matrix = bonepose[v->boneindex];
+			// FIXME: this can very easily be optimized with SSE or 3DNow
+			out[0] += v->origin[0] * matrix[0] + v->origin[1] * matrix[1] + v->origin[2] * matrix[ 2] + v->origin[3] * matrix[ 3];
+			out[1] += v->origin[0] * matrix[4] + v->origin[1] * matrix[5] + v->origin[2] * matrix[ 6] + v->origin[3] * matrix[ 7];
+			out[2] += v->origin[0] * matrix[8] + v->origin[1] * matrix[9] + v->origin[2] * matrix[10] + v->origin[3] * matrix[11];
+		}
+	}
+	else
+	{
+		int i, vertcount;
+		float lerp1, lerp2, lerp3, lerp4;
+		const float *vertsbase, *verts1, *verts2, *verts3, *verts4;
+		// vertex morph
+		if (!mesh->data_morphvertex3f)
+			Host_Error("model %s has no skeletal or vertex morph animation data\n", model->name);
+		vertsbase = mesh->data_morphvertex3f;
+		vertcount = mesh->num_vertices;
+		verts1 = vertsbase + frameblend[0].frame * vertcount * 3;
+		lerp1 = frameblend[0].lerp;
+		if (frameblend[1].lerp)
+		{
+			verts2 = vertsbase + frameblend[1].frame * vertcount * 3;
+			lerp2 = frameblend[1].lerp;
+			if (frameblend[2].lerp)
+			{
+				verts3 = vertsbase + frameblend[2].frame * vertcount * 3;
+				lerp3 = frameblend[2].lerp;
+				if (frameblend[3].lerp)
+				{
+					verts4 = vertsbase + frameblend[3].frame * vertcount * 3;
+					lerp4 = frameblend[3].lerp;
+					for (i = 0;i < vertcount * 3;i++)
+						VectorMAMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, lerp4, verts4 + i, out3f + i);
+				}
+				else
+					for (i = 0;i < vertcount * 3;i++)
+						VectorMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, out3f + i);
+			}
+			else
+				for (i = 0;i < vertcount * 3;i++)
+					VectorMAM(lerp1, verts1 + i, lerp2, verts2 + i, out3f + i);
+		}
+		else
+			memcpy(out3f, verts1, vertcount * sizeof(float[3]));
+	}
+}
+
+int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, matrix4x4_t *outmatrix)
+{
+	const float *boneframe;
+	float tempbonematrix[12], bonematrix[12];
+	Matrix4x4_CreateIdentity(outmatrix);
+	if (model->num_bones)
+	{
+		if (tagindex < 0 || tagindex >= model->num_bones)
+			return 4;
+		if (poseframe >= model->num_poses)
+			return 6;
+		boneframe = model->data_poses + poseframe * model->num_bones * 12;
+		memcpy(bonematrix, boneframe + tagindex * 12, sizeof(float[12]));
+		while (model->data_bones[tagindex].parent >= 0)
+		{
+			memcpy(tempbonematrix, bonematrix, sizeof(float[12]));
+			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;
+	}
+	else if (model->num_tags)
+	{
+		if (tagindex < 0 || tagindex >= model->num_tags)
+			return 4;
+		if (poseframe >= model->num_tagframes)
+			return 6;
+		*outmatrix = model->data_tags[poseframe * model->num_tags + tagindex].matrix;
+	}
+	return 0;
+}
+
+int Mod_Alias_GetTagIndexForName(const 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 (model->num_bones)
+		for (i = 0;i < model->num_bones;i++)
+			if (!strcasecmp(tagname, model->data_bones[i].name))
+				return i + 1;
+	if (model->num_tags)
+		for (i = 0;i < model->num_tags;i++)
+			if (!strcasecmp(tagname, model->data_tags[i].name))
+				return i + 1;
+	return 0;
+}
+
+static void Mod_Alias_Mesh_CompileFrameZero(surfmesh_t *mesh)
+{
+	frameblend_t frameblend[4] = {{0, 1}, {0, 0}, {0, 0}, {0, 0}};
+	mesh->data_vertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[3][4]));
+	mesh->data_svector3f = mesh->data_vertex3f + mesh->num_vertices * 3;
+	mesh->data_tvector3f = mesh->data_vertex3f + mesh->num_vertices * 6;
+	mesh->data_normal3f = mesh->data_vertex3f + mesh->num_vertices * 9;
+	Mod_Alias_GetMesh_Vertex3f(loadmodel, frameblend, mesh, mesh->data_vertex3f);
+	Mod_BuildTextureVectorsAndNormals(0, mesh->num_vertices, mesh->num_triangles, mesh->data_vertex3f, mesh->data_texcoordtexture2f, mesh->data_element3i, mesh->data_svector3f, mesh->data_tvector3f, mesh->data_normal3f);
+}
+
 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;
+	int i, linetrace;
 	float segmentmins[3], segmentmaxs[3];
-	colbrushf_t *thisbrush_start, *thisbrush_end;
+	frameblend_t frameblend[4];
+	msurface_t *surface;
+	surfmesh_t *mesh;
+	colbrushf_t *thisbrush_start = NULL, *thisbrush_end = NULL;
 	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]);
@@ -41,31 +199,26 @@ static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, co
 	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
+	linetrace = VectorCompare(boxstartmins, boxstartmaxs) && VectorCompare(boxendmins, boxendmaxs);
+	if (!linetrace)
 	{
 		// 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);
-		}
+	}
+	memset(frameblend, 0, sizeof(frameblend));
+	frameblend[0].frame = frame;
+	frameblend[0].lerp = 1;
+	for (i = 0, surface = model->data_surfaces;i < model->num_surfaces;i++, surface++)
+	{
+		mesh = surface->groupmesh;
+		Mod_Alias_GetMesh_Vertex3f(model, frameblend, mesh, varray_vertex3f);
+		if (linetrace)
+			Collision_TraceLineTriangleMeshFloat(trace, boxstartmins, boxendmins, mesh->num_triangles, mesh->data_element3i, varray_vertex3f, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs);
+		else
+			Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, mesh->num_triangles, mesh->data_element3i, varray_vertex3f, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs);
 	}
 }
 
@@ -73,15 +226,16 @@ static void Mod_CalcAliasModelBBoxes (void)
 {
 	int vnum, meshnum;
 	float dist, yawradius, radius;
-	aliasmesh_t *mesh;
+	surfmesh_t *mesh;
 	float *v;
 	VectorClear(loadmodel->normalmins);
 	VectorClear(loadmodel->normalmaxs);
 	yawradius = 0;
 	radius = 0;
-	for (meshnum = 0, mesh = loadmodel->alias.aliasdata_meshes;meshnum < loadmodel->alias.aliasnum_meshes;meshnum++, mesh++)
+	for (meshnum = 0;meshnum < loadmodel->num_surfaces;meshnum++)
 	{
-		for (vnum = 0, v = mesh->data_aliasvertex3f;vnum < mesh->num_vertices * mesh->num_frames;vnum++, v += 3)
+		mesh = loadmodel->meshlist[meshnum];
+		for (vnum = 0, v = mesh->data_morphvertex3f;vnum < mesh->num_vertices * mesh->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];
@@ -163,7 +317,10 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, v
 
 			interval = LittleFloat (intervals->interval); // FIXME: support variable framerate groups
 			if (interval < 0.01f)
-				Host_Error("Mod_MDL_LoadFrames: invalid interval");
+			{
+				Con_Printf("%s has an invalid interval %f, changing to 0.1\n", loadmodel->name, interval);
+				interval = 0.1f;
+			}
 		}
 
 		// get scene name from first frame
@@ -181,8 +338,7 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, v
 		{
 			pinframe = (daliasframe_t *)datapointer;
 			datapointer += sizeof(daliasframe_t);
-			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);
+			Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->meshlist[0]->data_morphvertex3f + pose * loadmodel->meshlist[0]->num_vertices * 3, vertremap);
 			datapointer += sizeof(trivertx_t) * inverts;
 			pose++;
 		}
@@ -190,85 +346,33 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, v
 }
 
 static skinframe_t missingskinframe;
-aliaslayer_t mod_alias_layersbuffer[16]; // 7 currently used
-void Mod_BuildAliasSkinFromSkinFrame(aliasskin_t *skin, skinframe_t *skinframe)
+static void Mod_BuildAliasSkinFromSkinFrame(texture_t *skin, skinframe_t *skinframe)
 {
-	aliaslayer_t *layer;
-
 	// hack
 	if (skinframe == NULL)
 	{
 		skinframe = &missingskinframe;
 		memset(skinframe, 0, sizeof(*skinframe));
-		skinframe->base = r_notexture;
-	}
-
-	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_DIFFUSE | ALIASLAYER_NODRAW_IF_COLORMAPPED;
-		layer->texture = skinframe->merged;
-		layer->nmap = skinframe->nmap;
-		layer++;
-	}
-	if (skinframe->base != NULL)
-	{
-		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_DIFFUSE | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_COLORMAP_PANTS;
-		layer->texture = skinframe->pants;
-		layer->nmap = skinframe->nmap;
-		layer++;
-	}
-	if (skinframe->shirt != NULL)
-	{
-		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++;
+		skinframe->base = r_texture_notexture;
 	}
 
-	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));
+	skin->skin = *skinframe;
+	skin->currentframe = skin;
+	skin->basematerialflags = MATERIALFLAG_WALL;
+	if (skin->skin.fog)
+		skin->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT;
+	skin->currentmaterialflags = skin->basematerialflags;
 }
 
-void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, char *meshname, char *shadername)
+static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, char *meshname, char *shadername)
 {
 	int i;
 	skinfileitem_t *skinfileitem;
 	skinframe_t tempskinframe;
 	if (skinfile)
 	{
-		for (i = 0;skinfile;skinfile = skinfile->next, i++, skin++)
+		// 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));
 			for (skinfileitem = skinfile->items;skinfileitem;skinfileitem = skinfileitem->next)
@@ -277,16 +381,18 @@ void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, c
 				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))
+					if (Mod_LoadSkinFrame(&tempskinframe, skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
 						Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
 					else
 					{
-						Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\", falling back to mesh's internal shader name \"%s\"\n", meshname, i, skinfileitem->replacement, shadername);
-						if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true))
+						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_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
 							Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
 						else
 						{
-							Con_Printf("failed to load skin \"%s\"\n", shadername);
+							if (cls.state != ca_dedicated)
+								Con_Printf("failed to load skin \"%s\"\n", shadername);
 							Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
 						}
 					}
@@ -297,11 +403,12 @@ void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, c
 	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))
+		if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
 			Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe);
 		else
 		{
-			Con_Printf("failed to load mesh \"%s\" shader \"%s\"\n", meshname, shadername);
+			if (cls.state != ca_dedicated)
+				Con_Printf("failed to load mesh \"%s\" shader \"%s\"\n", meshname, shadername);
 			Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
 		}
 	}
@@ -309,13 +416,15 @@ void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, c
 
 #define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%d exceeds %d - %d)\n", loadmodel->name, VALUE, MIN, MAX);
 #define BOUNDF(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%f exceeds %f - %f)\n", loadmodel->name, VALUE, MIN, MAX);
-extern void R_Model_Alias_Draw(entity_render_t *ent);
-extern void R_Model_Alias_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius);
-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);
+extern void R_Q1BSP_Draw(entity_render_t *ent);
+extern void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
+extern void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolor, int numsurfaces, const int *surfacelist);
 void Mod_IDP0_Load(model_t *mod, void *buffer)
 {
 	int i, j, version, totalskins, skinwidth, skinheight, groupframes, groupskins, numverts;
 	float scales, scalet, scale[3], translate[3], interval;
+	msurface_t *surface;
+	qbyte *data;
 	mdl_t *pinmodel;
 	stvert_t *pinstverts;
 	dtriangle_t *pintriangles;
@@ -328,7 +437,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 	char name[MAX_QPATH];
 	skinframe_t tempskinframe;
 	animscene_t *tempskinscenes;
-	aliasskin_t *tempaliasskins;
+	texture_t *tempaliasskins;
 	float *vertst;
 	int *vertonseam, *vertremap;
 	skinfile_t *skinfiles;
@@ -343,26 +452,35 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 				 loadmodel->name, version, ALIAS_VERSION);
 
 	loadmodel->type = mod_alias;
-	loadmodel->alias.aliastype = ALIASTYPE_ALIAS;
 	loadmodel->DrawSky = NULL;
-	loadmodel->Draw = R_Model_Alias_Draw;
-	loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
-	loadmodel->DrawLight = R_Model_Alias_DrawLight;
+	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
 
-	loadmodel->alias.aliasnum_meshes = 1;
-	loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, sizeof(aliasmesh_t));
+	loadmodel->num_surfaces = 1;
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
+	loadmodel->nummeshes = loadmodel->num_surfaces;
+	data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t));
+	loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
+	loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *);
+	for (i = 0;i < loadmodel->num_surfaces;i++)
+	{
+		loadmodel->surfacelist[i] = i;
+		loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t);
+	}
 
 	loadmodel->numskins = LittleLong(pinmodel->numskins);
-	BOUNDI(loadmodel->numskins,0,256);
+	BOUNDI(loadmodel->numskins,0,65536);
 	skinwidth = LittleLong (pinmodel->skinwidth);
-	BOUNDI(skinwidth,0,4096);
+	BOUNDI(skinwidth,0,65536);
 	skinheight = LittleLong (pinmodel->skinheight);
-	BOUNDI(skinheight,0,4096);
+	BOUNDI(skinheight,0,65536);
 	numverts = LittleLong(pinmodel->numverts);
 	BOUNDI(numverts,0,65536);
-	loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->numtris);
-	BOUNDI(loadmodel->alias.aliasdata_meshes->num_triangles,0,65536 / 3); // max elements limit, rather than max triangles limit
+	loadmodel->meshlist[0]->num_triangles = LittleLong(pinmodel->numtris);
+	BOUNDI(loadmodel->meshlist[0]->num_triangles,0,65536);
 	loadmodel->numframes = LittleLong(pinmodel->numframes);
 	BOUNDI(loadmodel->numframes,0,65536);
 	loadmodel->synctype = LittleLong (pinmodel->synctype);
@@ -402,10 +520,10 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 	datapointer += sizeof(stvert_t) * numverts;
 
 	pintriangles = (dtriangle_t *)datapointer;
-	datapointer += sizeof(dtriangle_t) * loadmodel->alias.aliasdata_meshes->num_triangles;
+	datapointer += sizeof(dtriangle_t) * loadmodel->meshlist[0]->num_triangles;
 
 	startframes = datapointer;
-	loadmodel->alias.aliasdata_meshes->num_frames = 0;
+	loadmodel->meshlist[0]->num_morphframes = 0;
 	for (i = 0;i < loadmodel->numframes;i++)
 	{
 		pinframetype = (daliasframetype_t *)datapointer;
@@ -424,7 +542,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 		{
 			datapointer += sizeof(daliasframe_t);
 			datapointer += sizeof(trivertx_t) * numverts;
-			loadmodel->alias.aliasdata_meshes->num_frames++;
+			loadmodel->meshlist[0]->num_morphframes++;
 		}
 	}
 
@@ -446,74 +564,73 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 	}
 
 // load triangle data
-	loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * loadmodel->alias.aliasdata_meshes->num_triangles);
+	loadmodel->meshlist[0]->data_element3i = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * loadmodel->meshlist[0]->num_triangles);
 
 	// read the triangle elements
-	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
+	for (i = 0;i < loadmodel->meshlist[0]->num_triangles;i++)
 		for (j = 0;j < 3;j++)
-			loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = LittleLong(pintriangles[i].vertindex[j]);
+			loadmodel->meshlist[0]->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__);
+	Mod_ValidateElements(loadmodel->meshlist[0]->data_element3i, loadmodel->meshlist[0]->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++)
+	for (i = 0;i < loadmodel->meshlist[0]->num_triangles;i++)
 		if (!LittleLong(pintriangles[i].facesfront)) // backface
 			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;
+				if (vertonseam[loadmodel->meshlist[0]->data_element3i[i*3+j]])
+					loadmodel->meshlist[0]->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]]++;
+	for (i = 0;i < loadmodel->meshlist[0]->num_triangles*3;i++)
+		vertremap[loadmodel->meshlist[0]->data_element3i[i]]++;
 	// build remapping table and compact array
-	loadmodel->alias.aliasdata_meshes->num_vertices = 0;
+	loadmodel->meshlist[0]->num_vertices = 0;
 	for (i = 0;i < numverts*2;i++)
 	{
 		if (vertremap[i])
 		{
-			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++;
+			vertremap[i] = loadmodel->meshlist[0]->num_vertices;
+			vertst[loadmodel->meshlist[0]->num_vertices*2+0] = vertst[i*2+0];
+			vertst[loadmodel->meshlist[0]->num_vertices*2+1] = vertst[i*2+1];
+			loadmodel->meshlist[0]->num_vertices++;
 		}
 		else
 			vertremap[i] = -1; // not used at all
 	}
 	// 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]];
+	for (i = 0;i < loadmodel->meshlist[0]->num_triangles * 3;i++)
+		loadmodel->meshlist[0]->data_element3i[i] = vertremap[loadmodel->meshlist[0]->data_element3i[i]];
 	// store the texture coordinates
-	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++)
+	loadmodel->meshlist[0]->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, sizeof(float[2]) * loadmodel->meshlist[0]->num_vertices);
+	for (i = 0;i < loadmodel->meshlist[0]->num_vertices;i++)
 	{
-		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];
+		loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+0] = vertst[i*2+0];
+		loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+1] = vertst[i*2+1];
 	}
 
 // load the frames
 	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
-	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;
+	loadmodel->meshlist[0]->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * loadmodel->meshlist[0]->num_morphframes * loadmodel->meshlist[0]->num_vertices);
+	loadmodel->meshlist[0]->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->meshlist[0]->num_triangles * sizeof(int[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_BuildTriangleNeighbors(loadmodel->meshlist[0]->data_neighbor3i, loadmodel->meshlist[0]->data_element3i, loadmodel->meshlist[0]->num_triangles);
 	Mod_CalcAliasModelBBoxes();
+	Mod_Alias_Mesh_CompileFrameZero(loadmodel->meshlist[0]);
 
 	Mem_Free(vertst);
 	Mem_Free(vertremap);
 
 	// load the skins
-	if ((skinfiles = Mod_LoadSkinFiles()))
+	skinfiles = Mod_LoadSkinFiles();
+	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t));
+	loadmodel->num_textures = loadmodel->num_surfaces;
+	loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * totalskins * sizeof(texture_t));
+	if (skinfiles)
 	{
-		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_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures, 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;
@@ -524,9 +641,6 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 	}
 	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++)
@@ -551,7 +665,10 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 
 				interval = LittleFloat(pinskinintervals[0].interval);
 				if (interval < 0.01f)
-					Host_Error("Mod_IDP0_Load: invalid interval\n");
+				{
+					Con_Printf("%s has an invalid interval %f, changing to 0.1\n", loadmodel->name, interval);
+					interval = 0.1f;
+				}
 			}
 
 			sprintf(loadmodel->skinscenes[i].name, "skin %i", i);
@@ -566,16 +683,16 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 					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);
+				if (!Mod_LoadSkinFrame(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA | TEXF_PICMIP, true, false, true))
+					Mod_LoadSkinFrame_Internal(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA | TEXF_PICMIP, true, false, r_fullbrights.integer, (qbyte *)datapointer, skinwidth, skinheight);
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &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))
+		while (Mod_LoadSkinFrame(&tempskinframe, va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA | TEXF_PICMIP, true, false, true))
 		{
 			// expand the arrays to make room
 			tempskinscenes = loadmodel->skinscenes;
@@ -583,13 +700,13 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 			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));
+			tempaliasskins = loadmodel->data_textures;
+			loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * (totalskins + 1) * sizeof(texture_t));
+			memcpy(loadmodel->data_textures, tempaliasskins, loadmodel->num_surfaces * totalskins * sizeof(texture_t));
 			Mem_Free(tempaliasskins);
 
 			// store the info about the new skin
-			Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe);
+			Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe);
 			strcpy(loadmodel->skinscenes[loadmodel->numskins].name, name);
 			loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins;
 			loadmodel->skinscenes[loadmodel->numskins].framecount = 1;
@@ -597,11 +714,18 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 			loadmodel->skinscenes[loadmodel->numskins].loop = true;
 
 			//increase skin counts
-			loadmodel->alias.aliasdata_meshes->num_skins++;
 			loadmodel->numskins++;
 			totalskins++;
 		}
 	}
+
+	surface = loadmodel->data_surfaces;
+	surface->texture = loadmodel->data_textures;
+	surface->groupmesh = loadmodel->meshlist[0];
+	surface->num_firsttriangle = 0;
+	surface->num_triangles = surface->groupmesh->num_triangles;
+	surface->num_firstvertex = 0;
+	surface->num_vertices = surface->groupmesh->num_vertices;
 }
 
 static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, float *out3f, int numverts, int *vertremap)
@@ -621,6 +745,8 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 {
 	int i, j, k, hashindex, num, numxyz, numst, xyz, st, skinwidth, skinheight, *vertremap, version, end, numverts;
 	float *stverts, s, t, scale[3], translate[3];
+	qbyte *data;
+	msurface_t *surface;
 	md2_t *pinmodel;
 	qbyte *base, *datapointer;
 	md2frame_t *pinframe;
@@ -646,14 +772,13 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 			loadmodel->name, version, MD2ALIAS_VERSION);
 
 	loadmodel->type = mod_alias;
-	loadmodel->alias.aliastype = ALIASTYPE_ALIAS;
 	loadmodel->DrawSky = NULL;
-	loadmodel->Draw = R_Model_Alias_Draw;
-	loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
-	loadmodel->DrawLight = R_Model_Alias_DrawLight;
+	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+	loadmodel->DrawLight = R_Q1BSP_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)
 		Host_Error ("%s has invalid number of triangles: %i", loadmodel->name, LittleLong(pinmodel->num_tris));
 	if (LittleLong(pinmodel->num_xyz) < 1 || LittleLong(pinmodel->num_xyz) > 65536)
 		Host_Error ("%s has invalid number of vertices: %i", loadmodel->name, LittleLong(pinmodel->num_xyz));
@@ -674,15 +799,25 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 	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->num_surfaces = 1;
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
+	loadmodel->nummeshes = loadmodel->num_surfaces;
+	data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t));
+	loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
+	loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *);
+	for (i = 0;i < loadmodel->num_surfaces;i++)
+	{
+		loadmodel->surfacelist[i] = i;
+		loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t);
+	}
 
 	loadmodel->numskins = LittleLong(pinmodel->num_skins);
 	numxyz = LittleLong(pinmodel->num_xyz);
 	numst = LittleLong(pinmodel->num_st);
-	loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->num_tris);
+	loadmodel->meshlist[0]->num_triangles = LittleLong(pinmodel->num_tris);
 	loadmodel->numframes = LittleLong(pinmodel->num_frames);
-	loadmodel->alias.aliasdata_meshes->num_frames = loadmodel->numframes;
+	loadmodel->meshlist[0]->num_morphframes = loadmodel->numframes;
 	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t));
 
 	loadmodel->flags = 0; // there are no MD2 flags
@@ -690,26 +825,27 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 
 	// load the skins
 	inskin = (void*)(base + LittleLong(pinmodel->ofs_skins));
-	if ((skinfiles = Mod_LoadSkinFiles()))
+	skinfiles = Mod_LoadSkinFiles();
+	if (skinfiles)
 	{
-		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", "");
+		loadmodel->num_textures = loadmodel->num_surfaces;
+		loadmodel->data_textures = 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->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));
+		loadmodel->num_textures = loadmodel->num_surfaces;
+		loadmodel->data_textures = 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_CLAMP | TEXF_PRECACHE, true, false, true))
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, &tempskinframe);
+			if (Mod_LoadSkinFrame(&tempskinframe, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true))
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, &tempskinframe);
 			else
 			{
-				Con_Printf("Mod_IDP2_Load: missing skin \"%s\"\n", inskin);
-				Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, NULL);
+				Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin);
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, NULL);
 			}
 		}
 	}
@@ -717,9 +853,9 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 	{
 		// 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->num_textures = loadmodel->num_surfaces;
+		loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
+		Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures, NULL);
 	}
 
 	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
@@ -746,33 +882,34 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 		k = (unsigned short) LittleShort(inst[i*2+1]);
 		if (j >= skinwidth || k >= skinheight)
 		{
-			Mem_Free(stverts);
-			Host_Error("Mod_MD2_LoadGeometry: invalid skin coordinate (%i %i) on vert %i of model %s\n", j, k, i, loadmodel->name);
+			Con_Printf("%s has an invalid skin coordinate (%i %i) on vert %i, changing to 0 0\n", loadmodel->name, j, k, i);
+			j = 0;
+			k = 0;
 		}
 		stverts[i*2+0] = j * s;
 		stverts[i*2+1] = k * t;
 	}
 
 	md2verthash = Mem_Alloc(tempmempool, 256 * sizeof(hash));
-	md2verthashdata = Mem_Alloc(tempmempool, loadmodel->alias.aliasdata_meshes->num_triangles * 3 * sizeof(*hash));
+	md2verthashdata = Mem_Alloc(tempmempool, loadmodel->meshlist[0]->num_triangles * 3 * sizeof(*hash));
 	// swap the triangle list
 	num = 0;
-	loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
-	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++)
+	loadmodel->meshlist[0]->data_element3i = Mem_Alloc(loadmodel->mempool, loadmodel->meshlist[0]->num_triangles * sizeof(int[3]));
+	for (i = 0;i < loadmodel->meshlist[0]->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 || st >= numst)
+			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)
 			{
-				Mem_Free(md2verthash);
-				Mem_Free(md2verthashdata);
-				Mem_Free(stverts);
-				if (xyz >= numxyz)
-					Host_Error("Mod_MD2_LoadGeometry: invalid xyz index (%i) on triangle %i of model %s\n", xyz, i, loadmodel->name);
-				if (st >= numst)
-					Host_Error("Mod_MD2_LoadGeometry: invalid st index (%i) on triangle %i of model %s\n", st, i, loadmodel->name);
+				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];
@@ -789,22 +926,22 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 				hash->next = md2verthash[hashindex];
 				md2verthash[hashindex] = hash;
 			}
-			loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = (hash - md2verthashdata);
+			loadmodel->meshlist[0]->data_element3i[i*3+j] = (hash - md2verthashdata);
 		}
 	}
 
 	Mem_Free(stverts);
 
 	numverts = num;
-	loadmodel->alias.aliasdata_meshes->num_vertices = numverts;
+	loadmodel->meshlist[0]->num_vertices = numverts;
 	vertremap = Mem_Alloc(loadmodel->mempool, num * sizeof(int));
-	loadmodel->alias.aliasdata_meshes->data_texcoord2f = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2]));
+	loadmodel->meshlist[0]->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2]));
 	for (i = 0;i < num;i++)
 	{
 		hash = md2verthashdata + i;
 		vertremap[i] = hash->xyz;
-		loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+0] = hash->st[0];
-		loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+1] = hash->st[1];
+		loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+0] = hash->st[0];
+		loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+1] = hash->st[1];
 	}
 
 	Mem_Free(md2verthash);
@@ -812,11 +949,8 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 
 	// load the frames
 	datapointer = (base + LittleLong(pinmodel->ofs_frames));
-	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++)
+	loadmodel->meshlist[0]->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, numverts * loadmodel->meshlist[0]->num_morphframes * sizeof(float[3]));
+	for (i = 0;i < loadmodel->meshlist[0]->num_morphframes;i++)
 	{
 		pinframe = (md2frame_t *)datapointer;
 		datapointer += sizeof(md2frame_t);
@@ -825,8 +959,7 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 			scale[j] = LittleFloat(pinframe->scale[j]);
 			translate[j] = LittleFloat(pinframe->translate[j]);
 		}
-		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);
+		Mod_MD2_ConvertVerts(scale, translate, (void *)datapointer, loadmodel->meshlist[0]->data_morphvertex3f + i * numverts * 3, numverts, vertremap);
 		datapointer += numxyz * sizeof(trivertx_t);
 
 		strcpy(loadmodel->animscenes[i].name, pinframe->name);
@@ -838,19 +971,30 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 
 	Mem_Free(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);
+	loadmodel->meshlist[0]->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->meshlist[0]->num_triangles * sizeof(int[3]));
+	Mod_BuildTriangleNeighbors(loadmodel->meshlist[0]->data_neighbor3i, loadmodel->meshlist[0]->data_element3i, loadmodel->meshlist[0]->num_triangles);
 	Mod_CalcAliasModelBBoxes();
+	Mod_Alias_Mesh_CompileFrameZero(loadmodel->meshlist[0]);
+
+	surface = loadmodel->data_surfaces;
+	surface->groupmesh = loadmodel->meshlist[0];
+	surface->texture = loadmodel->data_textures;
+	surface->num_firsttriangle = 0;
+	surface->num_triangles = surface->groupmesh->num_triangles;
+	surface->num_firstvertex = 0;
+	surface->num_vertices = surface->groupmesh->num_vertices;
 }
 
 void Mod_IDP3_Load(model_t *mod, void *buffer)
 {
 	int i, j, k, version;
+	qbyte *data;
+	msurface_t *surface;
+	surfmesh_t *mesh;
 	md3modelheader_t *pinmodel;
 	md3frameinfo_t *pinframe;
 	md3mesh_t *pinmesh;
 	md3tag_t *pintag;
-	aliasmesh_t *mesh;
 	skinfile_t *skinfiles;
 
 	pinmodel = buffer;
@@ -867,18 +1011,17 @@ void Mod_IDP3_Load(model_t *mod, void *buffer)
 		loadmodel->numskins = 1;
 
 	loadmodel->type = mod_alias;
-	loadmodel->alias.aliastype = ALIASTYPE_ALIAS;
 	loadmodel->DrawSky = NULL;
-	loadmodel->Draw = R_Model_Alias_Draw;
-	loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume;
-	loadmodel->DrawLight = R_Model_Alias_DrawLight;
+	loadmodel->Draw = R_Q1BSP_Draw;
+	loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+	loadmodel->DrawLight = R_Q1BSP_DrawLight;
 	loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox;
 	loadmodel->flags = LittleLong(pinmodel->flags);
 	loadmodel->synctype = ST_RAND;
 
 	// set up some global info about the model
 	loadmodel->numframes = LittleLong(pinmodel->num_frames);
-	loadmodel->alias.aliasnum_meshes = LittleLong(pinmodel->num_meshes);
+	loadmodel->num_surfaces = LittleLong(pinmodel->num_meshes);
 
 	// make skinscenes for the skins (no groups)
 	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
@@ -902,78 +1045,98 @@ void Mod_IDP3_Load(model_t *mod, void *buffer)
 	}
 
 	// 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++)
+	loadmodel->num_tagframes = loadmodel->numframes;
+	loadmodel->num_tags = LittleLong(pinmodel->num_tags);
+	loadmodel->data_tags = Mem_Alloc(loadmodel->mempool, loadmodel->num_tagframes * loadmodel->num_tags * sizeof(aliastag_t));
+	for (i = 0, pintag = (md3tag_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->num_tagframes * loadmodel->num_tags;i++, pintag++)
 	{
-		strcpy(loadmodel->alias.aliasdata_tags[i].name, pintag->name);
-		Matrix4x4_CreateIdentity(&loadmodel->alias.aliasdata_tags[i].matrix);
+		strcpy(loadmodel->data_tags[i].name, pintag->name);
+		Matrix4x4_CreateIdentity(&loadmodel->data_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]);
+				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]);
 		}
-		//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);
+		//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);
 	}
 
 	// load meshes
-	loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_meshes * sizeof(aliasmesh_t));
-	for (i = 0, pinmesh = (md3mesh_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_meshes));i < loadmodel->alias.aliasnum_meshes;i++, pinmesh = (md3mesh_t *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_end)))
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
+	loadmodel->nummeshes = loadmodel->num_surfaces;
+	loadmodel->num_textures = loadmodel->num_surfaces;
+	data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
+	loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
+	loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *);
+	loadmodel->data_textures = (void *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t);
+	for (i = 0;i < loadmodel->num_surfaces;i++)
+	{
+		loadmodel->surfacelist[i] = i;
+		loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t);
+	}
+	for (i = 0, pinmesh = (md3mesh_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_meshes));i < loadmodel->num_surfaces;i++, pinmesh = (md3mesh_t *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_end)))
 	{
 		if (memcmp(pinmesh->identifier, "IDP3", 4))
 			Host_Error("Mod_IDP3_Load: invalid mesh identifier (not IDP3)\n");
-		mesh = loadmodel->alias.aliasdata_meshes + i;
-		mesh->num_skins = loadmodel->numskins;
-		mesh->num_frames = LittleLong(pinmesh->num_frames);
+		mesh = loadmodel->meshlist[i];
+		mesh->num_morphframes = LittleLong(pinmesh->num_frames);
 		mesh->num_vertices = LittleLong(pinmesh->num_vertices);
 		mesh->num_triangles = LittleLong(pinmesh->num_triangles);
-		mesh->data_skins = Mem_Alloc(loadmodel->mempool, mesh->num_skins * sizeof(aliasskin_t));
 		mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
 		mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
-		mesh->data_texcoord2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2]));
-		mesh->data_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;
+		mesh->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2]));
+		mesh->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * mesh->num_morphframes * sizeof(float[3]));
 		for (j = 0;j < mesh->num_triangles * 3;j++)
-			mesh->data_element3i[j] = LittleLong(((int *)((qbyte *)pinmesh + pinmesh->lump_elements))[j]);
+			mesh->data_element3i[j] = LittleLong(((int *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_elements)))[j]);
 		for (j = 0;j < mesh->num_vertices;j++)
 		{
-			mesh->data_texcoord2f[j * 2 + 0] = LittleFloat(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 0]);
-			mesh->data_texcoord2f[j * 2 + 1] = LittleFloat(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 1]);
+			mesh->data_texcoordtexture2f[j * 2 + 0] = LittleFloat(((float *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 0]);
+			mesh->data_texcoordtexture2f[j * 2 + 1] = LittleFloat(((float *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 1]);
 		}
-		for (j = 0;j < mesh->num_vertices * mesh->num_frames;j++)
+		for (j = 0;j < mesh->num_vertices * mesh->num_morphframes;j++)
 		{
-			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);
+			mesh->data_morphvertex3f[j * 3 + 0] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 0]) * (1.0f / 64.0f);
+			mesh->data_morphvertex3f[j * 3 + 1] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 1]) * (1.0f / 64.0f);
+			mesh->data_morphvertex3f[j * 3 + 2] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 2]) * (1.0f / 64.0f);
 		}
-		for (j = 0;j < mesh->num_frames;j++)
-			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);
 
 		Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__);
 		Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
+		Mod_Alias_Mesh_CompileFrameZero(mesh);
 
-		if (LittleLong(pinmesh->num_shaders) >= 1 && ((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);
+		if (LittleLong(pinmesh->num_shaders) >= 1)
+			Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, pinmesh->name, ((md3shader_t *)((qbyte *) pinmesh + LittleLong(pinmesh->lump_shaders)))->name);
 		else
-			for (j = 0;j < mesh->num_skins;j++)
-				Mod_BuildAliasSkinFromSkinFrame(mesh->data_skins + j, NULL);
+			for (j = 0;j < loadmodel->numskins;j++)
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i + j * loadmodel->num_surfaces, NULL);
+
+		surface = loadmodel->data_surfaces + i;
+		surface->groupmesh = mesh;
+		surface->texture = loadmodel->data_textures + i;
+		surface->num_firsttriangle = 0;
+		surface->num_triangles = mesh->num_triangles;
+		surface->num_firstvertex = 0;
+		surface->num_vertices = mesh->num_vertices;
 	}
 	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_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_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
 {
 	zymtype1header_t *pinmodel, *pheader;
 	qbyte *pbase;
+	int i, j, k, l, numposes, *bonecount, *vertbonecounts, count, *renderlist, *renderlistend, *outelements, *remapvertices;
+	float modelradius, corner[2], *poses, *intexcoord2f, *outtexcoord2f;
+	zymvertex_t *verts, *vertdata;
+	zymscene_t *scene;
+	zymbone_t *bone;
+	char *shadername;
+	skinfile_t *skinfiles;
+	qbyte *data;
+	msurface_t *surface;
+	surfmesh_t *mesh;
 
 	pinmodel = (void *)buffer;
 	pbase = buffer;
@@ -983,11 +1146,13 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
 		Host_Error ("Mod_ZYMOTICMODEL_Load: only type 1 (skeletal pose) models are currently supported (name = %s)\n", loadmodel->name);
 
 	loadmodel->type = mod_alias;
-	loadmodel->alias.aliastype = ALIASTYPE_ZYM;
 	loadmodel->DrawSky = NULL;
-	loadmodel->Draw = R_Model_Zymotic_Draw;
-	loadmodel->DrawShadowVolume = NULL;//R_Model_Zymotic_DrawShadowVolume;
-	loadmodel->DrawLight = NULL;//R_Model_Zymotic_DrawLight;
+	loadmodel->Draw = R_Q1BSP_Draw;
+	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->synctype = ST_RAND;
 
 	// byteswap header
 	pheader = pinmodel;
@@ -1000,11 +1165,11 @@ void Mod_ZYMOTICMODEL_Load(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->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->numverts = BigLong(pinmodel->numverts);
+	pheader->numtris = BigLong(pinmodel->numtris);
+	pheader->numshaders = BigLong(pinmodel->numshaders);
+	pheader->numbones = BigLong(pinmodel->numbones);
+	pheader->numscenes = BigLong(pinmodel->numscenes);
 	pheader->lump_scenes.start = BigLong(pinmodel->lump_scenes.start);
 	pheader->lump_scenes.length = BigLong(pinmodel->lump_scenes.length);
 	pheader->lump_poses.start = BigLong(pinmodel->lump_poses.start);
@@ -1024,188 +1189,234 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
 	pheader->lump_trizone.start = BigLong(pinmodel->lump_trizone.start);
 	pheader->lump_trizone.length = BigLong(pinmodel->lump_trizone.length);
 
-	loadmodel->flags = 0; // there are no flags
 	loadmodel->numframes = pheader->numscenes;
-	loadmodel->synctype = ST_SYNC;
-	//loadmodel->num_triangles = pheader->num_triangles;
-	//loadmodel->num_vertices = 0;
+	loadmodel->num_surfaces = pheader->numshaders;
+
+	skinfiles = Mod_LoadSkinFiles();
+	if (loadmodel->numskins < 1)
+		loadmodel->numskins = 1;
 
+	// make skinscenes for the skins (no groups)
+	loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
+	for (i = 0;i < loadmodel->numskins;i++)
 	{
-		unsigned int i;
-		float modelradius, corner[2];
-		// model bbox
-		modelradius = pheader->radius;
-		for (i = 0;i < 3;i++)
-		{
-			loadmodel->normalmins[i] = pheader->mins[i];
-			loadmodel->normalmaxs[i] = pheader->maxs[i];
-			loadmodel->rotatedmins[i] = -modelradius;
-			loadmodel->rotatedmaxs[i] = modelradius;
-		}
-		corner[0] = max(fabs(loadmodel->normalmins[0]), fabs(loadmodel->normalmaxs[0]));
-		corner[1] = max(fabs(loadmodel->normalmins[1]), fabs(loadmodel->normalmaxs[1]));
-		loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = sqrt(corner[0]*corner[0]+corner[1]*corner[1]);
-		if (loadmodel->yawmaxs[0] > modelradius)
-			loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelradius;
-		loadmodel->yawmins[0] = loadmodel->yawmins[1] = -loadmodel->yawmaxs[0];
-		loadmodel->yawmins[2] = loadmodel->normalmins[2];
-		loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2];
-		loadmodel->radius = modelradius;
-		loadmodel->radius2 = modelradius * modelradius;
+		loadmodel->skinscenes[i].firstframe = i;
+		loadmodel->skinscenes[i].framecount = 1;
+		loadmodel->skinscenes[i].loop = true;
+		loadmodel->skinscenes[i].framerate = 10;
 	}
 
+	// model bbox
+	modelradius = pheader->radius;
+	for (i = 0;i < 3;i++)
 	{
-		// FIXME: add shaders, and make them switchable shader sets and...
-		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->numskins = 1;
+		loadmodel->normalmins[i] = pheader->mins[i];
+		loadmodel->normalmaxs[i] = pheader->maxs[i];
+		loadmodel->rotatedmins[i] = -modelradius;
+		loadmodel->rotatedmaxs[i] = modelradius;
 	}
+	corner[0] = max(fabs(loadmodel->normalmins[0]), fabs(loadmodel->normalmaxs[0]));
+	corner[1] = max(fabs(loadmodel->normalmins[1]), fabs(loadmodel->normalmaxs[1]));
+	loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = sqrt(corner[0]*corner[0]+corner[1]*corner[1]);
+	if (loadmodel->yawmaxs[0] > modelradius)
+		loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelradius;
+	loadmodel->yawmins[0] = loadmodel->yawmins[1] = -loadmodel->yawmaxs[0];
+	loadmodel->yawmins[2] = loadmodel->normalmins[2];
+	loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2];
+	loadmodel->radius = modelradius;
+	loadmodel->radius2 = modelradius * modelradius;
 
 	// go through the lumps, swapping things
 
+	//zymlump_t lump_scenes; // zymscene_t scene[numscenes]; // name and other information for each scene (see zymscene struct)
+	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+	scene = (void *) (pheader->lump_scenes.start + pbase);
+	numposes = pheader->lump_poses.length / pheader->numbones / sizeof(float[3][4]);
+	for (i = 0;i < pheader->numscenes;i++)
 	{
-		int i, numposes;
-		zymscene_t *scene;
-	//	zymlump_t lump_scenes; // zymscene_t scene[numscenes]; // name and other information for each scene (see zymscene struct)
-		loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
-		scene = (void *) (pheader->lump_scenes.start + pbase);
-		numposes = pheader->lump_poses.length / pheader->numbones / sizeof(float[3][4]);
-		for (i = 0;i < pheader->numscenes;i++)
-		{
-			memcpy(loadmodel->animscenes[i].name, scene->name, 32);
-			loadmodel->animscenes[i].firstframe = BigLong(scene->start);
-			loadmodel->animscenes[i].framecount = BigLong(scene->length);
-			loadmodel->animscenes[i].framerate = BigFloat(scene->framerate);
-			loadmodel->animscenes[i].loop = (BigLong(scene->flags) & ZYMSCENEFLAG_NOLOOP) == 0;
-			if ((unsigned int) loadmodel->animscenes[i].firstframe >= (unsigned int) numposes)
-				Host_Error("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_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_ZYMOTICMODEL_Load: scene framerate (%f) < 0\n", loadmodel->animscenes[i].framerate);
-			scene++;
-		}
+		memcpy(loadmodel->animscenes[i].name, scene->name, 32);
+		loadmodel->animscenes[i].firstframe = BigLong(scene->start);
+		loadmodel->animscenes[i].framecount = BigLong(scene->length);
+		loadmodel->animscenes[i].framerate = BigFloat(scene->framerate);
+		loadmodel->animscenes[i].loop = (BigLong(scene->flags) & ZYMSCENEFLAG_NOLOOP) == 0;
+		if ((unsigned int) loadmodel->animscenes[i].firstframe >= (unsigned int) numposes)
+			Host_Error("%s scene->firstframe (%i) >= numposes (%i)\n", loadmodel->name, loadmodel->animscenes[i].firstframe, numposes);
+		if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > (unsigned int) numposes)
+			Host_Error("%s scene->firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->name, loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes);
+		if (loadmodel->animscenes[i].framerate < 0)
+			Host_Error("%s scene->framerate (%f) < 0\n", loadmodel->name, loadmodel->animscenes[i].framerate);
+		scene++;
 	}
 
+	//zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data
+	loadmodel->num_poses = pheader->lump_poses.length / sizeof(float[3][4]);
+	loadmodel->data_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->data_poses[i] = BigFloat(poses[i]);
+
+	//zymlump_t lump_bones; // zymbone_t bone[numbones];
+	loadmodel->num_bones = pheader->numbones;
+	loadmodel->data_bones = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(aliasbone_t));
+	bone = (void *) (pheader->lump_bones.start + pbase);
+	for (i = 0;i < pheader->numbones;i++)
 	{
-		int i;
-		float *poses;
-	//	zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data
-		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->alias.zymdata_poses[i] = BigFloat(poses[i]);
+		memcpy(loadmodel->data_bones[i].name, bone[i].name, sizeof(bone[i].name));
+		loadmodel->data_bones[i].flags = BigLong(bone[i].flags);
+		loadmodel->data_bones[i].parent = BigLong(bone[i].parent);
+		if (loadmodel->data_bones[i].parent >= i)
+			Host_Error("%s bone[%i].parent >= %i\n", loadmodel->name, i, i);
 	}
 
+	//zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better)
+	vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int));
+	bonecount = (void *) (pheader->lump_vertbonecounts.start + pbase);
+	for (i = 0;i < pheader->numverts;i++)
 	{
-		int i;
-		zymbone_t *bone;
-	//	zymlump_t lump_bones; // zymbone_t bone[numbones];
-		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->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);
-		}
+		vertbonecounts[i] = BigLong(bonecount[i]);
+		if (vertbonecounts[i] < 1)
+			Host_Error("%s bonecount[%i] < 1\n", loadmodel->name, i);
 	}
 
+	//zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct
+	verts = Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length);
+	vertdata = (void *) (pheader->lump_verts.start + pbase);
+	for (i = 0;i < pheader->lump_verts.length / (int) sizeof(zymvertex_t);i++)
 	{
-		int i, *bonecount;
-	//	zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better)
-		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->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);
-		}
+		verts[i].bonenum = BigLong(vertdata[i].bonenum);
+		verts[i].origin[0] = BigFloat(vertdata[i].origin[0]);
+		verts[i].origin[1] = BigFloat(vertdata[i].origin[1]);
+		verts[i].origin[2] = BigFloat(vertdata[i].origin[2]);
 	}
 
+	//zymlump_t lump_texcoords; // float texcoords[numvertices][2];
+	outtexcoord2f = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(float[2]));
+	intexcoord2f = (void *) (pheader->lump_texcoords.start + pbase);
+	for (i = 0;i < pheader->numverts;i++)
 	{
-		int i;
-		zymvertex_t *vertdata;
-	//	zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct
-		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->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]);
-		}
+		outtexcoord2f[i*2+0] = BigFloat(intexcoord2f[i*2+0]);
+		// flip T coordinate for OpenGL
+		outtexcoord2f[i*2+1] = 1 - BigFloat(intexcoord2f[i*2+1]);
 	}
 
+	//zymlump_t lump_trizone; // byte trizone[numtris]; // see trizone explanation
+	//loadmodel->alias.zymdata_trizone = Mem_Alloc(loadmodel->mempool, pheader->numtris);
+	//memcpy(loadmodel->alias.zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris);
+
+	loadmodel->nummodelsurfaces = loadmodel->num_surfaces;
+	loadmodel->nummeshes = loadmodel->num_surfaces;
+	loadmodel->num_textures = loadmodel->num_surfaces;
+	data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
+	loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t);
+	loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *);
+	loadmodel->data_textures = (void *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t);
+	for (i = 0;i < loadmodel->num_surfaces;i++)
 	{
-		int i;
-		float *intexcoord2f, *outtexcoord2f;
-	//	zymlump_t lump_texcoords; // float texcoords[numvertices][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++)
-		{
-			outtexcoord2f[i*2+0] = BigFloat(intexcoord2f[i*2+0]);
-			// flip T coordinate for OpenGL
-			outtexcoord2f[i*2+1] = 1 - BigFloat(intexcoord2f[i*2+1]);
-		}
+		loadmodel->surfacelist[i] = i;
+		loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t);
 	}
 
+	//zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model
+	//zymlump_t lump_render; // int renderlist[rendersize]; // sorted by shader with run lengths (int count), shaders are sequentially used, each run can be used with glDrawElements (each triangle is 3 int indices)
+	// byteswap, validate, and swap winding order of tris
+	count = pheader->numshaders * sizeof(int) + pheader->numtris * sizeof(int[3]);
+	if (pheader->lump_render.length != count)
+		Host_Error("%s renderlist is wrong size (%i bytes, should be %i bytes)\n", loadmodel->name, pheader->lump_render.length, count);
+	renderlist = (void *) (pheader->lump_render.start + pbase);
+	renderlistend = (void *) ((qbyte *) renderlist + pheader->lump_render.length);
+	for (i = 0;i < loadmodel->num_surfaces;i++)
 	{
-		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->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_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("%s corrupt renderlist (wrong size)\n", loadmodel->name);
+		count = BigLong(*renderlist);renderlist++;
+		if (renderlist + count * 3 > renderlistend || (i == pheader->numshaders - 1 && renderlist + count * 3 != renderlistend))
+			Host_Error("%s corrupt renderlist (wrong size)\n", loadmodel->name);
+		mesh = loadmodel->meshlist[i];
+		mesh->num_triangles = count;
+		mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
+		mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3]));
+		outelements = mesh->data_element3i;
+		for (j = 0;j < mesh->num_triangles;j++)
 		{
-			if (renderlist >= renderlistend)
-				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_ZYMOTICMODEL_Load: corrupt renderlist in %s (wrong size)\n", loadmodel->name);
-			*outrenderlist++ = count;
-			while (count--)
+			outelements[2] = BigLong(renderlist[0]);
+			outelements[1] = BigLong(renderlist[1]);
+			outelements[0] = BigLong(renderlist[2]);
+			if ((unsigned int)outelements[0] >= (unsigned int)pheader->numverts
+			 || (unsigned int)outelements[1] >= (unsigned int)pheader->numverts
+			 || (unsigned int)outelements[2] >= (unsigned int)pheader->numverts)
+				Host_Error("%s corrupt renderlist (out of bounds index)\n", loadmodel->name);
+			if (vertbonecounts[outelements[0]] == 0 || vertbonecounts[outelements[1]] == 0 || vertbonecounts[outelements[2]] == 0)
+				Host_Error("%s corrupt renderlist (references vertex with no bone weights\n", loadmodel->name);
+			renderlist += 3;
+			outelements += 3;
+		}
+		remapvertices = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int));
+		mesh->num_vertices = Mod_BuildVertexRemapTableFromElements(mesh->num_triangles * 3, mesh->data_element3i, pheader->numverts, remapvertices);
+		for (j = 0;j < mesh->num_triangles * 3;j++)
+			mesh->data_element3i[j] = remapvertices[mesh->data_element3i[j]];
+		Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
+		mesh->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2]));
+		for (j = 0;j < pheader->numverts;j++)
+		{
+			if (remapvertices[j] >= 0)
 			{
-				outrenderlist[2] = BigLong(renderlist[0]);
-				outrenderlist[1] = BigLong(renderlist[1]);
-				outrenderlist[0] = BigLong(renderlist[2]);
-				if ((unsigned int)outrenderlist[0] >= (unsigned int)pheader->numverts
-				 || (unsigned int)outrenderlist[1] >= (unsigned int)pheader->numverts
-				 || (unsigned int)outrenderlist[2] >= (unsigned int)pheader->numverts)
-					Host_Error("Mod_ZYMOTICMODEL_Load: corrupt renderlist in %s (out of bounds index)\n", loadmodel->name);
-				renderlist += 3;
-				outrenderlist += 3;
+				mesh->data_texcoordtexture2f[remapvertices[j]*2+0] = outtexcoord2f[j*2+0];
+				mesh->data_texcoordtexture2f[remapvertices[j]*2+1] = outtexcoord2f[j*2+1];
 			}
 		}
-	}
+		mesh->num_vertexboneweights = 0;
+		for (j = 0;j < pheader->numverts;j++)
+			if (remapvertices[j] >= 0)
+				mesh->num_vertexboneweights += vertbonecounts[remapvertices[j]];
+		mesh->data_vertexboneweights = Mem_Alloc(loadmodel->mempool, mesh->num_vertexboneweights * sizeof(surfmeshvertexboneweight_t));
+		mesh->num_vertexboneweights = 0;
+		// note this vertexboneweight ordering requires that the remapvertices array is sequential numbers (separated by -1 values for omitted vertices)
+		l = 0;
+		for (j = 0;j < pheader->numverts;j++)
+		{
+			if (remapvertices[j] < 0)
+			{
+				l += vertbonecounts[j];
+				continue;
+			}
+			for (k = 0;k < vertbonecounts[j];k++)
+			{
+				// this format really should have had a per vertexweight weight value...
+				mesh->data_vertexboneweights[mesh->num_vertexboneweights].vertexindex = remapvertices[j];
+				mesh->data_vertexboneweights[mesh->num_vertexboneweights].boneindex = verts[l].bonenum;
+				mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3] = 1.0f / vertbonecounts[j];
+				mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[0] = verts[l].origin[0] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3];
+				mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[1] = verts[l].origin[1] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3];
+				mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[2] = verts[l].origin[2] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3];
+				mesh->num_vertexboneweights++;
+				l++;
+			}
+		}
+		shadername = (char *) (pheader->lump_shaders.start + pbase) + i * 32;
+		// since zym models do not have named sections, reuse their shader
+		// name as the section name
+		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);
 
-	{
-		int i;
-		char *shadername;
-	//	zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model
-		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->alias.zymdata_textures[i] = loadtextureimage(loadmodel->texturepool, shadername + i * 32, 0, 0, true, TEXF_ALPHA | TEXF_PRECACHE | (r_mipskins.integer ? TEXF_MIPMAP : 0));
+		Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__);
+		Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
+		Mod_Alias_Mesh_CompileFrameZero(mesh);
+
+		surface = loadmodel->data_surfaces + i;
+		surface->groupmesh = mesh;
+		surface->texture = loadmodel->data_textures + i;
+		surface->num_firsttriangle = 0;
+		surface->num_triangles = mesh->num_triangles;
+		surface->num_firstvertex = 0;
+		surface->num_vertices = mesh->num_vertices;
 	}
 
-	{
-	//	zymlump_t lump_trizone; // byte trizone[numtris]; // see trizone explanation
-		loadmodel->alias.zymdata_trizone = Mem_Alloc(loadmodel->mempool, pheader->numtris);
-		memcpy(loadmodel->alias.zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris);
-	}
+	Mem_Free(vertbonecounts);
+	Mem_Free(verts);
+	Mem_Free(outtexcoord2f);
 }