Merge pull request mrdoob#6495 from brason/patch-5

mrdoob · mrdoob · commit aee40ed0f3ad · 2015-05-02T13:23:48.000+01:00
InterleavedBufferAttribute: make .length number of elements
diff --git a/examples/webgl_buffergeometry_instancing_interleaved_dynamic.html b/examples/webgl_buffergeometry_instancing_interleaved_dynamic.html
@@ -185,7 +185,7 @@
         var offsets = new THREE.InterleavedBufferAttribute( instanceBuffer, 3, 0 );
 
         var vector = new THREE.Vector4();
-        for ( var i = 0, ul = offsets.length / 3; i < ul; i++ ) {
+        for ( var i = 0, ul = offsets.length; i < ul; i++ ) {
             var x = Math.random() * 100 - 50;
             var y = Math.random() * 100 - 50;
             var z = Math.random() * 100 - 50;
@@ -199,7 +199,7 @@
 
         orientations = new THREE.InterleavedBufferAttribute( instanceBuffer, 4, 4 );
 
-        for ( var i = 0, ul = orientations.length / 4; i < ul; i++ ) {
+        for ( var i = 0, ul = orientations.length; i < ul; i++ ) {
 
             vector.set( Math.random() * 2 - 1, Math.random() * 2 - 1, Math.random() * 2 - 1, Math.random() * 2 - 1 );
             vector.normalize();
@@ -290,7 +290,7 @@
         var delta = ( time - lastTime ) / 5000;
         tmpQ.set( moveQ.x * delta, moveQ.y * delta, moveQ.z * delta, 1 ).normalize();
 
-        for ( var i = 0, ul = orientations.length / 4; i < ul; i++ ) {
+        for ( var i = 0, ul = orientations.length; i < ul; i++ ) {
             var index = i * instanceBuffer.stride + orientations.offset;
             currentQ.set( instanceBuffer.array[index], instanceBuffer.array[index + 1], instanceBuffer.array[index + 2], instanceBuffer.array[index + 3] );
             currentQ.multiply( tmpQ );
diff --git a/src/core/InterleavedBufferAttribute.js b/src/core/InterleavedBufferAttribute.js
@@ -17,7 +17,7 @@ THREE.InterleavedBufferAttribute.prototype = {
 
 	get length() {
 
-		return this.itemSize * this.data.array.length / this.data.stride;
+		return this.data.array.length / this.data.stride;
 
 	},
 
