diff --git a/src/renderers/webgl/WebGLObjects.js b/src/renderers/webgl/WebGLObjects.js index fe706aaafbe1e8b06cc13cef30f37d2ec949a2f0..fab94b6fa2d806ea7c21efe8a7b858bc7ce6dea2 100644 --- a/src/renderers/webgl/WebGLObjects.js +++ b/src/renderers/webgl/WebGLObjects.js @@ -118,17 +118,7 @@ THREE.WebGLObjects = function ( gl, properties, info ) { function updateAttribute( attribute, name ) { - var bufferType; - - if ( name === 'index' || name === 'wireframe' ) { - - bufferType = gl.ELEMENT_ARRAY_BUFFER; - - } else { - - bufferType = gl.ARRAY_BUFFER; - - } + var bufferType = name === 'index' ? gl.ELEMENT_ARRAY_BUFFER : gl.ARRAY_BUFFER; var data = ( attribute instanceof THREE.InterleavedBufferAttribute ) ? attribute.data : attribute; @@ -208,16 +198,16 @@ THREE.WebGLObjects = function ( gl, properties, info ) { function getWireframeAttribute( geometry ) { - var attributes = geometry.attributes; - - if ( attributes.wireframe !== undefined ) { + if ( geometry._wireframe !== undefined ) { - return attributes.wireframe; + return geometry._wireframe; } var indices = []; + var attributes = geometry.attributes; + var index = attributes.index; var position = attributes.position; @@ -228,7 +218,7 @@ THREE.WebGLObjects = function ( gl, properties, info ) { var edges = {}; var array = index.array; - for ( var i = 0, j = 0, l = array.length; i < l; i += 3 ) { + for ( var i = 0, l = array.length; i < l; i += 3 ) { var a = array[ i + 0 ]; var b = array[ i + 1 ]; @@ -244,7 +234,7 @@ THREE.WebGLObjects = function ( gl, properties, info ) { var array = position.array; - for ( var i = 0, j = 0, l = ( array.length / 3 ) - 1; i < l; i += 3 ) { + for ( var i = 0, l = ( array.length / 3 ) - 1; i < l; i += 3 ) { var a = i + 0; var b = i + 1; @@ -261,9 +251,9 @@ THREE.WebGLObjects = function ( gl, properties, info ) { var TypeArray = position.count > 65535 ? Uint32Array : Uint16Array; var attribute = new THREE.BufferAttribute( new TypeArray( indices ), 1 ); - updateAttribute( attribute, 'wireframe' ); + updateAttribute( attribute, 'index' ); - geometry.addAttribute( 'wireframe', attribute ); + geometry._wireframe = attribute; return attribute;