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

Fixed a math issue in the symbol UV function.

Browse Source
This commit is contained in:
Rezmason
2021-10-30 20:30:55 -07:00
parent 4ea6cadd2f
commit 375560d6a1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.txt
View File

@@ -2,7 +2,6 @@ TODO:
WebGPU WebGPU
First decent rainRender First decent rainRender
What's wrong with the other font textures?
Port compute pass 100% Port compute pass 100%
Compute entry point can live in the same wgsl file, I think Compute entry point can live in the same wgsl file, I think
use textureLoad for texel access in render pipeline use textureLoad for texel access in render pipeline

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

@@ -25,7 +25,7 @@ float median3(vec3 i) {
vec2 getSymbolUV(float glyphCycle) { vec2 getSymbolUV(float glyphCycle) {
float symbol = floor(glyphSequenceLength * glyphCycle); float symbol = floor(glyphSequenceLength * glyphCycle);
float symbolX = mod(symbol, glyphTextureColumns); float symbolX = mod(symbol, glyphTextureColumns);
float symbolY = ((glyphTextureColumns - 1.0) - (symbol - symbolX) / glyphTextureColumns); float symbolY = glyphTextureColumns - floor(symbol / glyphTextureColumns);
return vec2(symbolX, symbolY); return vec2(symbolX, symbolY);
} }

4
shaders/wgsl/rainRenderPass.wgsl
View File

@@ -129,7 +129,7 @@ fn wobble(x:f32) -> f32 {
var uv = (quadPosition + quadCorner) / quadGridSize; var uv = (quadPosition + quadCorner) / quadGridSize;
// Retrieve the quad's glyph data // Retrieve the quad's glyph data
var vGlyph = vec4<f32>(1.0, 0.72, randomFloat(vec2<f32>(quadPosition.x, 1.0)), 0.0); // TODO: texture2D(state, quadPosition / quadGridSize); var vGlyph = vec4<f32>(1.0, 0.0, randomFloat(vec2<f32>(quadPosition.x, 1.0)), 0.0); // TODO: texture2D(state, quadPosition / quadGridSize);
// Calculate the quad's depth // Calculate the quad's depth
var quadDepth = 0.0; var quadDepth = 0.0;
@@ -181,7 +181,7 @@ fn median3(i:vec3<f32>) -> f32 {
fn getSymbolUV(glyphCycle:f32) -> vec2<f32> { fn getSymbolUV(glyphCycle:f32) -> vec2<f32> {
var symbol = i32(f32(msdf.glyphSequenceLength) * glyphCycle); var symbol = i32(f32(msdf.glyphSequenceLength) * glyphCycle);
var symbolX = symbol % msdf.glyphTextureColumns; var symbolX = symbol % msdf.glyphTextureColumns;
var symbolY = ((msdf.glyphTextureColumns - 1) - (symbol - symbolX) / msdf.glyphTextureColumns); var symbolY = symbol / msdf.glyphTextureColumns;
return vec2<f32>(f32(symbolX), f32(symbolY)); return vec2<f32>(f32(symbolX), f32(symbolY));
} }