Browse Source

Improved VTKLoader2.
Now it handles files with random number of spaces between numbers.

Mr.doob 13 years ago
parent
commit
334eb7041f
1 changed files with 3 additions and 3 deletions
  1. 3 3
      examples/js/loaders/VTKLoader2.js

+ 3 - 3
examples/js/loaders/VTKLoader2.js

@@ -61,7 +61,7 @@ THREE.VTKLoader2.prototype.parse = function ( data ) {
 
 
 	// float float float
 	// float float float
 
 
-	pattern = /([\d|\.|\+|\-|e]+) ([\d|\.|\+|\-|e]+) ([\d|\.|\+|\-|e]+)/g;
+	pattern = /([\d|\.|\+|\-|e]+)[ ]+([\d|\.|\+|\-|e]+)[ ]+([\d|\.|\+|\-|e]+)/g;
 
 
 	while ( ( result = pattern.exec( data ) ) != null ) {
 	while ( ( result = pattern.exec( data ) ) != null ) {
 
 
@@ -73,7 +73,7 @@ THREE.VTKLoader2.prototype.parse = function ( data ) {
 
 
 	// 3 int int int
 	// 3 int int int
 
 
-	pattern = /3 ([\d]+) ([\d]+) ([\d]+)/g;
+	pattern = /3[ ]+([\d]+)[ ]+([\d]+)[ ]+([\d]+)/g;
 
 
 	while ( ( result = pattern.exec( data ) ) != null ) {
 	while ( ( result = pattern.exec( data ) ) != null ) {
 
 
@@ -85,7 +85,7 @@ THREE.VTKLoader2.prototype.parse = function ( data ) {
 
 
 	// 4 int int int int
 	// 4 int int int int
 
 
-	pattern = /4 ([\d]+) ([\d]+) ([\d]+) ([\d]+)/g;
+	pattern = /4[ ]+([\d]+)[ ]+([\d]+)[ ]+([\d]+)[ ]+([\d]+)/g;
 
 
 	while ( ( result = pattern.exec( data ) ) != null ) {
 	while ( ( result = pattern.exec( data ) ) != null ) {