X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_brush.c;h=8db8ec9d572d5eaa851cfe8801bae1170a1f2e4f;hb=ade2eddca8b0e59f322584d5bfbec430f97af7a8;hp=df157e747faf71bc4a9f941db335e76773bed68e;hpb=0c7e58088735fc510f35f3a3230fe82b1f9c0698;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.c b/model_brush.c
index df157e74..8db8ec9d 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128", "how large water polygons should be (smaller values produce more polygons which give better warping effects)"};
 cvar_t r_novis = {0, "r_novis", "0", "draws whole level, see also sv_cullentities_pvs 0"};
-cvar_t r_picmipworld = {CVAR_SAVE, "r_picmipworld", "1", "whether gl_picmip shall apply to world textures too"};
 cvar_t r_nosurftextures = {0, "r_nosurftextures", "0", "pretends there was no texture lump found in the q1bsp/hlbsp loading (useful for debugging this rare case)"};
 cvar_t r_subdivisions_tolerance = {0, "r_subdivisions_tolerance", "4", "maximum error tolerance on curve subdivision for rendering purposes (in other words, the curves will be given as many polygons as necessary to represent curves at this quality)"};
 cvar_t r_subdivisions_mintess = {0, "r_subdivisions_mintess", "0", "minimum number of subdivisions (values above 0 will smooth curves that don't need it)"};
@@ -49,7 +48,7 @@ cvar_t mod_q3bsp_tracelineofsight_brushes = {0, "mod_q3bsp_tracelineofsight_brus
 cvar_t mod_q3shader_default_offsetmapping = {CVAR_SAVE, "mod_q3shader_default_offsetmapping", "1", "use offsetmapping by default on all surfaces"};
 
 cvar_t mod_q1bsp_polygoncollisions = {0, "mod_q1bsp_polygoncollisions", "0", "disables use of precomputed cliphulls and instead collides with polygons (uses Bounding Interval Hierarchy optimizations)"};
-cvar_t mod_collision_bih = {0, "mod_collision_bih", "0", "enables use of generated Bounding Interval Hierarchy tree instead of compiled bsp tree in collision code"};
+cvar_t mod_collision_bih = {0, "mod_collision_bih", "1", "enables use of generated Bounding Interval Hierarchy tree instead of compiled bsp tree in collision code"};
 cvar_t mod_recalculatenodeboxes = {0, "mod_recalculatenodeboxes", "1", "enables use of generated node bounding boxes based on BSP tree portal reconstruction, rather than the node boxes supplied by the map compiler"};
 
 static texture_t mod_q1bsp_texture_solid;
@@ -62,7 +61,6 @@ void Mod_BrushInit(void)
 {
 //	Cvar_RegisterVariable(&r_subdivide_size);
 	Cvar_RegisterVariable(&r_novis);
-	Cvar_RegisterVariable(&r_picmipworld);
 	Cvar_RegisterVariable(&r_nosurftextures);
 	Cvar_RegisterVariable(&r_subdivisions_tolerance);
 	Cvar_RegisterVariable(&r_subdivisions_mintess);
@@ -1578,7 +1576,9 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 			// LordHavoc: HL sky textures are entirely different than quake
 			if (!loadmodel->brush.ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == mtheight * 2)
 			{
-				data = loadimagepixelsbgra(tx->name, false, false, r_texture_convertsRGB_skin.integer);
+				data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), false, false, r_texture_convertsRGB_skin.integer, NULL);
+				if (!data)
+					data = loadimagepixelsbgra(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), false, false, r_texture_convertsRGB_skin.integer, NULL);
 				if (data && image_width == image_height * 2)
 				{
 					R_Q1BSP_LoadSplitSky(data, image_width, image_height, 4);
@@ -1589,9 +1589,9 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 			}
 			else
 			{
-				skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_ALPHA | TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
+				skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false);
 				if (!skinframe)
-					skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_ALPHA | TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
+					skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS, false);
 				if (!skinframe)
 				{
 					// did not find external texture, load it from the bsp or wad3
@@ -1608,13 +1608,13 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 						{
 							tx->width = image_width;
 							tx->height = image_height;
-							skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_ALPHA | TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0), pixels, image_width, image_height);
+							skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_ALPHA | TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP, pixels, image_width, image_height);
 						}
 						if (freepixels)
 							Mem_Free(freepixels);
 					}
 					else if (mtdata) // texture included
-						skinframe = R_SkinFrame_LoadInternalQuake(tx->name, TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0), false, r_fullbrights.integer, mtdata, tx->width, tx->height);
+						skinframe = R_SkinFrame_LoadInternalQuake(tx->name, TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP, false, r_fullbrights.integer, mtdata, tx->width, tx->height);
 				}
 				// if skinframe is still NULL the "missing" texture will be used
 				if (skinframe)
@@ -2456,9 +2456,9 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l)
 				loadmodel->brushq3.num_mergedlightmaps = lightmapnumber + 1;
 				loadmodel->brushq3.data_lightmaps = Mem_Realloc(loadmodel->mempool, loadmodel->brushq3.data_lightmaps, loadmodel->brushq3.num_mergedlightmaps * sizeof(loadmodel->brushq3.data_lightmaps[0]));
 				loadmodel->brushq3.data_deluxemaps = Mem_Realloc(loadmodel->mempool, loadmodel->brushq3.data_deluxemaps, loadmodel->brushq3.num_mergedlightmaps * sizeof(loadmodel->brushq3.data_deluxemaps[0]));
-				loadmodel->brushq3.data_lightmaps[lightmapnumber] = lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, NULL);
+				loadmodel->brushq3.data_lightmaps[lightmapnumber] = lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, -1, NULL);
 				if (loadmodel->brushq1.nmaplightdata)
-					loadmodel->brushq3.data_deluxemaps[lightmapnumber] = deluxemaptexture = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, NULL);
+					loadmodel->brushq3.data_deluxemaps[lightmapnumber] = deluxemaptexture = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_ALLOWUPDATES, -1, NULL);
 				lightmapnumber++;
 				Mod_AllocLightmap_Reset(&allocState);
 				Mod_AllocLightmap_Block(&allocState, ssize, tsize, &lightmapx, &lightmapy);
@@ -3415,6 +3415,31 @@ static void Mod_Q1BSP_RoundUpToHullSize(dp_model_t *cmodel, const vec3_t inmins,
 	VectorAdd(inmins, hull->clip_size, outmaxs);
 }
 
+static int Mod_Q1BSP_CreateShadowMesh(dp_model_t *mod)
+{
+	int j;
+	int numshadowmeshtriangles = 0;
+	msurface_t *surface;
+	if (cls.state == ca_dedicated)
+		return 0;
+	// make a single combined shadow mesh to allow optimized shadow volume creation
+
+	for (j = 0, surface = mod->data_surfaces;j < mod->num_surfaces;j++, surface++)
+	{
+		surface->num_firstshadowmeshtriangle = numshadowmeshtriangles;
+		numshadowmeshtriangles += surface->num_triangles;
+	}
+	mod->brush.shadowmesh = Mod_ShadowMesh_Begin(mod->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true);
+	for (j = 0, surface = mod->data_surfaces;j < mod->num_surfaces;j++, surface++)
+		if (surface->num_triangles > 0)
+			Mod_ShadowMesh_AddMesh(mod->mempool, mod->brush.shadowmesh, NULL, NULL, NULL, mod->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (mod->surfmesh.data_element3i + 3 * surface->num_firsttriangle));
+	mod->brush.shadowmesh = Mod_ShadowMesh_Finish(mod->mempool, mod->brush.shadowmesh, false, true, false);
+	if (mod->brush.shadowmesh)
+		Mod_BuildTriangleNeighbors(mod->brush.shadowmesh->neighbor3i, mod->brush.shadowmesh->element3i, mod->brush.shadowmesh->numtriangles);
+
+	return numshadowmeshtriangles;
+}
+
 void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
 	int i, j, k;
@@ -3422,7 +3447,6 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	dmodel_t *bm;
 	float dist, modelyawradius, modelradius;
 	msurface_t *surface;
-	int numshadowmeshtriangles;
 	hullinfo_t hullinfo;
 	int totalstylesurfaces, totalstyles, stylecounts[256], remapstyles[256];
 	model_brush_lightstyleinfo_t styleinfo[256];
