BufferAttribute TypeArray support and normalized clean up.

mrdoob · mrdoob · commit adfa0d8cd536 · 2016-04-19T16:08:22.000+01:00
diff --git a/src/core/BufferAttribute.js b/src/core/BufferAttribute.js
@@ -13,7 +13,7 @@ THREE.BufferAttribute = function ( array, itemSize, normalized ) {
 	this.updateRange = { offset: 0, count: - 1 };
 
 	this.version = 0;
-	this.normalized = normalized ? true : false;
+	this.normalized = normalized === true;
 
 };
 
diff --git a/src/loaders/BufferGeometryLoader.js b/src/loaders/BufferGeometryLoader.js
@@ -56,8 +56,7 @@ THREE.BufferGeometryLoader.prototype = {
 
 			var attribute = attributes[ key ];
 			var typedArray = new TYPED_ARRAYS[ attribute.type ]( attribute.array );
-			var normalized = attribute.normalized || false;
-			geometry.addAttribute( key, new THREE.BufferAttribute( typedArray, attribute.itemSize , normalized) );
+			geometry.addAttribute( key, new THREE.BufferAttribute( typedArray, attribute.itemSize , attribute.normalized ) );
 
 		}
 
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
@@ -831,6 +831,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		}
 
+		//
+
 		var index = geometry.index;
 		var position = geometry.attributes.position;
 
@@ -865,6 +867,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		}
 
+		//
+
 		var dataStart = 0;
 		var dataCount = Infinity;
 
@@ -996,48 +1000,44 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				if ( geometryAttribute !== undefined ) {
 
-					var dataType = _gl.FLOAT;
-					var normalized = geometryAttribute.normalized;
+					var type = _gl.FLOAT;
 					var array = geometryAttribute.array;
+					var normalized = geometryAttribute.normalized;
+
 					if ( array instanceof Float32Array ) {
 
-						dataType = _gl.FLOAT;
+						type = _gl.FLOAT;
 
 					} else if ( array instanceof Float64Array ) {
 
 						console.warn("Unsupported data buffer format: Float64Array");
 
 					} else if ( array instanceof Uint16Array ) {
 
-						dataType = _gl.UNSIGNED_SHORT;
-						
+						type = _gl.UNSIGNED_SHORT;
+
 					} else if ( array instanceof Int16Array ) {
 
-						dataType = _gl.SHORT;
+						type = _gl.SHORT;
 
 					} else if ( array instanceof Uint32Array ) {
 
-						dataType = _gl.UNSIGNED_INT;
+						type = _gl.UNSIGNED_INT;
 
 					} else if ( array instanceof Int32Array ) {
 
-						dataType = _gl.INT;
+						type = _gl.INT;
 
 					} else if ( array instanceof Int8Array ) {
 
-						dataType = _gl.BYTE;
+						type = _gl.BYTE;
 
 					} else if ( array instanceof Uint8Array ) {
 
-						dataType = _gl.UNSIGNED_BYTE;
-
-					} else
-					{
-
-						dataType = _gl.FLOAT;
+						type = _gl.UNSIGNED_BYTE;
 
 					}
-					
+
 					var size = geometryAttribute.itemSize;
 					var buffer = objects.getAttributeBuffer( geometryAttribute );
 
@@ -1064,7 +1064,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 						}
 
 						_gl.bindBuffer( _gl.ARRAY_BUFFER, buffer );
-						_gl.vertexAttribPointer( programAttribute, size, dataType, normalized, stride * data.array.BYTES_PER_ELEMENT, ( startIndex * stride + offset ) * data.array.BYTES_PER_ELEMENT );
+						_gl.vertexAttribPointer( programAttribute, size, type, normalized, stride * data.array.BYTES_PER_ELEMENT, ( startIndex * stride + offset ) * data.array.BYTES_PER_ELEMENT );
 
 					} else {
 
@@ -1085,7 +1085,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 						}
 
 						_gl.bindBuffer( _gl.ARRAY_BUFFER, buffer );
-						_gl.vertexAttribPointer( programAttribute, size, dataType, normalized, 0, startIndex * size * geometryAttribute.array.BYTES_PER_ELEMENT ); 
+						_gl.vertexAttribPointer( programAttribute, size, type, normalized, 0, startIndex * size * geometryAttribute.array.BYTES_PER_ELEMENT );
 
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ THREE.BufferGeometryLoader.prototype = {`
`56`	`56`
`57`	`57`	`var attribute = attributes[ key ];`
`58`	`58`	`var typedArray = new TYPED_ARRAYS[ attribute.type ]( attribute.array );`
`59`		`- var normalized = attribute.normalized \|\| false;`
`60`		`- geometry.addAttribute( key, new THREE.BufferAttribute( typedArray, attribute.itemSize , normalized) );`
	`59`	`+ geometry.addAttribute( key, new THREE.BufferAttribute( typedArray, attribute.itemSize , attribute.normalized ) );`
`61`	`60`
`62`	`61`	`}`
`63`	`62`