From c08b8535197bbefc2d39f064864e09b0fbde6d22 Mon Sep 17 00:00:00 2001
From: "Michael \"Z\" Goddard" <mzgoddard@gmail.com>
Date: Wed, 8 Aug 2018 14:04:37 -0400
Subject: [PATCH] add uniformName to ShaderManager EFFECT_INFO entries (#328)

---
 src/Drawable.js      | 7 ++++---
 src/ShaderManager.js | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Drawable.js b/src/Drawable.js
index 4acbbfa..db6bdcc 100644
--- a/src/Drawable.js
+++ b/src/Drawable.js
@@ -43,8 +43,9 @@ class Drawable {
         const numEffects = ShaderManager.EFFECTS.length;
         for (let index = 0; index < numEffects; ++index) {
             const effectName = ShaderManager.EFFECTS[index];
-            const converter = ShaderManager.EFFECT_INFO[effectName].converter;
-            this._uniforms[`u_${effectName}`] = converter(0);
+            const effectInfo = ShaderManager.EFFECT_INFO[effectName];
+            const converter = effectInfo.converter;
+            this._uniforms[effectInfo.uniformName] = converter(0);
         }
 
         this._position = twgl.v3.create(0, 0);
@@ -193,7 +194,7 @@ class Drawable {
                     this._effectBits &= ~effectInfo.mask;
                 }
                 const converter = effectInfo.converter;
-                this._uniforms[`u_${effectName}`] = converter(rawValue);
+                this._uniforms[effectInfo.uniformName] = converter(rawValue);
                 if (effectInfo.shapeChanges) {
                     this.setConvexHullDirty();
                 }
diff --git a/src/ShaderManager.js b/src/ShaderManager.js
index 8a1e78c..1c82528 100644
--- a/src/ShaderManager.js
+++ b/src/ShaderManager.js
@@ -88,30 +88,35 @@ class ShaderManager {
 ShaderManager.EFFECT_INFO = {
     /** Color effect */
     color: {
+        uniformName: 'u_color',
         mask: 1 << 0,
         converter: x => (x / 200) % 1,
         shapeChanges: false
     },
     /** Fisheye effect */
     fisheye: {
+        uniformName: 'u_fisheye',
         mask: 1 << 1,
         converter: x => Math.max(0, (x + 100) / 100),
         shapeChanges: true
     },
     /** Whirl effect */
     whirl: {
+        uniformName: 'u_whirl',
         mask: 1 << 2,
         converter: x => -x * Math.PI / 180,
         shapeChanges: true
     },
     /** Pixelate effect */
     pixelate: {
+        uniformName: 'u_pixelate',
         mask: 1 << 3,
         converter: x => Math.abs(x) / 10,
         shapeChanges: true
     },
     /** Mosaic effect */
     mosaic: {
+        uniformName: 'u_mosaic',
         mask: 1 << 4,
         converter: x => {
             x = Math.round((Math.abs(x) + 10) / 10);
@@ -122,12 +127,14 @@ ShaderManager.EFFECT_INFO = {
     },
     /** Brightness effect */
     brightness: {
+        uniformName: 'u_brightness',
         mask: 1 << 5,
         converter: x => Math.max(-100, Math.min(x, 100)) / 100,
         shapeChanges: false
     },
     /** Ghost effect */
     ghost: {
+        uniformName: 'u_ghost',
         mask: 1 << 6,
         converter: x => 1 - (Math.max(0, Math.min(x, 100)) / 100),
         shapeChanges: false