luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-10 11:55:27 +01:00
Code Activity

Support array textures in shadow renderer (the lazy way)

Browse Source
This commit is contained in:
sfan5
2025-11-09 13:33:55 +01:00
parent c3790dd7af
commit 760b20504f
7 changed files with 108 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/shaders/shadow/pass1/opengl_fragment.glsl
View File

@@ -1,18 +1,22 @@
// FIXME missing array texture handling
uniform sampler2D ColorMapSampler;
#ifdef USE_ARRAY_TEXTURE
uniform mediump sampler2DArray baseTexture;
#else
uniform sampler2D baseTexture;
#endif
varying vec4 tPos;
#ifdef GL_ES
varying mediump vec2 varTexCoord;
#else
centroid varying vec2 varTexCoord;
#endif
CENTROID_ VARYING_ mediump vec2 varTexCoord;
CENTROID_ VARYING_ float varTexLayer; // actually int
void main()
{
vec4 col = texture2D(ColorMapSampler, varTexCoord);
// FIXME: magic number???
if (col.a < 0.70)
#ifdef USE_ARRAY_TEXTURE
vec4 base = texture(baseTexture, vec3(varTexCoord, varTexLayer)).rgba;
#else
vec4 base = texture2D(baseTexture, varTexCoord).rgba;
#endif
// (this totally ignores the node's alpha mode)
if (base.a < 0.70)
discard;
float depth = 0.5 + tPos.z * 0.5;

13
client/shaders/shadow/pass1/opengl_vertex.glsl
View File

@@ -6,11 +6,8 @@ uniform float xyPerspectiveBias0;
uniform float xyPerspectiveBias1;
uniform float zPerspectiveBias;
#ifdef GL_ES
varying mediump vec2 varTexCoord;
#else
centroid varying vec2 varTexCoord;
#endif
CENTROID_ VARYING_ mediump vec2 varTexCoord;
CENTROID_ VARYING_ float varTexLayer; // actually int
vec4 getRelativePosition(in vec4 position)
{
@@ -45,5 +42,9 @@ void main()
tPos = applyPerspectiveDistortion(pos);
gl_Position = vec4(tPos.xyz, 1.0);
varTexCoord = (mTexture * vec4(inTexCoord0.xy, 0.0, 1.0)).xy;
varTexCoord = (mTexture * vec4(inTexCoord0.xy, 1.0, 1.0)).st;
#ifdef USE_ARRAY_TEXTURE
varTexLayer = inVertexAux;
#endif
}

30
client/shaders/shadow/pass1_trans/opengl_fragment.glsl
View File

@@ -1,12 +1,12 @@
// FIXME missing array texture handling
uniform sampler2D ColorMapSampler;
#ifdef USE_ARRAY_TEXTURE
uniform mediump sampler2DArray baseTexture;
#else
uniform sampler2D baseTexture;
#endif
varying vec4 tPos;
#ifdef GL_ES
varying mediump vec2 varTexCoord;
#else
centroid varying vec2 varTexCoord;
#endif
CENTROID_ VARYING_ mediump vec2 varTexCoord;
CENTROID_ VARYING_ float varTexLayer; // actually int
#ifdef COLORED_SHADOWS
varying vec3 varColor;
@@ -21,27 +21,27 @@ float packColor(vec3 color)
+ floor(color.g * c_precision + 0.5) * c_precisionp1
+ floor(color.r * c_precision + 0.5) * c_precisionp1 * c_precisionp1;
}
const vec3 black = vec3(0.0);
#endif
void main()
{
vec4 col = texture2D(ColorMapSampler, varTexCoord);
#ifdef USE_ARRAY_TEXTURE
vec4 base = texture(baseTexture, vec3(varTexCoord, varTexLayer)).rgba;
#else
vec4 base = texture2D(baseTexture, varTexCoord).rgba;
#endif
#ifndef COLORED_SHADOWS
if (col.a < 0.5)
if (base.a < 0.5)
discard;
#endif
float depth = 0.5 + tPos.z * 0.5;
// ToDo: Liso: Apply movement on waving plants
// depth in [0, 1] for texture
//col.rgb = col.a == 1.0 ? vec3(1.0) : col.rgb;
#ifdef COLORED_SHADOWS
col.rgb *= varColor.rgb;
base.rgb *= varColor.rgb;
// premultiply color alpha (see-through side)
float packedColor = packColor(col.rgb * (1.0 - col.a));
float packedColor = packColor(base.rgb * (1.0 - base.a));
gl_FragColor = vec4(depth, packedColor, 0.0,1.0);
#else
gl_FragColor = vec4(depth, 0.0, 0.0, 1.0);

13
client/shaders/shadow/pass1_trans/opengl_vertex.glsl
View File

@@ -9,11 +9,8 @@ uniform float xyPerspectiveBias0;
uniform float xyPerspectiveBias1;
uniform float zPerspectiveBias;
#ifdef GL_ES
varying mediump vec2 varTexCoord;
#else
centroid varying vec2 varTexCoord;
#endif
CENTROID_ VARYING_ mediump vec2 varTexCoord;
CENTROID_ VARYING_ float varTexLayer; // actually int
vec4 getRelativePosition(in vec4 position)
{
@@ -48,7 +45,11 @@ void main()
tPos = applyPerspectiveDistortion(pos);
gl_Position = vec4(tPos.xyz, 1.0);
varTexCoord = inTexCoord0.xy;
varTexCoord = (mTexture * vec4(inTexCoord0.xy, 1.0, 1.0)).st;
#ifdef USE_ARRAY_TEXTURE
varTexLayer = inVertexAux;
#endif
#ifdef COLORED_SHADOWS
varColor = inVertexColor.rgb;