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

Merge pull request #491 from adroitwhiz/dont-fudge-up-the-renderer

Browse Source 
Remove u_fudge
This commit is contained in:
Chris Willis-Ford 2019-10-01 13:02:15 -07:00 committed by GitHub
commit 13b9ed7e16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PenSkin.js
View File

@ -332,8 +332,7 @@ class PenSkin extends Skin {
const uniforms = { const uniforms = {
u_skin: this._texture, u_skin: this._texture,
u_projectionMatrix: projection, u_projectionMatrix: projection
u_fudge: 0
}; };
twgl.setUniforms(currentShader, uniforms); twgl.setUniforms(currentShader, uniforms);
@ -474,8 +473,7 @@ class PenSkin extends Skin {
0 0
), __modelScalingMatrix), ), __modelScalingMatrix),
__modelMatrix __modelMatrix
), )
u_fudge: 0
}; };
twgl.setTextureParameters(gl, texture, {minMag: gl.NEAREST}); twgl.setTextureParameters(gl, texture, {minMag: gl.NEAREST});

3
src/RenderWebGL.js
View File

@ -1720,8 +1720,7 @@ class RenderWebGL extends EventEmitter {
gl.useProgram(currentShader.program); gl.useProgram(currentShader.program);
twgl.setBuffersAndAttributes(gl, currentShader, this._bufferInfo); twgl.setBuffersAndAttributes(gl, currentShader, this._bufferInfo);
Object.assign(uniforms, { Object.assign(uniforms, {
u_projectionMatrix: projection, u_projectionMatrix: projection
u_fudge: window.fudge || 0
}); });
} }

2
src/shaders/sprite.frag
View File

@ -1,7 +1,5 @@
precision mediump float; precision mediump float;
uniform float u_fudge;
#ifdef DRAW_MODE_silhouette #ifdef DRAW_MODE_silhouette
uniform vec4 u_silhouetteColor; uniform vec4 u_silhouetteColor;
#else // DRAW_MODE_silhouette #else // DRAW_MODE_silhouette