X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=edf096aaeba004612a3ee13bca1f0f15cca08705;hb=3f8d33fc8db41690c62d18d670e366cdf0c16713;hp=4f046300aab2bffedb9222bf16621418ec2d94b0;hpb=8055d6b002a425841cac4cd6ea97b4a2b0691404;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.c b/model_shared.c
index 4f046300..edf096aa 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0", "mipmaps model skins so they render faster in the distance and do not display noise artifacts, can cause discoloration of skins if they contain undesirable border colors"};
 
-model_t *loadmodel;
+dp_model_t *loadmodel;
 
 static mempool_t *mod_mempool;
 static memexpandablearray_t models;
@@ -50,30 +50,38 @@ static q3shader_data_t* q3shader_data;
 
 static void mod_start(void)
 {
-	int i;
+	int i, count;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
-
-	// parse the Q3 shader files
-	Mod_LoadQ3Shaders();
+	dp_model_t *mod;
 
+	SCR_PushLoadingScreen(false, "Loading models", 1.0);
+	count = 0;
+	for (i = 0;i < nummodels;i++)
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*')
+			if (mod->used)
+				++count;
 	for (i = 0;i < nummodels;i++)
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*')
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*')
 			if (mod->used)
-				Mod_LoadModel(mod, true, false, mod->isworldmodel);
+			{
+				SCR_PushLoadingScreen(true, mod->name, 1.0 / count);
+				Mod_LoadModel(mod, true, false);
+				SCR_PopLoadingScreen(false);
+			}
+	SCR_PopLoadingScreen(false);
 }
 
 static void mod_shutdown(void)
 {
 	int i;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
+	dp_model_t *mod;
 
 	for (i = 0;i < nummodels;i++)
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && (mod->loaded || mod->mempool))
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && (mod->loaded || mod->mempool))
 			Mod_UnloadModel(mod);
 
-	Mem_FreePool (&q3shaders_mem);
+	Mod_FreeQ3Shaders();
 }
 
 static void mod_newmap(void)
@@ -81,12 +89,12 @@ static void mod_newmap(void)
 	msurface_t *surface;
 	int i, j, k, surfacenum, ssize, tsize;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
+	dp_model_t *mod;
 
 	R_SkinFrame_PrepareForPurge();
 	for (i = 0;i < nummodels;i++)
 	{
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_textures)
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_textures)
 		{
 			for (j = 0;j < mod->num_textures;j++)
 			{
@@ -104,7 +112,7 @@ static void mod_newmap(void)
 
 	for (i = 0;i < nummodels;i++)
 	{
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_surfaces)
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_surfaces)
 		{
 			for (surfacenum = 0, surface = mod->data_surfaces;surfacenum < mod->num_surfaces;surfacenum++, surface++)
 			{
@@ -113,7 +121,7 @@ static void mod_newmap(void)
 					ssize = (surface->lightmapinfo->extents[0] >> 4) + 1;
 					tsize = (surface->lightmapinfo->extents[1] >> 4) + 1;
 					memset(surface->lightmapinfo->stainsamples, 255, ssize * tsize * 3);
-					surface->cached_dlight = true;
+					mod->brushq1.lightmapupdateflags[surfacenum] = true;
 				}
 			}
 		}
@@ -127,11 +135,12 @@ Mod_Init
 */
 static void Mod_Print(void);
 static void Mod_Precache (void);
+static void Mod_Decompile_f(void);
 static void Mod_BuildVBOs(void);
 void Mod_Init (void)
 {
 	mod_mempool = Mem_AllocPool("modelinfo", 0, NULL);
-	Mem_ExpandableArray_NewArray(&models, mod_mempool, sizeof(model_t), 16);
+	Mem_ExpandableArray_NewArray(&models, mod_mempool, sizeof(dp_model_t), 16);
 
 	Mod_BrushInit();
 	Mod_AliasInit();
@@ -140,6 +149,7 @@ void Mod_Init (void)
 	Cvar_RegisterVariable(&r_mipskins);
 	Cmd_AddCommand ("modellist", Mod_Print, "prints a list of loaded models");
 	Cmd_AddCommand ("modelprecache", Mod_Precache, "load a model");
+	Cmd_AddCommand ("modeldecompile", Mod_Decompile_f, "exports a model in several formats for editing purposes");
 }
 
 void Mod_RenderInit(void)
@@ -147,30 +157,136 @@ void Mod_RenderInit(void)
 	R_RegisterModule("Models", mod_start, mod_shutdown, mod_newmap);
 }
 
-void Mod_UnloadModel (model_t *mod)
+void Mod_UnloadModel (dp_model_t *mod)
 {
 	char name[MAX_QPATH];
-	qboolean isworldmodel;
 	qboolean used;
+	dp_model_t *parentmodel;
+
+	if (developer_loading.integer)
+		Con_Printf("unloading model %s\n", mod->name);
+
 	strlcpy(name, mod->name, sizeof(name));
-	isworldmodel = mod->isworldmodel;
+	parentmodel = mod->brush.parentmodel;
 	used = mod->used;
-	if (mod->surfmesh.ebo)
-		R_Mesh_DestroyBufferObject(mod->surfmesh.ebo);
+	if (mod->surfmesh.ebo3i)
+		R_Mesh_DestroyBufferObject(mod->surfmesh.ebo3i);
+	if (mod->surfmesh.ebo3s)
+		R_Mesh_DestroyBufferObject(mod->surfmesh.ebo3s);
 	if (mod->surfmesh.vbo)
 		R_Mesh_DestroyBufferObject(mod->surfmesh.vbo);
 	// free textures/memory attached to the model
 	R_FreeTexturePool(&mod->texturepool);
 	Mem_FreePool(&mod->mempool);
 	// clear the struct to make it available
-	memset(mod, 0, sizeof(model_t));
+	memset(mod, 0, sizeof(dp_model_t));
 	// restore the fields we want to preserve
 	strlcpy(mod->name, name, sizeof(mod->name));
-	mod->isworldmodel = isworldmodel;
+	mod->brush.parentmodel = parentmodel;
 	mod->used = used;
 	mod->loaded = false;
 }
 
+void R_Model_Null_Draw(entity_render_t *ent)
+{
+	return;
+}
+
+
+typedef void (*mod_framegroupify_parsegroups_t) (unsigned int i, int start, int len, float fps, qboolean loop, void *pass);
+
+int Mod_FrameGroupify_ParseGroups(const char *buf, mod_framegroupify_parsegroups_t cb, void *pass)
+{
+	const char *bufptr;
+	int start, len;
+	float fps;
+	unsigned int i;
+	qboolean loop;
+
+	bufptr = buf;
+	i = 0;
+	for(;;)
+	{
+		// an anim scene!
+		if (!COM_ParseToken_Simple(&bufptr, true, false))
+			break;
+		if (!strcmp(com_token, "\n"))
+			continue; // empty line
+		start = atoi(com_token);
+		if (!COM_ParseToken_Simple(&bufptr, true, false))
+			break;
+		if (!strcmp(com_token, "\n"))
+		{
+			Con_Printf("framegroups file: missing number of frames\n");
+			continue;
+		}
+		len = atoi(com_token);
+		if (!COM_ParseToken_Simple(&bufptr, true, false))
+			break;
+		// we default to looping as it's usually wanted, so to NOT loop you append a 0
+		if (strcmp(com_token, "\n"))
+		{
+			fps = atof(com_token);
+			if (!COM_ParseToken_Simple(&bufptr, true, false))
+				break;
+			if (strcmp(com_token, "\n"))
+				loop = atoi(com_token);
+			else
+				loop = true;
+		}
+		else
+		{
+			fps = 20;
+			loop = true;
+		}
+
+		if(cb)
+			cb(i, start, len, fps, loop, pass);
+		++i;
+	}
+
+	return i;
+}
+
+void Mod_FrameGroupify_ParseGroups_Count (unsigned int i, int start, int len, float fps, qboolean loop, void *pass)
+{
+	unsigned int *cnt = (unsigned int *) pass;
+	++*cnt;
+}
+
+void Mod_FrameGroupify_ParseGroups_Store (unsigned int i, int start, int len, float fps, qboolean loop, void *pass)
+{
+	dp_model_t *mod = (dp_model_t *) pass;
+	animscene_t *anim = &mod->animscenes[i];
+	dpsnprintf(anim->name, sizeof(anim[i].name), "groupified_%d", i);
+	anim->firstframe = bound(0, start, mod->num_poses - 1);
+	anim->framecount = bound(1, len, mod->num_poses - anim->firstframe);
+	anim->framerate = max(1, fps);
+	anim->loop = !!loop;
+	//Con_Printf("frame group %d is %d %d %f %d\n", i, start, len, fps, loop);
+}
+
+void Mod_FrameGroupify(dp_model_t *mod, const char *buf)
+{
+	unsigned int cnt;
+
+	// 0. count
+	cnt = Mod_FrameGroupify_ParseGroups(buf, NULL, NULL);
+	if(!cnt)
+	{
+		Con_Printf("no scene found in framegroups file, aborting\n");
+		return;
+	}
+	mod->numframes = cnt;
+
+	// 1. reallocate
+	// (we do not free the previous animscenes, but model unloading will free the pool owning them, so it's okay)
+	mod->animscenes = (animscene_t *) Mem_Alloc(mod->mempool, sizeof(animscene_t) * mod->numframes);
+
+	// 2. parse
+	Mod_FrameGroupify_ParseGroups(buf, Mod_FrameGroupify_ParseGroups_Store, mod);
+}
+
 /*
 ==================
 Mod_LoadModel
@@ -178,7 +294,7 @@ Mod_LoadModel
 Loads a model
 ==================
 */
