Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[pull] dev from mrdoob:dev #614

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 1 commit into from
Jun 26, 2025
+11 −9
Merged

[pull] dev from mrdoob:dev #614

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/loaders/FileLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class FileLoader extends Loader {

url = this.manager.resolveURL( url );

const cached = Cache.get( url );
const cached = Cache.get( `file:${url}` );

if ( cached !== undefined ) {

Expand Down Expand Up @@ -263,7 +263,7 @@ class FileLoader extends Loader {

// Add to cache only on HTTP success, so that we do not cache
// error response bodies as proper responses to requests.
Cache.add( url, data );
Cache.add( `file:${url}`, data );

const callbacks = loading[ url ];
delete loading[ url ];
Expand Down
8 changes: 4 additions & 4 deletions src/loaders/ImageBitmapLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class ImageBitmapLoader extends Loader {

const scope = this;

const cached = Cache.get( url );
const cached = Cache.get( `imageBitmap:${url}` );

if ( cached !== undefined ) {

Expand Down Expand Up @@ -165,7 +165,7 @@ class ImageBitmapLoader extends Loader {

} ).then( function ( imageBitmap ) {

Cache.add( url, imageBitmap );
Cache.add( `imageBitmap:${url}`, imageBitmap );

if ( onLoad ) onLoad( imageBitmap );

Expand All @@ -179,14 +179,14 @@ class ImageBitmapLoader extends Loader {

_errorMap.set( promise, e );

Cache.remove( url );
Cache.remove( `imageBitmap:${url}` );

scope.manager.itemError( url );
scope.manager.itemEnd( url );

} );

Cache.add( url, promise );
Cache.add( `imageBitmap:${url}`, promise );
scope.manager.itemStart( url );

}
Expand Down
6 changes: 3 additions & 3 deletions src/loaders/ImageLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ImageLoader extends Loader {

const scope = this;

const cached = Cache.get( url );
const cached = Cache.get( `image:${url}` );

if ( cached !== undefined ) {

Expand Down Expand Up @@ -116,7 +116,7 @@ class ImageLoader extends Loader {

if ( onError ) onError( event );

Cache.remove( url );
Cache.remove( `image:${url}` );

//

Expand Down Expand Up @@ -153,7 +153,7 @@ class ImageLoader extends Loader {

}

Cache.add( url, image );
Cache.add( `image:${url}`, image );
scope.manager.itemStart( url );

image.src = url;
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/puppeteer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ const exceptionList = [
'webgpu_multisampled_renderbuffers',
'webgl_test_wide_gamut',
'webgl_volume_instancing',
'webgl_buffergeometry_attributes_integer',
'webgl_batch_lod_bvh',

// Intentional z-fighting in this demo makes it non-deterministic
'webgl_reverse_depth_buffer',
Expand Down