@@ -3550,17 +3574,7 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	mod->numskins = 1;
 
 	// make a single combined shadow mesh to allow optimized shadow volume creation
-	numshadowmeshtriangles = 0;
-	for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
-	{
-		surface->num_firstshadowmeshtriangle = numshadowmeshtriangles;
-		numshadowmeshtriangles += surface->num_triangles;
-	}
-	loadmodel->brush.shadowmesh = Mod_ShadowMesh_Begin(loadmodel->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true);
-	for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
-		Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, loadmodel->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle));
-	loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true, false);
-	Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles);
+	Mod_Q1BSP_CreateShadowMesh(loadmodel);
 
 	if (loadmodel->brush.numsubmodels)
 		loadmodel->brush.submodels = (dp_model_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brush.numsubmodels * sizeof(dp_model_t *));
@@ -3686,7 +3700,7 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 				mod->DrawSky = R_Q1BSP_DrawSky;
 
 			for (j = 0, surface = &mod->data_surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surface++)
-				if (surface->texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION))
+				if (surface->texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA))
 					break;
 			if (j < mod->nummodelsurfaces)
 				mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes;
@@ -3738,11 +3752,14 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 
 		if (mod_q1bsp_polygoncollisions.integer)
 		{
-			Mod_MakeCollisionBIH(mod, true);
+			Mod_MakeCollisionBIH(mod, true, &mod->collision_bih);
 			// point traces and contents checks still use the bsp tree
 			mod->TraceLine = Mod_CollisionBIH_TraceLine;
 			mod->TraceBox = Mod_CollisionBIH_TraceBox;
+			mod->TraceBrush = Mod_CollisionBIH_TraceBrush;
 		}
+		else
+			Mod_MakeCollisionBIH(mod, true, &mod->render_bih);
 
 		// generate VBOs and other shared data before cloning submodels
 		if (i == 0)
@@ -4281,13 +4298,10 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 		strlcpy (out[i].name, in[i].name, sizeof (out[i].name));
 		out[i].surfaceflags = LittleLong(in[i].surfaceflags);
 		out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
-		if (cls.state != ca_dedicated)
-		{
-			Mod_LoadTextureFromQ3Shader(out + i, out[i].name, true, true, TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
-			// restore the surfaceflags and supercontents
-			out[i].surfaceflags = LittleLong(in[i].surfaceflags);
-			out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
-		}
+		Mod_LoadTextureFromQ3Shader(out + i, out[i].name, true, true, TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS);
+		// restore the surfaceflags and supercontents
+		out[i].surfaceflags = LittleLong(in[i].surfaceflags);
+		out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
 	}
 }
 
@@ -4532,12 +4546,32 @@ static void Mod_Q3BSP_LoadTriangles(lump_t *l)
 static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 {
 	q3dlightmap_t *input_pointer;
-	int i, j, k, count, power, power2, endlightmap, mergewidth, mergeheight;
+	int i;
+	int j;
+	int k;
+	int count;
+	int powerx;
+	int powery;
+	int powerxy;
+	int powerdxy;
+	int endlightmap;
+	int mergegoal;
+	int lightmapindex;
+	int realcount;
+	int realindex;
+	int mergedwidth;
+	int mergedheight;
+	int mergedcolumns;
+	int mergedrows;
+	int mergedrowsxcolumns;
+	int size;
+	int bytesperpixel;
+	int rgbmap[3];
 	unsigned char *c;
-
-	unsigned char *convertedpixels;
+	unsigned char *mergedpixels;
+	unsigned char *mergeddeluxepixels;
+	unsigned char *mergebuf;
 	char mapname[MAX_QPATH];
-	int size, bytesperpixel, rgbmap[3];
 	qboolean external;
 	unsigned char *inpixels[10000]; // max count q3map2 can output (it uses 4 digits)
 
@@ -4576,7 +4610,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 		if (developer_loading.integer)
 			Con_Printf("Using external lightmaps\n");
 		FS_StripExtension(loadmodel->name, mapname, sizeof(mapname));
-		inpixels[0] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, 0), false, false, false);
+		inpixels[0] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, 0), false, false, false, NULL);
 		if(!inpixels[0])
 			return;
 
@@ -4596,7 +4630,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 
 		for(count = 1; ; ++count)
 		{
-			inpixels[count] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, count), false, false, false);
+			inpixels[count] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, count), false, false, false, NULL);
 			if(!inpixels[count])
 				break; // we got all of them
 			if(image_width != size || image_height != size)
@@ -4609,7 +4643,6 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 		}
 	}
 
-	convertedpixels = (unsigned char *) Mem_Alloc(tempmempool, size*size*4);
 	loadmodel->brushq3.lightmapsize = size;
 	loadmodel->brushq3.num_originallightmaps = count;
 
@@ -4679,18 +4712,42 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 
 	// figure out what the most reasonable merge power is within limits
 
-	loadmodel->brushq3.num_lightmapmergepower = 0;
-
-	for(i = 0; (128 << i) < size; ++i)
-		;
-	// i is now 0 for 128, 1 for 256, etc
-
-	for (power = 1;power + i <= mod_q3bsp_lightmapmergepower.integer && (size << power) <= (int)vid.maxtexturesize_2d && (1 << (power * 2)) < 4 * (count >> (loadmodel->brushq3.deluxemapping ? 1 : 0)); power++)
-		loadmodel->brushq3.num_lightmapmergepower = power;
-
-	loadmodel->brushq3.num_lightmapmerge = 1 << loadmodel->brushq3.num_lightmapmergepower;
-
-	loadmodel->brushq3.num_mergedlightmaps = ((count >> (loadmodel->brushq3.deluxemapping ? 1 : 0)) + (1 << (loadmodel->brushq3.num_lightmapmergepower * 2)) - 1) >> (loadmodel->brushq3.num_lightmapmergepower * 2);
+	// find the appropriate NxN dimensions to merge to, to avoid wasted space
+	realcount = count >> loadmodel->brushq3.deluxemapping;
+
+	// figure out how big the merged texture has to be
+	mergegoal = 128<<bound(0, mod_q3bsp_lightmapmergepower.integer, 6);
+	mergegoal = bound(size, mergegoal, (int)vid.maxtexturesize_2d);
+	while (mergegoal > size && mergegoal * mergegoal / 4 >= size * size * realcount)
+		mergegoal /= 2;
+	mergedwidth = mergegoal;
+	mergedheight = mergegoal;
+	// choose non-square size (2x1 aspect) if only half the space is used;
+	// this really only happens when the entire set fits in one texture, if
+	// there are multiple textures, we don't worry about shrinking the last
+	// one to fit, because the driver prefers the same texture size on
+	// consecutive draw calls...
+	if (mergedwidth * mergedheight / 2 >= size*size*realcount)
+		mergedheight /= 2;
+
+	loadmodel->brushq3.num_lightmapmergedwidthpower = 0;
+	loadmodel->brushq3.num_lightmapmergedheightpower = 0;
+	while (mergedwidth > size<<loadmodel->brushq3.num_lightmapmergedwidthpower)
+		loadmodel->brushq3.num_lightmapmergedwidthpower++;
+	while (mergedheight > size<<loadmodel->brushq3.num_lightmapmergedheightpower)
+		loadmodel->brushq3.num_lightmapmergedheightpower++;
+	loadmodel->brushq3.num_lightmapmergedwidthheightdeluxepower = loadmodel->brushq3.num_lightmapmergedwidthpower + loadmodel->brushq3.num_lightmapmergedheightpower + (loadmodel->brushq3.deluxemapping ? 1 : 0);
+
+	powerx = loadmodel->brushq3.num_lightmapmergedwidthpower;
+	powery = loadmodel->brushq3.num_lightmapmergedheightpower;
+	powerxy = powerx+powery;
+	powerdxy = loadmodel->brushq3.deluxemapping + powerxy;
+
+	mergedcolumns = 1 << powerx;
+	mergedrows = 1 << powery;
+	mergedrowsxcolumns = 1 << powerxy;
+
+	loadmodel->brushq3.num_mergedlightmaps = (realcount + (1 << powerxy) - 1) >> powerxy;
 	loadmodel->brushq3.data_lightmaps = (rtexture_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brushq3.num_mergedlightmaps * sizeof(rtexture_t *));
 	if (loadmodel->brushq3.deluxemapping)
 		loadmodel->brushq3.data_deluxemaps = (rtexture_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brushq3.num_mergedlightmaps * sizeof(rtexture_t *));
