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

Skip to content

[pull] dev from mrdoob:dev #616

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
Jun 27, 2025
Merged

[pull] dev from mrdoob:dev #616

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
cac652a
RoundedBoxGeometry: Fix parameters of the parent class (#31319)
linbingquan Jun 27, 2025
d891d2c
Update webgl_loader_texture_lottie.html
Mugen87 Jun 27, 2025
96011b9
WebGLRenderer: Correctly restore render target during transmission pa…
Mugen87 Jun 27, 2025
ee327fd
Update ImageBitmapLoader.js
mrdoob Jun 27, 2025
ac07a8a
Update ImageBitmapLoader.js
mrdoob Jun 27, 2025
1ffb9f4
Updated builds.
mrdoob Jun 27, 2025
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
13 changes: 8 additions & 5 deletions build/three.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48691,7 +48691,7 @@ class ImageBitmapLoader extends Loader {

const scope = this;

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

if ( cached !== undefined ) {

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

} ).then( function ( imageBitmap ) {

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

if ( onLoad ) onLoad( imageBitmap );

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

_errorMap.set( promise, e );

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

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

} );

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

}
Expand Down Expand Up @@ -74769,6 +74769,9 @@ class WebGLRenderer {
//

const currentRenderTarget = _this.getRenderTarget();
const currentActiveCubeFace = _this.getActiveCubeFace();
const currentActiveMipmapLevel = _this.getActiveMipmapLevel();

_this.setRenderTarget( transmissionRenderTarget );

_this.getClearColor( _currentClearColor );
Expand Down Expand Up @@ -74838,7 +74841,7 @@ class WebGLRenderer {

}

_this.setRenderTarget( currentRenderTarget );
_this.setRenderTarget( currentRenderTarget, currentActiveCubeFace, currentActiveMipmapLevel );

_this.setClearColor( _currentClearColor, _currentClearAlpha );

Expand Down
8 changes: 4 additions & 4 deletions build/three.core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48689,7 +48689,7 @@ class ImageBitmapLoader extends Loader {

const scope = this;

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

if ( cached !== undefined ) {

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

} ).then( function ( imageBitmap ) {

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

if ( onLoad ) onLoad( imageBitmap );

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

_errorMap.set( promise, e );

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

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

} );

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

}
Expand Down
2 changes: 1 addition & 1 deletion build/three.core.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion build/three.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16619,6 +16619,9 @@ class WebGLRenderer {
//

const currentRenderTarget = _this.getRenderTarget();
const currentActiveCubeFace = _this.getActiveCubeFace();
const currentActiveMipmapLevel = _this.getActiveMipmapLevel();

_this.setRenderTarget( transmissionRenderTarget );

_this.getClearColor( _currentClearColor );
Expand Down Expand Up @@ -16688,7 +16691,7 @@ class WebGLRenderer {

}

_this.setRenderTarget( currentRenderTarget );
_this.setRenderTarget( currentRenderTarget, currentActiveCubeFace, currentActiveMipmapLevel );

_this.setClearColor( _currentClearColor, _currentClearAlpha );

Expand Down
2 changes: 1 addition & 1 deletion build/three.module.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/jsm/geometries/RoundedBoxGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class RoundedBoxGeometry extends BoxGeometry {
// ensure radius isn't bigger than shortest side
radius = Math.min( width / 2, height / 2, depth / 2, radius );

super( 1, 1, 1, segments, segments, segments );
super( width, height, depth, segments, segments, segments );

// if we just have one segment we're the same as a regular box
if ( segments === 1 ) return;
Expand Down
1 change: 0 additions & 1 deletion examples/webgl_loader_texture_lottie.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import * as THREE from 'three';
import { RoomEnvironment } from 'three/addons/environments/RoomEnvironment.js';
import { RoundedBoxGeometry } from 'three/addons/geometries/RoundedBoxGeometry.js';
import { LottieLoader } from 'three/addons/loaders/LottieLoader.js';

import lottie from 'https://cdn.jsdelivr.net/npm/[email protected]/+esm';

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( `imageBitmap:${url}` );
const cached = Cache.get( `image-bitmap:${url}` );

if ( cached !== undefined ) {

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

} ).then( function ( imageBitmap ) {

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

if ( onLoad ) onLoad( imageBitmap );

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

_errorMap.set( promise, e );

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

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

} );

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

}
Expand Down
5 changes: 4 additions & 1 deletion src/renderers/WebGLRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1890,6 +1890,9 @@ class WebGLRenderer {
//

const currentRenderTarget = _this.getRenderTarget();
const currentActiveCubeFace = _this.getActiveCubeFace();
const currentActiveMipmapLevel = _this.getActiveMipmapLevel();

_this.setRenderTarget( transmissionRenderTarget );

_this.getClearColor( _currentClearColor );
Expand Down Expand Up @@ -1959,7 +1962,7 @@ class WebGLRenderer {

}

_this.setRenderTarget( currentRenderTarget );
_this.setRenderTarget( currentRenderTarget, currentActiveCubeFace, currentActiveMipmapLevel );

_this.setClearColor( _currentClearColor, _currentClearAlpha );

Expand Down
1 change: 1 addition & 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,7 @@ const exceptionList = [
'webgpu_multisampled_renderbuffers',
'webgl_test_wide_gamut',
'webgl_volume_instancing',
'webgl_buffergeometry',
'webgl_buffergeometry_attributes_integer',
'webgl_batch_lod_bvh',

Expand Down