Fixed OpenGL compatibility (and hopefully fixed the purple rock bug)

HoI4-LOTRMod-Team · Dec 17, 2022 · 4b14c38 · 4b14c38
1 parent ddf1e7a
commit 4b14c38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gfx/FX/pdxmap.shader b/gfx/FX/pdxmap.shader
@@ -329,7 +329,7 @@ PixelShader =
 			// Papermap color
 			float3 papermap = 0.8f * float3(0.66, 0.435, 0.196) * TerrainColor.a * 
 				lerp(
-					1.0f,
+					float3(1.0f, 1.0f, 1.0f),
 					min(TerrainColor.rgb*10.0f, 1.0f),
 					0.63f // This value effectively controls the saturation
 					)

diff --git a/gfx/FX/pdxmesh.shader b/gfx/FX/pdxmesh.shader
@@ -458,7 +458,7 @@ PixelShader =
 		float lava = 0.0f;
 		if(vDiffuse.r>=1.0f && vDiffuse.g<=0.0f && vDiffuse.b>=1.0f) {
 			lava = 1.0f;
-			lava_emit = tex2D( DiffuseMap, float2(vUV0.x, 1.0f-vUV0.y) );
+			lava_emit = tex2D( DiffuseMap, float2(vUV0.x, 1.0f-vUV0.y) ).rgb;
 			vDiffuse = float4(1.0f, 1.0f, 1.0f, 1.0f);
 		}
 
@@ -572,7 +572,7 @@ PixelShader =
 				// This controls the "glowiness" of the lava
 				lava_emit.rg *= 3.5f;
 				// 0.05 controls the amount of black slag on top of the lava, while 1.2 controls how red it is.
-				vColor = smoothstep(vColor, 0, 0.05) * pow(lava_emit, 1.2);
+				vColor = smoothstep(0, vColor.r, 0.05f) * pow(lava_emit, float3(1.2f, 1.2f, 1.2f));
 			}
 
 			float FogColorFactor = 0.0;