瀏覽代碼

Merge remote-tracking branch 'pavelgj/dev' into dev

Mr.doob 12 年之前
父節點
當前提交
7c4624e0d1
共有 1 個文件被更改,包括 19 次插入1 次删除
  1. 19 1
      src/loaders/SceneLoader.js

+ 19 - 1
src/loaders/SceneLoader.js

@@ -111,7 +111,8 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 		cameras: {},
 		cameras: {},
 		lights: {},
 		lights: {},
 		fogs: {},
 		fogs: {},
-		empties: {}
+		empties: {},
+		groups: {}
 
 
 	};
 	};
 
 
@@ -481,6 +482,23 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
 
 
 			}
 			}
 
 
+			if ( objJSON.groups !== undefined ) {
+
+				for ( var i = 0; i < objJSON.groups.length; i ++ ) {
+
+					var groupID = objJSON.groups[i];
+
+					if ( result.groups[groupID] === undefined ) {
+
+						result.groups[groupID] = [];
+
+					}
+
+					result.groups[groupID].push(objID);
+
+				}
+
+			}
 		}
 		}
 
 
 	};
 	};