-model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel)
+dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk)
 {
 	int num;
 	unsigned int crc;
@@ -189,18 +305,46 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea
 
 	if (mod->name[0] == '*') // submodel
 		return mod;
+	
+	if (!strcmp(mod->name, "null"))
+	{
+		if(mod->loaded)
+			return mod;
+
+		if (mod->loaded || mod->mempool)
+			Mod_UnloadModel(mod);
+
+		if (developer_loading.integer)
+			Con_Printf("loading model %s\n", mod->name);
+
+		mod->used = true;
+		mod->crc = -1;
+		mod->loaded = false;
+
+		VectorClear(mod->normalmins);
+		VectorClear(mod->normalmaxs);
+		VectorClear(mod->yawmins);
+		VectorClear(mod->yawmaxs);
+		VectorClear(mod->rotatedmins);
+		VectorClear(mod->rotatedmaxs);
+
+		mod->modeldatatypestring = "null";
+		mod->type = mod_null;
+		mod->Draw = R_Model_Null_Draw;
+		mod->numframes = 2;
+		mod->numskins = 1;
+
+		// no fatal errors occurred, so this model is ready to use.
+		mod->loaded = true;
+
+		return mod;
+	}
 
 	crc = 0;
 	buf = NULL;
 
 	// even if the model is loaded it still may need reloading...
 
-	// if the model is a worldmodel and is being referred to as a
-	// non-worldmodel here, then it needs reloading to get rid of the
-	// submodels
-	if (mod->isworldmodel != isworldmodel)
-		mod->loaded = false;
-
 	// if it is not loaded or checkdisk is true we need to calculate the crc
 	if (!mod->loaded || checkdisk)
 	{
@@ -224,13 +368,16 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea
 		return mod;
 	}
 
-	Con_DPrintf("loading model %s\n", mod->name);
+	if (developer_loading.integer)
+		Con_Printf("loading model %s\n", mod->name);
+	
+	SCR_PushLoadingScreen(true, mod->name, 1);
+
 	// LordHavoc: unload the existing model in this slot (if there is one)
 	if (mod->loaded || mod->mempool)
 		Mod_UnloadModel(mod);
 
 	// load the model
-	mod->isworldmodel = isworldmodel;
 	mod->used = true;
 	mod->crc = crc;
 	// errors can prevent the corresponding mod->loaded = true;
@@ -245,15 +392,9 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea
 	VectorSet(mod->rotatedmins, -mod->radius, -mod->radius, -mod->radius);
 	VectorSet(mod->rotatedmaxs, mod->radius, mod->radius, mod->radius);
 
-	// if we're loading a worldmodel, then this is a level change
-	if (mod->isworldmodel)
+	if (!q3shaders_mem)
 	{
-		// clear out any stale submodels or worldmodels lying around
-		// if we did this clear before now, an error might abort loading and
-		// leave things in a bad state
-		Mod_RemoveStaleWorldModels(mod);
-		// reload q3 shaders, to make sure they are ready to go for this level
-		// (including any models loaded for this level)
+		// load q3 shaders for the first time, or after a level change
 		Mod_LoadQ3Shaders();
 	}
 
@@ -267,7 +408,8 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea
 		num = LittleLong(*((int *)buf));
 		// call the apropriate loader
 		loadmodel = mod;
-		     if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf, bufend);
+		     if (!strcasecmp(FS_FileExtension(mod->name), "obj")) Mod_OBJ_Load(mod, buf, bufend);
+		else if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf, bufend);
 		else if (!memcmp(buf, "IDP2", 4)) Mod_IDP2_Load(mod, buf, bufend);
 		else if (!memcmp(buf, "IDP3", 4)) Mod_IDP3_Load(mod, buf, bufend);
 		else if (!memcmp(buf, "IDSP", 4)) Mod_IDSP_Load(mod, buf, bufend);
@@ -276,22 +418,31 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea
 		else if (!memcmp(buf, "ZYMOTICMODEL", 12)) Mod_ZYMOTICMODEL_Load(mod, buf, bufend);
 		else if (!memcmp(buf, "DARKPLACESMODEL", 16)) Mod_DARKPLACESMODEL_Load(mod, buf, bufend);
 		else if (!memcmp(buf, "ACTRHEAD", 8)) Mod_PSKMODEL_Load(mod, buf, bufend);
-		else if (strlen(mod->name) >= 4 && !strcmp(mod->name - 4, ".map")) Mod_MAP_Load(mod, buf, bufend);
-		else if (!memcmp(buf, "MCBSPpad", 8)) Mod_Q1BSP_Load(mod, buf, bufend);
+		else if (strlen(mod->name) >= 4 && !strcmp(mod->name + strlen(mod->name) - 4, ".map")) Mod_MAP_Load(mod, buf, bufend);
 		else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf, bufend);
 		else Con_Printf("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name);
 		Mem_Free(buf);
 
-		Mod_BuildVBOs();
+		buf = FS_LoadFile (va("%s.framegroups", mod->name), tempmempool, false, &filesize);
+		if(buf)
+		{
+			Mod_FrameGroupify(mod, buf);
+			Mem_Free(buf);
+		}
 
-		// no fatal errors occurred, so this model is ready to use.
-		mod->loaded = true;
+		Mod_BuildVBOs();
 	}
 	else if (crash)
 	{
 		// LordHavoc: Sys_Error was *ANNOYING*
 		Con_Printf ("Mod_LoadModel: %s not found\n", mod->name);
 	}
+
+	// no fatal errors occurred, so this model is ready to use.
+	mod->loaded = true;
+
+	SCR_PopLoadingScreen(false);
+
 	return mod;
 }
 
@@ -299,9 +450,9 @@ void Mod_ClearUsed(void)
 {
 	int i;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
+	dp_model_t *mod;
 	for (i = 0;i < nummodels;i++)
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0])
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0])
 			mod->used = false;
 }
 
@@ -309,10 +460,10 @@ void Mod_PurgeUnused(void)
 {
 	int i;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
+	dp_model_t *mod;
 	for (i = 0;i < nummodels;i++)
 	{
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !mod->used)
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !mod->used)
 		{
 			Mod_UnloadModel(mod);
 			Mem_ExpandableArray_FreeRecord(&models, mod);
@@ -320,34 +471,25 @@ void Mod_PurgeUnused(void)
 	}
 }
 
-// only used during loading!
-void Mod_RemoveStaleWorldModels(model_t *skip)
-{
-	int i;
-	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
-	for (i = 0;i < nummodels;i++)
-	{
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->isworldmodel && mod->loaded && skip != mod)
-		{
-			Mod_UnloadModel(mod);
-			mod->isworldmodel = false;
-			mod->used = false;
-		}
-	}
-}
-
 /*
 ==================
 Mod_FindName
 
 ==================
 */
-model_t *Mod_FindName(const char *name)
+dp_model_t *Mod_FindName(const char *name, const char *parentname)
 {
 	int i;
-	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
+	int nummodels;
+	dp_model_t *mod;
+
+	if (!parentname)
+		parentname = "";
+
+	// if we're not dedicatd, the renderer calls will crash without video
+	Host_StartVideo();
+
+	nummodels = Mem_ExpandableArray_IndexRange(&models);
 
 	if (!name[0])
 		Host_Error ("Mod_ForName: NULL name");
@@ -355,7 +497,7 @@ model_t *Mod_FindName(const char *name)
 	// search the currently loaded models
 	for (i = 0;i < nummodels;i++)
 	{
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !strcmp(mod->name, name))
+		if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !strcmp(mod->name, name) && ((!mod->brush.parentmodel && !parentname[0]) || (mod->brush.parentmodel && parentname[0] && !strcmp(mod->brush.parentmodel->name, parentname))))
 		{
 			mod->used = true;
 			return mod;
@@ -363,8 +505,12 @@ model_t *Mod_FindName(const char *name)
 	}
 
 	// no match found, create a new one
-	mod = Mem_ExpandableArray_AllocRecord(&models);
+	mod = (dp_model_t *) Mem_ExpandableArray_AllocRecord(&models);
 	strlcpy(mod->name, name, sizeof(mod->name));
+	if (parentname[0])
+		mod->brush.parentmodel = Mod_FindName(parentname, NULL);
+	else
+		mod->brush.parentmodel = NULL;
 	mod->loaded = false;
 	mod->used = true;
 	return mod;
@@ -377,12 +523,12 @@ Mod_ForName
 Loads in a model for the given name
 ==================
 */
-model_t *Mod_ForName(const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel)
+dp_model_t *Mod_ForName(const char *name, qboolean crash, qboolean checkdisk, const char *parentname)
 {
-	model_t *model;
-	model = Mod_FindName(name);
-	if (model->name[0] != '*' && (!model->loaded || checkdisk))
-		Mod_LoadModel(model, crash, checkdisk, isworldmodel);
+	dp_model_t *model;
+	model = Mod_FindName(name, parentname);
+	if (!model->loaded || checkdisk)
+		Mod_LoadModel(model, crash, checkdisk);
 	return model;
 }
 
