Merged with master

This commit is contained in:
Anuken
2018-04-08 10:46:48 -04:00
27 changed files with 180 additions and 109 deletions

View File

@@ -64,11 +64,11 @@ void main() {
if(i >= u_hitamount) break;
vec3 hit = u_hits[i];
float rad = hit.z * HIT_RADIUS;
float fract = 1.0 - hit.z;
float fin = 1.0 - hit.z;
if(abs(distance(vec2(hit.x, hit.y), coords - u_texsize/2.0) - rad) < 1.0){
color = mix(color, u_color* vec4(si, si, si, 1.0), (1.0 * fract));
color.a = ALPHA + 0.82 *fract;
color = mix(color, u_color* vec4(si, si, si, 1.0), (1.0 * fin));
color.a = ALPHA + 0.82 *fin;
}
}
}