X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_alias.c;h=f8625a8a3f26c0502a95e57316ce7942b6ca126e;hb=ff99e6f68a28da2ccd4c43b9df29adb813a9353f;hp=4488936f3dafeb8d636640aaa2dbfbe87650fa80;hpb=504abd5f0c89234ac3c4c4766bc0effbcefbf355;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.c b/model_alias.c
index 4488936f..f8625a8a 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)
@@ -149,11 +190,20 @@ 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)
 {
 	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;
@@ -212,12 +262,57 @@ void Mod_BuildAliasSkinFromSkinFrame(aliasskin_t *skin, skinframe_t *skinframe)
 	memcpy(skin->data_layers, mod_alias_layersbuffer, skin->num_layers * sizeof(aliaslayer_t));
 }
 
+void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_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++)
+		{
+			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);
+extern void R_Model_Alias_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap);
 void Mod_IDP0_Load(model_t *mod, void *buffer)
 {
 	int i, j, version, totalskins, skinwidth, skinheight, groupframes, groupskins, numverts;
@@ -234,9 +329,10 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 	char name[MAX_QPATH];
 	skinframe_t tempskinframe;
 	animscene_t *tempskinscenes;
-	skinframe_t *tempskinframes;
+	aliasskin_t *tempaliasskins;
 	float *vertst;
 	int *vertonseam, *vertremap;
+	skinfile_t *skinfiles;
 
 	datapointer = buffer;
 	pinmodel = (mdl_t *)datapointer;
@@ -251,23 +347,23 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 	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);
+	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
+	BOUNDI(loadmodel->alias.aliasdata_meshes->num_triangles,0,65536);
 	loadmodel->numframes = LittleLong(pinmodel->numframes);
 	BOUNDI(loadmodel->numframes,0,65536);
 	loadmodel->synctype = LittleLong (pinmodel->synctype);
@@ -333,89 +429,6 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 		}
 	}
 
-	// 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_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(loadmodel->skinframes + totalskins, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, true, false, true))
-				Mod_LoadSkinFrame_Internal(loadmodel->skinframes + totalskins, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | 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_CLAMP | 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;
-	}
-
-	loadmodel->alias.aliasdata_meshes->num_skins = 0;
-	for (i = 0;i < loadmodel->numskins;i++)
-		loadmodel->alias.aliasdata_meshes->num_skins += loadmodel->skinscenes[i].framecount;
-	loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t));
-
 	// 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]));
@@ -489,12 +502,107 @@ void Mod_IDP0_Load(model_t *mod, void *buffer)
 	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);
-	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_skins;i++)
-		Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, loadmodel->skinframes + i);
 	Mod_CalcAliasModelBBoxes();
 
 	Mem_Free(vertst);
 	Mem_Free(vertremap);
+
+	// 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, r_fullbrights.integer, (qbyte *)datapointer, skinwidth, skinheight);
+				Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe);
+				datapointer += skinwidth * skinheight;
+				totalskins++;
+			}
+		}
+		// check for skins that don't exist in the model, but do exist as external images
+		// (this was added because yummyluv kept pestering me about support for it)
+		while (Mod_LoadSkinFrame(&tempskinframe, va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, 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, float *out3f, int numverts, int *vertremap)
@@ -527,6 +635,8 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 		float st[2];
 	}
 	*hash, **md2verthash, *md2verthashdata;
+	skinframe_t tempskinframe;
+	skinfile_t *skinfiles;
 
 	pinmodel = buffer;
 	base = buffer;
@@ -540,29 +650,29 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 	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)
 		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;
@@ -581,21 +691,37 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 
 	// load the skins
 	inskin = (void*)(base + LittleLong(pinmodel->ofs_skins));
-	if (loadmodel->numskins)
+	if ((skinfiles = Mod_LoadSkinFiles()))
+	{
+		loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins;
+		loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(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->skinframes = Mem_Alloc(loadmodel->mempool, sizeof(skinframe_t) * loadmodel->numskins);
+		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)
-			Mod_LoadSkinFrame(loadmodel->skinframes + i, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true);
+		{
+			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->skinframes = Mem_Alloc(loadmodel->mempool, sizeof(skinframe_t) * loadmodel->numskins);
+		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->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->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins);
 	for (i = 0;i < loadmodel->numskins;i++)
@@ -606,7 +732,6 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 		loadmodel->skinscenes[i].framerate = 10;
 	}
 
-
 	// load the triangles and stvert data
 	inst = (void*)(base + LittleLong(pinmodel->ofs_st));
 	intri = (void*)(base + LittleLong(pinmodel->ofs_tris));
@@ -716,8 +841,6 @@ void Mod_IDP2_Load(model_t *mod, void *buffer)
 
 	loadmodel->alias.aliasdata_meshes->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3]));
 	Mod_BuildTriangleNeighbors(loadmodel->alias.aliasdata_meshes->data_neighbor3i, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles);
-	for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_skins;i++)
-		Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, loadmodel->skinframes + i);
 	Mod_CalcAliasModelBBoxes();
 }
 
@@ -729,7 +852,7 @@ void Mod_IDP3_Load(model_t *mod, void *buffer)
 	md3mesh_t *pinmesh;
 	md3tag_t *pintag;
 	aliasmesh_t *mesh;
-	skinframe_t tempskinframe;
+	skinfile_t *skinfiles;
 
 	pinmodel = buffer;
 
@@ -740,25 +863,33 @@ void Mod_IDP3_Load(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->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->alias.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;
+
+	// 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));
@@ -775,16 +906,17 @@ void Mod_IDP3_Load(model_t *mod, void *buffer)
 	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++, pinframe++)
+	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[k][j] = LittleLong(pintag->rotationmatrix[j * 3 + k]);
-			loadmodel->alias.aliasdata_tags[i].matrix.m[j][3] = LittleLong(pintag->origin[j]);
+				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
@@ -810,8 +942,8 @@ void Mod_IDP3_Load(model_t *mod, void *buffer)
 			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++)
 		{
@@ -822,21 +954,23 @@ void Mod_IDP3_Load(model_t *mod, void *buffer)
 		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);
 
-		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_CLAMP | 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);
+extern void R_Model_Zymotic_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap);
 void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
 {
 	zymtype1header_t *pinmodel, *pheader;
@@ -853,7 +987,6 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
 	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;
 
@@ -895,8 +1028,8 @@ void Mod_ZYMOTICMODEL_Load(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;
@@ -924,12 +1057,11 @@ void Mod_ZYMOTICMODEL_Load(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;
 	}
 
@@ -1077,3 +1209,4 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer)
 		memcpy(loadmodel->alias.zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris);
 	}
 }
+