@@ -4699,60 +4756,43 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 	if (loadmodel->texturepool == NULL && cls.state != ca_dedicated)
 		loadmodel->texturepool = R_AllocTexturePool();
 
-	power = loadmodel->brushq3.num_lightmapmergepower;
-	power2 = power * 2;
+	mergedpixels = (unsigned char *) Mem_Alloc(tempmempool, mergedwidth * mergedheight * 4);
+	mergeddeluxepixels = loadmodel->brushq3.deluxemapping ? (unsigned char *) Mem_Alloc(tempmempool, mergedwidth * mergedheight * 4) : NULL;
 	for (i = 0;i < count;i++)
 	{
 		// figure out which merged lightmap texture this fits into
-		int lightmapindex = i >> (loadmodel->brushq3.deluxemapping + power2);
-		for (k = 0;k < size*size;k++)
+		realindex = i >> loadmodel->brushq3.deluxemapping;
+		lightmapindex = i >> powerdxy;
+
+		// choose the destination address
+		mergebuf = (loadmodel->brushq3.deluxemapping && (i & 1)) ? mergeddeluxepixels : mergedpixels;
+		mergebuf += 4 * (realindex & (mergedcolumns-1))*size + 4 * ((realindex >> powerx) & (mergedrows-1))*mergedwidth*size;
+		if ((i & 1) == 0 || !loadmodel->brushq3.deluxemapping)
+			Con_Printf("copying original lightmap %i (%ix%i) to %i (at %i,%i)\n", i, size, size, lightmapindex, (realindex & (mergedcolumns-1))*size, ((realindex >> powerx) & (mergedrows-1))*size);
+
+		// convert pixels from RGB or BGRA while copying them into the destination rectangle
+		for (j = 0;j < size;j++)
+		for (k = 0;k < size;k++)
 		{
-			convertedpixels[k*4+0] = inpixels[i][k*bytesperpixel+rgbmap[0]];
-			convertedpixels[k*4+1] = inpixels[i][k*bytesperpixel+rgbmap[1]];
-			convertedpixels[k*4+2] = inpixels[i][k*bytesperpixel+rgbmap[2]];
-			convertedpixels[k*4+3] = 255;
+			mergebuf[(j*mergedwidth+k)*4+0] = inpixels[i][(j*size+k)*bytesperpixel+rgbmap[0]];
+			mergebuf[(j*mergedwidth+k)*4+1] = inpixels[i][(j*size+k)*bytesperpixel+rgbmap[1]];
+			mergebuf[(j*mergedwidth+k)*4+2] = inpixels[i][(j*size+k)*bytesperpixel+rgbmap[2]];
+			mergebuf[(j*mergedwidth+k)*4+3] = 255;
 		}
-		if (loadmodel->brushq3.num_lightmapmergepower > 0)
-		{
-			// if the lightmap has not been allocated yet, create it
-			if (!loadmodel->brushq3.data_lightmaps[lightmapindex])
-			{
-				// create a lightmap only as large as necessary to hold the
-				// remaining size*size blocks
-				// if there are multiple merged lightmap textures then they will
-				// all be full size except the last one which may be smaller
-				// because it only needs to the remaining blocks, and it will often
-				// be odd sizes like 2048x512 due to only being 25% full or so.
-				j = (count >> (loadmodel->brushq3.deluxemapping ? 1 : 0)) - (lightmapindex << power2);
-				for (mergewidth = 1;mergewidth < j && mergewidth < (1 << power);mergewidth *= 2)
-					;
-				for (mergeheight = 1;mergewidth*mergeheight < j && mergeheight < (1 << power);mergeheight *= 2)
-					;
-				if (developer_loading.integer)
-					Con_Printf("lightmap merge texture #%i is %ix%i (%i of %i used)\n", lightmapindex, mergewidth*size, mergeheight*size, min(j, mergewidth*mergeheight), mergewidth*mergeheight);
-				loadmodel->brushq3.data_lightmaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), mergewidth * size, mergeheight * size, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : TEXF_ALLOWUPDATES), NULL);
-				if (loadmodel->brushq3.data_deluxemaps)
-					loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), mergewidth * size, mergeheight * size, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bspdeluxemaps.integer ? TEXF_COMPRESS : TEXF_ALLOWUPDATES), NULL);
-			}
-			mergewidth = R_TextureWidth(loadmodel->brushq3.data_lightmaps[lightmapindex]) / size;
-			mergeheight = R_TextureHeight(loadmodel->brushq3.data_lightmaps[lightmapindex]) / size;
-			j = (i >> (loadmodel->brushq3.deluxemapping ? 1 : 0)) & ((1 << power2) - 1);
-			if (loadmodel->brushq3.deluxemapping && (i & 1))
-				R_UpdateTexture(loadmodel->brushq3.data_deluxemaps[lightmapindex], convertedpixels, (j % mergewidth) * size, (j / mergewidth) * size, size, size);
-			else
-				R_UpdateTexture(loadmodel->brushq3.data_lightmaps [lightmapindex], convertedpixels, (j % mergewidth) * size, (j / mergewidth) * size, size, size);
-		}
-		else
+
+		// upload texture if this was the last tile being written to the texture
+		if (((realindex + 1) & (mergedrowsxcolumns - 1)) == 0 || (realindex + 1) == realcount)
 		{
-			// figure out which merged lightmap texture this fits into
 			if (loadmodel->brushq3.deluxemapping && (i & 1))
-				loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), size, size, convertedpixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bspdeluxemaps.integer ? TEXF_COMPRESS : 0), NULL);
+				loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), mergedwidth, mergedheight, mergeddeluxepixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bspdeluxemaps.integer ? TEXF_COMPRESS : 0), -1, NULL);
 			else
-				loadmodel->brushq3.data_lightmaps [lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), size, size, convertedpixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : 0), NULL);
+				loadmodel->brushq3.data_lightmaps [lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), mergedwidth, mergedheight, mergedpixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : 0), -1, NULL);
 		}
 	}
 
-	Mem_Free(convertedpixels);
+	if (mergeddeluxepixels)
+		Mem_Free(mergeddeluxepixels);
+	Mem_Free(mergedpixels);
 	if(external)
 	{
 		for(i = 0; i < count; ++i)
@@ -4914,9 +4954,9 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 			}
 			else
 			{
-				out->lightmaptexture = loadmodel->brushq3.data_lightmaps[n >> (loadmodel->brushq3.num_lightmapmergepower * 2 + loadmodel->brushq3.deluxemapping)];
+				out->lightmaptexture = loadmodel->brushq3.data_lightmaps[n >> loadmodel->brushq3.num_lightmapmergedwidthheightdeluxepower];
 				if (loadmodel->brushq3.deluxemapping)
-					out->deluxemaptexture = loadmodel->brushq3.data_deluxemaps[n >> (loadmodel->brushq3.num_lightmapmergepower * 2 + loadmodel->brushq3.deluxemapping)];
+					out->deluxemaptexture = loadmodel->brushq3.data_deluxemaps[n >> loadmodel->brushq3.num_lightmapmergedwidthheightdeluxepower];
 			}
 		}
 
@@ -5761,7 +5801,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 	vec_t backdist1;
 	vec_t backdist2;
 	vec_t backfrac;
-	vec3_t clipped[2];
+	vec3_t clipped, newstart, newend;
 #endif
 	vec3_t segmentmins;
 	vec3_t segmentmaxs;
