浏览代码

Merge pull request #14562 from looeee/fbxloader_remove_unit8array_indexof

FBXLoader: remove use of Uint8Array.indexOf
Mr.doob 7 年之前
父节点
当前提交
8c1220346d
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      examples/js/loaders/FBXLoader.js

+ 3 - 2
examples/js/loaders/FBXLoader.js

@@ -3701,7 +3701,8 @@
 
 
 		getString: function ( size ) {
 		getString: function ( size ) {
 
 
-			var a = new Uint8Array( size );
+			// note: safari 9 doesn't support Uint8Array.indexOf; create intermediate array instead
+			var a = [];
 
 
 			for ( var i = 0; i < size; i ++ ) {
 			for ( var i = 0; i < size; i ++ ) {
 
 
@@ -3712,7 +3713,7 @@
 			var nullByte = a.indexOf( 0 );
 			var nullByte = a.indexOf( 0 );
 			if ( nullByte >= 0 ) a = a.slice( 0, nullByte );
 			if ( nullByte >= 0 ) a = a.slice( 0, nullByte );
 
 
-			return THREE.LoaderUtils.decodeText( a );
+			return THREE.LoaderUtils.decodeText( new Uint8Array( a ) );
 
 
 		}
 		}