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

Antialiasing on opengl markers #4023

Merged
merged 4 commits into from
Dec 21, 2023
Merged

Antialiasing on opengl markers #4023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcd26fb
Antialiasing on opengl markers
vallsv Dec 20, 2023
b8b4971
use a local version of smoothstep for compatibility with GLSL 1.20
t20100 Dec 21, 2023
8898364
fix unused import
t20100 Dec 21, 2023
7a083b6
Merge pull request #37 from t20100/pr4023
vallsv Dec 21, 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
67 changes: 27 additions & 40 deletions src/silx/gui/plot/backends/glutils/GLPlotCurve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,22 +650,14 @@ class Points2D(object):
PLUS: """
float alphaSymbol(vec2 coord, float size) {
vec2 d = abs(size * (coord - vec2(0.5, 0.5)));
if (min(d.x, d.y) < 0.5) {
return 1.0;
} else {
return 0.0;
}
return local_smoothstep(1.5, 0.5, min(d.x, d.y));
}
""",
X_MARKER: """
float alphaSymbol(vec2 coord, float size) {
vec2 pos = floor(size * coord) + 0.5;
vec2 d_x = abs(pos.x + vec2(- pos.y, pos.y - size));
if (min(d_x.x, d_x.y) <= 0.5) {
return 1.0;
} else {
return 0.0;
}
return local_smoothstep(1.5, 0.5, min(d_x.x, d_x.y));
}
""",
ASTERISK: """
Expand All @@ -686,22 +678,14 @@ class Points2D(object):
""",
H_LINE: """
float alphaSymbol(vec2 coord, float size) {
float dy = abs(size * (coord.y - 0.5));
if (dy < 0.5) {
return 1.0;
} else {
return 0.0;
}
float d = abs(size * (coord.y - 0.5));
return local_smoothstep(1.5, 0.5, d);
}
""",
V_LINE: """
float alphaSymbol(vec2 coord, float size) {
float dx = abs(size * (coord.x - 0.5));
if (dx < 0.5) {
return 1.0;
} else {
return 0.0;
}
float d = abs(size * (coord.x - 0.5));
return local_smoothstep(1.5, 0.5, d);
}
""",
HEART: """
Expand All @@ -715,60 +699,56 @@ class Points2D(object):
float d = (13.0*h - 22.0*h*h + 10.0*h*h*h)/(6.0-5.0*h);
float res = clamp(r-d, 0., 1.);
// antialiasing
res = smoothstep(0.1, 0.001, res);
res = local_smoothstep(0.1, 0.001, res);
return res;
}
""",
TICK_LEFT: """
float alphaSymbol(vec2 coord, float size) {
coord = size * (coord - 0.5);
float dy = abs(coord.y);
if (dy < 0.5 && coord.x < 0.5) {
return 1.0;
} else {
if (coord.x > 0.5) {
return 0.0;
}
return local_smoothstep(1.5, 0.5, dy);
}
""",
TICK_RIGHT: """
float alphaSymbol(vec2 coord, float size) {
coord = size * (coord - 0.5);
float dy = abs(coord.y);
if (dy < 0.5 && coord.x > -0.5) {
return 1.0;
} else {
if (coord.x < -0.5) {
return 0.0;
}
return local_smoothstep(1.5, 0.5, dy);
}
""",
TICK_UP: """
float alphaSymbol(vec2 coord, float size) {
coord = size * (coord - 0.5);
coord = size * (coord - 0.5);
float dx = abs(coord.x);
if (dx < 0.5 && coord.y < 0.5) {
return 1.0;
} else {
if (coord.y > 0.5) {
return 0.0;
}
return local_smoothstep(1.5, 0.5, dx);
}
""",
TICK_DOWN: """
float alphaSymbol(vec2 coord, float size) {
coord = size * (coord - 0.5);
float dx = abs(coord.x);
if (dx < 0.5 && coord.y > -0.5) {
return 1.0;
} else {
if (coord.y < -0.5) {
return 0.0;
}
return local_smoothstep(1.5, 0.5, dx);
}
""",
CARET_LEFT: """
float alphaSymbol(vec2 coord, float size) {
coord = size * (coord - 0.5);
float d = abs(coord.x) - abs(coord.y);
if (d >= -0.1 && coord.x > 0.5) {
return smoothstep(-0.1, 0.1, d);
return local_smoothstep(-0.1, 0.1, d);
} else {
return 0.0;
}
Expand All @@ -779,7 +759,7 @@ class Points2D(object):
coord = size * (coord - 0.5);
float d = abs(coord.x) - abs(coord.y);
if (d >= -0.1 && coord.x < 0.5) {
return smoothstep(-0.1, 0.1, d);
return local_smoothstep(-0.1, 0.1, d);
} else {
return 0.0;
}
Expand All @@ -790,7 +770,7 @@ class Points2D(object):
coord = size * (coord - 0.5);
float d = abs(coord.y) - abs(coord.x);
if (d >= -0.1 && coord.y > 0.5) {
return smoothstep(-0.1, 0.1, d);
return local_smoothstep(-0.1, 0.1, d);
} else {
return 0.0;
}
Expand All @@ -801,7 +781,7 @@ class Points2D(object):
coord = size * (coord - 0.5);
float d = abs(coord.y) - abs(coord.x);
if (d >= -0.1 && coord.y < 0.5) {
return smoothstep(-0.1, 0.1, d);
return local_smoothstep(-0.1, 0.1, d);
} else {
return 0.0;
}
Expand All @@ -816,6 +796,13 @@ class Points2D(object):

varying vec4 vColor;

/* smoothstep function implementation to support GLSL 1.20 */
float local_smoothstep(float edge0, float edge1, float x) {
float t;
t = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
return t * t * (3.0 - 2.0 * t);
}

%s

void main(void) {
Expand Down
1 change: 0 additions & 1 deletion src/silx/gui/plot/items/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
__license__ = "MIT"
__date__ = "08/12/2020"

import collections
from collections import abc
from copy import deepcopy
import logging
Expand Down
Loading