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

Added glint brightness and contrast, makes a big difference

Browse Source
This commit is contained in:
Rezmason
2022-09-17 10:09:52 -07:00
parent 9c2d6d7ed8
commit eddbd12c36
6 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
shaders/glsl/rainPass.frag.glsl
View File

@@ -8,7 +8,7 @@ uniform sampler2D raindropState, symbolState, effectState;
uniform float numColumns, numRows;
uniform sampler2D glyphTex, glintTex;
uniform float glyphHeightToWidth, glyphSequenceLength, glyphEdgeCrop;
uniform float baseContrast, baseBrightness;
uniform float baseContrast, baseBrightness, glintContrast, glintBrightness;
uniform float brightnessOverride, brightnessThreshold;
uniform vec2 glyphTextureGridSize;
uniform vec2 slantVec;
@@ -58,26 +58,35 @@ vec2 getUV(vec2 uv) {
return uv;
}
vec2 getBrightness(float brightness, float cursor, float multipliedEffects, float addedEffects) {
if (!isolateCursor) {
cursor = 0.;
}
brightness = (1. - brightness) * baseContrast + baseBrightness;
vec3 getBrightness(vec4 raindrop, vec4 effect, float quadDepth) {
float base = raindrop.r;
bool isCursor = bool(raindrop.g) && isolateCursor;
float glint = base;
float multipliedEffects = effect.r;
float addedEffects = effect.g;
base = base * baseContrast + baseBrightness;
glint = glint * glintContrast + glintBrightness;
// Modes that don't fade glyphs set their actual brightness here
if (brightnessOverride > 0. && brightness > brightnessThreshold && cursor == 0.) {
brightness = brightnessOverride;
if (brightnessOverride > 0. && base > brightnessThreshold && !isCursor) {
base = brightnessOverride;
}
brightness *= multipliedEffects;
brightness += addedEffects;
base = base * multipliedEffects + addedEffects;
glint = glint * multipliedEffects + addedEffects;
// In volumetric mode, distant glyphs are dimmer
if (volumetric && !showDebugView) {
brightness = brightness * min(1., vDepth);
base = base * min(1.0, quadDepth);
glint = glint * min(1.0, quadDepth);
}
return vec2(brightness * (1. - cursor), brightness * cursor);
return vec3(
(isCursor ? vec2(0.0, 1.0) : vec2(1.0, 0.0)) * base,
glint
);
}
vec2 getSymbolUV(float index) {
@@ -121,7 +130,11 @@ void main() {
vec4 symbolData = volumetric ? vSymbol : texture2D( symbolState, uv);
vec4 effectData = volumetric ? vEffect : texture2D( effectState, uv);
vec2 brightness = getBrightness(raindropData.r, raindropData.g, effectData.r, effectData.g);
vec3 brightness = getBrightness(
raindropData,
effectData,
vDepth
);
vec2 symbol = getSymbol(uv, symbolData.r);
if (showDebugView) {
@@ -136,6 +149,6 @@ void main() {
1.
);
} else {
gl_FragColor = vec4(brightness * symbol.r, brightness.r * symbol.g, 0.);
gl_FragColor = vec4(brightness.rg * symbol.r, brightness.b * symbol.g, 0.);
}
}

4
shaders/glsl/rainPass.raindrop.frag.glsl
View File

@@ -56,7 +56,7 @@ float getRainBrightness(float simTime, vec2 glyphPos) {
if (!loops) {
rainTime = wobble(rainTime);
}
return fract(rainTime);
return 1.0 - fract(rainTime);
}
// Main function
@@ -64,7 +64,7 @@ float getRainBrightness(float simTime, vec2 glyphPos) {
vec4 computeResult(float simTime, bool isFirstFrame, vec2 glyphPos, vec2 screenPos, vec4 previous) {
float brightness = getRainBrightness(simTime, glyphPos);
float brightnessBelow = getRainBrightness(simTime, glyphPos + vec2(0., -1.));
float cursor = brightness < brightnessBelow ? 1.0 : 0.0;
float cursor = brightness > brightnessBelow ? 1.0 : 0.0;
// Blend the glyph's brightness with its previous brightness, so it winks on and off organically
if (!isFirstFrame) {