edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix grid jump when parsing brush nodes

Browse Source
This commit is contained in:
luboslenco
2025-02-14 17:28:59 +01:00
parent a1a1c3db67
commit 9f672da0fe
6 changed files with 11 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/shaders/smaa_neighborhood_blend.frag.glsl
-25
View File
@@ -1,12 +1,7 @@
#version 450
#define _Veloc
uniform sampler2D color_tex;
uniform sampler2D blend_tex;
#ifdef _Veloc
uniform sampler2D sveloc;
#endif
uniform vec2 screen_size_inv;
in vec2 tex_coord;
@@ -21,15 +16,6 @@ vec4 textureLodA_color_tex(sampler2D color_tex, vec2 coords, float lod) {
return textureLod(color_tex, coords, lod);
}
vec4 textureLodA_sveloc(sampler2D sveloc, vec2 coords, float lod) {
#ifdef GLSL
#else
coords.y = 1.0 - coords.y;
#endif
return textureLod(sveloc, coords, lod);
}
vec4 smaa_neighborhood_blending_ps(vec2 texcoord, vec4 offset) {
vec4 a;
a.x = textureLod(blend_tex, offset.xy, 0.0).a; // Right
@@ -38,11 +24,6 @@ vec4 smaa_neighborhood_blending_ps(vec2 texcoord, vec4 offset) {
if (dot(a, vec4(1.0, 1.0, 1.0, 1.0)) < 1e-5) {
vec4 color = textureLod(color_tex, texcoord, 0.0);
#ifdef _Veloc
vec2 velocity = textureLod(sveloc, tex_coord, 0.0).rg;
color.a = sqrt(5.0 * length(velocity));
#endif
return color;
}
else {
@@ -72,12 +53,6 @@ vec4 smaa_neighborhood_blending_ps(vec2 texcoord, vec4 offset) {
vec4 color = blending_weight.x * textureLodA_color_tex(color_tex, blending_coord.xy, 0.0);
color += blending_weight.y * textureLodA_color_tex(color_tex, blending_coord.zw, 0.0);
#ifdef _Veloc
vec2 velocity = blending_weight.x * textureLodA_sveloc(sveloc, blending_coord.xy, 0.0).rg;
velocity += blending_weight.y * textureLodA_sveloc(sveloc, blending_coord.zw, 0.0).rg;
color.a = sqrt(5.0 * length(velocity));
#endif
return color;
}
return vec4(0.0, 0.0, 0.0, 0.0);
base/shaders/taa_pass.frag.glsl
+2 -21
View File
@@ -2,31 +2,12 @@
uniform sampler2D tex;
uniform sampler2D tex2;
uniform sampler2D sveloc;
in vec2 tex_coord;
out vec4 frag_color;
const float SMAA_REPROJECTION_WEIGHT_SCALE = 30.0;
void main() {
vec4 current = textureLod(tex, tex_coord, 0.0);
// Velocity is assumed to be calculated for motion blur, so we need to inverse it for reprojection
vec2 velocity = -textureLod(sveloc, tex_coord, 0.0).rg;
#ifdef GLSL
#else
velocity.y = -velocity.y;
#endif
// Reproject current coordinates and fetch previous pixel
vec4 previous = textureLod(tex2, tex_coord + velocity, 0.0);
// Attenuate the previous pixel if the velocity is different
float delta = abs(current.a * current.a - previous.a * previous.a) / 5.0;
float weight = 0.5 * clamp(1.0 - sqrt(delta) * SMAA_REPROJECTION_WEIGHT_SCALE, 0.0, 1.0);
// Blend the pixels according to the calculated weight:
frag_color = vec4(mix(current.rgb, previous.rgb, weight), 1.0);
vec4 previous = textureLod(tex2, tex_coord, 0.0);
frag_color = vec4(mix(current.rgb, previous.rgb, 0.5), 1.0);
}