Reworks the lighting settings according to the discussion in scp-fs2open#1634.

This fixes scp-fs2open#1634

Author: The-E

code/def_files/data/effects/deferred-f.sdr

@@ -131,6 +131,6 @@ void main()
 	vec3 halfVec = normalize(lightDir + eyeDir);
 	float NdotL = clamp(dot(normal.xyz, lightDir), 0.0, 1.0);
 	vec4 fragmentColor = vec4(color * (diffuseLightColor * NdotL * attenuation), 1.0);
-	fragmentColor.rgb += SpecularGGX(specColor.rgb, lightDir, normal.xyz, halfVec, eyeDir, gloss, fresnel, NdotL).rgb * specLightColor * attenuation;
+	fragmentColor.rgb += computeLighting(specColor.rgb, lightDir, normal.xyz, halfVec, eyeDir, gloss, fresnel, NdotL).rgb * specLightColor * attenuation;
 	fragOut0 = max(fragmentColor, vec4(0.0));
 }

code/def_files/data/effects/lighting.sdr

@@ -47,3 +47,12 @@ vec3 SpecularGGX(vec3 specColor, vec3 light, vec3 normal, vec3 halfVec, vec3 vie
 
 	return distribution * fresnel * visibility * dotNL;
 }
+
+vec3 computeLighting(vec3 specColor, vec3 light, vec3 normal, vec3 halfVec, vec3 view, float gloss, float fresnelFactor, float dotNL) 
+{
+	#ifdef FLAG_LIGHT_MODEL_BLINN_PHONG
+	return SpecularBlinnPhong(specColor, light, normal, halfVec, 1.0, fresnelFactor, dotNL);
+	#else
+	return SpecularGGX(specColor, light, normal, halfVec, view, gloss, fresnelFactor, dotNL);
+	#endif
+}

code/def_files/data/effects/main-f.sdr

@@ -209,7 +209,7 @@ vec3 CalculateLighting(vec3 normal, vec3 diffuseMaterial, vec3 specularMaterial,
 		float NdotL = clamp(dot(normal, lightDir), 0.0f, 1.0f);
 		// Ambient, Diffuse, and Specular
 		lightDiffuse += (lights[i].diffuse_color.rgb * diffuseFactor * NdotL * attenuation) * shadow;
-		lightSpecular += lights[i].spec_color * SpecularGGX(specularMaterial, lightDir, normal, halfVec, eyeDir, gloss, fresnel, NdotL) * attenuation * shadow;
+		lightSpecular += lights[i].spec_color * computeLighting(specularMaterial, lightDir, normal, halfVec, eyeDir, gloss, fresnel, NdotL) * attenuation * shadow;
 	}
 	return diffuseMaterial * (lightAmbient + lightDiffuse) + lightSpecular;
 }

code/graphics/opengl/gropenglshader.cpp

@@ -336,6 +336,10 @@ static SCP_string opengl_shader_get_header(shader_type type_id, int flags, shade
 		sflags << "#define WORKAROUND_CLIPPING_PLANES\n";
 	}
 
