Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing the horrendous nvidia bug with outlines #823

Merged
merged 2 commits into from
Sep 15, 2023
Merged

fixing the horrendous nvidia bug with outlines #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04defab
fix nvidia bug
krizej Sep 14, 2023
0413d65
bound check for depth threshold
krizej Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/glm_rmain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static void GLM_DrawWorldOutlines(void)

renderer.TextureUnitBind(0, normals);

R_ProgramUniform1f(r_program_uniform_outline_depth_threshold, gl_outline_world_depth_threshold.value);
R_ProgramUniform1f(r_program_uniform_outline_depth_threshold, bound(1, gl_outline_world_depth_threshold.value, 16));
// R_ProgramUniform1f(r_program_uniform_outline_scale, gl_outline_scale_world.value);
R_ProgramUniform3f(r_program_uniform_outline_color,
(float)gl_outline_color_world.color[0] / 255.0f,
Expand Down
24 changes: 16 additions & 8 deletions src/glsl/fx_world_geometry.fragment.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ uniform float outline_depth_threshold;
in vec2 TextureCoord;
out vec4 frag_colour;

bool vec_nequ(vec3 a, vec3 b) {
return dot(a, b) < 0.997; // todo: make this customizable?
}

void main()
{
ivec2 coords = ivec2(TextureCoord.x * r_width, TextureCoord.y * r_height);
Expand All @@ -21,16 +25,20 @@ void main()
vec4 down = texelFetch(normal_texture, coords + ivec2(0, 1), 0);

bool ignore = center.a == left.a && center.a == right.a && center.a == up.a && center.a == down.a;
if(ignore)
discard;
if(ignore) {
frag_colour = vec4(0);
return;
}

if(center.a == 0)
discard;
if(center.a == 0) {
frag_colour = vec4(0);
return;
}

if ((left.a != 0 && center.rgb != left.rgb ) ||
(right.a != 0 && center.rgb != right.rgb) ||
(up.a != 0 && center.rgb != up.rgb ) ||
(down.a != 0 && center.rgb != down.rgb )
if ((left.a != 0 && vec_nequ(center.rgb, left.rgb )) ||
(right.a != 0 && vec_nequ(center.rgb, right.rgb)) ||
(up.a != 0 && vec_nequ(center.rgb, up.rgb )) ||
(down.a != 0 && vec_nequ(center.rgb, down.rgb ))
) {
frag_colour.rgb = outline_color;
frag_colour.a = 1;
Expand Down