Add more obj support

BabylonJS · f10e53fffc03df9818a5227de0a87444f11b5d8a · sebavanmicrosoft committed Mar 19, 2016 · Mar 19, 2016 · f10e53f
1 parent c796e17
commit f10e53fffc03df9818a5227de0a87444f11b5d8a
Unified Split

Showing with 8 additions and 8 deletions.

+4 −4 loaders/OBJ/babylon.objFileLoader.js

+4 −4 loaders/OBJ/babylon.objFileLoader.ts
@@ -187,13 +187,13 @@ var BABYLON;
             // vt float float
             this.uvPattern = /vt( +[\d|\.|\+|\-|e|E]+)( +[\d|\.|\+|\-|e|E]+)/;
             // f vertex vertex vertex ...
-            this.facePattern1 = /f\s(([\d]{1,}[\s]?){3,})+/;
+            this.facePattern1 = /f\s+(([\d]{1,}[\s]?){3,})+/;
             // f vertex/uvs vertex/uvs vertex/uvs ...
-            this.facePattern2 = /f\s((([\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
+            this.facePattern2 = /f\s+((([\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
             // f vertex/uvs/normal vertex/uvs/normal vertex/uvs/normal ...
-            this.facePattern3 = /f\s((([\d]{1,}\/[\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
+            this.facePattern3 = /f\s+((([\d]{1,}\/[\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
             // f vertex//normal vertex//normal vertex//normal ...
-            this.facePattern4 = /f\s((([\d]{1,}\/\/[\d]{1,}[\s]?){3,})+)/;
+            this.facePattern4 = /f\s+((([\d]{1,}\/\/[\d]{1,}[\s]?){3,})+)/;
         }
         /**
          * Calls synchronously the MTL file attached to this obj.
@@ -204,13 +204,13 @@ module BABYLON {
         // vt float float
         public uvPattern = /vt( +[\d|\.|\+|\-|e|E]+)( +[\d|\.|\+|\-|e|E]+)/;
         // f vertex vertex vertex ...
-        public facePattern1 = /f\s(([\d]{1,}[\s]?){3,})+/;
+        public facePattern1 = /f\s+(([\d]{1,}[\s]?){3,})+/;
         // f vertex/uvs vertex/uvs vertex/uvs ...
-        public facePattern2 = /f\s((([\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
+        public facePattern2 = /f\s+((([\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
         // f vertex/uvs/normal vertex/uvs/normal vertex/uvs/normal ...
-        public facePattern3 = /f\s((([\d]{1,}\/[\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
+        public facePattern3 = /f\s+((([\d]{1,}\/[\d]{1,}\/[\d]{1,}[\s]?){3,})+)/;
         // f vertex//normal vertex//normal vertex//normal ...
-        public facePattern4 = /f\s((([\d]{1,}\/\/[\d]{1,}[\s]?){3,})+)/;
+        public facePattern4 = /f\s+((([\d]{1,}\/\/[\d]{1,}[\s]?){3,})+)/;
 
 
         /**