eric/matrix
1
0
Fork 0
mirror of https://github.com/Rezmason/matrix.git synced 2026-04-17 22:09:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

Overhauled the rainPass's support for the "operator" version of the effect. It now overrides the brightness of any glyph brighter than a threshold, which I think is a much clearer concept.

Browse Source 
Also changed the way the glyphs cycle in the "operator" version, after noticing they only change once every four or five frames in the original effect.
This commit is contained in:
Rezmason
2021-10-22 08:38:37 -07:00
parent 7569246b5b
commit 6d8f5ba41a
5 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shaders/rainPass.compute
View File

@@ -13,16 +13,18 @@ precision highp float;
#define SQRT_5 2.23606797749979
uniform float time;
uniform float tick;
uniform float numColumns, numRows;
uniform sampler2D lastState;
uniform bool hasSun;
uniform bool hasThunder;
uniform bool showComputationTexture;
uniform float brightnessMinimum, brightnessMultiplier, brightnessOffset, brightnessMix;
uniform float brightnessOverride, brightnessThreshold, brightnessDecay;
uniform float animationSpeed, fallSpeed, cycleSpeed;
uniform float raindropLength;
uniform float glyphHeightToWidth;
uniform int cycleStyle;
uniform float cycleFrameSkip;
uniform float rippleScale, rippleSpeed, rippleThickness;
uniform int rippleType;
uniform float cursorEffectThreshold;
@@ -60,8 +62,7 @@ float getGlyphCycleSpeed(float rainTime, float brightness) {
if (cycleStyle == 0 && brightness > 0.0) {
glyphCycleSpeed = pow(1.0 - brightness, 4.0);
} else if (cycleStyle == 1) {
glyphCycleSpeed = fract((rainTime + 0.7 * sin(RADS_TO_HZ * SQRT_2 * rainTime) + 1.1 * sin(RADS_TO_HZ * SQRT_5 * rainTime))) * 0.75;
// glyphCycleSpeed = fract(rainTime) * 0.75; // loop
glyphCycleSpeed = fract(rainTime);
}
return glyphCycleSpeed;
}
@@ -144,7 +145,10 @@ void main() {
if (hasThunder) rainBrightness = applyThunder(rainBrightness, simTime, screenPos);
float glyphCycleSpeed = getGlyphCycleSpeed(rainTime, rainBrightness);
float glyphCycle = fract(oldGlyphCycle + 0.005 * animationSpeed * cycleSpeed * glyphCycleSpeed);
float glyphCycle = oldGlyphCycle;
if (mod(tick, cycleFrameSkip) == 0.0) {
glyphCycle = fract(oldGlyphCycle + 0.005 * animationSpeed * cycleSpeed * glyphCycleSpeed * cycleFrameSkip);
}
float effect = 0.;
effect = applyRippleEffect(effect, simTime, screenPos);
@@ -152,12 +156,12 @@ void main() {
float glyphDepth = rand(vec2(glyphPos.x, 0.0));
if (rainBrightness > brightnessMinimum) {
rainBrightness = rainBrightness * brightnessMultiplier + brightnessOffset;
if (brightnessOverride > 0. && rainBrightness > brightnessThreshold) {
rainBrightness = brightnessOverride;
}
if (!isInitializing) {
rainBrightness = mix(oldRainBrightness, rainBrightness, brightnessMix);
rainBrightness = mix(oldRainBrightness, rainBrightness, brightnessDecay);
}
if (showComputationTexture) {