Skip to content

[pull] dev from mrdoob:dev #1273

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
pull merged 2 commits into from
Apr 13, 2026
Merged

[pull] dev from mrdoob:dev #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3612474
AudioLoader: Fix race condition with loading manager. (#33378)
Mugen87 Apr 13, 2026
32b4d93
ImageBitmapLoader: Improve docs. (#33379)
Mugen87 Apr 13, 2026
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
12 changes: 11 additions & 1 deletion src/loaders/AudioLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,21 @@ class AudioLoader extends Loader {
const bufferCopy = buffer.slice( 0 );

const context = AudioContext.getContext();

const decodeUrl = url + '#decode';
scope.manager.itemStart( decodeUrl ); // prevent loading manager from completing too early, see #33378

context.decodeAudioData( bufferCopy, function ( audioBuffer ) {

onLoad( audioBuffer );
scope.manager.itemEnd( decodeUrl );

} ).catch( function ( e ) {

handleError( e );
scope.manager.itemEnd( decodeUrl );

} ).catch( handleError );
} );

} catch ( e ) {

Expand Down
3 changes: 3 additions & 0 deletions src/loaders/ImageBitmapLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ class ImageBitmapLoader extends Loader {
* Sets the given loader options. The structure of the object must match the `options` parameter of
* [createImageBitmap](https://developer.mozilla.org/en-US/docs/Web/API/Window/createImageBitmap).
*
* Note: When caching is enabled, the cache key is based on the URL only. Loading the same URL with
* different options will return the cached result of the first request.
*
* @param {Object} options - The loader options to set.
* @return {ImageBitmapLoader} A reference to this image bitmap loader.
*/
Expand Down
Loading