eric/matrix
1
0
Fork 0
mirror of https://github.com/Rezmason/matrix.git synced 2026-04-21 23:39:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

A couple more style tweaks.

Browse Source
This commit is contained in:
Rezmason
2020-01-21 18:47:34 -08:00
parent 67636db908
commit 1d629a20c4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/config.js
View File

@@ -36,7 +36,7 @@ const versions = {
rippleTypeName: "circle", rippleTypeName: "circle",
rippleThickness: 0.2, rippleThickness: 0.2,
rippleScale: 30, rippleScale: 30,
rippleSpeed: 0.2, rippleSpeed: 0.1,
numColumns: 30, numColumns: 30,
palette: [ palette: [
{ rgb: [0.0, 0.0, 0.0], at: 0.0 }, { rgb: [0.0, 0.0, 0.0], at: 0.0 },
@@ -52,8 +52,8 @@ const versions = {
...fonts.gothic, ...fonts.gothic,
bloomRadius: 0.8, bloomRadius: 0.8,
bloomStrength: 1, bloomStrength: 1,
highPassThreshold: 0.5, highPassThreshold: 0.7,
cycleSpeed: 0.02, cycleSpeed: 1,
cycleStyleName: "cycleFasterWhenDimmed", cycleStyleName: "cycleFasterWhenDimmed",
cursorEffectThreshold: 1, cursorEffectThreshold: 1,
brightnessOffset: 0.0, brightnessOffset: 0.0,
@@ -71,8 +71,8 @@ const versions = {
numColumns: 60, numColumns: 60,
palette: [ palette: [
{ rgb: [0.0, 0.0, 0.0], at: 0.0 }, { rgb: [0.0, 0.0, 0.0], at: 0.0 },
{ rgb: [0.52, 0.0, 0.0], at: 0.2 }, { rgb: [0.32, 0.06, 0.0], at: 0.2 },
{ rgb: [0.82, 0.05, 0.05], at: 0.4 }, { rgb: [0.82, 0.06, 0.05], at: 0.4 },
{ rgb: [1.0, 0.6, 0.3], at: 0.8 }, { rgb: [1.0, 0.6, 0.3], at: 0.8 },
{ rgb: [1.0, 1.0, 0.9], at: 1.0 } { rgb: [1.0, 1.0, 0.9], at: 1.0 }
], ],
@@ -132,7 +132,7 @@ const versions = {
cursorEffectThreshold: 0.466, cursorEffectThreshold: 0.466,
brightnessOffset: 0.25, brightnessOffset: 0.25,
brightnessMultiplier: 0.0, brightnessMultiplier: 0.0,
fallSpeed: 0.6, fallSpeed: 0.65,
glyphEdgeCrop: 0.15, glyphEdgeCrop: 0.15,
glyphHeightToWidth: 1.35, glyphHeightToWidth: 1.35,
hasSun: false, hasSun: false,

2
js/renderer.js
View File

@@ -140,7 +140,7 @@ export default (regl, config) => {
if (hasThunder) { if (hasThunder) {
vec2 distVec = (gl_FragCoord.xy / numColumns - vec2(0.5, 1.0)) * vec2(1.0, 2.0); vec2 distVec = (gl_FragCoord.xy / numColumns - vec2(0.5, 1.0)) * vec2(1.0, 2.0);
float thunder = (blast(sin(SQRT_5 * simTime), 10.0) + blast(sin(SQRT_2 * simTime), 10.0)); float thunder = (blast(sin(SQRT_5 * simTime), 10.0) + blast(sin(SQRT_2 * simTime), 10.0));
thunder *= 30.0 * (1.0 - 1.0 * length(distVec)); thunder *= 20.0 * (1.0 - 0.8 * length(distVec));
newBrightness *= max(0.0, thunder) * 1.0 + 0.7; newBrightness *= max(0.0, thunder) * 1.0 + 0.7;