X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=d4021ee0bf46731690676e6f984dde0b60c26fe3;hb=8b77d5651e90b342b1b2b3cdb768294a6619e353;hp=559de9e8140e78fad525fb831a4c2f2dd3fb001c;hpb=fc3e16ee6c45ac0e550735eb1955b4f578b9c0ca;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.c b/model_shared.c
index 559de9e8..d4021ee0 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -1605,6 +1605,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
 	memcpy (&entry->shader, shader, sizeof (q3shaderinfo_t));
 }
 
+extern cvar_t mod_noshader_default_offsetmapping;
 extern cvar_t mod_q3shader_default_offsetmapping;
 extern cvar_t mod_q3shader_default_polygonoffset;
 extern cvar_t mod_q3shader_default_polygonfactor;
@@ -2072,6 +2073,8 @@ void Mod_LoadQ3Shaders(void)
 					shader.dpshadow = true;
 				else if (!strcasecmp(parameter[0], "dpnoshadow"))
 					shader.dpnoshadow = true;
+				else if (!strcasecmp(parameter[0], "dpnortlight"))
+					shader.dpnortlight = true;
 				else if (!strcasecmp(parameter[0], "dpreflectcube"))
 					strlcpy(shader.dpreflectcube, parameter[1], sizeof(shader.dpreflectcube));
 				else if (!strcasecmp(parameter[0], "dpmeshcollisions"))
@@ -2281,7 +2284,7 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
 	if(defaulttexflags & TEXF_ISSPRITE)
 		texflagsor |= TEXF_ISSPRITE;
 	// unless later loaded from the shader
-	texture->offsetmapping = (mod_q3shader_default_offsetmapping.value) ? OFFSETMAPPING_DEFAULT : OFFSETMAPPING_OFF;
+	texture->offsetmapping = (mod_noshader_default_offsetmapping.value) ? OFFSETMAPPING_DEFAULT : OFFSETMAPPING_OFF;
 	texture->offsetscale = 1;
 	texture->specularscalemod = 1;
 	texture->specularpowermod = 1; 
@@ -2419,6 +2422,8 @@ nothing                GL_ZERO GL_ONE
 			texture->basematerialflags &= ~MATERIALFLAG_NOSHADOW;
 		if (shader->dpnoshadow)
 			texture->basematerialflags |= MATERIALFLAG_NOSHADOW;
+		if (shader->dpnortlight)
+			texture->basematerialflags |= MATERIALFLAG_NORTLIGHT;
 		memcpy(texture->deforms, shader->deforms, sizeof(texture->deforms));
 		texture->reflectmin = shader->reflectmin;
 		texture->reflectmax = shader->reflectmax;
@@ -2520,6 +2525,7 @@ nothing                GL_ZERO GL_ONE
 		if(cls.state == ca_dedicated)
 		{
 			texture->skinframes[0] = NULL;
+			success = false;
 		}
 		else
 		{
@@ -2797,7 +2803,7 @@ void Mod_BuildVBOs(void)
 			VectorScale(loadmodel->surfmesh.data_tvector3f + 3*vertexindex, 1.0f, vertexmesh->tvector3f);
 			VectorScale(loadmodel->surfmesh.data_normal3f + 3*vertexindex, 1.0f, vertexmesh->normal3f);
 			if (loadmodel->surfmesh.data_lightmapcolor4f)
-				Vector4Scale(loadmodel->surfmesh.data_lightmapcolor4f + 4*vertexindex, 255.0f, vertexmesh->color4ub);
+				Vector4Copy(loadmodel->surfmesh.data_lightmapcolor4f + 4*vertexindex, vertexmesh->color4f);
 			Vector2Copy(loadmodel->surfmesh.data_texcoordtexture2f + 2*vertexindex, vertexmesh->texcoordtexture2f);
 			if (loadmodel->surfmesh.data_texcoordlightmap2f)
 				Vector2Scale(loadmodel->surfmesh.data_texcoordlightmap2f + 2*vertexindex, 1.0f, vertexmesh->texcoordlightmap2f);
@@ -3428,8 +3434,8 @@ static void Mod_GenerateLightmaps_LightPoint(dp_model_t *model, const vec3_t pos
 			continue;
 		lightiradius = 1.0f / lightradius;
 		dist = sqrt(dist2) * lightiradius;
-		intensity = dist < 1 ? ((1.0f - dist) * r_shadow_lightattenuationlinearscale.value / (r_shadow_lightattenuationdividebias.value + dist*dist)) : 0;
-		if (intensity <= 0)
+		intensity = (1.0f - dist) * r_shadow_lightattenuationlinearscale.value / (r_shadow_lightattenuationdividebias.value + dist*dist);
+		if (intensity <= 0.0f)
 			continue;
 		if (model && model->TraceLine)
 		{