Emit #line directives, refactor prefixes '__' -> '_', fix 'bars' outline

This commit is contained in:
Jarcode
2019-04-02 03:22:46 -07:00
parent 4b71de19c4
commit 13e9f051ce
9 changed files with 81 additions and 29 deletions

View File

@@ -31,7 +31,7 @@ out vec4 fragment;
void main() {
#if __USE_ALPHA > 0
#if _USE_ALPHA > 0
#define APPLY_FRAG(f, c) f = vec4(f.rgb * f.a + c.rgb * (1 - clamp(f.a, 0, 1)), max(c.a, f.a))
fragment = #00000000;
#else
@@ -48,7 +48,7 @@ void main() {
float d = sqrt((dx * dx) + (dy * dy)); /* distance */
if (d > C_RADIUS - (float(C_LINE) / 2.0F) && d < C_RADIUS + (float(C_LINE) / 2.0F)) {
APPLY_FRAG(fragment, OUTLINE);
#if __USE_ALPHA > 0
#if _USE_ALPHA > 0
fragment.a *= clamp(((C_LINE / 2) - abs(C_RADIUS - d)) * C_ALIAS_FACTOR, 0, 1);
#else
return; /* return immediately if there is no alpha blending available */
@@ -74,7 +74,7 @@ void main() {
v *= AMPLIFY; /* amplify */
#undef smooth_f
/* offset to fragment distance from inner circle */
#if __USE_ALPHA > 0
#if _USE_ALPHA > 0
#define ALIAS_FACTOR (((BAR_WIDTH / 2) - abs(ym)) * BAR_ALIAS_FACTOR)
d -= C_RADIUS; /* start bar overlapping the inner circle for blending */
#else
@@ -91,7 +91,7 @@ void main() {
#else
r = COLOR;
#endif
#if __USE_ALPHA > 0
#if _USE_ALPHA > 0
r.a *= ALIAS_FACTOR;
#endif
APPLY_FRAG(fragment, r);
@@ -99,7 +99,7 @@ void main() {
}
#if BAR_OUTLINE_WIDTH > 0
if (d <= v) {
#if __USE_ALPHA > 0
#if _USE_ALPHA > 0
vec4 r = BAR_OUTLINE;
r.a *= ALIAS_FACTOR;
APPLY_FRAG(fragment, r);