From cb1fb441f59b2066f5f32145fabe143b792db8b5 Mon Sep 17 00:00:00 2001 From: Takahiro Date: Mon, 19 Mar 2018 05:32:35 +0900 Subject: [PATCH] Clean up setupVertexAttributes in WebGLRenderer --- src/renderers/WebGLRenderer.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index fec8a76801..ab77d9245d 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -835,7 +835,7 @@ function WebGLRenderer( parameters ) { }; - function setupVertexAttributes( material, program, geometry, startIndex ) { + function setupVertexAttributes( material, program, geometry ) { if ( geometry && geometry.isInstancedBufferGeometry ) { @@ -848,8 +848,6 @@ function WebGLRenderer( parameters ) { } - if ( startIndex === undefined ) startIndex = 0; - state.initAttributes(); var geometryAttributes = geometry.attributes; @@ -904,7 +902,7 @@ function WebGLRenderer( parameters ) { } _gl.bindBuffer( _gl.ARRAY_BUFFER, buffer ); - _gl.vertexAttribPointer( programAttribute, size, type, normalized, stride * bytesPerElement, ( startIndex * stride + offset ) * bytesPerElement ); + _gl.vertexAttribPointer( programAttribute, size, type, normalized, stride * bytesPerElement, offset * bytesPerElement ); } else { @@ -925,7 +923,7 @@ function WebGLRenderer( parameters ) { } _gl.bindBuffer( _gl.ARRAY_BUFFER, buffer ); - _gl.vertexAttribPointer( programAttribute, size, type, normalized, 0, startIndex * size * bytesPerElement ); + _gl.vertexAttribPointer( programAttribute, size, type, normalized, 0, 0 ); } -- GitLab