diff options
| author | Joni Poikelin <joni.poikelin@qt.io> | 2018-10-05 11:29:15 +0300 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@qt.io> | 2018-10-05 08:50:43 +0000 |
| commit | d8789d8fd17fd58f06003e9846b3d107ffc8ec52 (patch) | |
| tree | 93cea2a5f1470f370c2745830d3ca47e5dabf905 | |
| parent | c82d0c81aa109667a3fcef8637d25fc6ef6f6059 (diff) | |
Fix normal calculation in MorphPhongMaterial
Change-Id: Iad160f2d454633b558bee91b1e01c287d4202451
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | src/extras/shaders/es2/morphphong.vert | 2 | ||||
| -rw-r--r-- | 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 ); |