@@ -395,12 +541,23 @@ Reloads all models if they have changed
 */
 void Mod_Reload(void)
 {
-	int i;
+	int i, count;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
+	dp_model_t *mod;
+
+	SCR_PushLoadingScreen(false, "Reloading models", 1.0);
+	count = 0;
 	for (i = 0;i < nummodels;i++)
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used)
-			Mod_LoadModel(mod, true, true, mod->isworldmodel);
+		if ((mod = (dp_model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used)
+			++count;
+	for (i = 0;i < nummodels;i++)
+		if ((mod = (dp_model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used)
+		{
+			SCR_PushLoadingScreen(true, mod->name, 1.0 / count);
+			Mod_LoadModel(mod, true, true);
+			SCR_PopLoadingScreen(false);
+		}
+	SCR_PopLoadingScreen(false);
 }
 
 unsigned char *mod_base;
@@ -417,12 +574,19 @@ static void Mod_Print(void)
 {
 	int i;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	model_t *mod;
+	dp_model_t *mod;
 
 	Con_Print("Loaded models:\n");
 	for (i = 0;i < nummodels;i++)
-		if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0])
-			Con_Printf("%4iK %s\n", mod->mempool ? (int)((mod->mempool->totalsize + 1023) / 1024) : 0, mod->name);
+	{
+		if ((mod = (dp_model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*')
+		{
+			if (mod->brush.numsubmodels)
+				Con_Printf("%4iK %s (%i submodels)\n", mod->mempool ? (int)((mod->mempool->totalsize + 1023) / 1024) : 0, mod->name, mod->brush.numsubmodels);
+			else
+				Con_Printf("%4iK %s\n", mod->mempool ? (int)((mod->mempool->totalsize + 1023) / 1024) : 0, mod->name);
+		}
+	}
 }
 
 /*
@@ -433,7 +597,7 @@ Mod_Precache
 static void Mod_Precache(void)
 {
 	if (Cmd_Argc() == 2)
-		Mod_ForName(Cmd_Argv(1), false, true, cl.worldmodel && !strcasecmp(Cmd_Argv(1), cl.worldmodel->name));
+		Mod_ForName(Cmd_Argv(1), false, true, Cmd_Argv(1)[0] == '*' ? cl.model_name[1] : NULL);
 	else
 		Con_Print("usage: modelprecache <filename>\n");
 }
@@ -515,6 +679,9 @@ void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtria
 				match = -1;
 			n[p] = match;
 		}
+
+		// also send a keepalive here (this can take a while too!)
+		CL_KeepaliveMessage(false);
 	}
 	// free the allocated buffer
 	if (edgehashentries != edgehashentriesbuffer)
@@ -747,7 +914,7 @@ void Mod_BuildTextureVectorsFromNormals(int firstvertex, int numvertices, int nu
 void Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors)
 {
 	unsigned char *data;
-	data = (unsigned char *)Mem_Alloc(mempool, numvertices * (3 + 3 + 3 + 3 + 2 + 2 + (vertexcolors ? 4 : 0)) * sizeof(float) + numvertices * (lightmapoffsets ? 1 : 0) * sizeof(int) + numtriangles * (3 + (neighbors ? 3 : 0)) * sizeof(int));
+	data = (unsigned char *)Mem_Alloc(mempool, numvertices * (3 + 3 + 3 + 3 + 2 + 2 + (vertexcolors ? 4 : 0)) * sizeof(float) + numvertices * (lightmapoffsets ? 1 : 0) * sizeof(int) + numtriangles * (3 + (neighbors ? 3 : 0)) * sizeof(int) + (numvertices <= 65536 ? numtriangles * sizeof(unsigned short[3]) : 0));
 	loadmodel->surfmesh.num_vertices = numvertices;
 	loadmodel->surfmesh.num_triangles = numtriangles;
 	if (loadmodel->surfmesh.num_vertices)
@@ -768,6 +935,8 @@ void Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qb
 		loadmodel->surfmesh.data_element3i = (int *)data, data += sizeof(int[3]) * loadmodel->surfmesh.num_triangles;
 		if (neighbors)
 			loadmodel->surfmesh.data_neighbor3i = (int *)data, data += sizeof(int[3]) * loadmodel->surfmesh.num_triangles;
+		if (loadmodel->surfmesh.num_vertices <= 65536)
+			loadmodel->surfmesh.data_element3s = (unsigned short *)data, data += sizeof(unsigned short[3]) * loadmodel->surfmesh.num_triangles;
 	}
 }
 
@@ -781,6 +950,8 @@ shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtria
 	if (light)
 		size += maxverts * sizeof(float[11]);
 	size += maxtriangles * sizeof(int[3]);
+	if (maxverts <= 65536)
+		size += maxtriangles * sizeof(unsigned short[3]);
 	if (neighbors)
 		size += maxtriangles * sizeof(int[3]);
 	if (expandable)
@@ -813,6 +984,8 @@ shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtria
 		newmesh->vertexhashtable = (shadowmeshvertexhash_t **)data;data += SHADOWMESHVERTEXHASH * sizeof(shadowmeshvertexhash_t *);
 		newmesh->vertexhashentries = (shadowmeshvertexhash_t *)data;data += maxverts * sizeof(shadowmeshvertexhash_t);
 	}
+	if (maxverts <= 65536)
+		newmesh->element3s = (unsigned short *)data;data += maxtriangles * sizeof(unsigned short[3]);
 	return newmesh;
 }
 
@@ -929,10 +1102,16 @@ void Mod_ShadowMesh_AddMesh(mempool_t *mempool, shadowmesh_t *mesh, rtexture_t *
 		}
 		Mod_ShadowMesh_AddTriangle(mempool, mesh, map_diffuse, map_specular, map_normal, vbuf);
 	}
+
+	// the triangle calculation can take a while, so let's do a keepalive here
+	CL_KeepaliveMessage(false);
 }
 
 shadowmesh_t *Mod_ShadowMesh_Begin(mempool_t *mempool, int maxverts, int maxtriangles, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, int light, int neighbors, int expandable)
 {
+	// the preparation before shadow mesh initialization can take a while, so let's do a keepalive here
+	CL_KeepaliveMessage(false);
+
 	return Mod_ShadowMesh_Alloc(mempool, maxverts, maxtriangles, map_diffuse, map_specular, map_normal, light, neighbors, expandable);
 }
 
@@ -943,7 +1122,12 @@ static void Mod_ShadowMesh_CreateVBOs(shadowmesh_t *mesh)
 
 	// element buffer is easy because it's just one array
 	if (mesh->numtriangles)
-		mesh->ebo = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, mesh->element3i, mesh->numtriangles * sizeof(int[3]), "shadowmesh");
+	{
+		if (mesh->element3s)
+			mesh->ebo3s = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, mesh->element3s, mesh->numtriangles * sizeof(unsigned short[3]), "shadowmesh");
+		else
+			mesh->ebo3i = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, mesh->element3i, mesh->numtriangles * sizeof(unsigned int[3]), "shadowmesh");
+	}
 
 	// vertex buffer is several arrays and we put them in the same buffer
 	//
@@ -983,11 +1167,21 @@ shadowmesh_t *Mod_ShadowMesh_Finish(mempool_t *mempool, shadowmesh_t *firstmesh,
 			newmesh = Mod_ShadowMesh_ReAlloc(mempool, mesh, light, neighbors);
 			newmesh->next = firstmesh;
 			firstmesh = newmesh;
+			if (newmesh->element3s)
+			{
+				int i;
+				for (i = 0;i < newmesh->numtriangles*3;i++)
+					newmesh->element3s[i] = newmesh->element3i[i];
+			}
 			if (createvbo)
 				Mod_ShadowMesh_CreateVBOs(newmesh);
 		}
 		Mem_Free(mesh);
 	}
+
+	// this can take a while, so let's do a keepalive here
+	CL_KeepaliveMessage(false);
+
 	return firstmesh;
 }
 
@@ -1045,8 +1239,10 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh)
 	shadowmesh_t *nextmesh;
 	for (;mesh;mesh = nextmesh)
 	{
-		if (mesh->ebo)
-			R_Mesh_DestroyBufferObject(mesh->ebo);
+		if (mesh->ebo3i)
+			R_Mesh_DestroyBufferObject(mesh->ebo3i);
+		if (mesh->ebo3s)
+			R_Mesh_DestroyBufferObject(mesh->ebo3s);
 		if (mesh->vbo)
 			R_Mesh_DestroyBufferObject(mesh->vbo);
 		nextmesh = mesh->next;
@@ -1129,18 +1325,9 @@ q3wavefunc_t Mod_LoadQ3Shaders_EnumerateWaveFunc(const char *s)
 	return Q3WAVEFUNC_NONE;
 }
 
-static void Q3Shaders_Clear()
+void Mod_FreeQ3Shaders(void)
 {
-	/* Just clear out everything... */
-	Mem_FreePool (&q3shaders_mem);
-	/* ...and alloc the structs again. */
-	q3shaders_mem = Mem_AllocPool("q3shaders", 0, NULL);
-	q3shader_data = (q3shader_data_t*)Mem_Alloc (q3shaders_mem,
-		sizeof (q3shader_data_t));
-	Mem_ExpandableArray_NewArray (&q3shader_data->hash_entries, 
-		q3shaders_mem, sizeof (q3shader_hash_entry_t), 256);
-	Mem_ExpandableArray_NewArray (&q3shader_data->char_ptrs,
-		q3shaders_mem, sizeof (char**), 256);
+	Mem_FreePool(&q3shaders_mem);
 }
 
 static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
@@ -1152,7 +1339,14 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
 	{
 		if (strcasecmp (entry->shader.name, shader->name) == 0)
 		{
-			Con_Printf("Shader '%s' already defined\n", shader->name);
+			unsigned char *start, *end, *start2;
+			start = (unsigned char *) (&shader->Q3SHADERINFO_COMPARE_START);
+			end = ((unsigned char *) (&shader->Q3SHADERINFO_COMPARE_END)) + sizeof(shader->Q3SHADERINFO_COMPARE_END);
+			start2 = (unsigned char *) (&entry->shader.Q3SHADERINFO_COMPARE_START);
+			if(memcmp(start, start2, end - start))
+				Con_Printf("Shader '%s' already defined, ignoring mismatching redeclaration\n", shader->name);
+			else
+				Con_DPrintf("Shader '%s' already defined\n", shader->name);
 			return;
 		}
 		lastEntry = entry;
@@ -1165,7 +1359,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
 			/* Add to chain */
 			q3shader_hash_entry_t* newEntry = (q3shader_hash_entry_t*)
 			  Mem_ExpandableArray_AllocRecord (&q3shader_data->hash_entries);
-        		
+
 			while (lastEntry->chain != NULL) lastEntry = lastEntry->chain;
 			lastEntry->chain = newEntry;
 			newEntry->chain = NULL;
@@ -1177,6 +1371,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
 	memcpy (&entry->shader, shader, sizeof (q3shaderinfo_t));
 }
 
+extern cvar_t r_picmipworld;
 void Mod_LoadQ3Shaders(void)
 {
 	int j;
@@ -1189,7 +1384,15 @@ void Mod_LoadQ3Shaders(void)
 	int numparameters;
 	char parameter[TEXTURE_MAXFRAMES + 4][Q3PATHLENGTH];
 
-	Q3Shaders_Clear();
+	Mod_FreeQ3Shaders();
+
+	q3shaders_mem = Mem_AllocPool("q3shaders", 0, NULL);
+	q3shader_data = (q3shader_data_t*)Mem_Alloc (q3shaders_mem,
+		sizeof (q3shader_data_t));
+	Mem_ExpandableArray_NewArray (&q3shader_data->hash_entries,
+		q3shaders_mem, sizeof (q3shader_hash_entry_t), 256);
+	Mem_ExpandableArray_NewArray (&q3shader_data->char_ptrs,
+		q3shaders_mem, sizeof (char**), 256);
 
 	search = FS_Search("scripts/*.shader", true, false);
 	if (!search)
@@ -1208,6 +1411,7 @@ void Mod_LoadQ3Shaders(void)
 			Vector4Set(shader.refractcolor4f, 1, 1, 1, 1);
 			shader.reflectfactor = 1;
 			Vector4Set(shader.reflectcolor4f, 1, 1, 1, 1);
+			shader.r_water_wateralpha = 1;
 
 			strlcpy(shader.name, com_token, sizeof(shader.name));
 			if (!COM_ParseToken_QuakeC(&text, false) || strcasecmp(com_token, "{"))
@@ -1332,7 +1536,7 @@ void Mod_LoadQ3Shaders(void)
 							int i;
 							layer->numframes = min(numparameters - 2, TEXTURE_MAXFRAMES);
 							layer->framerate = atof(parameter[1]);
-							layer->texturename = Mem_Alloc (q3shaders_mem, sizeof (char*) * layer->numframes);
+							layer->texturename = (char **) Mem_Alloc (q3shaders_mem, sizeof (char*) * layer->numframes);
 							for (i = 0;i < layer->numframes;i++)
 								layer->texturename[i] = Mem_strdup (q3shaders_mem, parameter[i + 2]);
 						}
@@ -1374,7 +1578,7 @@ void Mod_LoadQ3Shaders(void)
 							else if (!strcasecmp(parameter[1], "vertex"))           layer->alphagen.alphagen = Q3ALPHAGEN_VERTEX;
 							else if (!strcasecmp(parameter[1], "wave"))
 							{
-								layer->alphagen.alphagen = Q3RGBGEN_WAVE;
+								layer->alphagen.alphagen = Q3ALPHAGEN_WAVE;
 								layer->alphagen.wavefunc = Mod_LoadQ3Shaders_EnumerateWaveFunc(parameter[2]);
 								for (i = 0;i < numparameters - 3 && i < Q3WAVEPARMS;i++)
 									layer->alphagen.waveparms[i] = atof(parameter[i+3]);
@@ -1419,6 +1623,7 @@ void Mod_LoadQ3Shaders(void)
 								else if (!strcasecmp(parameter[1], "rotate"))          layer->tcmods[tcmodindex].tcmod = Q3TCMOD_ROTATE;
 								else if (!strcasecmp(parameter[1], "scale"))           layer->tcmods[tcmodindex].tcmod = Q3TCMOD_SCALE;
 								else if (!strcasecmp(parameter[1], "scroll"))          layer->tcmods[tcmodindex].tcmod = Q3TCMOD_SCROLL;
+								else if (!strcasecmp(parameter[1], "page"))            layer->tcmods[tcmodindex].tcmod = Q3TCMOD_PAGE;
 								else if (!strcasecmp(parameter[1], "stretch"))
 								{
 									layer->tcmods[tcmodindex].tcmod = Q3TCMOD_STRETCH;
@@ -1452,6 +1657,13 @@ void Mod_LoadQ3Shaders(void)
 							shader.textureblendalpha = true;
 						}
 					}
+					layer->texflags = TEXF_ALPHA | TEXF_PRECACHE;
+					if (!(shader.surfaceparms & Q3SURFACEPARM_NOMIPMAPS))
+						layer->texflags |= TEXF_MIPMAP;
+					if (!(shader.textureflags & Q3TEXTUREFLAG_NOPICMIP))
+						layer->texflags |= TEXF_PICMIP | TEXF_COMPRESS;
+					if (layer->clampmap)
+						layer->texflags |= TEXF_CLAMP;
 					continue;
 				}
 				numparameters = 0;
@@ -1547,6 +1759,10 @@ void Mod_LoadQ3Shaders(void)
 					else
 						Con_DPrintf("%s parsing warning: unknown surfaceparm \"%s\"\n", search->filenames[fileindex], parameter[1]);
 				}
+				else if (!strcasecmp(parameter[0], "dpshadow"))
+					shader.dpshadow = true;
+				else if (!strcasecmp(parameter[0], "dpnoshadow"))
+					shader.dpnoshadow = true;
 				else if (!strcasecmp(parameter[0], "sky") && numparameters >= 2)
 				{
 					// some q3 skies don't have the sky parm set
@@ -1583,7 +1799,7 @@ void Mod_LoadQ3Shaders(void)
 					shader.reflectfactor = atof(parameter[1]);
 					Vector4Set(shader.reflectcolor4f, atof(parameter[2]), atof(parameter[3]), atof(parameter[4]), atof(parameter[5]));
 				}
-				else if (!strcasecmp(parameter[0], "dp_water") && numparameters >= 11)
+				else if (!strcasecmp(parameter[0], "dp_water") && numparameters >= 12)
 				{
 					shader.textureflags |= Q3TEXTUREFLAG_WATERSHADER;
 					shader.reflectmin = atof(parameter[1]);
@@ -1592,6 +1808,7 @@ void Mod_LoadQ3Shaders(void)
 					shader.reflectfactor = atof(parameter[4]);
 					Vector4Set(shader.refractcolor4f, atof(parameter[5]), atof(parameter[6]), atof(parameter[7]), 1);
 					Vector4Set(shader.reflectcolor4f, atof(parameter[8]), atof(parameter[9]), atof(parameter[10]), 1);
+					shader.r_water_wateralpha = atof(parameter[11]);
 				}
 				else if (!strcasecmp(parameter[0], "deformvertexes") && numparameters >= 2)
 				{
@@ -1633,26 +1850,29 @@ void Mod_LoadQ3Shaders(void)
 					}
 				}
 			}
