Added experimental sun light hack.

src/g_levellocals.h

@@ -728,6 +728,11 @@ struct FLevelLocals
 		return savegamerestore
 			|| (info != nullptr && info->Snapshot.mBuffer != nullptr && info->isValid());
 	}
+
+	// [LAD] sunlight hack
+	DVector3 sunPos;
+	PalEntry sunColor;
+
 };
 
 

src/rendering/gl/renderer/gl_renderstate.cpp

@@ -140,6 +140,10 @@ bool FGLRenderState::ApplyShader()
 	activeShader->muSpecularMaterial.Set(mGlossiness, mSpecularLevel);
 	activeShader->muAddColor.Set(mAddColor);
 
+	// [LAD] sunlight hack
+	activeShader->muSunPos.Set(mSunPos.vec);
+	activeShader->muSunColor.Set(mSunColor);
+
 	if (mGlowEnabled)
 	{
 		activeShader->muGlowTopColor.Set(mGlowTop.vec);

src/rendering/gl/shaders/gl_shader.cpp

@@ -266,6 +266,10 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
 	i_data += "#define uLightDist uLightAttr.r\n";
 	i_data += "uniform int uFogEnabled;\n";
 
+	// [LAD] sunlight hack
+	i_data += "uniform vec4 uSunPos;\n";
+	i_data += "uniform vec4 uSunColor;\n";
+
 	// dynamic lights
 	i_data += "uniform int uLightIndex;\n";
 
@@ -538,6 +542,10 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
 	muAddColor.Init(hShader, "uAddColor");
 	muTimer.Init(hShader, "timer");
 
+	// [LAD] sunlight hack
+	muSunPos.Init(hShader, "uSunPos");
+	muSunColor.Init(hShader, "uSunColor");
+
 	lights_index = glGetUniformLocation(hShader, "lights");
 	fakevb_index = glGetUniformLocation(hShader, "fakeVB");
 	modelmatrix_index = glGetUniformLocation(hShader, "ModelMatrix");

src/rendering/gl/shaders/gl_shader.h

@@ -258,6 +258,10 @@ class FShader
 	FBufferedUniform1f muAlphaThreshold;
 	FBufferedUniform2f muSpecularMaterial;
 	FBufferedUniform1f muTimer;
+
+	// [LAD] sunlight hack
+	FBufferedUniform4f muSunPos;
+	FBufferedUniformPE muSunColor;
 
 	int lights_index;
 	int modelmatrix_index;

src/rendering/hwrenderer/scene/hw_renderstate.cpp

@@ -39,6 +39,10 @@
 //==========================================================================
 void HWDrawInfo::SetColor(FRenderState &state, int sectorlightlevel, int rellight, bool fullbright, const FColormap &cm, float alpha, bool weapon)
 {
+	// [LAD] sunlight hack
+	// I don't know where else to put this :S
+	state.SetSunParms();
+
 	if (fullbright)
 	{
 		state.SetColorAlpha(0xffffff, alpha, 0);

src/rendering/hwrenderer/scene/hw_renderstate.h

@@ -156,6 +156,10 @@ class FRenderState
 	FStateVec4 mDynColor;
 	FRenderStyle mRenderStyle;
 
+	// [LAD] sunlight hack
+	FStateVec4 mSunPos;
+	PalEntry mSunColor;
+
 	FMaterialState mMaterial;
 	FDepthBiasState mBias;
 
@@ -393,6 +397,16 @@ class FRenderState
 		mLightParms[0] = d;
 	}
 
+	void SetSunParms(void)
+	{
+		mSunPos.Set(primaryLevel->sunPos.X, primaryLevel->sunPos.Y, primaryLevel->sunPos.Z, 0.f);
+		PalEntry sc;
+		sc.r = primaryLevel->sunColor.r;
+		sc.g = primaryLevel->sunColor.g;
+		sc.b = primaryLevel->sunColor.b;
+		mSunColor = sc;
+	}
+
 	PalEntry GetFogColor() const
 	{
 		return mFogColor;

src/scripting/vmthunks.cpp

@@ -2981,6 +2981,8 @@ DEFINE_FIELD_BIT(FLevelLocals, flags3, removeitems, LEVEL3_REMOVEITEMS)
 // [LAD]
 DEFINE_FIELD_BIT(FLevelLocals, ladflags, noautomap, LADLEVEL_NOAUTOMAP)
 DEFINE_FIELD_BIT(FLevelLocals, ladflags, nousersave, LADLEVEL_NOSAVEGAME)
+DEFINE_FIELD(FLevelLocals, sunPos)
+DEFINE_FIELD(FLevelLocals, sunColor)
 
 DEFINE_FIELD_X(Sector, sector_t, floorplane)
 DEFINE_FIELD_X(Sector, sector_t, ceilingplane)

wadsrc/static/shaders/glsl/material_normal.fp

@@ -59,6 +59,12 @@ vec3 ProcessMaterialLight(Material material, vec3 color)
 		}
 	}
 
+	// [LAD] sunlight hack
+	// Sun direction
+	vec3 sundir = normalize(uSunPos.xyz);
+	vec3 suncolor = uSunColor.rgb;
+	dynlight.rgb += suncolor * clamp(dot(normal, sundir), 0.0, 1.0);
+
 	vec3 frag = material.Base.rgb * clamp(color + desaturate(dynlight).rgb, 0.0, 1.4);
 
 	if (uLightIndex >= 0)

wadsrc/static/shaders/glsl/material_specular.fp

@@ -34,6 +34,23 @@ vec2 lightAttenuation(int i, vec3 normal, vec3 viewdir, float lightcolorA)
 	return vec2(attenuation, attenuation * specularLevel * pow(specAngle, phExp));
 }
 
+// [LAD] sunlight hack
+vec2 sunlightAttenuation(vec3 normal, vec3 viewdir)
+{
+	// Sun direction
+	vec3 sundir = normalize(uSunPos.xyz);
+
+	float attenuation = clamp(dot(normal, sundir), 0.0, 1.0);
+
+	float glossiness = uSpecularMaterial.x;
+	float specularLevel = uSpecularMaterial.y;
+
+	vec3 halfdir = normalize(viewdir + sundir);
+	float specAngle = clamp(dot(halfdir, normal), 0.0f, 1.0f);
+	float phExp = glossiness * 4.0f;
+	return vec2(attenuation, attenuation * specularLevel * pow(specAngle, phExp));
+}
+
 vec3 ProcessMaterialLight(Material material, vec3 color)
 {
 	vec4 dynlight = uDynLightColor;
@@ -67,6 +84,12 @@ vec3 ProcessMaterialLight(Material material, vec3 color)
 		}
 	}
 
+	// [LAD] sunlight hack
+	vec3 suncolor = uSunColor.rgb;
+	vec2 attenuation = sunlightAttenuation(normal, viewdir);
+	dynlight.rgb += suncolor * attenuation.x;
+	specular.rgb += suncolor * attenuation.y;
+
 	dynlight.rgb = clamp(color + desaturate(dynlight).rgb, 0.0, 1.4);
 	specular.rgb = clamp(desaturate(specular).rgb, 0.0, 1.4);
 

wadsrc/static/zscript/base.zs

@@ -710,6 +710,8 @@ struct LevelLocals native
 	// [LAD]
 	native bool noautomap;
 	native bool nousersave;
+	native Vector3 sunPos;
+	native Color sunColor;
 
 	native String GetUDMFString(int type, int index, Name key);
 	native int GetUDMFInt(int type, int index, Name key);