From 5708bf84161e4cb75420e6bc1d4c2d088cbc7341 Mon Sep 17 00:00:00 2001 From: Jonathas Costa Date: Fri, 23 Aug 2019 16:56:30 -0400 Subject: [PATCH] New fast AA for lines is working. --- modules/base/rendering/renderabletrail.cpp | 2 +- modules/base/shaders/renderabletrail_fs.glsl | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 0137a5c16c..ef0cea3264 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -178,7 +178,7 @@ RenderableTrail::Appearance::Appearance() , lineColor(LineColorInfo, glm::vec3(1.0f, 1.0f, 0.f), glm::vec3(0.f), glm::vec3(1.f)) , useLineFade(EnableFadeInfo, true) , lineFade(FadeInfo, 1.f, 0.f, 30.f) - , lineWidth(LineWidthInfo, 2.f, 1.f, 20.f) + , lineWidth(LineWidthInfo, 10.f, 1.f, 20.f) , pointSize(PointSizeInfo, 1, 1, 64) , renderingModes( RenderingModeInfo, diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl index a89c32adb0..d5499dd1bf 100644 --- a/modules/base/shaders/renderabletrail_fs.glsl +++ b/modules/base/shaders/renderabletrail_fs.glsl @@ -27,7 +27,7 @@ in float vs_positionDepth; in vec4 vs_gPosition; in float fade; -in vec2 mathLine; +noperspective in vec2 mathLine; uniform vec3 color; uniform int renderPhase; @@ -63,18 +63,14 @@ Fragment getFragment() { double distanceCenter = length(mathLine - vec2(gl_FragCoord.xy)); double dLW = double(lineWidth); - float blendFactor = 1.5; + float blendFactor = 20; + if (distanceCenter > dLW) { - frag.color = vec4(1.0, 0.0, 0.0, 1.0); - //frag.color.a = 0; + frag.color.a = 0.0; } else { frag.color.a *= pow(float((dLW - distanceCenter) / dLW), blendFactor); - //frag.color.a = 1.0; } - // if (distanceCenter > 3.0) - // frag.color = vec4(0.0, 1.0, 0.0, 1.0); - frag.gPosition = vs_gPosition; // There is no normal here