Marisa Kirisame
d1b1a0541d
Partial implementation of Fuck Your Shit rounds, currently in progress. Added various shader effects to some powerups, and to player damage. Added custom view effects to player death, disabled "face attacker" because it looks weird with model-based players. Added "untouchable" spree tracking to the Stats tab. Implemented "emergency reboot system" for people who want a less shameful form of the Resurrect cheat. Cooldown for consecutive reboots can be configured. Rebalanced armors. Small language string corrections. Adjusted pickup model sizes of some weapons. Fixed missing punch sound (damn typos). Fix targetter always displaying voodoo dolls. Fix uptime breaking when loading saves, now based on total playtime rather than gametic. Readjusted Spreadgun ammo availability. Flush HUD interpolators alongside messages, fixes things such as the score VERY slowly counting up when loading a save. Spare armors now only get auto-used on pickup if there is NO armor available of that type. Added some extra visual effects to punching walls and non-bleeding actors. Slightly altered the melee range so it's not as awkward. Fixed punching not using flesh sounds for bleeding actors. Pusher primary now drags the player towards their target, like the Chainsaw. Fixed the player having no pain sounds whatsoever. Fixed stair step anchoring not working. The damage dealt when walljumping on a monster now also gets boosted by the Ragekit.
59 lines
1.6 KiB
GLSL
59 lines
1.6 KiB
GLSL
/*
|
|
Complex grain shader ported over from MariENB
|
|
(C)2012-2018 Marisa Kirisame
|
|
*/
|
|
const float nf = 0.00001;
|
|
const vec3 nm1 = vec3(2.05,3.11,2.22);
|
|
const float nk = 0.04;
|
|
const vec3 nm2 = vec3(4.25,9.42,6.29);
|
|
const float ns = -0.28;
|
|
const float np = 2.1;
|
|
const float bnp = 0.7;
|
|
|
|
#define darkmask(a,b) (a>0.5)?(2.0*a*(0.5+b)):(1.0-2.0*(1.0-a)*(1.0-((0.5+b))))
|
|
|
|
vec3 grain( in vec3 res, in vec2 coord )
|
|
{
|
|
float ts = Timer*nf;
|
|
vec2 s1 = coord+vec2(0.0,ts);
|
|
vec2 s2 = coord+vec2(ts,0.0);
|
|
vec2 s3 = coord+vec2(ts,ts);
|
|
float n1, n2, n3;
|
|
vec2 nr = textureSize(NoiseTexture,0);
|
|
s1 = mod(s1*nm1.x*nr,1.0);
|
|
s2 = mod(s2*nm1.y*nr,1.0);
|
|
s3 = mod(s3*nm1.z*nr,1.0);
|
|
n1 = texture(NoiseTexture,s1).r;
|
|
n2 = texture(NoiseTexture,s2).g;
|
|
n3 = texture(NoiseTexture,s3).b;
|
|
s1 = coord+vec2(ts+n1*nk,n2*nk);
|
|
s2 = coord+vec2(n2,ts+n3*nk);
|
|
s3 = coord+vec2(ts+n3*nk,ts+n1*nk);
|
|
s1 = mod(s1*nm2.x*nr,1.0);
|
|
s2 = mod(s2*nm2.y*nr,1.0);
|
|
s3 = mod(s3*nm2.z*nr,1.0);
|
|
n1 = texture(NoiseTexture,s1).r;
|
|
n2 = texture(NoiseTexture,s2).g;
|
|
n3 = texture(NoiseTexture,s3).b;
|
|
float n4 = (n1+n2+n3)/3.0;
|
|
vec3 ng = vec3(n4);
|
|
vec3 nc = vec3(n1,n2,n3);
|
|
vec3 nt = pow(clamp(mix(ng,nc,ns),0.0,1.0),vec3(np));
|
|
float bn = 1.0-clamp((res.r+res.g+res.b)/3.0,0.0,1.0);
|
|
bn = pow(bn,bnp);
|
|
vec3 nn = clamp(nt*bn,vec3(0.0),vec3(1.0));
|
|
res.r = darkmask(res.r,(nn.r*ni));
|
|
res.g = darkmask(res.g,(nn.g*ni));
|
|
res.b = darkmask(res.b,(nn.b*ni));
|
|
return res;
|
|
}
|
|
|
|
void main()
|
|
{
|
|
vec2 coord = TexCoord;
|
|
vec4 res = texture(InputTexture,coord);
|
|
vec2 sfact = max(vec2(640.0,400.0),textureSize(InputTexture,0)*0.5);
|
|
coord = floor(coord*sfact)/sfact;
|
|
res.rgb = grain(res.rgb,coord);
|
|
FragColor = res;
|
|
}
|