Skip to content

GLTFLoader: Fix bug when loading external WebP texture #21282

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 6 commits into from
Feb 17, 2021
Merged

GLTFLoader: Fix bug when loading external WebP texture #21282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3315515
fix webp extension with no handler
gkjohnson Feb 15, 2021
697b459
Add "manager"
gkjohnson Feb 15, 2021
da06eb3
Adjust code style
gkjohnson Feb 15, 2021
08f03ce
Merge remote-tracking branch 'mrdoob-origin/dev' into gltf-webp-bug
gkjohnson Feb 15, 2021
020fbdb
Merge remote-tracking branch 'mrdoob-origin/dev' into gltf-webp-bug
gkjohnson Feb 15, 2021
3d06022
Fix bad merge resolve
gkjohnson Feb 15, 2021
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
29 changes: 12 additions & 17 deletions examples/js/loaders/GLTFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,14 @@ THREE.GLTFLoader = ( function () {

var extension = textureDef.extensions[ name ];
var source = json.images[ extension.source ];
var loader = source.uri ? parser.options.manager.getHandler( source.uri ) : parser.textureLoader;

var loader = parser.textureLoader;
if ( source.uri ) {

var handler = parser.options.manager.getHandler( source.uri );
if ( handler !== null ) loader = handler;

}

return this.detectSupport().then( function ( isSupported ) {

Expand Down Expand Up @@ -2357,29 +2364,17 @@ THREE.GLTFLoader = ( function () {
*/
GLTFParser.prototype.loadTexture = function ( textureIndex ) {

var parser = this;
var json = this.json;
var options = this.options;

var textureDef = json.textures[ textureIndex ];
var source = json.images[ textureDef.source ];

var textureExtensions = textureDef.extensions || {};

var source;

source = json.images[ textureDef.source ];

var loader;
var loader = this.textureLoader;

if ( source.uri ) {

loader = options.manager.getHandler( source.uri );

}

if ( ! loader ) {

loader = this.textureLoader;
var handler = options.manager.getHandler( source.uri );
if ( handler !== null ) loader = handler;

}

Expand Down
29 changes: 12 additions & 17 deletions examples/jsm/loaders/GLTFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,14 @@ var GLTFLoader = ( function () {

var extension = textureDef.extensions[ name ];
var source = json.images[ extension.source ];
var loader = source.uri ? parser.options.manager.getHandler( source.uri ) : parser.textureLoader;

var loader = parser.textureLoader;
if ( source.uri ) {

var handler = parser.options.manager.getHandler( source.uri );
if ( handler !== null ) loader = handler;

}

return this.detectSupport().then( function ( isSupported ) {

Expand Down Expand Up @@ -2422,29 +2429,17 @@ var GLTFLoader = ( function () {
*/
GLTFParser.prototype.loadTexture = function ( textureIndex ) {

var parser = this;
var json = this.json;
var options = this.options;

var textureDef = json.textures[ textureIndex ];
var source = json.images[ textureDef.source ];

var textureExtensions = textureDef.extensions || {};

var source;

source = json.images[ textureDef.source ];

var loader;
var loader = this.textureLoader;

if ( source.uri ) {

loader = options.manager.getHandler( source.uri );

}

if ( ! loader ) {

loader = this.textureLoader;
var handler = options.manager.getHandler( source.uri );
if ( handler !== null ) loader = handler;

}

Expand Down