Merge pull request mrdoob#8209 from stity/binaryVTKLoader

mrdoob · mrdoob · commit 5b55178ba773 · 2016-02-24T21:02:40.000+09:00
Fix VTK parser pull request
diff --git a/examples/js/loaders/VTKLoader.js b/examples/js/loaders/VTKLoader.js
@@ -259,7 +259,7 @@ THREE.VTKLoader.prototype = {
 
 				// Nodal. Use BufferGeometry
 				geometry = new THREE.BufferGeometry();
-				geometry.setIndex( new THREE.BufferAttribute( new ( indices.length > 65535 ? Uint32Array : Uint16Array )( indices ), 1 ) );
+				geometry.setIndex( new THREE.BufferAttribute( new Uint32Array( indices ), 1 ) );
 				geometry.addAttribute( 'position', new THREE.BufferAttribute( new Float32Array( positions ), 3 ) );
 
 				if ( colors.length == positions.length ) {
@@ -532,11 +532,18 @@ THREE.VTKLoader.prototype = {
 
 		var meta = String.fromCharCode.apply( null, new Uint8Array( data, 0, 250 ) ).split( '\n' );
 
-		// console.log( meta );
 
-		if ( meta[ 2 ] === 'ASCII' ) {
+		if ( meta[ 2 ].includes( 'ASCII' ) ) {
 
-			return parseASCII( String.fromCharCode.apply( null, new Uint8Array( data ) ) );
+			var stringFile = '';
+			var charArray = new Uint8Array( data );
+			for ( var i = 0; i < charArray.length; i ++ ) {
+
+				stringFile += String.fromCharCode( charArray[ i ] );
+
+			}
+
+			return parseASCII( stringFile );
 
 		} else {
 
