From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 19 Apr 2006 07:04:05 +0000 (+0000)
Subject: removed the flawed detection of modelspace deluxemaps (it was always concluding they... 
X-Git-Tag: xonotic-v0.1.0preview~4054
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a2c743d3ac927c82f77aa66fb2a16f890fe5b385;p=xonotic%2Fdarkplaces.git

removed the flawed detection of modelspace deluxemaps (it was always concluding they were modelspace because of unused black pixels and such), now assumes q3bsp deluxemaps are always modelspace


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6311 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/model_brush.c b/model_brush.c
index 816e3b1a..f367e4b7 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -4601,28 +4601,8 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l)
 	loadmodel->brushq3.data_lightmaps = out;
 	loadmodel->brushq3.num_lightmaps = count;
 
-	loadmodel->brushq3.deluxemapping_modelspace = false;
 	for (i = 0;i < count;i++, in++, out++)
-	{
-		// if this may be a deluxemap, check if it's in modelspace or not
-		if ((i & 1) && !loadmodel->brushq3.deluxemapping_modelspace)
-		{
-			int j;
-			unsigned char *b = in->rgb;
-			for (j = 2;j < 128*128*3;j += 3)
-			{
-				// if this is definitely negative Z, it is not facing outward,
-				// and thus must be in modelspace, as negative Z would never
-				// occur in tangentspace
-				if (b[j] < 120)
-				{
-					loadmodel->brushq3.deluxemapping_modelspace = true;
-					break;
-				}
-			}
-		}
 		*out = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", i), 128, 128, in->rgb, TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
-	}
 }
 
 static void Mod_Q3BSP_LoadFaces(lump_t *l)
@@ -4657,6 +4637,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 	// is also not a deluxemapped bsp if it has an odd number of lightmaps or
 	// less than 2
 	loadmodel->brushq3.deluxemapping = true;
+	loadmodel->brushq3.deluxemapping_modelspace = true;
 	if (loadmodel->brushq3.num_lightmaps >= 2 && !(loadmodel->brushq3.num_lightmaps & 1))
 	{
 		for (i = 0;i < count;i++)