From f4ae51333cd7dd3c1ae3525e57807e0909efcdc0 Mon Sep 17 00:00:00 2001 From: Robert Plummer Date: Mon, 27 May 2019 15:17:58 -0400 Subject: [PATCH] fix: Revert some changes to legacyEncoder32 I forgot to roll them back in the excitement. --- src/backend/web-gl/fragment-shader.js | 3 +-- src/backend/web-gl2/fragment-shader.js | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/backend/web-gl/fragment-shader.js b/src/backend/web-gl/fragment-shader.js index b7d11ff3..15b945b0 100644 --- a/src/backend/web-gl/fragment-shader.js +++ b/src/backend/web-gl/fragment-shader.js @@ -210,7 +210,6 @@ vec4 legacyEncode32(float f) { float exponent = floor(log2(F)); float mantissa = (exp2(-exponent) * F); // exponent += floor(log2(mantissa)); - exponent = exponent + 127.0; vec4 texel = vec4(F * exp2(23.0-exponent)) * SCALE_FACTOR_INV; texel.rg = integerMod(texel.rg, 256.0); texel.b = integerMod(texel.b, 128.0); @@ -360,4 +359,4 @@ void main(void) { module.exports = { fragmentShader -}; \ No newline at end of file +}; diff --git a/src/backend/web-gl2/fragment-shader.js b/src/backend/web-gl2/fragment-shader.js index d5d21f1b..dcf2fe69 100644 --- a/src/backend/web-gl2/fragment-shader.js +++ b/src/backend/web-gl2/fragment-shader.js @@ -197,10 +197,10 @@ vec4 legacyEncode32(float f) { float exponent = floor(log2(F)); float mantissa = (exp2(-exponent) * F); // exponent += floor(log2(mantissa)); - vec4 texel = vec4(F * exp2(23.0 - exponent)) * SCALE_FACTOR_INV; + vec4 texel = vec4(F * exp2(23.0-exponent)) * SCALE_FACTOR_INV; texel.rg = integerMod(texel.rg, 256.0); texel.b = integerMod(texel.b, 128.0); - texel.a = exponent * 0.5 + 63.5; + texel.a = exponent*0.5 + 63.5; texel.ba += vec2(integerMod(exponent+127.0, 2.0), sign) * 128.0; texel = floor(texel); texel *= 0.003921569; // 1/255 @@ -347,4 +347,4 @@ void main(void) { module.exports = { fragmentShader -}; \ No newline at end of file +};