X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=6ea5a859889fd9dd68b48a6686907b446259baee;hb=d4ff7e4d36f00ec7b8697b4df26c279cdd332ba6;hp=12bcad7b6f5ad6c1246aba6f9c0acd62877c3144;hpb=a9acdb17f88adf4ac412f91a2bdb29ef830cf139;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.c b/model_shared.c
index 12bcad7b..6ea5a859 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -50,17 +50,25 @@ static q3shader_data_t* q3shader_data;
 
 static void mod_start(void)
 {
-	int i;
+	int i, count;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
 	dp_model_t *mod;
 
-	// parse the Q3 shader files
-	Mod_LoadQ3Shaders();
-
+	SCR_PushLoadingScreen(false, "Loading models", 1.0);
+	count = 0;
 	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);
+				++count;
+	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)
+			{
+				SCR_PushLoadingScreen(true, mod->name, 1.0 / count);
+				Mod_LoadModel(mod, true, false);
+				SCR_PopLoadingScreen(false);
+			}
+	SCR_PopLoadingScreen(false);
 }
 
 static void mod_shutdown(void)
@@ -70,10 +78,10 @@ static void mod_shutdown(void)
 	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)
@@ -83,28 +91,30 @@ static void mod_newmap(void)
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
 	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)
 		{
-			for (j = 0;j < mod->num_textures;j++)
+			for (j = 0;j < mod->num_textures && mod->data_textures;j++)
 			{
 				for (k = 0;k < mod->data_textures[j].numskinframes;k++)
 					R_SkinFrame_MarkUsed(mod->data_textures[j].skinframes[k]);
 				for (k = 0;k < mod->data_textures[j].backgroundnumskinframes;k++)
 					R_SkinFrame_MarkUsed(mod->data_textures[j].backgroundskinframes[k]);
 			}
+			if (mod->brush.solidskyskinframe)
+				R_SkinFrame_MarkUsed(mod->brush.solidskyskinframe);
+			if (mod->brush.alphaskyskinframe)
+				R_SkinFrame_MarkUsed(mod->brush.alphaskyskinframe);
 		}
 	}
-	R_SkinFrame_Purge();
 
 	if (!cl_stainmaps_clearonload.integer)
 		return;
 
 	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++)
 			{
@@ -127,6 +137,7 @@ 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)
 {
@@ -140,6 +151,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)
@@ -150,14 +162,14 @@ void Mod_RenderInit(void)
 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.ebo3i)
 		R_Mesh_DestroyBufferObject(mod->surfmesh.ebo3i);
@@ -172,11 +184,111 @@ void Mod_UnloadModel (dp_model_t *mod)
 	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) != 0;
+			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
@@ -184,7 +296,7 @@ Mod_LoadModel
 Loads a model
 ==================
 */
-dp_model_t *Mod_LoadModel(dp_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;
@@ -195,18 +307,46 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, q
 
 	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 = (unsigned int)-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)
 	{
@@ -232,13 +372,14 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, q
 
 	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;
@@ -253,15 +394,9 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, q
 	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();
 	}
 
@@ -275,7 +410,8 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, q
 		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);
@@ -289,16 +425,26 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk, q
 		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, (const char *)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;
 }
 
@@ -308,7 +454,7 @@ void Mod_ClearUsed(void)
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
 	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;
 }
 
@@ -319,7 +465,7 @@ void Mod_PurgeUnused(void)
 	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);
@@ -327,42 +473,33 @@ void Mod_PurgeUnused(void)
 	}
 }
 
-// only used during loading!
-void Mod_RemoveStaleWorldModels(dp_model_t *skip)
-{
-	int i;
-	int nummodels = Mem_ExpandableArray_IndexRange(&models);
-	dp_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
 
 ==================
 */
-dp_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);
+	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");
 
 	// 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;
@@ -370,8 +507,12 @@ dp_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;
@@ -384,12 +525,12 @@ Mod_ForName
 Loads in a model for the given name
 ==================
 */
