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

Updating the README.md. Renaming "threedee" to "volumetric".

Browse Source
This commit is contained in:
Rezmason
2021-09-06 17:23:54 -07:00
parent 99591e1186
commit 51f1b6ebf5
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/renderer.js
View File

@@ -21,10 +21,10 @@ const numVerticesPerQuad = 2 * 3;
export default (regl, config) => {
const threedee = config.threedee;
const density = threedee && config.effect !== "none" ? config.density : 1;
const volumetric = config.volumetric;
const density = volumetric && config.effect !== "none" ? config.density : 1;
const [numRows, numColumns] = [config.numColumns, config.numColumns * density];
const [numQuadRows, numQuadColumns] = threedee ? [numRows, numColumns] : [1, 1];
const [numQuadRows, numQuadColumns] = volumetric ? [numRows, numColumns] : [1, 1];
const numQuads = numQuadRows * numQuadColumns;
const quadSize = [1 / numQuadColumns, 1 / numQuadRows];
@@ -78,7 +78,7 @@ export default (regl, config) => {
numQuadRows,
numQuadColumns,
quadSize,
threedee
volumetric
};
uniforms.rippleType =
@@ -304,8 +304,8 @@ export default (regl, config) => {
uniform float glyphHeightToWidth;
uniform mat4 camera;
uniform mat4 transform;
uniform float time;
uniform bool threedee;
uniform float time, animationSpeed;
uniform bool volumetric;
uniform bool showComputationTexture;
varying vec2 vUV;
varying vec4 vGlyph;
@@ -317,13 +317,13 @@ export default (regl, config) => {
vGlyph = texture2D(lastState, vUV + (0.5 - aCorner) * quadSize);
float quadDepth = 0.0;
if (threedee && !showComputationTexture) {
quadDepth = fract(vGlyph.b + time * forwardSpeed);
if (volumetric && !showComputationTexture) {
quadDepth = fract(vGlyph.b + time * animationSpeed * forwardSpeed);
vGlyph.b = quadDepth;
}
vec4 pos = vec4(position, quadDepth, 1.0);
if (threedee) {
if (volumetric) {
pos.x /= glyphHeightToWidth;
pos = camera * transform * pos;
} else {
@@ -351,7 +351,7 @@ export default (regl, config) => {
uniform float slantScale;
uniform bool isPolar;
uniform bool showComputationTexture;
uniform bool threedee;
uniform bool volumetric;
varying vec2 vUV;
varying vec4 vGlyph;
@@ -371,7 +371,7 @@ export default (regl, config) => {
vec2 uv = vUV;
if (!threedee) {
if (!volumetric) {
if (isPolar) {
// Curves the UV space to make letters appear to radiate from up above
uv -= 0.5;
@@ -391,7 +391,7 @@ export default (regl, config) => {
uv.y /= glyphHeightToWidth;
}
vec4 glyph = threedee ? vGlyph : texture2D(lastState, uv);
vec4 glyph = volumetric ? vGlyph : texture2D(lastState, uv);
if (showComputationTexture) {
gl_FragColor = glyph;
@@ -405,7 +405,7 @@ export default (regl, config) => {
float effect = glyph.a;
brightness = max(effect, brightness);
if (threedee) {
if (volumetric) {
brightness = min(1.0, brightness * quadDepth * 1.25);
}