-			// identify if this is a blended terrain shader or similar
+			// pick the primary layer to render with
 			if (shader.numlayers)
 			{
 				shader.backgroundlayer = -1;
 				shader.primarylayer = 0;
-				if ((shader.layers[0].blendfunc[0] == GL_ONE       && shader.layers[0].blendfunc[1] == GL_ZERO                && !shader.layers[0].alphatest)
-				&& ((shader.layers[1].blendfunc[0] == GL_SRC_ALPHA && shader.layers[1].blendfunc[1] == GL_ONE_MINUS_SRC_ALPHA && !shader.layers[0].alphatest)
-				||  (shader.layers[1].blendfunc[0] == GL_ONE       && shader.layers[1].blendfunc[1] == GL_ZERO                &&  shader.layers[1].alphatest)))
-				{
-					// terrain blending or other effects
-					shader.backgroundlayer = 0;
-					shader.primarylayer = 1;
-				}
-				// now see if the lightmap came first, and if so choose the second texture instead
+				// if lightmap comes first this is definitely an ordinary texture
+				// if the first two layers have the correct blendfuncs and use vertex alpha, it is a blended terrain shader
 				if ((shader.layers[shader.primarylayer].texturename != NULL)
 				  && !strcasecmp(shader.layers[shader.primarylayer].texturename[0], "$lightmap"))
 				{
 					shader.backgroundlayer = -1;
 					shader.primarylayer = 1;
 				}
+				else if (shader.numlayers >= 2
+				&&   shader.layers[1].alphagen.alphagen == Q3ALPHAGEN_VERTEX
+				&&  (shader.layers[0].blendfunc[0] == GL_ONE       && shader.layers[0].blendfunc[1] == GL_ZERO                && !shader.layers[0].alphatest)
+				&& ((shader.layers[1].blendfunc[0] == GL_SRC_ALPHA && shader.layers[1].blendfunc[1] == GL_ONE_MINUS_SRC_ALPHA)
+				||  (shader.layers[1].blendfunc[0] == GL_ONE       && shader.layers[1].blendfunc[1] == GL_ZERO                &&  shader.layers[1].alphatest)))
+				{
+					// terrain blending or other effects
+					shader.backgroundlayer = 0;
+					shader.primarylayer = 1;
+				}
 			}
 			// fix up multiple reflection types
 			if(shader.textureflags & Q3TEXTUREFLAG_WATERSHADER)
