Skip to content

Catch promise rejections in GLTFParser.loadNode #15350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2018
Merged

Catch promise rejections in GLTFParser.loadNode #15350

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6023975
Catch promise rejections in GLTFParser.loadNode
thecharhan Nov 30, 2018
0bb8cce
make IIFS a little easier to read
thecharhan Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions examples/js/loaders/GLTFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 ) {

Expand Down