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

fix a bug about dir and a little cosmetic #257

Merged
merged 2 commits into from
Dec 7, 2020
Merged

fix a bug about dir and a little cosmetic #257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfad9ce
fix a bug about `dir` and a little cosmetic
finscn Mar 23, 2020
6b0d441
Update crt.frag
finscn Mar 23, 2020
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
16 changes: 7 additions & 9 deletions filters/crt/src/crt.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,11 @@ float rand(vec2 co) {
void main(void)
{
vec2 pixelCoord = vTextureCoord.xy * filterArea.xy;
vec2 coord = pixelCoord / dimensions;

vec2 dir = vec2(coord - vec2(0.5, 0.5));

float _c = curvature > 0. ? curvature : 1.;
float k = curvature > 0. ?(length(dir * dir) * 0.25 * _c * _c + 0.935 * _c) : 1.;
vec2 uv = dir * k;
vec2 dir = vec2(vTextureCoord.xy - vec2(0.5, 0.5)) * filterArea.xy / dimensions;

gl_FragColor = texture2D(uSampler, vTextureCoord);
vec3 rgb = gl_FragColor.rgb;


if (noise > 0.0 && noiseSize > 0.0)
{
pixelCoord.x = floor(pixelCoord.x / noiseSize);
Expand All @@ -49,7 +42,12 @@ void main(void)
rgb += _noise * noise;
}

if (lineWidth > 0.0) {
if (lineWidth > 0.0)
{
float _c = curvature > 0. ? curvature : 1.;
float k = curvature > 0. ?(length(dir * dir) * 0.25 * _c * _c + 0.935 * _c) : 1.;
vec2 uv = dir * k;

float v = (verticalLine ? uv.x * dimensions.x : uv.y * dimensions.y) * min(1.0, 2.0 / lineWidth ) / _c;
float j = 1. + cos(v * 1.2 - time) * 0.5 * lineContrast;
rgb *= j;
Expand Down