@@ -1666,8 +1886,12 @@ void Mod_LoadQ3Shaders(void)
 
 q3shaderinfo_t *Mod_LookupQ3Shader(const char *name)
 {
-	unsigned short hash = CRC_Block_CaseInsensitive ((const unsigned char *)name, strlen (name));
-	q3shader_hash_entry_t* entry = q3shader_data->hash + (hash % Q3SHADER_HASH_SIZE);
+	unsigned short hash;
+	q3shader_hash_entry_t* entry;
+	if (!q3shaders_mem)
+		Mod_LoadQ3Shaders();
+	hash = CRC_Block_CaseInsensitive ((const unsigned char *)name, strlen (name));
+	entry = q3shader_data->hash + (hash % Q3SHADER_HASH_SIZE);
 	while (entry != NULL)
 	{
 		if (strcasecmp (entry->shader.name, name) == 0)
@@ -1677,25 +1901,35 @@ q3shaderinfo_t *Mod_LookupQ3Shader(const char *name)
 	return NULL;
 }
 
-extern cvar_t r_picmipworld;
-qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean q1bsp, qboolean q3bsp, qboolean md3)
+qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean warnmissing, qboolean fallback, int defaulttexflags)
 {
 	int j;
-	int texflags;
+	int texflagsmask;
 	qboolean success = true;
 	q3shaderinfo_t *shader;
+	if (!name)
+		name = "";
 	strlcpy(texture->name, name, sizeof(texture->name));
 	shader = name[0] ? Mod_LookupQ3Shader(name) : NULL;
+
+	texflagsmask = ~0;
+	if(!(defaulttexflags & TEXF_PICMIP))
+		texflagsmask &= ~TEXF_PICMIP;
+	if(!(defaulttexflags & TEXF_COMPRESS))
+		texflagsmask &= ~TEXF_COMPRESS;
+
 	if (shader)
 	{
-		if (developer.integer >= 100)
-			Con_DPrintf("%s: loaded shader for %s\n", loadmodel->name, name);
+		if (developer_loading.integer)
+			Con_Printf("%s: loaded shader for %s\n", loadmodel->name, name);
 		texture->surfaceparms = shader->surfaceparms;
-		texture->textureflags = shader->textureflags;
-		texture->basematerialflags = 0;
+
+		// allow disabling of picmip or compression by defaulttexflags
+		texture->textureflags = shader->textureflags & texflagsmask;
+
 		if (shader->surfaceparms & Q3SURFACEPARM_SKY)
 		{
-			texture->basematerialflags |= MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW;
+			texture->basematerialflags = MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW;
 			if (shader->skyboxname[0])
 			{
 				// quake3 seems to append a _ to the skybox name, so this must do so as well
@@ -1703,21 +1937,16 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
 			}
 		}
 		else if ((texture->surfaceflags & Q3SURFACEFLAG_NODRAW) || shader->numlayers == 0)
-			texture->basematerialflags |= MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
-		else if (shader->surfaceparms & Q3SURFACEPARM_LAVA)
-			texture->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOSHADOW;
-		else if (shader->surfaceparms & Q3SURFACEPARM_SLIME)
-			texture->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_WATERALPHA | MATERIALFLAG_NOSHADOW;
-		else if (shader->surfaceparms & Q3SURFACEPARM_WATER)
-			texture->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_WATERALPHA | MATERIALFLAG_NOSHADOW;
+			texture->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
 		else
-			texture->basematerialflags |= MATERIALFLAG_WALL;
+			texture->basematerialflags = MATERIALFLAG_WALL;
+
 		if (shader->layers[0].alphatest)
 			texture->basematerialflags |= MATERIALFLAG_ALPHATEST | MATERIALFLAG_NOSHADOW;
 		if (shader->textureflags & Q3TEXTUREFLAG_TWOSIDED)
 			texture->basematerialflags |= MATERIALFLAG_NOSHADOW | MATERIALFLAG_NOCULLFACE;
 		if (shader->textureflags & Q3TEXTUREFLAG_POLYGONOFFSET)
-			texture->basepolygonoffset -= 2;
+			texture->biaspolygonoffset -= 2;
 		if (shader->textureflags & Q3TEXTUREFLAG_REFRACTION)
 			texture->basematerialflags |= MATERIALFLAG_REFRACTION;
 		if (shader->textureflags & Q3TEXTUREFLAG_REFLECTION)
@@ -1778,14 +2007,11 @@ nothing                GL_ZERO GL_ONE
 			texture->skinframerate = primarylayer->framerate;
 			for (j = 0;j < primarylayer->numframes;j++)
 			{
-				texflags = TEXF_ALPHA | TEXF_PRECACHE;
-				if (!(shader->surfaceparms & Q3SURFACEPARM_NOMIPMAPS))
-					texflags |= TEXF_MIPMAP;
-				if (!(shader->textureflags & Q3TEXTUREFLAG_NOPICMIP) && ((!q1bsp && !q3bsp) || r_picmipworld.integer))
-					texflags |= TEXF_PICMIP | TEXF_COMPRESS;
-				if (primarylayer->clampmap)
-					texflags |= TEXF_CLAMP;
-				if (!(texture->skinframes[j] = R_SkinFrame_LoadExternal(primarylayer->texturename[j], texflags, false)))
+				if(cls.state == ca_dedicated)
+				{
+					texture->skinframes[j] = NULL;
+				}
+				else if (!(texture->skinframes[j] = R_SkinFrame_LoadExternal(primarylayer->texturename[j], primarylayer->texflags & texflagsmask, false)))
 				{
 					Con_Printf("^1%s:^7 could not load texture ^3\"%s\"^7 (frame %i) for shader ^2\"%s\"\n", loadmodel->name, primarylayer->texturename[j], j, texture->name);
 					texture->skinframes[j] = R_SkinFrame_LoadMissing();
@@ -1795,17 +2021,28 @@ nothing                GL_ZERO GL_ONE
 		if (shader->backgroundlayer >= 0)
 		{
 			q3shaderinfo_layer_t* backgroundlayer = shader->layers + shader->backgroundlayer;
+			// copy over one secondarylayer parameter
+			memcpy(texture->backgroundtcmods, backgroundlayer->tcmods, sizeof(texture->backgroundtcmods));
+			// load the textures
 			texture->backgroundnumskinframes = backgroundlayer->numframes;
 			texture->backgroundskinframerate = backgroundlayer->framerate;
 			for (j = 0;j < backgroundlayer->numframes;j++)
 			{
-				if (!(texture->backgroundskinframes[j] = R_SkinFrame_LoadExternal(backgroundlayer->texturename[j], ((shader->surfaceparms & Q3SURFACEPARM_NOMIPMAPS) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | ((!r_picmipworld.integer || (shader->textureflags & Q3TEXTUREFLAG_NOPICMIP)) ? 0 : (TEXF_PICMIP | TEXF_COMPRESS)) | (backgroundlayer->clampmap ? TEXF_CLAMP : 0), false)))
+				if(cls.state == ca_dedicated)
 				{
-					Con_Printf("^1%s:^7 could not load texture ^3\"%s\"^7 (frame %i) for shader ^2\"%s\"\n", loadmodel->name, backgroundlayer->texturename[j], j, texture->name);
+					texture->skinframes[j] = NULL;
+				}
+				else if (!(texture->backgroundskinframes[j] = R_SkinFrame_LoadExternal(backgroundlayer->texturename[j], backgroundlayer->texflags & texflagsmask, false)))
+				{
+					Con_Printf("^1%s:^7 could not load texture ^3\"%s\"^7 (background frame %i) for shader ^2\"%s\"\n", loadmodel->name, backgroundlayer->texturename[j], j, texture->name);
 					texture->backgroundskinframes[j] = R_SkinFrame_LoadMissing();
 				}
 			}
 		}
+		if (shader->dpshadow)
+			texture->basematerialflags &= ~MATERIALFLAG_NOSHADOW;
+		if (shader->dpnoshadow)
+			texture->basematerialflags |= MATERIALFLAG_NOSHADOW;
 		memcpy(texture->deforms, shader->deforms, sizeof(texture->deforms));
 		texture->reflectmin = shader->reflectmin;
 		texture->reflectmax = shader->reflectmax;
@@ -1813,18 +2050,25 @@ nothing                GL_ZERO GL_ONE
 		Vector4Copy(shader->refractcolor4f, texture->refractcolor4f);
 		texture->reflectfactor = shader->reflectfactor;
 		Vector4Copy(shader->reflectcolor4f, texture->reflectcolor4f);
+		texture->r_water_wateralpha = shader->r_water_wateralpha;
+	}
+	else if (!strcmp(texture->name, "noshader") || !texture->name[0])
+	{
+		if (developer.integer >= 100)
+			Con_Printf("^1%s:^7 using fallback noshader material for ^3\"%s\"\n", loadmodel->name, name);
+		texture->surfaceparms = 0;
 	}
-	else if (!strcmp(texture->name, "noshader"))
+	else if (!strcmp(texture->name, "common/nodraw") || !strcmp(texture->name, "textures/common/nodraw"))
 	{
 		if (developer.integer >= 100)
-			Con_DPrintf("%s: using default handler for %s\n", loadmodel->name, name);
+			Con_Printf("^1%s:^7 using fallback nodraw material for ^3\"%s\"\n", loadmodel->name, name);
 		texture->surfaceparms = 0;
+		texture->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
 	}
 	else
 	{
-		success = false;
-		if (developer.integer >= 100 || loadmodel->type == mod_brushq3)
-			Con_DPrintf("%s: No shader found for texture \"%s\"\n", loadmodel->name, texture->name);
+		if (developer.integer >= 100)
+			Con_Printf("^1%s:^7 No shader found for texture ^3\"%s\"\n", loadmodel->name, texture->name);
 		texture->surfaceparms = 0;
 		if (texture->surfaceflags & Q3SURFACEFLAG_NODRAW)
 			texture->basematerialflags |= MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
@@ -1833,9 +2077,28 @@ nothing                GL_ZERO GL_ONE
 		else
 			texture->basematerialflags |= MATERIALFLAG_WALL;
 		texture->numskinframes = 1;
-		if (!(texture->skinframes[0] = R_SkinFrame_LoadExternal(texture->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false)))
-			if(developer.integer || q3bsp) // only the Q3BSP path provides no alternative (like loading image directly, or internal texture)
-				Con_Printf("^1%s:^7 could not load texture for missing shader ^3\"%s\"\n", loadmodel->name, texture->name);
+		if(cls.state == ca_dedicated)
+		{
+			texture->skinframes[0] = NULL;
+		}
+		else
+		{
+			if (fallback)
+			{
+				qboolean has_alpha;
+				if ((texture->skinframes[0] = R_SkinFrame_LoadExternal_CheckAlpha(texture->name, defaulttexflags, false, &has_alpha)))
+				{
+					if(has_alpha && (defaulttexflags & TEXF_ALPHA))
+						texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+				}
+				else
+					success = false;
+			}
+			else
+				success = false;
+			if (!success && warnmissing)
+				Con_Printf("^1%s:^7 could not load texture ^3\"%s\"\n", loadmodel->name, texture->name);
+		}
 	}
 	// init the animation variables
 	texture->currentframe = texture;
@@ -1850,14 +2113,12 @@ nothing                GL_ZERO GL_ONE
 
 skinfile_t *Mod_LoadSkinFiles(void)
 {
-	int i, words, numtags, line, tagsetsused = false, wordsoverflow;
+	int i, words, line, wordsoverflow;
 	char *text;
 	const char *data;
 	skinfile_t *skinfile = NULL, *first = NULL;
 	skinfileitem_t *skinfileitem;
 	char word[10][MAX_QPATH];
-	overridetagnameset_t tagsets[MAX_SKINS];
-	overridetagname_t tags[256];
 
 /*
 sample file:
@@ -1874,12 +2135,9 @@ tag_head,
 tag_weapon,
 tag_torso,
 */
-	memset(tagsets, 0, sizeof(tagsets));
 	memset(word, 0, sizeof(word));
 	for (i = 0;i < MAX_SKINS && (data = text = (char *)FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true, NULL));i++)
 	{
-		numtags = 0;
-
 		// If it's the first file we parse
 		if (skinfile == NULL)
 		{
@@ -1920,7 +2178,8 @@ tag_torso,
 			{
 				if (words == 3)
 				{
-					Con_DPrintf("Mod_LoadSkinFiles: parsed mesh \"%s\" shader replacement \"%s\"\n", word[1], word[2]);
+					if (developer_loading.integer)
+						Con_Printf("Mod_LoadSkinFiles: parsed mesh \"%s\" shader replacement \"%s\"\n", word[1], word[2]);
 					skinfileitem = (skinfileitem_t *)Mem_Alloc(loadmodel->mempool, sizeof(skinfileitem_t));
 					skinfileitem->next = skinfile->items;
 					skinfile->items = skinfileitem;
@@ -1930,18 +2189,16 @@ tag_torso,
 				else
 					Con_Printf("Mod_LoadSkinFiles: parsing error in file \"%s_%i.skin\" on line #%i: wrong number of parameters to command \"%s\", see documentation in DP_GFX_SKINFILES extension in dpextensions.qc\n", loadmodel->name, i, line, word[0]);
 			}
-			else if (words == 2 && !strcmp(word[1], ","))
+			else if (words >= 2 && !strncmp(word[0], "tag_", 4))
 			{
 				// tag name, like "tag_weapon,"
-				Con_DPrintf("Mod_LoadSkinFiles: parsed tag #%i \"%s\"\n", numtags, word[0]);
-				memset(tags + numtags, 0, sizeof(tags[numtags]));
-				strlcpy (tags[numtags].name, word[0], sizeof (tags[numtags].name));
-				numtags++;
+				// not used for anything (not even in Quake3)
 			}
-			else if (words == 3 && !strcmp(word[1], ","))
+			else if (words >= 2 && !strcmp(word[1], ","))
 			{
 				// mesh shader name, like "U_RArm,models/players/Legoman/BikerA1.tga"
-				Con_DPrintf("Mod_LoadSkinFiles: parsed mesh \"%s\" shader replacement \"%s\"\n", word[0], word[2]);
+				if (developer_loading.integer)
+					Con_Printf("Mod_LoadSkinFiles: parsed mesh \"%s\" shader replacement \"%s\"\n", word[0], word[2]);
 				skinfileitem = (skinfileitem_t *)Mem_Alloc(loadmodel->mempool, sizeof(skinfileitem_t));
 				skinfileitem->next = skinfile->items;
 				skinfile->items = skinfileitem;
@@ -1952,21 +2209,6 @@ tag_torso,
 				Con_Printf("Mod_LoadSkinFiles: parsing error in file \"%s_%i.skin\" on line #%i: does not look like tag or mesh specification, or replace command, see documentation in DP_GFX_SKINFILES extension in dpextensions.qc\n", loadmodel->name, i, line);
 		}
 		Mem_Free(text);
-
-		if (numtags)
-		{
-			overridetagnameset_t *t;
-			t = tagsets + i;
-			t->num_overridetagnames = numtags;
-			t->data_overridetagnames = (overridetagname_t *)Mem_Alloc(loadmodel->mempool, t->num_overridetagnames * sizeof(overridetagname_t));
-			memcpy(t->data_overridetagnames, tags, t->num_overridetagnames * sizeof(overridetagname_t));
-			tagsetsused = true;
-		}
-	}
-	if (tagsetsused)
-	{
-		loadmodel->data_overridetagnamesforskin = (overridetagnameset_t *)Mem_Alloc(loadmodel->mempool, i * sizeof(overridetagnameset_t));
-		memcpy(loadmodel->data_overridetagnamesforskin, tagsets, i * sizeof(overridetagnameset_t));
 	}
 	if (i)
 		loadmodel->numskins = i;
@@ -2007,23 +2249,20 @@ void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float
 int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f)
 {
 	int i, outtriangles;
-	float d, edgedir[3], temp[3];
+	float edgedir1[3], edgedir2[3], temp[3];
 	// a degenerate triangle is one with no width (thickness, surface area)
 	// these are characterized by having all 3 points colinear (along a line)
 	// or having two points identical
+	// the simplest check is to calculate the triangle's area
 	for (i = 0, outtriangles = 0;i < numtriangles;i++, inelement3i += 3)
 	{
 		// calculate first edge
-		VectorSubtract(vertex3f + inelement3i[1] * 3, vertex3f + inelement3i[0] * 3, edgedir);
-		if (VectorLength2(edgedir) < 0.0001f)
-			continue; // degenerate first edge (no length)
-		VectorNormalize(edgedir);
-		// check if third point is on the edge (colinear)
-		d = -DotProduct(vertex3f + inelement3i[2] * 3, edgedir);
-		VectorMA(vertex3f + inelement3i[2] * 3, d, edgedir, temp);
-		if (VectorLength2(temp) < 0.0001f)
-			continue; // third point colinear with first edge
-		// valid triangle (no colinear points, no duplicate points)
+		VectorSubtract(vertex3f + inelement3i[1] * 3, vertex3f + inelement3i[0] * 3, edgedir1);
+		VectorSubtract(vertex3f + inelement3i[2] * 3, vertex3f + inelement3i[0] * 3, edgedir2);
+		CrossProduct(edgedir1, edgedir2, temp);
+		if (VectorLength2(temp) < 0.001f)
+			continue; // degenerate triangle (no area)
+		// valid triangle (has area)
 		VectorCopy(inelement3i, outelement3i);
 		outelement3i += 3;
 		outtriangles++;
@@ -2053,6 +2292,39 @@ void Mod_VertexRangeFromElements(int numelements, const int *elements, int *firs
 		*lastvertexpointer = lastvertex;
 }
 
+void Mod_MakeSortedSurfaces(dp_model_t *mod)
+{
+	// make an optimal set of texture-sorted batches to draw...
+	int j, t;
+	int *firstsurfacefortexture;
+	int *numsurfacesfortexture;
+	if (!mod->sortedmodelsurfaces)
+		mod->sortedmodelsurfaces = (int *) Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->sortedmodelsurfaces));
+	firstsurfacefortexture = (int *) Mem_Alloc(tempmempool, mod->num_textures * sizeof(*firstsurfacefortexture));
+	numsurfacesfortexture = (int *) Mem_Alloc(tempmempool, mod->num_textures * sizeof(*numsurfacesfortexture));
+	memset(numsurfacesfortexture, 0, mod->num_textures * sizeof(*numsurfacesfortexture));
+	for (j = 0;j < mod->nummodelsurfaces;j++)
+	{
+		const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface;
+		int t = (int)(surface->texture - mod->data_textures);
+		numsurfacesfortexture[t]++;
+	}
+	j = 0;
+	for (t = 0;t < mod->num_textures;t++)
+	{
+		firstsurfacefortexture[t] = j;
+		j += numsurfacesfortexture[t];
+	}
+	for (j = 0;j < mod->nummodelsurfaces;j++)
+	{
+		const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface;
+		int t = (int)(surface->texture - mod->data_textures);
+		mod->sortedmodelsurfaces[firstsurfacefortexture[t]++] = j + mod->firstmodelsurface;
+	}
+	Mem_Free(firstsurfacefortexture);
+	Mem_Free(numsurfacesfortexture);
+}
+
 static void Mod_BuildVBOs(void)
 {
 	if (!gl_support_arb_vertex_buffer_object)
@@ -2060,7 +2332,17 @@ static void Mod_BuildVBOs(void)
 
 	// element buffer is easy because it's just one array
 	if (loadmodel->surfmesh.num_triangles)
-		loadmodel->surfmesh.ebo = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles * sizeof(int[3]), loadmodel->name);
+	{
+		if (loadmodel->surfmesh.data_element3s)
+		{
+			int i;
+			for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+				loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+			loadmodel->surfmesh.ebo3s = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, loadmodel->surfmesh.data_element3s, loadmodel->surfmesh.num_triangles * sizeof(unsigned short[3]), loadmodel->name);
+		}
+		else
+			loadmodel->surfmesh.ebo3i = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles * sizeof(unsigned int[3]), loadmodel->name);
+	}
 
 	// vertex buffer is several arrays and we put them in the same buffer
 	//
@@ -2091,3 +2373,404 @@ static void Mod_BuildVBOs(void)
 		Mem_Free(mem);
 	}
 }
+
+static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const char *mtlfilename, const char *originalfilename)
+{
+	int vertexindex, surfaceindex, triangleindex, textureindex, countvertices = 0, countsurfaces = 0, countfaces = 0, counttextures = 0;
+	int a, b, c;
+	const char *texname;
+	const int *e;
+	const float *v, *vn, *vt;
+	size_t l;
+	size_t outbufferpos = 0;
+	size_t outbuffermax = 0x100000;
+	char *outbuffer = (char *) Z_Malloc(outbuffermax), *oldbuffer;
+	const msurface_t *surface;
+	const int maxtextures = 256;
+	char *texturenames = (char *) Z_Malloc(maxtextures * MAX_QPATH);
+
+	// construct the mtllib file
+	l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "# mtllib for %s exported by darkplaces engine\n", originalfilename);
+	if (l > 0)
+		outbufferpos += l;
+	for (surfaceindex = 0, surface = model->data_surfaces;surfaceindex < model->num_surfaces;surfaceindex++, surface++)
+	{
+		countsurfaces++;
+		countvertices += surface->num_vertices;
+		countfaces += surface->num_triangles;
+		texname = (surface->texture && surface->texture->name[0]) ? surface->texture->name : "default";
+		for (textureindex = 0;textureindex < maxtextures && texturenames[textureindex*MAX_QPATH];textureindex++)
+			if (!strcmp(texturenames + textureindex * MAX_QPATH, texname))
+				break;
+		if (textureindex >= maxtextures)
+			continue; // just a precaution
+		if (counttextures < textureindex + 1)
+			counttextures = textureindex + 1;
+		strlcpy(texturenames + textureindex * MAX_QPATH, texname, MAX_QPATH);
+		if (outbufferpos >= outbuffermax >> 1)
+		{
+			outbuffermax *= 2;
+			oldbuffer = outbuffer;
+			outbuffer = (char *) Z_Malloc(outbuffermax);
+			memcpy(outbuffer, oldbuffer, outbufferpos);
+			Z_Free(oldbuffer);
+		}
+		l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "newmtl %s\nNs 96.078431\nKa 0 0 0\nKd 0.64 0.64 0.64\nKs 0.5 0.5 0.5\nNi 1\nd 1\nillum 2\nmap_Kd %s%s\n\n", texname, texname, strstr(texname, ".tga") ? "" : ".tga");
+		if (l > 0)
+			outbufferpos += l;
+	}
+
+	// write the mtllib file
+	FS_WriteFile(mtlfilename, outbuffer, outbufferpos);
+	outbufferpos = 0;
+
+	// construct the obj file
+	l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "# model exported from %s by darkplaces engine\n# %i vertices, %i faces, %i surfaces\nmtllib %s\n", originalfilename, countvertices, countfaces, countsurfaces, mtlfilename);
+	if (l > 0)
+		outbufferpos += l;
+	for (vertexindex = 0, v = model->surfmesh.data_vertex3f, vn = model->surfmesh.data_normal3f, vt = model->surfmesh.data_texcoordtexture2f;vertexindex < model->surfmesh.num_vertices;vertexindex++, v += 3, vn += 3, vt += 2)
+	{
+		if (outbufferpos >= outbuffermax >> 1)
+		{
+			outbuffermax *= 2;
+			oldbuffer = outbuffer;
+			outbuffer = (char *) Z_Malloc(outbuffermax);
+			memcpy(outbuffer, oldbuffer, outbufferpos);
+			Z_Free(oldbuffer);
+		}
+		l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "v %f %f %f\nvn %f %f %f\nvt %f %f\n", v[0], v[2], -v[1], vn[0], vn[2], -vn[1], vt[0], 1-vt[1]);
+		if (l > 0)
+			outbufferpos += l;
+	}
+	for (surfaceindex = 0, surface = model->data_surfaces;surfaceindex < model->num_surfaces;surfaceindex++, surface++)
+	{
+		l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "usemtl %s\n", (surface->texture && surface->texture->name[0]) ? surface->texture->name : "default");
+		if (l > 0)
+			outbufferpos += l;
+		for (triangleindex = 0, e = model->surfmesh.data_element3i + surface->num_firsttriangle * 3;triangleindex < surface->num_triangles;triangleindex++, e += 3)
+		{
+			if (outbufferpos >= outbuffermax >> 1)
+			{
+				outbuffermax *= 2;
+				oldbuffer = outbuffer;
+				outbuffer = (char *) Z_Malloc(outbuffermax);
+				memcpy(outbuffer, oldbuffer, outbufferpos);
+				Z_Free(oldbuffer);
+			}
+			a = e[0]+1;
+			b = e[2]+1;
+			c = e[1]+1;
+			l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "f %i/%i/%i %i/%i/%i %i/%i/%i\n", a,a,a,b,b,b,c,c,c);
+			if (l > 0)
+				outbufferpos += l;
+		}
+	}
+
+	// write the obj file
+	FS_WriteFile(filename, outbuffer, outbufferpos);
+
+	// clean up
+	Z_Free(outbuffer);
+	Z_Free(texturenames);
+
+	// print some stats
+	Con_Printf("Wrote %s (%i bytes, %i vertices, %i faces, %i surfaces with %i distinct textures)\n", filename, (int)outbufferpos, countvertices, countfaces, countsurfaces, counttextures);
+}
+
+static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int firstpose, int numposes, qboolean writetriangles)
+{
+	int countnodes = 0, counttriangles = 0, countframes = 0;
+	int surfaceindex;
+	int triangleindex;
+	int transformindex;
+	int poseindex;
+	int cornerindex;
+	float modelscale;
+	const int *e;
+	const float *pose;
+	size_t l;
+	size_t outbufferpos = 0;
+	size_t outbuffermax = 0x100000;
+	char *outbuffer = (char *) Z_Malloc(outbuffermax), *oldbuffer;
+	const msurface_t *surface;
+	l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "version 1\nnodes\n");
+	if (l > 0)
+		outbufferpos += l;
+	modelscale = 1;
+	if(model->num_poses >= 0)
+		modelscale = sqrt(model->data_poses[0] * model->data_poses[0] + model->data_poses[1] * model->data_poses[1] + model->data_poses[2] * model->data_poses[2]);
+	if(fabs(modelscale - 1) > 1e-4)
+	{
+		if(firstpose == 0) // only print the when writing the reference pose
+			Con_Printf("The model has an old-style model scale of %f\n", modelscale);
+	}
+	else
+		modelscale = 1;
+	for (transformindex = 0;transformindex < model->num_bones;transformindex++)
+	{
+		if (outbufferpos >= outbuffermax >> 1)
+		{
+			outbuffermax *= 2;
+			oldbuffer = outbuffer;
+			outbuffer = (char *) Z_Malloc(outbuffermax);
+			memcpy(outbuffer, oldbuffer, outbufferpos);
+			Z_Free(oldbuffer);
+		}
+		countnodes++;
+		l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i \"%s\" %3i\n", transformindex, model->data_bones[transformindex].name, model->data_bones[transformindex].parent);
+		if (l > 0)
+			outbufferpos += l;
+	}
+	l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "end\nskeleton\n");
+	if (l > 0)
+		outbufferpos += l;
+	for (poseindex = 0, pose = model->data_poses + model->num_bones * 12 * firstpose;poseindex < numposes;poseindex++)
+	{
+		countframes++;
+		l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "time %i\n", poseindex);
+		if (l > 0)
+			outbufferpos += l;
+		for (transformindex = 0;transformindex < model->num_bones;transformindex++, pose += 12)
+		{
+			float a, b, c;
+			float angles[3];
+			float mtest[3][4];
+			if (outbufferpos >= outbuffermax >> 1)
+			{
+				outbuffermax *= 2;
+				oldbuffer = outbuffer;
+				outbuffer = (char *) Z_Malloc(outbuffermax);
+				memcpy(outbuffer, oldbuffer, outbufferpos);
+				Z_Free(oldbuffer);
+			}
+
+			// strangely the smd angles are for a transposed matrix, so we
+			// have to generate a transposed matrix, then convert that...
+			mtest[0][0] = pose[ 0];
+			mtest[0][1] = pose[ 4];
+			mtest[0][2] = pose[ 8];
+			mtest[0][3] = pose[ 3];
+			mtest[1][0] = pose[ 1];
+			mtest[1][1] = pose[ 5];
+			mtest[1][2] = pose[ 9];
+			mtest[1][3] = pose[ 7];
+			mtest[2][0] = pose[ 2];
+			mtest[2][1] = pose[ 6];
+			mtest[2][2] = pose[10];
+			mtest[2][3] = pose[11];
+			AnglesFromVectors(angles, mtest[0], mtest[2], false);
+			if (angles[0] >= 180) angles[0] -= 360;
+			if (angles[1] >= 180) angles[1] -= 360;
+			if (angles[2] >= 180) angles[2] -= 360;
+
+			a = DEG2RAD(angles[ROLL]);
+			b = DEG2RAD(angles[PITCH]);
+			c = DEG2RAD(angles[YAW]);
+
+#if 0
+{
+			float cy, sy, cp, sp, cr, sr;
+			float test[3][4];
+			// smd matrix construction, for comparing to non-transposed m
+			sy = sin(c);
+			cy = cos(c);
+			sp = sin(b);
+			cp = cos(b);
+			sr = sin(a);
+			cr = cos(a);
+
+			test[0][0] = cp*cy;
+			test[1][0] = cp*sy;
+			test[2][0] = -sp;
+			test[0][1] = sr*sp*cy+cr*-sy;
+			test[1][1] = sr*sp*sy+cr*cy;
+			test[2][1] = sr*cp;
+			test[0][2] = (cr*sp*cy+-sr*-sy);
+			test[1][2] = (cr*sp*sy+-sr*cy);
+			test[2][2] = cr*cp;
+			test[0][3] = pose[3];
+			test[1][3] = pose[7];
+			test[2][3] = pose[11];
+}
+#endif
+			l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f\n", transformindex, pose[3] * modelscale, pose[7] * modelscale, pose[11] * modelscale, DEG2RAD(angles[ROLL]), DEG2RAD(angles[PITCH]), DEG2RAD(angles[YAW]));
+			if (l > 0)
+				outbufferpos += l;
+		}
+	}
+	l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "end\n");
+	if (l > 0)
+		outbufferpos += l;
+	if (writetriangles)
+	{
+		l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "triangles\n");
+		if (l > 0)
+			outbufferpos += l;
+		for (surfaceindex = 0, surface = model->data_surfaces;surfaceindex < model->num_surfaces;surfaceindex++, surface++)
+		{
+			for (triangleindex = 0, e = model->surfmesh.data_element3i + surface->num_firsttriangle * 3;triangleindex < surface->num_triangles;triangleindex++, e += 3)
+			{
+				counttriangles++;
+				if (outbufferpos >= outbuffermax >> 1)
+				{
+					outbuffermax *= 2;
+					oldbuffer = outbuffer;
+					outbuffer = (char *) Z_Malloc(outbuffermax);
+					memcpy(outbuffer, oldbuffer, outbufferpos);
+					Z_Free(oldbuffer);
+				}
+				l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%s\n", surface->texture && surface->texture->name[0] ? surface->texture->name : "default.bmp");
+				if (l > 0)
+					outbufferpos += l;
+				for (cornerindex = 0;cornerindex < 3;cornerindex++)
+				{
+					const int index = e[2-cornerindex];
+					const float *v = model->surfmesh.data_vertex3f + index * 3;
+					const float *vn = model->surfmesh.data_normal3f + index * 3;
+					const float *vt = model->surfmesh.data_texcoordtexture2f + index * 2;
+					const int *wi = model->surfmesh.data_vertexweightindex4i + index * 4;
+					const float *wf = model->surfmesh.data_vertexweightinfluence4f + index * 4;
+					     if (wf[3]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 4 %i %f %i %f %i %f %i %f\n", wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0], wi[1], wf[1], wi[2], wf[2], wi[3], wf[3]);
+					else if (wf[2]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 3 %i %f %i %f %i %f\n"      , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0], wi[1], wf[1], wi[2], wf[2]);
+					else if (wf[1]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 2 %i %f %i %f\n"            , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0], wi[1], wf[1]);
+					else            l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f\n"                          , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1]);
+					if (l > 0)
+						outbufferpos += l;
+				}
+			}
+		}
+		l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "end\n");
+		if (l > 0)
+			outbufferpos += l;
+	}
+
+	FS_WriteFile(filename, outbuffer, outbufferpos);
+	Z_Free(outbuffer);
+
+	Con_Printf("Wrote %s (%i bytes, %i nodes, %i frames, %i triangles)\n", filename, (int)outbufferpos, countnodes, countframes, counttriangles);
+}
+
+/*
+================
+Mod_Decompile_f
+
+decompiles a model to editable files
+================
+*/
+static void Mod_Decompile_f(void)
+{
+	int i, j, k, l, first, count;
+	dp_model_t *mod;
+	char inname[MAX_QPATH];
+	char outname[MAX_QPATH];
+	char mtlname[MAX_QPATH];
+	char basename[MAX_QPATH];
+	char animname[MAX_QPATH];
+	char animname2[MAX_QPATH];
+	char zymtextbuffer[16384];
+	char dpmtextbuffer[16384];
+	int zymtextsize = 0;
+	int dpmtextsize = 0;
+
+	if (Cmd_Argc() != 2)
+	{
+		Con_Print("usage: modeldecompile <filename>\n");
+		return;
+	}
+
+	strlcpy(inname, Cmd_Argv(1), sizeof(inname));
+	FS_StripExtension(inname, basename, sizeof(basename));
+
+	mod = Mod_ForName(inname, false, true, inname[0] == '*' ? cl.model_name[1] : NULL);
+	if (mod->brush.submodel)
+	{
+		// if we're decompiling a submodel, be sure to give it a proper name based on its parent
+		FS_StripExtension(cl.model_name[1], outname, sizeof(outname));
+		dpsnprintf(basename, sizeof(basename), "%s/%s", outname, mod->name);
+		outname[0] = 0;
+	}
+	if (!mod)
+	{
+		Con_Print("No such model\n");
+		return;
+	}
+	if (!mod->surfmesh.num_triangles)
+	{
+		Con_Print("Empty model (or sprite)\n");
+		return;
+	}
+
+	// export OBJ if possible (not on sprites)
+	if (mod->surfmesh.num_triangles)
+	{
+		dpsnprintf(outname, sizeof(outname), "%s_decompiled.obj", basename);
+		dpsnprintf(mtlname, sizeof(mtlname), "%s_decompiled.mtl", basename);
+		Mod_Decompile_OBJ(mod, outname, mtlname, inname);
+	}
+
+	// export SMD if possible (only for skeletal models)
+	if (mod->surfmesh.num_triangles && mod->num_bones)
+	{
+		dpsnprintf(outname, sizeof(outname), "%s_decompiled/ref1.smd", basename);
+		Mod_Decompile_SMD(mod, outname, 0, 1, true);
+		l = dpsnprintf(zymtextbuffer + zymtextsize, sizeof(zymtextbuffer) - zymtextsize, "output out.zym\nscale 1\norigin 0 0 0\nmesh ref1.smd\n");
+		if (l > 0) zymtextsize += l;
+		l = dpsnprintf(dpmtextbuffer + dpmtextsize, sizeof(dpmtextbuffer) - dpmtextsize, "outputdir .\nmodel out\nscale 1\norigin 0 0 0\nscene ref1.smd\n");
+		if (l > 0) dpmtextsize += l;
+		for (i = 0;i < mod->numframes;i = j)
+		{
+			strlcpy(animname, mod->animscenes[i].name, sizeof(animname));
+			first = mod->animscenes[i].firstframe;
+			if (mod->animscenes[i].framecount > 1)
+			{
+				// framegroup anim
+				count = mod->animscenes[i].framecount;
+				j = i + 1;
+			}
+			else
+			{
+				// individual frame
+				// check for additional frames with same name
+				for (l = 0, k = strlen(animname);animname[l];l++)
+					if ((animname[l] < '0' || animname[l] > '9') && animname[l] != '_')
+						k = l + 1;
+				animname[k] = 0;
+				count = mod->num_poses - first;
+				for (j = i + 1;j < mod->numframes;j++)
+				{
+					strlcpy(animname2, mod->animscenes[j].name, sizeof(animname2));
+					for (l = 0, k = strlen(animname2);animname2[l];l++)
+						if ((animname2[l] < '0' || animname2[l] > '9') && animname2[l] != '_')
+							k = l + 1;
+					animname2[k] = 0;
+					if (strcmp(animname2, animname) || mod->animscenes[j].framecount > 1)
+					{
+						count = mod->animscenes[j].firstframe - first;
+						break;
+					}
+				}
+				// if it's only one frame, use the original frame name
+				if (j == i + 1)
+					strlcpy(animname, mod->animscenes[i].name, sizeof(animname));
+				
+			}
+			dpsnprintf(outname, sizeof(outname), "%s_decompiled/%s.smd", basename, animname);
+			Mod_Decompile_SMD(mod, outname, first, count, false);
+			if (zymtextsize < (int)sizeof(zymtextbuffer) - 100)
+			{
+				l = dpsnprintf(zymtextbuffer + zymtextsize, sizeof(zymtextbuffer) - zymtextsize, "scene %s.smd fps %g\n", animname, mod->animscenes[i].framerate);
+				if (l > 0) zymtextsize += l;
+			}
+			if (dpmtextsize < (int)sizeof(dpmtextbuffer) - 100)
+			{
+				l = dpsnprintf(dpmtextbuffer + dpmtextsize, sizeof(dpmtextbuffer) - dpmtextsize, "scene %s.smd\n", animname);
+				if (l > 0) dpmtextsize += l;
+			}
+		}
+		if (zymtextsize)
+			FS_WriteFile(va("%s_decompiled/out_zym.txt", basename), zymtextbuffer, (fs_offset_t)zymtextsize);
+		if (dpmtextsize)
+			FS_WriteFile(va("%s_decompiled/out_dpm.txt", basename), dpmtextbuffer, (fs_offset_t)dpmtextsize);
+	}
+}
+