github/scratch-render
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add uniformName to ShaderManager EFFECT_INFO entries (#328)

Browse Source
This commit is contained in:
Michael "Z" Goddard
2018-08-08 14:04:37 -04:00
committed by Mx Corey Frang
parent bcf8ff60e4
commit c08b853519
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Drawable.js
View File

@@ -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();
}