+	if (Detail.lighting < 3) {
+		sflags << "#define FLAG_LIGHT_MODEL_BLINN_PHONG\n";
+	}
+
 	if (type_id == SDR_TYPE_POST_PROCESS_MAIN || type_id == SDR_TYPE_POST_PROCESS_LIGHTSHAFTS || type_id == SDR_TYPE_POST_PROCESS_FXAA) {
 		// ignore looking for variants. main post process, lightshafts, and FXAA shaders need special headers to be hacked in
 		opengl_post_shader_header(sflags, type_id, flags);

code/lighting/lighting.cpp

@@ -353,15 +353,6 @@ void light_apply_rgb( ubyte *param_r, ubyte *param_g, ubyte *param_b, const vec3
 	int idx;
 	float rval, gval, bval;
 
-	if (Detail.lighting==0) {
-		// No static light
-		ubyte lVal = ubyte(fl2i(static_light_level*255.0f));
-		*param_r = lVal;
-		*param_g = lVal;
-		*param_b = lVal;
-		return;
-	}
-
 	if ( Lighting_off ) {
 		*param_r = 255;
 		*param_g = 255;

code/model/modelrender.cpp

@@ -1111,7 +1111,7 @@ void model_render_buffers(model_draw_list* scene, model_material *rendering_mate
 				texture_maps[TM_SPEC_GLOSS_TYPE] = model_interp_get_texture(&tmap->textures[TM_SPEC_GLOSS_TYPE], base_frametime);
 			}
 
-			if ((Detail.lighting > 2) && (detail_level < 2)) {
+			if (detail_level < 2) {
 				// likewise, etc.
 				texture_info *norm_map = &tmap->textures[TM_NORMAL_TYPE];
 				texture_info *height_map = &tmap->textures[TM_HEIGHT_TYPE];
@@ -1143,10 +1143,10 @@ void model_render_buffers(model_draw_list* scene, model_material *rendering_mate
 				if (debug_flags & MR_DEBUG_NO_DIFFUSE)  texture_maps[TM_BASE_TYPE] = -1;
 				if (debug_flags & MR_DEBUG_NO_GLOW)		  texture_maps[TM_GLOW_TYPE] = -1;
 				if (debug_flags & MR_DEBUG_NO_SPEC)		  texture_maps[TM_SPECULAR_TYPE] = -1;
-				if (!(debug_flags & MR_DEBUG_NO_NORMAL))  texture_maps[TM_NORMAL_TYPE] = model_interp_get_texture(norm_map, base_frametime);
-				if (!(debug_flags & MR_DEBUG_NO_HEIGHT))  texture_maps[TM_HEIGHT_TYPE] = model_interp_get_texture(height_map, base_frametime);
-				if (!(debug_flags & MR_DEBUG_NO_AMBIENT)) texture_maps[TM_AMBIENT_TYPE] = model_interp_get_texture(ambient_map, base_frametime);
 				if (!(debug_flags & MR_DEBUG_NO_MISC))    texture_maps[TM_MISC_TYPE] = model_interp_get_texture(misc_map, base_frametime);
+				if (!(debug_flags & MR_DEBUG_NO_NORMAL) && Detail.lighting > 0)  texture_maps[TM_NORMAL_TYPE] = model_interp_get_texture(norm_map, base_frametime);
+				if (!(debug_flags & MR_DEBUG_NO_AMBIENT) && Detail.lighting > 0) texture_maps[TM_AMBIENT_TYPE] = model_interp_get_texture(ambient_map, base_frametime);
+				if (!(debug_flags & MR_DEBUG_NO_HEIGHT) && Detail.lighting > 1)  texture_maps[TM_HEIGHT_TYPE] = model_interp_get_texture(height_map, base_frametime);
 			}
 		} else {
 			alpha = forced_alpha;
@@ -1810,7 +1810,7 @@ void model_render_glowpoint(int point_num, vec3d *pos, matrix *orient, glow_poin
 				}
 			}
 
-			if ( Deferred_lighting && gpo && gpo->is_lightsource ) {
+			if ( Detail.lighting > 3 && Deferred_lighting && gpo && gpo->is_lightsource ) {
 				if ( gpo->lightcone ) {
 					vec3d cone_dir_rot;
 					vec3d cone_dir_model;

code/object/object.cpp

@@ -1183,7 +1183,7 @@ void obj_move_all_post(object *objp, float frametime)
 				weapon_process_post( objp, frametime );
 
 			// Cast light
-			if ( Detail.lighting > 2 ) {
+			if ( Detail.lighting > 3 ) {
 				// Weapons cast light
 
 				int group_id = Weapons[objp->instance].group_id;
@@ -1233,7 +1233,7 @@ void obj_move_all_post(object *objp, float frametime)
 
 			// Make any electrical arcs on ships cast light
 			if (Arc_light)	{
-				if ( (Detail.lighting > 2) && (objp != Viewer_obj) ) {
+				if ( (Detail.lighting > 3) && (objp != Viewer_obj) ) {
 					int i;
 					ship		*shipp;
 					shipp = &Ships[objp->instance];
@@ -1276,7 +1276,7 @@ void obj_move_all_post(object *objp, float frametime)
 			if ( !physics_paused )
 				fireball_process_post(objp,frametime);
 
-			if (Detail.lighting > 3) {
+			if (Detail.lighting > 2) {
 				float r = 0.0f, g = 0.0f, b = 0.0f;
 
 				fireball_get_color(Fireballs[objp->instance].fireball_info_index, &r, &g, &b);
@@ -1323,7 +1323,7 @@ void obj_move_all_post(object *objp, float frametime)
 
 			// Make any electrical arcs on debris cast light
 			if (Arc_light)	{
-				if ( Detail.lighting > 2 ) {
+				if ( Detail.lighting > 3 ) {
 					int i;
 					debris		*db;
 					db = &Debris[objp->instance];

code/weapon/beam.cpp

@@ -86,9 +86,6 @@ int Beam_good_shot_octants[BEAM_NUM_GOOD_OCTANTS][4] = {
 	{ 4, 0, 1, 0 },
 };
 
-// beam lighting effects
-int Beam_lighting = 1;
-
 // debug stuff - keep track of how many collision tests we perform a second and how many we toss a second
 #define BEAM_TEST_STAMP_TIME		4000	// every 4 seconds
 int Beam_test_stamp = -1;
@@ -1607,7 +1604,7 @@ void beam_add_light_small(beam *bm, object *objp, vec3d *pt_override = NULL)
 	float noise;
 
 	// no lighting 
-	if(!Beam_lighting){
+	if(Detail.lighting < 1){
 		return;
 	}
 
@@ -1677,7 +1674,7 @@ void beam_add_light_large(beam *bm, object *objp, vec3d *pt0, vec3d *pt1)
 	float noise;
 
 	// no lighting 
-	if(!Beam_lighting){
+	if(Detail.lighting < 2){
 		return;
 	}