From 4e015df1c19ff90a2dcd3a464045f8334ce0834a Mon Sep 17 00:00:00 2001 From: WestLangley Date: Mon, 7 Aug 2017 22:28:10 -0400 Subject: [PATCH] Texture rotation: auto-update texture.matrix --- src/renderers/WebGLRenderer.js | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 57ddda1726..b34ceab62a 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -1984,17 +1984,14 @@ function WebGLRenderer( parameters ) { if ( uvScaleMap.matrixAutoUpdate === true ) { - var offset = uvScaleMap.offset; - var repeat = uvScaleMap.repeat; - - uniforms.uvTransform.value.setUvTransform( offset.x, offset.y, repeat.x, repeat.y, 0, 0, 0 ); - - } else { - - uniforms.uvTransform.value.copy( uvScaleMap.matrix ); + var offset = uvScaleMap.offset; + var repeat = uvScaleMap.repeat; + uvScaleMap.matrix.setUvTransform( offset.x, offset.y, repeat.x, repeat.y, 0, 0, 0 ); } + uniforms.uvTransform.value.copy( uvScaleMap.matrix ); + } } @@ -2027,17 +2024,14 @@ function WebGLRenderer( parameters ) { if ( material.map.matrixAutoUpdate === true ) { - var offset = material.map.offset; - var repeat = material.map.repeat; - - uniforms.uvTransform.value.setUvTransform( offset.x, offset.y, repeat.x, repeat.y, 0, 0, 0 ); - - } else { - - uniforms.uvTransform.value.copy( material.map.matrix ); + var offset = material.map.offset; + var repeat = material.map.repeat; + material.map.matrix.setUvTransform( offset.x, offset.y, repeat.x, repeat.y, 0, 0, 0 ); } + uniforms.uvTransform.value.copy( material.map.matrix ); + } } -- GitLab