提交 675d9f2a 编写于 作者: M Mr.doob

Updated builds.

上级 c066383d
......@@ -9221,8 +9221,6 @@ THREE.JSONLoader.prototype.loadAjaxJSON = function ( context, url, callback, tex
var length = 0;
xhr.withCredentials = this.withCredentials;
xhr.onreadystatechange = function () {
if ( xhr.readyState === xhr.DONE ) {
......@@ -9275,6 +9273,7 @@ THREE.JSONLoader.prototype.loadAjaxJSON = function ( context, url, callback, tex
};
xhr.open( "GET", url, true );
xhr.withCredentials = this.withCredentials;
xhr.send( null );
};
......@@ -9764,7 +9763,8 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
cameras: {},
lights: {},
fogs: {},
empties: {}
empties: {},
groups: {}
};
......@@ -10124,6 +10124,24 @@ 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 );
}
}
if ( objJSON.children !== undefined ) {
handle_children( object, objJSON.children );
......@@ -10805,12 +10823,6 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
}
color = data.defaults.bgcolor;
result.bgColor = new THREE.Color();
result.bgColor.setRGB( color[0], color[1], color[2] );
result.bgColorAlpha = data.defaults.bgalpha;
// synchronous callback
scope.callbackSync( result );
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册