From d8789d8fd17fd58f06003e9846b3d107ffc8ec52 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Fri, 5 Oct 2018 11:29:15 +0300 Subject: Fix normal calculation in MorphPhongMaterial MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iad160f2d454633b558bee91b1e01c287d4202451 Reviewed-by: Antti Määttä --- src/extras/shaders/es2/morphphong.vert | 2 +- src/extras/shaders/gl3/morphphong.vert | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extras/shaders/es2/morphphong.vert b/src/extras/shaders/es2/morphphong.vert index d091e87c0..89877dca8 100644 --- a/src/extras/shaders/es2/morphphong.vert +++ b/src/extras/shaders/es2/morphphong.vert @@ -25,7 +25,7 @@ void main() morphNormal = normalize(vertexNormal + vertexNormalTarget * abs(interpolator)); } - worldNormal = normalize( modelNormalMatrix * morphPos ); + worldNormal = normalize( modelNormalMatrix * morphNormal ); worldPosition = vec3( modelMatrix * vec4( morphPos, 1.0 ) ); gl_Position = modelViewProjection * vec4( morphPos, 1.0 ); diff --git a/src/extras/shaders/gl3/morphphong.vert b/src/extras/shaders/gl3/morphphong.vert index c74fbdcff..7a8bdd097 100644 --- a/src/extras/shaders/gl3/morphphong.vert +++ b/src/extras/shaders/gl3/morphphong.vert @@ -27,7 +27,7 @@ void main() morphNormal = normalize(vertexNormal + vertexNormalTarget * abs(interpolator)); } - worldNormal = normalize( modelNormalMatrix * morphPos ); + worldNormal = normalize( modelNormalMatrix * morphNormal ); worldPosition = vec3( modelMatrix * vec4( morphPos, 1.0 ) ); gl_Position = modelViewProjection * vec4( morphPos, 1.0 ); -- cgit v1.2.3