Merge remote-tracking branch 'remotes/mrdoob/dev' into unflip

examples/js/loaders/OBJLoader.js

@@ -76,7 +76,7 @@ THREE.OBJLoader.prototype = {
 
 		// v float float float
 
-		pattern = /v( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/g;
+		pattern = /v( +[\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/g;
 
 		while ( ( result = pattern.exec( data ) ) != null ) {
 
@@ -93,7 +93,7 @@ THREE.OBJLoader.prototype = {
 
 		// vn float float float
 
-		pattern = /vn( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/g;
+		pattern = /vn( +[\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/g;
 
 		while ( ( result = pattern.exec( data ) ) != null ) {
 
@@ -109,7 +109,7 @@ THREE.OBJLoader.prototype = {
 
 		// vt float float
 
-		pattern = /vt( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/g;
+		pattern = /vt( +[\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/g;
 
 		while ( ( result = pattern.exec( data ) ) != null ) {
 
@@ -134,7 +134,7 @@ THREE.OBJLoader.prototype = {
 
 			// f vertex vertex vertex ...
 
-			pattern = /f( [\d]+)( [\d]+)( [\d]+)( [\d]+)?/g;
+			pattern = /f( +[\d]+)( [\d]+)( [\d]+)( [\d]+)?/g;
 
 			while ( ( result = pattern.exec( object ) ) != null ) {
 
@@ -163,7 +163,7 @@ THREE.OBJLoader.prototype = {
 
 			// f vertex/uv vertex/uv vertex/uv ...
 
-			pattern = /f( ([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))?/g;
+			pattern = /f( +([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))?/g;
 
 			while ( ( result = pattern.exec( object ) ) != null ) {
 
@@ -205,7 +205,7 @@ THREE.OBJLoader.prototype = {
 
 			// f vertex/uv/normal vertex/uv/normal vertex/uv/normal ...
 
-			pattern = /f( ([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))?/g;
+			pattern = /f( +([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))?/g;
 
 			while ( ( result = pattern.exec( object ) ) != null ) {
 
@@ -259,7 +259,7 @@ THREE.OBJLoader.prototype = {
 
 			// f vertex//normal vertex//normal vertex//normal ...
 
-			pattern = /f( ([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))?/g;
+			pattern = /f( +([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))?/g;
 
 			while ( ( result = pattern.exec( object ) ) != null ) {