mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-22 02:19:44 +00:00
feat: entity translucent pass & test layered transparency pipeline
This commit is contained in:
parent
e7f030f226
commit
7522016e84
19 changed files with 484 additions and 111 deletions
|
|
@ -8,6 +8,7 @@ local function refresh_model(id)
|
|||
itemid = id
|
||||
rig:set_model(itemIndex, item.model_name(itemid))
|
||||
rig:set_matrix(itemIndex, mat4.rotate({0, 1, 0}, -80))
|
||||
rig:set_color({1, 1, 1, 0.5})
|
||||
end
|
||||
|
||||
function on_render()
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"lines",
|
||||
"entity",
|
||||
"translucent",
|
||||
"translucent_composite",
|
||||
"background",
|
||||
"skybox_gen",
|
||||
"shadows",
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
#include <shadows>
|
||||
#include <deferred_light>
|
||||
#include <fog>
|
||||
|
||||
#define CLOUDS_FOG_FACTOR_MUL 0.3f
|
||||
#define CLOUDS_FOG_CURVE_MUL 0.4f
|
||||
#define COLOR_TEMPERATURE_COMPENSATION 1.14f
|
||||
|
||||
vec4 effect() {
|
||||
vec4 pos = texture(u_position, v_uv);
|
||||
float light = 1.0;
|
||||
float ao = 1.0;
|
||||
|
||||
#ifdef ENABLE_SSAO
|
||||
vec2 texel = 2.0 / u_screenSize;
|
||||
|
|
@ -23,7 +22,7 @@ vec4 effect() {
|
|||
wsum += w;
|
||||
}
|
||||
}
|
||||
light = sum / wsum;
|
||||
ao = sum / wsum;
|
||||
#endif // ENABLE_SSAO
|
||||
|
||||
vec4 modelpos = u_inverseView * pos;
|
||||
|
|
@ -31,18 +30,7 @@ vec4 effect() {
|
|||
vec3 dir = modelpos.xyz - u_cameraPos;
|
||||
|
||||
float emission = texture(u_emission, v_uv).r;
|
||||
|
||||
float rg = 1.0;
|
||||
#ifdef ENABLE_SHADOWS
|
||||
float shadow_mul = calc_shadow(modelpos, normal, length(pos));
|
||||
light *= shadow_mul;
|
||||
rg *= min(1.0, shadow_mul + emission) * COLOR_TEMPERATURE_COMPENSATION;
|
||||
light *= 2.0;
|
||||
#endif
|
||||
|
||||
light = max(light, emission);
|
||||
|
||||
light = pow(light, u_gamma);
|
||||
vec3 light = calc_deferred_light(modelpos, normal, length(pos), emission, ao);
|
||||
|
||||
vec3 fogColor = texture(u_skybox, dir).rgb;
|
||||
float fog = calc_fog(
|
||||
|
|
@ -50,5 +38,5 @@ vec4 effect() {
|
|||
mix(1.0, CLOUDS_FOG_FACTOR_MUL, emission),
|
||||
mix(1.0, CLOUDS_FOG_CURVE_MUL, emission)
|
||||
);
|
||||
return vec4(mix(texture(u_screen, v_uv).rgb * mix(1.0, light, 1.0) * vec3(rg, 0.5 + rg * 0.5, 1.0), fogColor, fog), 1.0);
|
||||
return vec4(mix(texture(u_screen, v_uv).rgb * light, fogColor, fog), 1.0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,60 +3,43 @@ layout (location = 1) out vec4 f_position;
|
|||
layout (location = 2) out vec4 f_normal;
|
||||
layout (location = 3) out vec4 f_emission;
|
||||
|
||||
uniform vec3 u_sunDir;
|
||||
|
||||
#include <world_fragment_header>
|
||||
#include <deferred_light>
|
||||
|
||||
in vec4 a_color;
|
||||
|
||||
uniform sampler2D u_texture0;
|
||||
|
||||
uniform vec3 u_fogColor;
|
||||
uniform float u_fogFactor;
|
||||
uniform float u_fogCurve;
|
||||
uniform bool u_alphaClip;
|
||||
uniform bool u_dithering;
|
||||
uniform vec3 u_sunDir;
|
||||
|
||||
const float BAYER_MATRIX[64] = float[](
|
||||
0.0, 32.0, 8.0, 40.0, 2.0, 34.0, 10.0, 42.0,
|
||||
48.0, 16.0, 56.0, 24.0, 50.0, 18.0, 58.0, 26.0,
|
||||
12.0, 44.0, 4.0, 36.0, 14.0, 46.0, 6.0, 38.0,
|
||||
60.0, 28.0, 52.0, 20.0, 62.0, 30.0, 54.0, 22.0,
|
||||
3.0, 35.0, 11.0, 43.0, 1.0, 33.0, 9.0, 41.0,
|
||||
51.0, 19.0, 59.0, 27.0, 49.0, 17.0, 57.0, 25.0,
|
||||
15.0, 47.0, 7.0, 39.0, 13.0, 45.0, 5.0, 37.0,
|
||||
63.0, 31.0, 55.0, 23.0, 61.0, 29.0, 53.0, 21.0
|
||||
);
|
||||
|
||||
float calc_bayer(vec2 pos){
|
||||
ivec2 p = ivec2(mod(pos, 8.0));
|
||||
return BAYER_MATRIX[p.y * 8 + p.x] / 64.0;
|
||||
}
|
||||
uniform float u_alphaThreshold;
|
||||
uniform bool u_opaque;
|
||||
uniform bool u_forward;
|
||||
uniform bool u_forwardLight;
|
||||
|
||||
void main() {
|
||||
vec4 texColor = texture(u_texture0, a_texCoord);
|
||||
float alpha = a_color.a * texColor.a;
|
||||
// anyway it's any alpha-test alternative required
|
||||
if (u_dithering) {
|
||||
if (u_alphaClip) {
|
||||
float bayer = calc_bayer(gl_FragCoord.xy);
|
||||
if (alpha - bayer < 0.01f) {
|
||||
discard;
|
||||
}
|
||||
alpha = 1.0;
|
||||
} else if (alpha < 0.05f) {
|
||||
discard;
|
||||
}
|
||||
} else if (alpha < (u_alphaClip ? 0.5f : 0.15f)) {
|
||||
if (alpha < u_alphaThreshold) {
|
||||
discard;
|
||||
}
|
||||
f_color = a_color * texColor;
|
||||
|
||||
#ifndef ADVANCED_RENDER
|
||||
#ifdef ADVANCED_RENDER
|
||||
if (u_forward) {
|
||||
if (u_forwardLight) {
|
||||
f_color.rgb *= calc_deferred_light(
|
||||
a_modelpos, a_realnormal, length(a_position), a_emission, 1.0
|
||||
);
|
||||
}
|
||||
vec3 fogColor = texture(u_skybox, a_dir).rgb;
|
||||
f_color.rgb = mix(f_color.rgb, fogColor, a_fog);
|
||||
}
|
||||
#else
|
||||
vec3 fogColor = texture(u_skybox, a_dir).rgb;
|
||||
f_color = mix(f_color, vec4(fogColor, 1.0), a_fog);
|
||||
f_color.rgb = mix(f_color.rgb, fogColor, a_fog);
|
||||
#endif
|
||||
|
||||
f_color.a = alpha;
|
||||
f_color.a = u_opaque ? 1.0 : alpha;
|
||||
f_position = vec4(a_position, 1.0);
|
||||
f_normal = vec4(a_normal, 1.0);
|
||||
f_emission = vec4(vec3(a_emission), 1.0);
|
||||
|
|
|
|||
24
res/shaders/lib/deferred_light.glsl
Normal file
24
res/shaders/lib/deferred_light.glsl
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
#ifndef DEFERRED_LIGHT_GLSL_
|
||||
#define DEFERRED_LIGHT_GLSL_
|
||||
|
||||
#include <shadows>
|
||||
|
||||
#define COLOR_TEMPERATURE_COMPENSATION 1.14f
|
||||
|
||||
vec3 calc_deferred_light(
|
||||
vec4 modelpos, vec3 normal, float distance, float emission, float ao
|
||||
) {
|
||||
float light = ao;
|
||||
float rg = 1.0;
|
||||
#ifdef ENABLE_SHADOWS
|
||||
float shadow_mul = calc_shadow(modelpos, normal, distance);
|
||||
light *= shadow_mul;
|
||||
rg *= min(1.0, shadow_mul + emission) * COLOR_TEMPERATURE_COMPENSATION;
|
||||
light *= 2.0;
|
||||
#endif
|
||||
light = max(light, emission);
|
||||
light = pow(light, u_gamma);
|
||||
return light * vec3(rg, 0.5 + rg * 0.5, 1.0);
|
||||
}
|
||||
|
||||
#endif // DEFERRED_LIGHT_GLSL_
|
||||
55
res/shaders/translucent_composite.glslf
Normal file
55
res/shaders/translucent_composite.glslf
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
in vec2 v_uv;
|
||||
out vec4 f_color;
|
||||
|
||||
#define LAYERS_COUNT 3
|
||||
|
||||
uniform sampler2D u_layerColor0;
|
||||
uniform sampler2D u_layerColor1;
|
||||
uniform sampler2D u_layerColor2;
|
||||
uniform sampler2D u_layerDepth0;
|
||||
uniform sampler2D u_layerDepth1;
|
||||
uniform sampler2D u_layerDepth2;
|
||||
|
||||
void main() {
|
||||
vec4 colors[LAYERS_COUNT];
|
||||
float depths[LAYERS_COUNT];
|
||||
colors[0] = texture(u_layerColor0, v_uv);
|
||||
colors[1] = texture(u_layerColor1, v_uv);
|
||||
colors[2] = texture(u_layerColor2, v_uv);
|
||||
depths[0] = texture(u_layerDepth0, v_uv).r;
|
||||
depths[1] = texture(u_layerDepth1, v_uv).r;
|
||||
depths[2] = texture(u_layerDepth2, v_uv).r;
|
||||
|
||||
vec4 layerColors[LAYERS_COUNT];
|
||||
float layerDepths[LAYERS_COUNT];
|
||||
int count = 0;
|
||||
for (int i = 0; i < LAYERS_COUNT; i++) {
|
||||
if (colors[i].a > 0.0) {
|
||||
layerColors[count] = colors[i];
|
||||
layerDepths[count] = depths[i];
|
||||
count++;
|
||||
}
|
||||
}
|
||||
if (count == 0) {
|
||||
discard;
|
||||
}
|
||||
|
||||
for (int i = 1; i < count; i++) {
|
||||
vec4 color = layerColors[i];
|
||||
float depth = layerDepths[i];
|
||||
int j = i - 1;
|
||||
while (j >= 0 && layerDepths[j] < depth) {
|
||||
layerColors[j + 1] = layerColors[j];
|
||||
layerDepths[j + 1] = layerDepths[j];
|
||||
j--;
|
||||
}
|
||||
layerColors[j + 1] = color;
|
||||
layerDepths[j + 1] = depth;
|
||||
}
|
||||
|
||||
vec4 result = vec4(0.0);
|
||||
for (int i = 0; i < count; i++) {
|
||||
result = result * (1.0 - layerColors[i].a) + layerColors[i];
|
||||
}
|
||||
f_color = result;
|
||||
}
|
||||
8
res/shaders/translucent_composite.glslv
Normal file
8
res/shaders/translucent_composite.glslv
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
layout (location = 0) in vec2 v_position;
|
||||
|
||||
out vec2 v_uv;
|
||||
|
||||
void main() {
|
||||
v_uv = v_position * 0.5 + 0.5;
|
||||
gl_Position = vec4(v_position, 0.0, 1.0);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue