未验证 提交 60239755 编写于 作者: T thecharhan 提交者: GitHub

Catch promise rejections in GLTFParser.loadNode

上级 9e7bddd9
......@@ -3129,16 +3129,16 @@ THREE.GLTFLoader = ( function () {
var nodeDef = json.nodes[ nodeIndex ];
return new Promise( function ( resolve ) {
return function( ) {
// .isBone isn't in glTF spec. See .markDefs
if ( nodeDef.isBone === true ) {
resolve( new THREE.Bone() );
return Promise.resolve( new THREE.Bone() );
} else if ( nodeDef.mesh !== undefined ) {
parser.getDependency( 'mesh', nodeDef.mesh ).then( function ( mesh ) {
return parser.getDependency( 'mesh', nodeDef.mesh ).then( function ( mesh ) {
var node;
......@@ -3165,27 +3165,27 @@ THREE.GLTFLoader = ( function () {
}
resolve( node );
return node;
} );
} else if ( nodeDef.camera !== undefined ) {
parser.getDependency( 'camera', nodeDef.camera ).then( resolve );
return parser.getDependency( 'camera', nodeDef.camera );
} else if ( nodeDef.extensions
&& nodeDef.extensions[ EXTENSIONS.KHR_LIGHTS_PUNCTUAL ]
&& nodeDef.extensions[ EXTENSIONS.KHR_LIGHTS_PUNCTUAL ].light !== undefined ) {
parser.getDependency( 'light', nodeDef.extensions[ EXTENSIONS.KHR_LIGHTS_PUNCTUAL ].light ).then( resolve );
return parser.getDependency( 'light', nodeDef.extensions[ EXTENSIONS.KHR_LIGHTS_PUNCTUAL ].light );
} else {
resolve( new THREE.Object3D() );
return Promise.resolve( new THREE.Object3D() );
}
} ).then( function ( node ) {
}( ).then( function ( node ) {
if ( nodeDef.name !== undefined ) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册