Browse Source

Merge pull request #8301 from andreykaipov/patch-1

Update OBJLoader.js to parse blank named objects and groups
Mr.doob 9 years ago
parent
commit
22295655c2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      examples/js/loaders/OBJLoader.js

+ 2 - 2
examples/js/loaders/OBJLoader.js

@@ -215,7 +215,7 @@ THREE.OBJLoader.prototype = {
 		// f vertex//normal vertex//normal vertex//normal ...
 		// f vertex//normal vertex//normal vertex//normal ...
 		var face_pattern4 = /^f\s+((-?\d+)\/\/(-?\d+))\s+((-?\d+)\/\/(-?\d+))\s+((-?\d+)\/\/(-?\d+))(?:\s+((-?\d+)\/\/(-?\d+)))?/;
 		var face_pattern4 = /^f\s+((-?\d+)\/\/(-?\d+))\s+((-?\d+)\/\/(-?\d+))\s+((-?\d+)\/\/(-?\d+))(?:\s+((-?\d+)\/\/(-?\d+)))?/;
 
 
-		var object_pattern = /^[og]\s+(.+)/;
+		var object_pattern = /^[og]\s*(.+)?/;
 
 
 		var smoothing_pattern = /^s\s+(\d+|on|off)/;
 		var smoothing_pattern = /^s\s+(\d+|on|off)/;
 
 
@@ -306,7 +306,7 @@ THREE.OBJLoader.prototype = {
 				// or
 				// or
 				// g group_name
 				// g group_name
 
 
-				var name = result[ 1 ].trim();
+				var name = result[ 0 ].substr( 1 ).trim();
 
 
 				if ( foundObjects === false ) {
 				if ( foundObjects === false ) {