@@ -5826,8 +5866,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// START end START END
 #ifdef BIHLINECLIP
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[0]);
-			start = clipped[0];
+			VectorLerp(start, frontfrac, end, newstart); start = newstart;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5841,8 +5880,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 #ifdef BIHLINECLIP
 			// start END START END
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[0]);
-			end = clipped[0];
+			VectorLerp(start, frontfrac, end, newend); end = newend;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5860,8 +5898,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #ifdef BIHLINECLIP
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			end = clipped[0];
+			VectorLerp(start, backfrac, end, newend); end = newend;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5875,11 +5912,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// START end start END
 #ifdef BIHLINECLIP
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[1]);
-			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+			VectorLerp(start, frontfrac, end, clipped);
+			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			end = clipped[0];
+			VectorLerp(start, backfrac, end, newend); end = newend;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5895,11 +5931,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// start END start END
 #ifdef BIHLINECLIP
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[1]);
-			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+			VectorLerp(start, frontfrac, end, clipped);
+			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			end = clipped[0];
+			VectorLerp(start, backfrac, end, newend); end = newend;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5915,8 +5950,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// START END start END
 #ifdef BIHLINECLIP
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			end = clipped[0];
+			VectorLerp(start, backfrac, end, newend); end = newend;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5931,8 +5965,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #ifdef BIHLINECLIP
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			start = clipped[0];
+			VectorLerp(start, backfrac, end, newstart); start = newstart;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5946,11 +5979,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// START end START end
 #ifdef BIHLINECLIP
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[1]);
-			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+			VectorLerp(start, frontfrac, end, clipped);
+			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			start = clipped[0];
+			VectorLerp(start, backfrac, end, newstart); start = newstart;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5966,11 +5998,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// start END START end
 #ifdef BIHLINECLIP
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[1]);
-			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+			VectorLerp(start, frontfrac, end, clipped);
+			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			start = clipped[0];
+			VectorLerp(start, backfrac, end, newstart); start = newstart;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -5986,8 +6017,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// START END START end
 #ifdef BIHLINECLIP
 			backfrac = backdist1 / (backdist1 - backdist2);
-			VectorLerp(start, backfrac, end, clipped[0]);
-			start = clipped[0];
+			VectorLerp(start, backfrac, end, newstart); start = newstart;
 			segmentmins[0] = min(start[0], end[0]);
 			segmentmins[1] = min(start[1], end[1]);
 			segmentmins[2] = min(start[2], end[2]);
@@ -6006,8 +6036,8 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// START end start end
 #ifdef BIHLINECLIP
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[1]);
-			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+			VectorLerp(start, frontfrac, end, clipped);
+			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
 #else
 			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #endif
@@ -6017,8 +6047,8 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 			// start END start end
 #ifdef BIHLINECLIP
 			frontfrac = frontdist1 / (frontdist1 - frontdist2);
-			VectorLerp(start, frontfrac, end, clipped[1]);
-			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+			VectorLerp(start, frontfrac, end, clipped);
+			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
 #else
 			Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #endif
@@ -6158,10 +6188,7 @@ void Mod_CollisionBIH_TraceBox(dp_model_t *model, const frameblend_t *frameblend
 		if (VectorCompare(start, end))
 			Mod_CollisionBIH_TracePoint(model, frameblend, skeleton, trace, shiftstart, hitsupercontentsmask);
 		else
-		{
 			Mod_CollisionBIH_TraceLine(model, frameblend, skeleton, trace, shiftstart, shiftend, hitsupercontentsmask);
-			VectorSubtract(trace->endpos, boxmins, trace->endpos);
-		}
 		return;
 	}
 
@@ -6185,6 +6212,33 @@ void Mod_CollisionBIH_TraceBox(dp_model_t *model, const frameblend_t *frameblend
 	Mod_CollisionBIH_TraceBrush_RecursiveBIHNode(trace, model, model->collision_bih.rootnode, &thisbrush_start.brush, &thisbrush_end.brush, segmentmins, segmentmaxs);
 }
 
+void Mod_CollisionBIH_TraceBrush(dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, colbrushf_t *start, colbrushf_t *end, int hitsupercontentsmask)
+{
+	float segmentmins[3], segmentmaxs[3];
+
+	if (mod_q3bsp_optimizedtraceline.integer && VectorCompare(start->mins, start->maxs) && VectorCompare(end->mins, end->maxs))
+	{
+		if (VectorCompare(start->mins, end->mins))
+			Mod_CollisionBIH_TracePoint(model, frameblend, skeleton, trace, start->mins, hitsupercontentsmask);
+		else
+			Mod_CollisionBIH_TraceLine(model, frameblend, skeleton, trace, start->mins, end->mins, hitsupercontentsmask);
+		return;
+	}
+
+	// box trace, performed as brush trace
+	memset(trace, 0, sizeof(*trace));
+	trace->fraction = 1;
+	trace->realfraction = 1;
+	trace->hitsupercontentsmask = hitsupercontentsmask;
+	segmentmins[0] = min(start->mins[0], end->mins[0]);
+	segmentmins[1] = min(start->mins[1], end->mins[1]);
+	segmentmins[2] = min(start->mins[2], end->mins[2]);
+	segmentmaxs[0] = max(start->maxs[0], end->maxs[0]);
+	segmentmaxs[1] = max(start->maxs[1], end->maxs[1]);
+	segmentmaxs[2] = max(start->maxs[2], end->maxs[2]);
+	Mod_CollisionBIH_TraceBrush_RecursiveBIHNode(trace, model, model->collision_bih.rootnode, start, end, segmentmins, segmentmaxs);
+}
+
 int Mod_CollisionBIH_PointSuperContents(struct model_s *model, int frame, const vec3_t point)
 {
 	trace_t trace;
@@ -6524,10 +6578,7 @@ static void Mod_Q3BSP_TraceBox(dp_model_t *model, const frameblend_t *frameblend
 		if (VectorCompare(start, end))
 			Mod_Q3BSP_TracePoint(model, frameblend, skeleton, trace, shiftstart, hitsupercontentsmask);
 		else
-		{
 			Mod_Q3BSP_TraceLine(model, frameblend, skeleton, trace, shiftstart, shiftend, hitsupercontentsmask);
-			VectorSubtract(trace->endpos, boxmins, trace->endpos);
-		}
 		return;
 	}
 
@@ -6564,6 +6615,49 @@ static void Mod_Q3BSP_TraceBox(dp_model_t *model, const frameblend_t *frameblend
 		Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, model->brush.data_nodes, &thisbrush_start.brush, &thisbrush_end.brush, ++markframe, segmentmins, segmentmaxs);
 }
 
+void Mod_Q3BSP_TraceBrush(dp_model_t *model, const frameblend_t *frameblend, const skeleton_t *skeleton, trace_t *trace, colbrushf_t *start, colbrushf_t *end, int hitsupercontentsmask)
+{
+	float segmentmins[3], segmentmaxs[3];
+	int i;
+	msurface_t *surface;
+	q3mbrush_t *brush;
+
+	if (mod_q3bsp_optimizedtraceline.integer && VectorCompare(start->mins, start->maxs) && VectorCompare(end->mins, end->maxs))
+	{
+		if (VectorCompare(start->mins, end->mins))
+			Mod_Q3BSP_TracePoint(model, frameblend, skeleton, trace, start->mins, hitsupercontentsmask);
+		else
+			Mod_Q3BSP_TraceLine(model, frameblend, skeleton, trace, start->mins, end->mins, hitsupercontentsmask);
+		return;
+	}
+
+	// box trace, performed as brush trace
+	memset(trace, 0, sizeof(*trace));
+	trace->fraction = 1;
+	trace->realfraction = 1;
+	trace->hitsupercontentsmask = hitsupercontentsmask;
+	segmentmins[0] = min(start->mins[0], end->mins[0]);
+	segmentmins[1] = min(start->mins[1], end->mins[1]);
+	segmentmins[2] = min(start->mins[2], end->mins[2]);
+	segmentmaxs[0] = max(start->maxs[0], end->maxs[0]);
+	segmentmaxs[1] = max(start->maxs[1], end->maxs[1]);
+	segmentmaxs[2] = max(start->maxs[2], end->maxs[2]);
+	if (mod_collision_bih.integer)
+		Mod_CollisionBIH_TraceBrush_RecursiveBIHNode(trace, model, model->collision_bih.rootnode, start, end, segmentmins, segmentmaxs);
+	else if (model->brush.submodel)
+	{
+		for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+			if (brush->colbrushf && BoxesOverlap(segmentmins, segmentmaxs, brush->colbrushf->mins, brush->colbrushf->maxs))
+				Collision_TraceBrushBrushFloat(trace, start, end, brush->colbrushf, brush->colbrushf);
+		if (mod_q3bsp_curves_collisions.integer)
+			for (i = 0, surface = model->data_surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surface++)
+				if (surface->num_collisiontriangles && BoxesOverlap(segmentmins, segmentmaxs, surface->mins, surface->maxs))
+					Collision_TraceBrushTriangleMeshFloat(trace, start, end, surface->num_collisiontriangles, surface->deprecatedq3data_collisionelement3i, surface->deprecatedq3data_collisionvertex3f, surface->deprecatedq3num_collisionbboxstride, surface->deprecatedq3data_collisionbbox6f, surface->texture->supercontents, surface->texture->surfaceflags, surface->texture, segmentmins, segmentmaxs);
+	}
+	else
+		Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, model->brush.data_nodes, start, end, ++markframe, segmentmins, segmentmaxs);
+}
+
 static int Mod_Q3BSP_PointSuperContents(struct model_s *model, int frame, const vec3_t point)
 {
 	int i;
@@ -6602,7 +6696,7 @@ static int Mod_Q3BSP_PointSuperContents(struct model_s *model, int frame, const
 	return supercontents;
 }
 
-void Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces)
+bih_t *Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces, bih_t *out)
 {
 	int j;
 	int bihnumleafs;
@@ -6637,40 +6731,47 @@ void Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces)
 			if (brush->colbrushf)
 				bihnumleafs++;
 		for (j = 0, surface = model->data_surfaces + model->firstmodelsurface;j < nummodelsurfaces;j++, surface++)
