|
@@ -254,31 +254,31 @@ THREE.OBJMTLLoader.prototype = {
|
|
|
|
|
|
// v float float float
|
|
|
|
|
|
- var vertex_pattern = /v( +[\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/;
|
|
|
+ var vertex_pattern = /v( +[\d|\.|\+|\-|e]+)( +[\d|\.|\+|\-|e]+)( +[\d|\.|\+|\-|e]+)/;
|
|
|
|
|
|
// vn float float float
|
|
|
|
|
|
- var normal_pattern = /vn( +[\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/;
|
|
|
+ var normal_pattern = /vn( +[\d|\.|\+|\-|e]+)( +[\d|\.|\+|\-|e]+)( +[\d|\.|\+|\-|e]+)/;
|
|
|
|
|
|
// vt float float
|
|
|
|
|
|
- var uv_pattern = /vt( +[\d|\.|\+|\-|e]+)( [\d|\.|\+|\-|e]+)/;
|
|
|
+ var uv_pattern = /vt( +[\d|\.|\+|\-|e]+)( +[\d|\.|\+|\-|e]+)/
|
|
|
|
|
|
// f vertex vertex vertex ...
|
|
|
|
|
|
- var face_pattern1 = /f( +[\d]+)( [\d]+)( [\d]+)( [\d]+)?/;
|
|
|
+ var face_pattern1 = /f( +\d+)( +\d+)( +\d+)( +\d+)?/
|
|
|
|
|
|
// f vertex/uv vertex/uv vertex/uv ...
|
|
|
|
|
|
- var face_pattern2 = /f( +([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))( ([\d]+)\/([\d]+))?/;
|
|
|
+ var face_pattern2 = /f( +(\d+)\/(\d+))( +(\d+)\/(\d+))( +(\d+)\/(\d+))( +(\d+)\/(\d+))?/;
|
|
|
|
|
|
// f vertex/uv/normal vertex/uv/normal vertex/uv/normal ...
|
|
|
|
|
|
- var face_pattern3 = /f( +([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))( ([\d]+)\/([\d]+)\/([\d]+))?/;
|
|
|
+ var face_pattern3 = /f( +(\d+)\/(\d+)\/(\d+))( +(\d+)\/(\d+)\/(\d+))( +(\d+)\/(\d+)\/(\d+))( +(\d+)\/(\d+)\/(\d+))?/;
|
|
|
|
|
|
// f vertex//normal vertex//normal vertex//normal ...
|
|
|
|
|
|
- var face_pattern4 = /f( +([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))( ([\d]+)\/\/([\d]+))?/;
|
|
|
+ var face_pattern4 = /f( +(\d+)\/\/(\d+))( +(\d+)\/\/(\d+))( +(\d+)\/\/(\d+))( +(\d+)\/\/(\d+))?/;
|
|
|
|
|
|
//
|
|
|
|