Move brightness from the shine compute shader to the fragment shader and clean it up

This commit is contained in:
Rezmason
2022-09-15 21:10:33 -07:00
parent b0613f9bc3
commit 3b456baef9
5 changed files with 89 additions and 81 deletions

View File

@@ -150,11 +150,11 @@ const versions = {
font: "coptic",
bloomStrength: 1,
highPassThreshold: 0,
cycleSpeed: 0.05,
cycleSpeed: 0.005,
baseBrightness: -1.3,
baseContrast: 2,
brightnessDecay: 0.05,
fallSpeed: 0.04,
fallSpeed: 0.02,
isPolar: true,
rippleTypeName: "circle",
rippleSpeed: 0.1,
@@ -176,7 +176,7 @@ const versions = {
baseContrast: 1.17,
highPassThreshold: 0,
numColumns: 70,
cycleSpeed: 0.05,
cycleSpeed: 0.03,
bloomStrength: 0.7,
fallSpeed: 0.3,
paletteEntries: [
@@ -218,7 +218,7 @@ const versions = {
font: "resurrections",
numColumns: 20,
fallSpeed: 0.35,
cycleSpeed: 0.3,
cycleSpeed: 0.04,
glyphEdgeCrop: 0.1,
ditherMagnitude: 0,
paletteEntries: [
@@ -240,7 +240,7 @@ const versions = {
["3d"]: {
volumetric: true,
fallSpeed: 0.5,
cycleSpeed: 0.35,
cycleSpeed: 0.03,
baseBrightness: -0.9,
baseContrast: 1.5,
raindropLength: 0.3,

View File

@@ -59,7 +59,7 @@ export default ({ regl, config, lkg }) => {
const rainPassShine = loadText("shaders/glsl/rainPass.shine.frag.glsl");
const shineUniforms = {
...commonUniforms,
...extractEntries(config, ["baseBrightness", "baseContrast", "brightnessDecay", "fallSpeed", "raindropLength", "loops"]),
...extractEntries(config, ["brightnessDecay", "fallSpeed", "raindropLength", "loops"]),
};
const shine = regl({
frag: regl.prop("frag"),
@@ -126,6 +126,8 @@ export default ({ regl, config, lkg }) => {
"forwardSpeed",
"glyphVerticalSpacing",
// fragment
"baseBrightness",
"baseContrast",
"brightnessThreshold",
"brightnessOverride",
"cursorBrightness",