-			bihnumleafs += surface->num_collisiontriangles;
+		{
+			if (surface->texture->basematerialflags & MATERIALFLAG_MESHCOLLISIONS)
+				bihnumleafs += surface->num_triangles + surface->num_collisiontriangles;
+			else
+				bihnumleafs += surface->num_collisiontriangles;
+		}
 	}
 
 	if (!bihnumleafs)
-		return;
+		return NULL;
 
 	// allocate the memory for the BIH leaf nodes
 	bihleafs = Mem_Alloc(loadmodel->mempool, sizeof(bih_leaf_t) * bihnumleafs);
 
 	// now populate the BIH leaf nodes
 	bihleafindex = 0;
-	if (userendersurfaces)
+
+	// add render surfaces
+	renderelement3i = model->surfmesh.data_element3i;
+	rendervertex3f = model->surfmesh.data_vertex3f;
+	for (j = 0, surface = model->data_surfaces + model->firstmodelsurface;j < nummodelsurfaces;j++, surface++)
 	{
-		// add render surfaces
-		renderelement3i = model->surfmesh.data_element3i;
-		rendervertex3f = model->surfmesh.data_vertex3f;
-		for (j = 0, surface = model->data_surfaces + model->firstmodelsurface;j < nummodelsurfaces;j++, surface++)
+		for (triangleindex = 0, e = renderelement3i + 3*surface->num_firsttriangle;triangleindex < surface->num_triangles;triangleindex++, e += 3)
 		{
-			for (triangleindex = 0, e = renderelement3i + 3*surface->num_firsttriangle;triangleindex < surface->num_triangles;triangleindex++, e += 3)
-			{
-				bihleafs[bihleafindex].type = BIH_RENDERTRIANGLE;
-				bihleafs[bihleafindex].textureindex = surface->texture - model->data_textures;
-				bihleafs[bihleafindex].itemindex = triangleindex+surface->num_firsttriangle;
-				bihleafs[bihleafindex].mins[0] = min(rendervertex3f[3*e[0]+0], min(rendervertex3f[3*e[1]+0], rendervertex3f[3*e[2]+0])) - 1;
-				bihleafs[bihleafindex].mins[1] = min(rendervertex3f[3*e[0]+1], min(rendervertex3f[3*e[1]+1], rendervertex3f[3*e[2]+1])) - 1;
-				bihleafs[bihleafindex].mins[2] = min(rendervertex3f[3*e[0]+2], min(rendervertex3f[3*e[1]+2], rendervertex3f[3*e[2]+2])) - 1;
-				bihleafs[bihleafindex].maxs[0] = max(rendervertex3f[3*e[0]+0], max(rendervertex3f[3*e[1]+0], rendervertex3f[3*e[2]+0])) + 1;
-				bihleafs[bihleafindex].maxs[1] = max(rendervertex3f[3*e[0]+1], max(rendervertex3f[3*e[1]+1], rendervertex3f[3*e[2]+1])) + 1;
-				bihleafs[bihleafindex].maxs[2] = max(rendervertex3f[3*e[0]+2], max(rendervertex3f[3*e[1]+2], rendervertex3f[3*e[2]+2])) + 1;
-				bihleafindex++;
-			}
+			if (!userendersurfaces && !(surface->texture->basematerialflags & MATERIALFLAG_MESHCOLLISIONS))
+				continue;
+			bihleafs[bihleafindex].type = BIH_RENDERTRIANGLE;
+			bihleafs[bihleafindex].textureindex = surface->texture - model->data_textures;
+			bihleafs[bihleafindex].surfaceindex = surface - model->data_surfaces;
+			bihleafs[bihleafindex].itemindex = triangleindex+surface->num_firsttriangle;
+			bihleafs[bihleafindex].mins[0] = min(rendervertex3f[3*e[0]+0], min(rendervertex3f[3*e[1]+0], rendervertex3f[3*e[2]+0])) - 1;
+			bihleafs[bihleafindex].mins[1] = min(rendervertex3f[3*e[0]+1], min(rendervertex3f[3*e[1]+1], rendervertex3f[3*e[2]+1])) - 1;
+			bihleafs[bihleafindex].mins[2] = min(rendervertex3f[3*e[0]+2], min(rendervertex3f[3*e[1]+2], rendervertex3f[3*e[2]+2])) - 1;
+			bihleafs[bihleafindex].maxs[0] = max(rendervertex3f[3*e[0]+0], max(rendervertex3f[3*e[1]+0], rendervertex3f[3*e[2]+0])) + 1;
+			bihleafs[bihleafindex].maxs[1] = max(rendervertex3f[3*e[0]+1], max(rendervertex3f[3*e[1]+1], rendervertex3f[3*e[2]+1])) + 1;
+			bihleafs[bihleafindex].maxs[2] = max(rendervertex3f[3*e[0]+2], max(rendervertex3f[3*e[1]+2], rendervertex3f[3*e[2]+2])) + 1;
+			bihleafindex++;
 		}
 	}
-	else
+
+	if (!userendersurfaces)
 	{
 		// add collision brushes
 		for (brushindex = 0, brush = model->brush.data_brushes + brushindex+model->firstmodelbrush;brushindex < nummodelbrushes;brushindex++, brush++)
@@ -6679,6 +6780,7 @@ void Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces)
 				continue;
 			bihleafs[bihleafindex].type = BIH_BRUSH;
 			bihleafs[bihleafindex].textureindex = brush->texture - model->data_textures;
+			bihleafs[bihleafindex].surfaceindex = -1;
 			bihleafs[bihleafindex].itemindex = brushindex+model->firstmodelbrush;
 			VectorCopy(brush->colbrushf->mins, bihleafs[bihleafindex].mins);
 			VectorCopy(brush->colbrushf->maxs, bihleafs[bihleafindex].maxs);
@@ -6694,6 +6796,7 @@ void Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces)
 			{
 				bihleafs[bihleafindex].type = BIH_COLLISIONTRIANGLE;
 				bihleafs[bihleafindex].textureindex = surface->texture - model->data_textures;
+				bihleafs[bihleafindex].surfaceindex = surface - model->data_surfaces;
 				bihleafs[bihleafindex].itemindex = triangleindex+surface->num_firstcollisiontriangle;
 				bihleafs[bihleafindex].mins[0] = min(collisionvertex3f[3*e[0]+0], min(collisionvertex3f[3*e[1]+0], collisionvertex3f[3*e[2]+0])) - 1;
 				bihleafs[bihleafindex].mins[1] = min(collisionvertex3f[3*e[0]+1], min(collisionvertex3f[3*e[1]+1], collisionvertex3f[3*e[2]+1])) - 1;
@@ -6713,17 +6816,19 @@ void Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces)
 	temp_leafsortscratch = temp_leafsort + bihnumleafs;
 
 	// now build it
-	BIH_Build(&model->collision_bih, bihnumleafs, bihleafs, bihmaxnodes, bihnodes, temp_leafsort, temp_leafsortscratch);
+	BIH_Build(out, bihnumleafs, bihleafs, bihmaxnodes, bihnodes, temp_leafsort, temp_leafsortscratch);
 
 	// we're done with the temporary data
 	Mem_Free(temp_leafsort);
 
 	// resize the BIH nodes array if it over-allocated
