Skip to content
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

Jump to bottom

GLTFLoader: Use source name for texture if available. #24849

Merged
merged 1 commit into from
Oct 25, 2022
Merged

GLTFLoader: Use source name for texture if available. #24849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions examples/jsm/loaders/GLTFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ class GLTFLoader extends Loader {

json = JSON.parse( data );

} else if( data instanceof ArrayBuffer ) {
} else if ( data instanceof ArrayBuffer ) {

const magic = LoaderUtils.decodeText( new Uint8Array( data, 0, 4 ) );

Expand Down Expand Up @@ -1453,7 +1453,7 @@ class GLTFMeshGpuInstancing {
attributes[ key ] = accessor;
return attributes[ key ];

}));
} ) );

}

Expand Down Expand Up @@ -1537,6 +1537,7 @@ class GLTFMeshGpuInstancing {
nodeObject.add( ... instancedMeshes );

return nodeObject;

}

return instancedMeshes[ 0 ];
Expand Down Expand Up @@ -3189,7 +3190,7 @@ class GLTFParser {

texture.flipY = false;

if ( textureDef.name ) texture.name = textureDef.name;
texture.name = textureDef.name || sourceDef.name || '';

const samplers = json.samplers || {};
const sampler = samplers[ textureDef.sampler ] || {};
Expand Down