Skip to content

ColladaLoader: Fallback if material doesn't match #13172

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 4 commits into from
Jul 12, 2018
Merged

ColladaLoader: Fallback if material doesn't match #13172

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9826e8
ColladaLoader: Fallback if material doesn't match
cnspaha Jan 25, 2018
09a967d
ColladaLoader: Use console.warn instead of inline comments
cnspaha Jan 25, 2018
173d7ec
ColladaLoader: Define fallback material and apply it
cnspaha Jan 26, 2018
3880dba
ColladaLoader: Use MeshBasicMaterial as fallback
cnspaha Feb 1, 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
14 changes: 13 additions & 1 deletion examples/js/loaders/ColladaLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3183,14 +3183,26 @@ THREE.ColladaLoader.prototype = {

}

var fallbackMaterial = new THREE.MeshBasicMaterial( { color: 0xff00ff ) };
Copy link
Contributor

@Splizard Splizard Jul 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There appears to be a syntax error here! ( { color: 0xff00ff ) }

Copy link
Collaborator

@Mugen87 Mugen87 Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Can you make a PR with the change?

Copy link
Contributor

@Splizard Splizard Jul 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, sure thing, I should have mentioned it before! ha
#14464


function resolveMaterialBinding( keys, instanceMaterials ) {

var materials = [];

for ( var i = 0, l = keys.length; i < l; i ++ ) {

var id = instanceMaterials[ keys[ i ] ];
materials.push( getMaterial( id ) );

if ( id === undefined ) {

console.warn( 'THREE.ColladaLoader: Material with key %s not found. Apply fallback material.', keys[ i ] );
materials.push( fallbackMaterial );

} else {

materials.push( getMaterial( id ) );

}

}

Expand Down