-	if (model->collision_bih.maxnodes > model->collision_bih.numnodes)
+	if (out->maxnodes > out->numnodes)
 	{
-		model->collision_bih.maxnodes = model->collision_bih.numnodes;
-		model->collision_bih.nodes = Mem_Realloc(loadmodel->mempool, model->collision_bih.nodes, model->collision_bih.numnodes * sizeof(bih_node_t));
+		out->maxnodes = out->numnodes;
+		out->nodes = Mem_Realloc(loadmodel->mempool, out->nodes, out->numnodes * sizeof(bih_node_t));
 	}
+
+	return out;
 }
 
 static int Mod_Q3BSP_SuperContentsFromNativeContents(dp_model_t *model, int nativecontents)
@@ -6801,10 +6906,9 @@ void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node)
 
 void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
-	int i, j, numshadowmeshtriangles, lumps;
+	int i, j, lumps;
 	q3dheader_t *header;
 	float corner[3], yawradius, modelradius;
-	msurface_t *surface;
 
 	mod->modeldatatypestring = "Q3BSP";
 
@@ -6822,6 +6926,7 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 
 	mod->soundfromcenter = true;
 	mod->TraceBox = Mod_Q3BSP_TraceBox;
+	mod->TraceBrush = Mod_Q3BSP_TraceBrush;
 	mod->TraceLine = Mod_Q3BSP_TraceLine;
 	mod->TracePoint = Mod_Q3BSP_TracePoint;
 	mod->PointSuperContents = Mod_Q3BSP_PointSuperContents;
@@ -6922,22 +7027,7 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	loadmodel->brush.supportwateralpha = true;
 
 	// make a single combined shadow mesh to allow optimized shadow volume creation
-	numshadowmeshtriangles = 0;
-	if (cls.state != ca_dedicated)
-	{
-		for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
-		{
-			surface->num_firstshadowmeshtriangle = numshadowmeshtriangles;
-			numshadowmeshtriangles += surface->num_triangles;
-		}
-		loadmodel->brush.shadowmesh = Mod_ShadowMesh_Begin(loadmodel->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true);
-		for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
-			if (surface->num_triangles > 0)
-				Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, loadmodel->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle));
-		loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true, false);
-		if (loadmodel->brush.shadowmesh)
-			Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles);
-	}
+	Mod_Q1BSP_CreateShadowMesh(loadmodel);
 
 	loadmodel->brush.num_leafs = 0;
 	Mod_Q3BSP_RecursiveFindNumLeafs(loadmodel->brush.data_nodes);
@@ -7034,12 +7124,13 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 			mod->DrawSky = R_Q1BSP_DrawSky;
 
 		for (j = 0;j < mod->nummodelsurfaces;j++)
-			if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION))
+			if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA))
 				break;
 		if (j < mod->nummodelsurfaces)
 			mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes;
 
-		Mod_MakeCollisionBIH(mod, false);
+		Mod_MakeCollisionBIH(mod, false, &mod->collision_bih);
+		Mod_MakeCollisionBIH(mod, true, &mod->render_bih);
 
 		// generate VBOs and other shared data before cloning submodels
 		if (i == 0)
@@ -7071,6 +7162,7 @@ void Mod_MAP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 typedef struct objvertex_s
 {
 	int nextindex;
+	int submodelindex;
 	int textureindex;
 	float v[3];
 	float vt[2];
@@ -7078,6 +7170,8 @@ typedef struct objvertex_s
 }
 objvertex_t;
 
+static unsigned char nobsp_pvs[1] = {1};
+
 void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
 	const char *textbase = (char *)buffer, *text = textbase;
@@ -7085,7 +7179,7 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	char *argv[512];
 	char line[1024];
 	char materialname[MAX_QPATH];
-	int i, j, numvertices, firstvertex, firsttriangle, elementindex, vertexindex, numsurfaces, surfacevertices, surfacetriangles, surfaceelements;
+	int i, j, l, numvertices, firstvertex, firsttriangle, elementindex, vertexindex, surfacevertices, surfacetriangles, surfaceelements, submodelindex = 0;
 	int index1, index2, index3;
 	objvertex_t vfirst, vprev, vcurrent;
 	int argc;
@@ -7099,12 +7193,13 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	int maxvt = 0, numvt = 1;
 	int maxvn = 0, numvn = 1;
 	char *texturenames = NULL;
-	float dist, modelradius, modelyawradius;
+	float dist, modelradius, modelyawradius, yawradius;
 	float *v = NULL;
 	float *vt = NULL;
 	float *vn = NULL;
 	float mins[3];
 	float maxs[3];
+	float corner[3];
 	objvertex_t *thisvertex = NULL;
 	int vertexhashindex;
 	int *vertexhashtable = NULL;
@@ -7114,6 +7209,9 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	int vertexhashcount = 0;
 	skinfile_t *skinfiles = NULL;
 	unsigned char *data = NULL;
+	int *submodelfirstsurface;
+	msurface_t *surface;
+	msurface_t *tempsurfaces;
 
 	memset(&vfirst, 0, sizeof(vfirst));
 	memset(&vprev, 0, sizeof(vprev));
@@ -7126,6 +7224,7 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	loadmodel->type = mod_obj;
 	loadmodel->soundfromcenter = true;
 	loadmodel->TraceBox = Mod_CollisionBIH_TraceBox;
+	loadmodel->TraceBrush = Mod_CollisionBIH_TraceBrush;
 	loadmodel->TraceLine = Mod_CollisionBIH_TraceLine;
 	loadmodel->TracePoint = Mod_CollisionBIH_TracePoint_Mesh;
 	loadmodel->PointSuperContents = Mod_CollisionBIH_PointSuperContents_Mesh;
@@ -7278,6 +7377,7 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 					index3 = numvn - index3;
 				vcurrent.nextindex = -1;
 				vcurrent.textureindex = textureindex;
+				vcurrent.submodelindex = submodelindex;
 				VectorCopy(v + 3*index1, vcurrent.v);
 				Vector2Copy(vt + 2*index2, vcurrent.vt);
 				VectorCopy(vn + 3*index3, vcurrent.vn);
@@ -7313,7 +7413,10 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 			}
 		}
 		else if (!strcmp(argv[0], "o") || !strcmp(argv[0], "g"))
-			;
+		{
+			submodelindex = atof(argv[1]);
+			loadmodel->brush.numsubmodels = max(submodelindex + 1, loadmodel->brush.numsubmodels);
+		}
 		else if (!strcmp(argv[0], "usemtl"))
 		{
 			for (i = 0;i < numtextures;i++)
@@ -7356,9 +7459,7 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	loadmodel->radius2 = modelradius * modelradius;
 
 	// allocate storage for triangles
-	loadmodel->num_surfaces = loadmodel->nummodelsurfaces = numsurfaces = numtextures;
 	loadmodel->surfmesh.data_element3i = Mem_Alloc(loadmodel->mempool, numtriangles * sizeof(int[3]));
-	loadmodel->data_surfaces = (msurface_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t));
 	// allocate vertex hash structures to build an optimal vertex subset
 	vertexhashsize = numtriangles*2;
 	vertexhashtable = Mem_Alloc(loadmodel->mempool, sizeof(int) * vertexhashsize);
@@ -7370,61 +7471,91 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	firstvertex = 0;
 	firsttriangle = 0;
 	elementindex = 0;