-dp_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)
 {
 	dp_model_t *model;
-	model = Mod_FindName(name);
-	if (model->name[0] != '*' && (!model->loaded || checkdisk))
-		Mod_LoadModel(model, crash, checkdisk, isworldmodel);
+	model = Mod_FindName(name, parentname);
+	if (!model->loaded || checkdisk)
+		Mod_LoadModel(model, crash, checkdisk);
 	return model;
 }
 
@@ -402,12 +543,23 @@ Reloads all models if they have changed
 */
 void Mod_Reload(void)
 {
-	int i;
+	int i, count;
 	int nummodels = Mem_ExpandableArray_IndexRange(&models);
 	dp_model_t *mod;
+
+	SCR_PushLoadingScreen(false, "Reloading 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] != '*' && mod->used)
+			++count;
 	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)
+		{
+			SCR_PushLoadingScreen(true, mod->name, 1.0 / count);
+			Mod_LoadModel(mod, true, true);
+			SCR_PopLoadingScreen(false);
+		}
+	SCR_PopLoadingScreen(false);
 }
 
 unsigned char *mod_base;
@@ -428,8 +580,15 @@ static void Mod_Print(void)
 
 	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);
+		}
+	}
 }
 
 /*
@@ -440,7 +599,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");
 }
@@ -522,6 +681,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)
@@ -805,6 +967,8 @@ shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtria
 	newmesh->maxtriangles = maxtriangles;
 	newmesh->numverts = 0;
 	newmesh->numtriangles = 0;
+	memset(newmesh->sideoffsets, 0, sizeof(newmesh->sideoffsets));
+	memset(newmesh->sidetotals, 0, sizeof(newmesh->sidetotals));
 
 	newmesh->vertex3f = (float *)data;data += maxverts * sizeof(float[3]);
 	if (light)
@@ -835,6 +999,8 @@ shadowmesh_t *Mod_ShadowMesh_ReAlloc(mempool_t *mempool, shadowmesh_t *oldmesh,
 	newmesh = Mod_ShadowMesh_Alloc(mempool, oldmesh->numverts, oldmesh->numtriangles, oldmesh->map_diffuse, oldmesh->map_specular, oldmesh->map_normal, light, neighbors, false);
 	newmesh->numverts = oldmesh->numverts;
 	newmesh->numtriangles = oldmesh->numtriangles;
+	memcpy(newmesh->sideoffsets, oldmesh->sideoffsets, sizeof(oldmesh->sideoffsets));
+	memcpy(newmesh->sidetotals, oldmesh->sidetotals, sizeof(oldmesh->sidetotals));
 
 	memcpy(newmesh->vertex3f, oldmesh->vertex3f, oldmesh->numverts * sizeof(float[3]));
 	if (newmesh->svector3f && oldmesh->svector3f)
@@ -942,10 +1108,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);
 }
 
@@ -1012,6 +1184,10 @@ shadowmesh_t *Mod_ShadowMesh_Finish(mempool_t *mempool, shadowmesh_t *firstmesh,
 		}
 		Mem_Free(mesh);
 	}
+
+	// this can take a while, so let's do a keepalive here
+	CL_KeepaliveMessage(false);
+
 	return firstmesh;
 }
 
@@ -1080,6 +1256,35 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh)
 	}
 }
 
+void Mod_CreateCollisionMesh(dp_model_t *mod)
+{
+	int k;
+	int numcollisionmeshtriangles;
+	const msurface_t *surface;
+	mempool_t *mempool = mod->mempool;
+	if (!mempool && mod->brush.parentmodel)
+		mempool = mod->brush.parentmodel->mempool;
+	// make a single combined collision mesh for physics engine use
+	// TODO rewrite this to use the collision brushes as source, to fix issues with e.g. common/caulk which creates no drawsurface
+	numcollisionmeshtriangles = 0;
+	for (k = 0;k < mod->nummodelsurfaces;k++)
+	{
+		surface = mod->data_surfaces + mod->firstmodelsurface + k;
+		if (!(surface->texture->supercontents & SUPERCONTENTS_SOLID))
+			continue;
+		numcollisionmeshtriangles += surface->num_triangles;
+	}
+	mod->brush.collisionmesh = Mod_ShadowMesh_Begin(mempool, numcollisionmeshtriangles * 3, numcollisionmeshtriangles, NULL, NULL, NULL, false, false, true);
+	for (k = 0;k < mod->nummodelsurfaces;k++)
+	{
+		surface = mod->data_surfaces + mod->firstmodelsurface + k;
+		if (!(surface->texture->supercontents & SUPERCONTENTS_SOLID))
+			continue;
+		Mod_ShadowMesh_AddMesh(mempool, mod->brush.collisionmesh, NULL, NULL, NULL, mod->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (mod->surfmesh.data_element3i + 3 * surface->num_firsttriangle));
+	}
+	mod->brush.collisionmesh = Mod_ShadowMesh_Finish(mempool, mod->brush.collisionmesh, false, true, false);
+}
+
 void Mod_GetTerrainVertex3fTexCoord2fFromBGRA(const unsigned char *imagepixels, int imagewidth, int imageheight, int ix, int iy, float *vertex3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
 {
 	float v[3], tc[3];
@@ -1143,6 +1348,86 @@ void Mod_ConstructTerrainPatchFromBGRA(const unsigned char *imagepixels, int ima
 			Mod_GetTerrainVertexFromBGRA(imagepixels, imagewidth, imageheight, ix, iy, vertex3f, texcoord2f, svector3f, tvector3f, normal3f, pixelstepmatrix, pixeltexturestepmatrix);
 }
 
+#if 0
+void Mod_Terrain_SurfaceRecurseChunk(dp_model_t *model, int stepsize, int x, int y)
+{
+	float mins[3];
+	float maxs[3];
+	float chunkwidth = min(stepsize, model->terrain.width - 1 - x);
+	float chunkheight = min(stepsize, model->terrain.height - 1 - y);
+	float viewvector[3];
+	unsigned int firstvertex;
+	unsigned int *e;
+	float *v;
+	if (chunkwidth < 2 || chunkheight < 2)
+		return;
+	VectorSet(mins, model->terrain.mins[0] +  x    * stepsize * model->terrain.scale[0], model->terrain.mins[1] +  y    * stepsize * model->terrain.scale[1], model->terrain.mins[2]);
+	VectorSet(maxs, model->terrain.mins[0] + (x+1) * stepsize * model->terrain.scale[0], model->terrain.mins[1] + (y+1) * stepsize * model->terrain.scale[1], model->terrain.maxs[2]);
+	viewvector[0] = bound(mins[0], localvieworigin, maxs[0]) - model->terrain.vieworigin[0];
+	viewvector[1] = bound(mins[1], localvieworigin, maxs[1]) - model->terrain.vieworigin[1];
+	viewvector[2] = bound(mins[2], localvieworigin, maxs[2]) - model->terrain.vieworigin[2];
+	if (stepsize > 1 && VectorLength(viewvector) < stepsize*model->terrain.scale[0]*r_terrain_lodscale.value)
+	{
+		// too close for this stepsize, emit as 4 chunks instead
+		stepsize /= 2;
+		Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x, y);
+		Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x+stepsize, y);
+		Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x, y+stepsize);
+		Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x+stepsize, y+stepsize);
+		return;
+	}
+	// emit the geometry at stepsize into our vertex buffer / index buffer
+	// we add two columns and two rows for skirt
+	outwidth = chunkwidth+2;
+	outheight = chunkheight+2;
+	outwidth2 = outwidth-1;
+	outheight2 = outheight-1;
+	outwidth3 = outwidth+1;
+	outheight3 = outheight+1;
+	firstvertex = numvertices;
+	e = model->terrain.element3i + numtriangles;
+	numtriangles += chunkwidth*chunkheight*2+chunkwidth*2*2+chunkheight*2*2;
+	v = model->terrain.vertex3f + numvertices;
+	numvertices += (chunkwidth+1)*(chunkheight+1)+(chunkwidth+1)*2+(chunkheight+1)*2;
+	// emit the triangles (note: the skirt is treated as two extra rows and two extra columns)
+	for (ty = 0;ty < outheight;ty++)
+	{
+		for (tx = 0;tx < outwidth;tx++)
+		{
+			*e++ = firstvertex + (ty  )*outwidth3+(tx  );
+			*e++ = firstvertex + (ty  )*outwidth3+(tx+1);
+			*e++ = firstvertex + (ty+1)*outwidth3+(tx+1);
+			*e++ = firstvertex + (ty  )*outwidth3+(tx  );
+			*e++ = firstvertex + (ty+1)*outwidth3+(tx+1);
+			*e++ = firstvertex + (ty+1)*outwidth3+(tx  );
+		}
+	}
+	// TODO: emit surface vertices (x+tx*stepsize, y+ty*stepsize)
+	for (ty = 0;ty <= outheight;ty++)
+	{
+		skirtrow = ty == 0 || ty == outheight;
+		ry = y+bound(1, ty, outheight)*stepsize;
+		for (tx = 0;tx <= outwidth;tx++)
+		{
+			skirt = skirtrow || tx == 0 || tx == outwidth;
+			rx = x+bound(1, tx, outwidth)*stepsize;
+			v[0] = rx*scale[0];
+			v[1] = ry*scale[1];
+			v[2] = heightmap[ry*terrainwidth+rx]*scale[2];
+			v += 3;
+		}
+	}
+	// TODO: emit skirt vertices
+}
+
+void Mod_Terrain_UpdateSurfacesForViewOrigin(dp_model_t *model)
+{
+	for (y = 0;y < model->terrain.size[1];y += model->terrain.
+	Mod_Terrain_SurfaceRecurseChunk(model, model->terrain.maxstepsize, x, y);
+	Mod_Terrain_BuildChunk(model, 
+}
+#endif
+
 q3wavefunc_t Mod_LoadQ3Shaders_EnumerateWaveFunc(const char *s)
 {
 	if (!strcasecmp(s, "sin"))             return Q3WAVEFUNC_SIN;
@@ -1155,18 +1440,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)
@@ -1178,7 +1454,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;
@@ -1216,7 +1499,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)
@@ -1236,6 +1527,8 @@ void Mod_LoadQ3Shaders(void)
 			shader.reflectfactor = 1;
 			Vector4Set(shader.reflectcolor4f, 1, 1, 1, 1);
 			shader.r_water_wateralpha = 1;
+			shader.specularscalemod = 1;
+			shader.specularpowermod = 1;
 
 			strlcpy(shader.name, com_token, sizeof(shader.name));
 			if (!COM_ParseToken_QuakeC(&text, false) || strcasecmp(com_token, "{"))
@@ -1282,8 +1575,8 @@ void Mod_LoadQ3Shaders(void)
 							if (!COM_ParseToken_QuakeC(&text, true))
 								break;
 						}
-						for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
-							parameter[j][0] = 0;
+						//for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
+						//	parameter[j][0] = 0;
 						if (developer.integer >= 100)
 						{
 							Con_Printf("%s %i: ", shader.name, shader.numlayers - 1);
@@ -1360,7 +1653,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]);
 						}
@@ -1402,7 +1695,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]);
@@ -1501,8 +1794,8 @@ void Mod_LoadQ3Shaders(void)
 					if (!COM_ParseToken_QuakeC(&text, true))
 						break;
 				}
-				for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
-					parameter[j][0] = 0;
+				//for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
+				//	parameter[j][0] = 0;
 				if (fileindex == 0 && !strcasecmp(com_token, "}"))
 					break;
 				if (developer.integer >= 100)
@@ -1634,6 +1927,14 @@ void Mod_LoadQ3Shaders(void)
 					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], "dp_glossintensitymod") && numparameters >= 2)
+				{
+					shader.specularscalemod = atof(parameter[1]);
+				}
+				else if (!strcasecmp(parameter[0], "dp_glossexponentmod") && numparameters >= 2)
+				{
+					shader.specularpowermod = atof(parameter[1]);
+				}
 				else if (!strcasecmp(parameter[0], "deformvertexes") && numparameters >= 2)
 				{
 					int i, deformindex;
@@ -1706,12 +2007,17 @@ void Mod_LoadQ3Shaders(void)
 		}
 		Mem_Free(f);
 	}
+	FS_FreeSearch(search);
 }
 
 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)
@@ -1724,26 +2030,31 @@ q3shaderinfo_t *Mod_LookupQ3Shader(const char *name)
 qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean warnmissing, qboolean fallback, int defaulttexflags)
 {
 	int j;
+	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;
+	texture->specularscalemod = 1; // unless later loaded from the shader
+	texture->specularpowermod = 1; // unless later loaded from the shader
+
 	if (shader)
 	{
 		if (developer_loading.integer)
 			Con_Printf("%s: loaded shader for %s\n", loadmodel->name, name);
 		texture->surfaceparms = shader->surfaceparms;
-		texture->textureflags = shader->textureflags;
 
 		// allow disabling of picmip or compression by defaulttexflags
-		if(!(defaulttexflags & TEXF_PICMIP))
-			texture->textureflags &= ~TEXF_PICMIP;
-		if(!(defaulttexflags & TEXF_COMPRESS))
-			texture->textureflags &= ~TEXF_COMPRESS;
+		texture->textureflags = shader->textureflags & texflagsmask;
 
-		texture->basematerialflags = 0;
 		if (shader->surfaceparms & Q3SURFACEPARM_SKY)
 		{
 			texture->basematerialflags = MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW;
@@ -1757,6 +2068,7 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
 			texture->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
 		else
 			texture->basematerialflags = MATERIALFLAG_WALL;
+
 		if (shader->layers[0].alphatest)
 			texture->basematerialflags |= MATERIALFLAG_ALPHATEST | MATERIALFLAG_NOSHADOW;
 		if (shader->textureflags & Q3TEXTUREFLAG_TWOSIDED)
@@ -1827,7 +2139,7 @@ nothing                GL_ZERO GL_ONE
 				{
 					texture->skinframes[j] = NULL;
 				}
-				else if (!(texture->skinframes[j] = R_SkinFrame_LoadExternal(primarylayer->texturename[j], primarylayer->texflags, false)))
+				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();
@@ -1837,6 +2149,9 @@ 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++)
@@ -1845,7 +2160,7 @@ nothing                GL_ZERO GL_ONE
 				{
 					texture->skinframes[j] = NULL;
 				}
-				else if (!(texture->backgroundskinframes[j] = R_SkinFrame_LoadExternal(backgroundlayer->texturename[j], backgroundlayer->texflags, false)))
+				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();
@@ -1864,6 +2179,8 @@ nothing                GL_ZERO GL_ONE
 		texture->reflectfactor = shader->reflectfactor;
 		Vector4Copy(shader->reflectcolor4f, texture->reflectcolor4f);
 		texture->r_water_wateralpha = shader->r_water_wateralpha;
+		texture->specularscalemod = shader->specularscalemod;
+		texture->specularpowermod = shader->specularpowermod;
 	}
 	else if (!strcmp(texture->name, "noshader") || !texture->name[0])
 	{
@@ -2062,23 +2379,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++;
@@ -2108,8 +2422,54 @@ 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 (developer.integer && loadmodel->surfmesh.data_element3s && loadmodel->surfmesh.data_element3i)
+	{
+		int i;
+		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+		{
+			if (loadmodel->surfmesh.data_element3s[i] != loadmodel->surfmesh.data_element3i[i])
+			{
+				Con_Printf("Mod_BuildVBOs: element %u is incorrect (%u should be %u)\n", i, loadmodel->surfmesh.data_element3s[i], loadmodel->surfmesh.data_element3i[i]);
+				loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+			}
+		}
+	}
+
 	if (!gl_support_arb_vertex_buffer_object)
 		return;
 
@@ -2117,12 +2477,7 @@ static void Mod_BuildVBOs(void)
 	if (loadmodel->surfmesh.num_triangles)
 	{
 		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);
 	}
@@ -2156,3 +2511,405 @@ 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 < counttextures;textureindex++)
+			if (!strcmp(texturenames + textureindex * MAX_QPATH, texname))
+				break;
+		if (textureindex < counttextures)
+			continue; // already wrote this material entry
+		if (textureindex >= maxtextures)
+			continue; // just a precaution
+		textureindex = counttextures++;
+		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);
+	}
+}
+