sen/tcr
sen/tcr
1
0
Fork 0
Code Activity

improve shader

Browse source
This commit is contained in:
Sen 2025-08-28 23:48:33 +02:00
parent 64396b28b9
commit 01ceef058c
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
7 changed files with 127 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/src/main/resources/shaders/world.fsh
View file

@ -10,9 +10,9 @@ struct light_t {
in vec3 vertex;
in vec3 normal;
in vec4 brightness;
in vec2 tex_coord;
in vec2 lm_coord;
in float brightness;
uniform vec3 cam_pos;
uniform sampler2D tex;
@ -24,9 +24,9 @@ uniform float max_cam_dist;
uniform float light_factor;
uniform vec3 dir_direction;
uniform vec3 dir_ambient;
uniform vec3 dir_diffuse;
uniform vec3 dir_specular;
uniform vec3 block_ambient;
uniform int n_lights;
uniform bool sky_light;
uniform light_block {
light_t lights[MAX_LIGHTS];
};
@ -50,8 +50,8 @@ vec3 calc_dir_light(vec3 norm, vec3 dir, vec3 rgb) {
vec3 rdir = reflect(-ldir, norm);
float spec = pow(max(dot(dir, rdir), 0.0), shine);
vec3 ambient = dir_ambient * rgb + clamp(vec3(0.0), 0.0, 1.0);
vec3 diffuse = dir_diffuse * diff * rgb;
vec3 specular = dir_specular * spec * specular * rgb;
vec3 diffuse = dir_ambient * 0.125 * diff * rgb;
vec3 specular = dir_ambient * 1.25 * spec * specular * rgb;
return (ambient + diffuse + specular);
}
@ -75,10 +75,12 @@ vec3 calc_point_light(light_t light, vec3 norm, vec3 dir, vec3 rgb) {
void main() {
vec3 norm = normalize(normal);
vec3 dir = normalize(cam_pos - vertex);
vec4 texel = texture(tex, tex_coord) * brightness;
texel *= texture(lightmap, 0.03125 + lm_coord * 256.0);
vec3 rgb = texel.rgb;
vec3 result = calc_dir_light(norm, dir, rgb);
vec4 texel = texture(tex, tex_coord);
float sky = sky_light ? vertex.y < 0.0 ? 0.0 : (vertex.y < 64.0 ? vertex.y / 64.0 : 1.0) : 1.0;
float block = clamp(0.03125 + lm_coord.x * 256.0, 0.0, 1.0);
vec3 lm = block * block_ambient;
vec3 rgb = texel.rgb; // * brightness;
vec3 result = rgb * lm + calc_dir_light(norm, dir, rgb * sky * (1.0 - block));
// int l = 0;
for(int z = 0; z < n_lights; z++) {
// if(lights[z].enabled) {
@ -87,5 +89,5 @@ void main() {
// l++;
// }
}
FragColor = texel; // vec4(result, texel.a);
FragColor = vec4(result, texel.a);
}