-	for (textureindex = 0;textureindex < numtextures;textureindex++)
+	loadmodel->num_surfaces = 0;
+	// allocate storage for the worst case number of surfaces, later we resize
+	tempsurfaces = (msurface_t *)Mem_Alloc(loadmodel->mempool, numtextures * loadmodel->brush.numsubmodels * sizeof(msurface_t));
+	submodelfirstsurface = (int *)Mem_Alloc(loadmodel->mempool, (loadmodel->brush.numsubmodels+1) * sizeof(int));
+	surface = tempsurfaces;
+	for (submodelindex = 0;submodelindex < loadmodel->brush.numsubmodels;submodelindex++)
 	{
-		msurface_t *surface = loadmodel->data_surfaces + textureindex;
-		// copy the mins/maxs of the model backwards so that the first vertex
-		// added will set the surface bounds to a point
-		VectorCopy(loadmodel->normalmaxs, surface->mins);
-		VectorCopy(loadmodel->normalmins, surface->maxs);
-		surfacevertices = 0;
-		surfaceelements = 0;
-		for (vertexindex = 0;vertexindex < numtriangles*3;vertexindex++)
-		{
-			thisvertex = vertices + vertexindex;
-			if (thisvertex->textureindex != textureindex)
-				continue;
-			surface->mins[0] = min(surface->mins[0], thisvertex->v[0]);
-			surface->mins[1] = min(surface->mins[1], thisvertex->v[1]);
-			surface->mins[2] = min(surface->mins[2], thisvertex->v[2]);
-			surface->maxs[0] = max(surface->maxs[0], thisvertex->v[0]);
-			surface->maxs[1] = max(surface->maxs[1], thisvertex->v[1]);
-			surface->maxs[2] = max(surface->maxs[2], thisvertex->v[2]);
-			vertexhashindex = (unsigned int)(thisvertex->v[0] * 3571 + thisvertex->v[0] * 1777 + thisvertex->v[0] * 457) % (unsigned int)vertexhashsize;
-			for (i = vertexhashtable[vertexhashindex];i >= 0;i = vertexhashdata[i].nextindex)
+		submodelfirstsurface[submodelindex] = loadmodel->num_surfaces;
+		for (textureindex = 0;textureindex < numtextures;textureindex++)
+		{
+			for (vertexindex = 0;vertexindex < numtriangles*3;vertexindex++)
 			{
-				vdata = vertexhashdata + i;
-				if (vdata->textureindex == thisvertex->textureindex && VectorCompare(thisvertex->v, vdata->v) && VectorCompare(thisvertex->vn, vdata->vn) && Vector2Compare(thisvertex->vt, vdata->vt))
+				thisvertex = vertices + vertexindex;
+				if (thisvertex->submodelindex == submodelindex && thisvertex->textureindex == textureindex)
 					break;
 			}
-			if (i < 0)
+			// skip the surface creation if there are no triangles for it
+			if (vertexindex == numtriangles*3)
+				continue;
+			// create a surface for these vertices
+			surfacevertices = 0;
+			surfaceelements = 0;
+			// we hack in a texture index in the surface to be fixed up later...
+			surface->texture = (texture_t *)((size_t)textureindex);
+			// calculate bounds as we go
+			VectorCopy(thisvertex->v, surface->mins);
+			VectorCopy(thisvertex->v, surface->maxs);
+			for (;vertexindex < numtriangles*3;vertexindex++)
 			{
-				i = vertexhashcount++;
-				vdata = vertexhashdata + i;
-				*vdata = *thisvertex;
-				vdata->nextindex = vertexhashtable[vertexhashindex];
-				vertexhashtable[vertexhashindex] = i;
-				surfacevertices++;
+				thisvertex = vertices + vertexindex;
+				if (thisvertex->submodelindex != submodelindex)
+					continue;
+				if (thisvertex->textureindex != textureindex)
+					continue;
+				// add vertex to surface bounds
+				surface->mins[0] = min(surface->mins[0], thisvertex->v[0]);
+				surface->mins[1] = min(surface->mins[1], thisvertex->v[1]);
+				surface->mins[2] = min(surface->mins[2], thisvertex->v[2]);
+				surface->maxs[0] = max(surface->maxs[0], thisvertex->v[0]);
+				surface->maxs[1] = max(surface->maxs[1], thisvertex->v[1]);
+				surface->maxs[2] = max(surface->maxs[2], thisvertex->v[2]);
+				// add the vertex if it is not found in the merged set, and
+				// get its index (triangle element) for the surface
+				vertexhashindex = (unsigned int)(thisvertex->v[0] * 3571 + thisvertex->v[0] * 1777 + thisvertex->v[0] * 457) % (unsigned int)vertexhashsize;
+				for (i = vertexhashtable[vertexhashindex];i >= 0;i = vertexhashdata[i].nextindex)
+				{
+					vdata = vertexhashdata + i;
+					if (vdata->submodelindex == thisvertex->submodelindex && vdata->textureindex == thisvertex->textureindex && VectorCompare(thisvertex->v, vdata->v) && VectorCompare(thisvertex->vn, vdata->vn) && Vector2Compare(thisvertex->vt, vdata->vt))
+						break;
+				}
+				if (i < 0)
+				{
+					i = vertexhashcount++;
+					vdata = vertexhashdata + i;
+					*vdata = *thisvertex;
+					vdata->nextindex = vertexhashtable[vertexhashindex];
+					vertexhashtable[vertexhashindex] = i;
+					surfacevertices++;
+				}
+				loadmodel->surfmesh.data_element3i[elementindex++] = i;
+				surfaceelements++;
 			}
-			loadmodel->surfmesh.data_element3i[elementindex++] = i;
-			surfaceelements++;
-		}
-		surfacetriangles = surfaceelements / 3;
-		surface->num_vertices = surfacevertices;
-		surface->num_triangles = surfacetriangles;
-		surface->num_firstvertex = firstvertex;
-		surface->num_firsttriangle = firsttriangle;
-		firstvertex += surface->num_vertices;
-		firsttriangle += surface->num_triangles;
-	}
+			surfacetriangles = surfaceelements / 3;
+			surface->num_vertices = surfacevertices;
+			surface->num_triangles = surfacetriangles;
+			surface->num_firstvertex = firstvertex;
+			surface->num_firsttriangle = firsttriangle;
+			firstvertex += surface->num_vertices;
+			firsttriangle += surface->num_triangles;
+			surface++;
+			loadmodel->num_surfaces++;
+		}
+	}
+	submodelfirstsurface[submodelindex] = loadmodel->num_surfaces;
 	numvertices = firstvertex;
+	loadmodel->data_surfaces = (msurface_t *)Mem_Realloc(loadmodel->mempool, tempsurfaces, loadmodel->num_surfaces * sizeof(msurface_t));
+	tempsurfaces = NULL;
 
 	// allocate storage for final mesh data
 	loadmodel->num_textures = numtextures * loadmodel->numskins;
 	loadmodel->num_texturesperskin = numtextures;
-	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, numsurfaces * sizeof(int) + numsurfaces * loadmodel->numskins * sizeof(texture_t) + numtriangles * sizeof(int[3]) + (numvertices <= 65536 ? numtriangles * sizeof(unsigned short[3]) : 0) + numvertices * sizeof(float[14]));
-	loadmodel->sortedmodelsurfaces = (int *)data;data += numsurfaces * sizeof(int);
-	loadmodel->data_textures = (texture_t *)data;data += numsurfaces * loadmodel->numskins * sizeof(texture_t);
+	data = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(int) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + numtriangles * sizeof(int[3]) + (numvertices <= 65536 ? numtriangles * sizeof(unsigned short[3]) : 0) + numvertices * sizeof(float[14]) + loadmodel->brush.numsubmodels * sizeof(dp_model_t *));
+	loadmodel->brush.submodels = (dp_model_t **)data;data += loadmodel->brush.numsubmodels * sizeof(dp_model_t *);
+	loadmodel->sortedmodelsurfaces = (int *)data;data += loadmodel->num_surfaces * sizeof(int);
+	loadmodel->data_textures = (texture_t *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t);
 	loadmodel->surfmesh.num_vertices = numvertices;
 	loadmodel->surfmesh.num_triangles = numtriangles;
 	loadmodel->surfmesh.data_neighbor3i = (int *)data;data += numtriangles * sizeof(int[3]);
@@ -7448,12 +7579,9 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 		Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + textureindex, skinfiles, texturenames + textureindex*MAX_QPATH, texturenames + textureindex*MAX_QPATH);
 	Mod_FreeSkinFiles(skinfiles);
 
-	// set the surface textures
-	for (textureindex = 0;textureindex < numtextures;textureindex++)
-	{
-		msurface_t *surface = loadmodel->data_surfaces + textureindex;
-		surface->texture = loadmodel->data_textures + textureindex;
-	}
+	// set the surface textures to their real values now that we loaded them...
+	for (i = 0;i < loadmodel->num_surfaces;i++)
+		loadmodel->data_surfaces[i].texture = loadmodel->data_textures + (size_t)loadmodel->data_surfaces[i].texture;
 
 	// free data
 	Mem_Free(vertices);
