Browse Source

Merge pull request #16362 from Mugen87/dev29

PCDLoader: Fix data parsing for Edge.
Mr.doob 6 years ago
parent
commit
d0b90a500d
2 changed files with 12 additions and 3 deletions
  1. 1 1
      examples/js/loaders/PCDLoader.js
  2. 11 2
      src/loaders/LoaderUtils.js

+ 1 - 1
examples/js/loaders/PCDLoader.js

@@ -169,7 +169,7 @@ THREE.PCDLoader.prototype = {
 
 		}
 
-		var textData = THREE.LoaderUtils.decodeText( data );
+		var textData = THREE.LoaderUtils.decodeText( new Uint8Array( data ) );
 
 		// parse header (always ascii format)
 

+ 11 - 2
src/loaders/LoaderUtils.js

@@ -24,8 +24,17 @@ var LoaderUtils = {
 
 		}
 
-		// Merges multi-byte utf-8 characters.
-		return decodeURIComponent( escape( s ) );
+		try {
+
+			// merges multi-byte utf-8 characters.
+
+			return decodeURIComponent( escape( s ) );
+
+		} catch ( e ) { // see #16358
+
+			return s;
+
+		}
 
 	},