X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=shader_hlsl.h;h=652428704e34c95f9b83fa102a2b3f39a5e26f6a;hb=940c356b2e70a0f653714000141979478ae27e40;hp=1586d05e6412d12e791dc6baf9b0820d1b1bcca2;hpb=3a5b55a7e3887ad2cd3fdf56a9141848f72203ee;p=xonotic%2Fdarkplaces.git

diff --git a/shader_hlsl.h b/shader_hlsl.h
index 1586d05e..65242870 100644
--- a/shader_hlsl.h
+++ b/shader_hlsl.h
@@ -544,7 +544,7 @@
 "#endif\n"
 "\n"
 "#ifdef USEOFFSETMAPPING\n"
-"float2 OffsetMapping(float2 TexCoord, float4 OffsetMapping_ScaleSteps, float OffsetMapping_LodDistance, float3 EyeVector, sampler Texture_Normal, float2 dPdx, float2 dPdy)\n"
+"float2 OffsetMapping(float2 TexCoord, float4 OffsetMapping_ScaleSteps, float OffsetMapping_Bias, float OffsetMapping_LodDistance, float3 EyeVector, sampler Texture_Normal, float2 dPdx, float2 dPdy)\n"
 "{\n"
 "	float i;\n"
 "	// distance-based LOD\n"
@@ -562,7 +562,7 @@
 "	//float3 OffsetVector = float3(EyeVector.xy * ((1.0 / EyeVector.z) * ScaleSteps.x) * float2(-1, 1), -1);\n"
 "	//float3 OffsetVector = float3(normalize(EyeVector.xy) * ScaleSteps.x * float2(-1, 1), -1);\n"
 "	float3 OffsetVector = float3(normalize(EyeVector).xy * ScaleSteps.x * float2(-1, 1), -1);\n"
-"	float3 RT = float3(TexCoord, 1);\n"
+"	float3 RT = float3(float2(TexCoord.xy - OffsetVector.xy*OffsetMapping_Bias), 1);\n"
 "	OffsetVector *= ScaleSteps.z;\n"
 "	for(i = 1.0; i < ScaleSteps.y; ++i)\n"
 "		RT += OffsetVector *  step(tex2Dgrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z);\n"
@@ -574,6 +574,7 @@
 "	//float2 OffsetVector = float2(EyeVector.xy * ((1.0 / EyeVector.z) * ScaleSteps.x) * float2(-1, 1));\n"
 "	//float2 OffsetVector = float2(normalize(EyeVector.xy) * ScaleSteps.x * float2(-1, 1));\n"
 "	float2 OffsetVector = float2(normalize(EyeVector).xy * ScaleSteps.x * float2(-1, 1));\n"
+"	TexCoord.xy = TexCoord.xy - OffsetVector.xy*OffsetMapping_Bias;\n"
 "	OffsetVector *= ScaleSteps.z;\n"
 "	for(i = 0.0; i < ScaleSteps.y; ++i)\n"
 "		TexCoord += OffsetVector * (1.0 - tex2Dgrad(Texture_Normal, TexCoord, dPdx, dPdy).a);\n"
@@ -794,6 +795,7 @@
 "#ifdef USEOFFSETMAPPING\n"
 "uniform float4 OffsetMapping_ScaleSteps : register(c24),\n"
 "uniform float4 OffsetMapping_LodDistance : register(c53),\n"
+"uniform float OffsetMapping_Bias : register(c54),\n"
 "#endif\n"
 "uniform half SpecularPower : register(c36),\n"
 "#ifdef HLSL\n"
@@ -809,7 +811,7 @@
 "	// apply offsetmapping\n"
 "	float2 dPdx = ddx(TexCoord);\n"
 "	float2 dPdy = ddy(TexCoord);\n"
-"	float2 TexCoordOffset = OffsetMapping(TexCoord, OffsetMapping_ScaleSteps, OffsetMapping_LodDistance, EyeVector, Texture_Normal, dPdx, dPdy);\n"
+"	float2 TexCoordOffset = OffsetMapping(TexCoord, OffsetMapping_ScaleSteps, OffsetMapping_Bias, OffsetMapping_LodDistance, EyeVector, Texture_Normal, dPdx, dPdy);\n"
 "# define offsetMappedTexture2D(t) tex2Dgrad(t, TexCoordOffset, dPdx, dPdy)\n"
 "#else\n"
 "# define offsetMappedTexture2D(t) tex2D(t, TexCoord)\n"
@@ -1224,6 +1226,7 @@
 "\n"
 "#ifdef USEOFFSETMAPPING\n"
 "uniform float4 OffsetMapping_ScaleSteps : register(c24),\n"
+"uniform float OffsetMapping_Bias : register(c54),\n"
 "#endif\n"
 "\n"
 "#ifdef USEDEFERREDLIGHTMAP\n"
@@ -1293,7 +1296,7 @@
 "	// apply offsetmapping\n"
 "	float2 dPdx = ddx(TexCoord);\n"
 "	float2 dPdy = ddy(TexCoord);\n"
-"	float2 TexCoordOffset = OffsetMapping(TexCoord, OffsetMapping_ScaleSteps, OffsetMapping_LodDistance, EyeVector, Texture_Normal, dPdx, dPdy);\n"
+"	float2 TexCoordOffset = OffsetMapping(TexCoord, OffsetMapping_ScaleSteps, OffsetMapping_Bias, OffsetMapping_LodDistance, EyeVector, Texture_Normal, dPdx, dPdy);\n"
 "# define offsetMappedTexture2D(t) tex2Dgrad(t, TexCoordOffset, dPdx, dPdy)\n"
 "#else\n"
 "# define offsetMappedTexture2D(t) tex2D(t, TexCoord)\n"