@@ -7464,8 +7592,10 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	Mem_Free(vertexhashtable);
 	Mem_Free(vertexhashdata);
 
+	// make a single combined shadow mesh to allow optimized shadow volume creation
+	Mod_Q1BSP_CreateShadowMesh(loadmodel);
+
 	// compute all the mesh information that was not loaded from the file
-	Mod_MakeSortedSurfaces(loadmodel);
 	if (loadmodel->surfmesh.data_element3s)
 		for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
 			loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
@@ -7476,7 +7606,138 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true);
 	Mod_BuildTriangleNeighbors(loadmodel->surfmesh.data_neighbor3i, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles);
 
-	Mod_MakeCollisionBIH(loadmodel, true);
+	// if this is a worldmodel and has no BSP tree, create a fake one for the purpose
+	loadmodel->brush.num_visleafs = 1;
+	loadmodel->brush.num_leafs = 1;
+	loadmodel->brush.num_nodes = 0;
+	loadmodel->brush.num_leafsurfaces = loadmodel->num_surfaces;
+	loadmodel->brush.data_leafs = (mleaf_t *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_leafs * sizeof(mleaf_t));
+	loadmodel->brush.data_nodes = (mnode_t *)loadmodel->brush.data_leafs;
+	loadmodel->brush.num_pvsclusters = 1;
+	loadmodel->brush.num_pvsclusterbytes = 1;
+	loadmodel->brush.data_pvsclusters = nobsp_pvs;
+	//if (loadmodel->num_nodes) loadmodel->data_nodes = (mnode_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_nodes * sizeof(mnode_t));
+	//loadmodel->data_leafsurfaces = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->num_leafsurfaces * sizeof(int));
+	loadmodel->brush.data_leafsurfaces = loadmodel->sortedmodelsurfaces;
+	VectorCopy(loadmodel->normalmins, loadmodel->brush.data_leafs->mins);
+	VectorCopy(loadmodel->normalmaxs, loadmodel->brush.data_leafs->maxs);
+	loadmodel->brush.data_leafs->combinedsupercontents = 0; // FIXME?
+	loadmodel->brush.data_leafs->clusterindex = 0;
+	loadmodel->brush.data_leafs->areaindex = 0;
+	loadmodel->brush.data_leafs->numleafsurfaces = loadmodel->brush.num_leafsurfaces;
+	loadmodel->brush.data_leafs->firstleafsurface = loadmodel->brush.data_leafsurfaces;
+	loadmodel->brush.data_leafs->numleafbrushes = 0;
+	loadmodel->brush.data_leafs->firstleafbrush = NULL;
+	loadmodel->brush.supportwateralpha = true;
+
+	if (loadmodel->brush.numsubmodels)
+		loadmodel->brush.submodels = (dp_model_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brush.numsubmodels * sizeof(dp_model_t *));
+
+	mod = loadmodel;
+	for (i = 0;i < loadmodel->brush.numsubmodels;i++)
+	{
+		if (i > 0)
+		{
+			char name[10];
+			// duplicate the basic information
+			dpsnprintf(name, sizeof(name), "*%i", i);
+			mod = Mod_FindName(name, loadmodel->name);
+			// copy the base model to this one
+			*mod = *loadmodel;
+			// rename the clone back to its proper name
+			strlcpy(mod->name, name, sizeof(mod->name));
+			mod->brush.parentmodel = loadmodel;
+			// textures and memory belong to the main model
+			mod->texturepool = NULL;
+			mod->mempool = NULL;
+			mod->brush.GetPVS = NULL;
+			mod->brush.FatPVS = NULL;
+			mod->brush.BoxTouchingPVS = NULL;
+			mod->brush.BoxTouchingLeafPVS = NULL;
+			mod->brush.BoxTouchingVisibleLeafs = NULL;
+			mod->brush.FindBoxClusters = NULL;
+			mod->brush.LightPoint = NULL;
+			mod->brush.AmbientSoundLevelsForPoint = NULL;
+		}
+		mod->brush.submodel = i;
+		if (loadmodel->brush.submodels)
+			loadmodel->brush.submodels[i] = mod;
+
+		// make the model surface list (used by shadowing/lighting)
+		mod->firstmodelsurface = submodelfirstsurface[i];
+		mod->nummodelsurfaces = submodelfirstsurface[i+1] - submodelfirstsurface[i];
+		mod->firstmodelbrush = 0;
+		mod->nummodelbrushes = 0;
+		mod->sortedmodelsurfaces = loadmodel->sortedmodelsurfaces + mod->firstmodelsurface;
+		Mod_MakeSortedSurfaces(mod);
+
+		VectorClear(mod->normalmins);
+		VectorClear(mod->normalmaxs);
+		l = false;
+		for (j = 0;j < mod->nummodelsurfaces;j++)
+		{
+			const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface;
+			const float *v = mod->surfmesh.data_vertex3f + 3 * surface->num_firstvertex;
+			int k;
+			if (!surface->num_vertices)
+				continue;
+			if (!l)
+			{
+				l = true;
+				VectorCopy(v, mod->normalmins);
+				VectorCopy(v, mod->normalmaxs);
+			}
+			for (k = 0;k < surface->num_vertices;k++, v += 3)
+			{
+				mod->normalmins[0] = min(mod->normalmins[0], v[0]);
+				mod->normalmins[1] = min(mod->normalmins[1], v[1]);
+				mod->normalmins[2] = min(mod->normalmins[2], v[2]);
+				mod->normalmaxs[0] = max(mod->normalmaxs[0], v[0]);
+				mod->normalmaxs[1] = max(mod->normalmaxs[1], v[1]);
+				mod->normalmaxs[2] = max(mod->normalmaxs[2], v[2]);
+			}
+		}
+		corner[0] = max(fabs(mod->normalmins[0]), fabs(mod->normalmaxs[0]));
+		corner[1] = max(fabs(mod->normalmins[1]), fabs(mod->normalmaxs[1]));
+		corner[2] = max(fabs(mod->normalmins[2]), fabs(mod->normalmaxs[2]));
+		modelradius = sqrt(corner[0]*corner[0]+corner[1]*corner[1]+corner[2]*corner[2]);
+		yawradius = sqrt(corner[0]*corner[0]+corner[1]*corner[1]);
+		mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
+		mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
+		mod->yawmaxs[0] = mod->yawmaxs[1] = yawradius;
+		mod->yawmins[0] = mod->yawmins[1] = -yawradius;
+		mod->yawmins[2] = mod->normalmins[2];
+		mod->yawmaxs[2] = mod->normalmaxs[2];
+		mod->radius = modelradius;
+		mod->radius2 = modelradius * modelradius;
+
+		// this gets altered below if sky or water is used
+		mod->DrawSky = NULL;
+		mod->DrawAddWaterPlanes = NULL;
+
+		for (j = 0;j < mod->nummodelsurfaces;j++)
+			if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & MATERIALFLAG_SKY)
+				break;
+		if (j < mod->nummodelsurfaces)
+			mod->DrawSky = R_Q1BSP_DrawSky;
+
+		for (j = 0;j < mod->nummodelsurfaces;j++)
+			if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA))
+				break;
+		if (j < mod->nummodelsurfaces)
+			mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes;
+
+		Mod_MakeCollisionBIH(mod, true, &mod->collision_bih);
+		mod->render_bih = mod->collision_bih;
+
+		// generate VBOs and other shared data before cloning submodels
+		if (i == 0)
+			Mod_BuildVBOs();
+	}
+	mod = loadmodel;
+	Mem_Free(submodelfirstsurface);
+
+	Con_DPrintf("Stats for obj model \"%s\": %i faces, %i nodes, %i leafs, %i clusters, %i clusterportals, mesh: %i vertices, %i triangles, %i surfaces\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->num_surfaces);
 }
 
 
@@ -8168,7 +8429,7 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend)
 	loadmodel->num_textures = numtextures;
 	loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_textures * sizeof(texture_t));
 	for (i = 0;i < numtextures;i++)
-		Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i, texturenames[i], true, true, TEXF_MIPMAP | TEXF_ALPHA | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
+		Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i, texturenames[i], true, true, TEXF_MIPMAP | TEXF_ALPHA | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS);
 
 	// free the texturenames array since we are now done with it
 	for (i = 0;i < numtextures;i++)