Skip to content

Commit 291d50e

Browse files
mrdoobmrdoob
committed
Updated builds.
1 parent af8709e commit 291d50e

File tree

7 files changed

+113
-43
lines changed

7 files changed

+113
-43
lines changed

‎build/three.cjs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7411,7 +7411,7 @@ class Texture extends EventDispatcher {
74117411
const output = {
74127412

74137413
metadata: {
7414-
version: 4.6,
7414+
version: 4.7,
74157415
type: 'Texture',
74167416
generator: 'Texture.toJSON'
74177417
},
@@ -14369,7 +14369,7 @@ class Object3D extends EventDispatcher {
1436914369
};
1437014370

1437114371
output.metadata = {
14372-
version: 4.6,
14372+
version: 4.7,
1437314373
type: 'Object',
1437414374
generator: 'Object3D.toJSON'
1437514375
};
@@ -16846,7 +16846,7 @@ class Material extends EventDispatcher {
1684616846

1684716847
const data = {
1684816848
metadata: {
16849-
version: 4.6,
16849+
version: 4.7,
1685016850
type: 'Material',
1685116851
generator: 'Material.toJSON'
1685216852
}
@@ -19897,7 +19897,7 @@ class BufferGeometry extends EventDispatcher {
1989719897

1989819898
const data = {
1989919899
metadata: {
19900-
version: 4.6,
19900+
version: 4.7,
1990119901
type: 'BufferGeometry',
1990219902
generator: 'BufferGeometry.toJSON'
1990319903
}
@@ -25442,7 +25442,7 @@ class Skeleton {
2544225442

2544325443
const data = {
2544425444
metadata: {
25445-
version: 4.6,
25445+
version: 4.7,
2544625446
type: 'Skeleton',
2544725447
generator: 'Skeleton.toJSON'
2544825448
},
@@ -31749,7 +31749,7 @@ class Curve {
3174931749

3175031750
const data = {
3175131751
metadata: {
31752-
version: 4.6,
31752+
version: 4.7,
3175331753
type: 'Curve',
3175431754
generator: 'Curve.toJSON'
3175531755
}

‎build/three.core.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7409,7 +7409,7 @@ class Texture extends EventDispatcher {
74097409
const output = {
74107410

74117411
metadata: {
7412-
version: 4.6,
7412+
version: 4.7,
74137413
type: 'Texture',
74147414
generator: 'Texture.toJSON'
74157415
},
@@ -14367,7 +14367,7 @@ class Object3D extends EventDispatcher {
1436714367
};
1436814368

1436914369
output.metadata = {
14370-
version: 4.6,
14370+
version: 4.7,
1437114371
type: 'Object',
1437214372
generator: 'Object3D.toJSON'
1437314373
};
@@ -16844,7 +16844,7 @@ class Material extends EventDispatcher {
1684416844

1684516845
const data = {
1684616846
metadata: {
16847-
version: 4.6,
16847+
version: 4.7,
1684816848
type: 'Material',
1684916849
generator: 'Material.toJSON'
1685016850
}
@@ -19895,7 +19895,7 @@ class BufferGeometry extends EventDispatcher {
1989519895

1989619896
const data = {
1989719897
metadata: {
19898-
version: 4.6,
19898+
version: 4.7,
1989919899
type: 'BufferGeometry',
1990019900
generator: 'BufferGeometry.toJSON'
1990119901
}
@@ -25440,7 +25440,7 @@ class Skeleton {
2544025440

2544125441
const data = {
2544225442
metadata: {
25443-
version: 4.6,
25443+
version: 4.7,
2544425444
type: 'Skeleton',
2544525445
generator: 'Skeleton.toJSON'
2544625446
},
@@ -31747,7 +31747,7 @@ class Curve {
3174731747

3174831748
const data = {
3174931749
metadata: {
31750-
version: 4.6,
31750+
version: 4.7,
3175131751
type: 'Curve',
3175231752
generator: 'Curve.toJSON'
3175331753
}

‎build/three.core.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/three.webgpu.js

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const refreshUniforms = [
1313
'anisotropyMap',
1414
'anisotropyRotation',
1515
'aoMap',
16+
'aoMapIntensity',
1617
'attenuationColor',
1718
'attenuationDistance',
1819
'bumpMap',
@@ -25,15 +26,18 @@ const refreshUniforms = [
2526
'dispersion',
2627
'displacementMap',
2728
'emissive',
29+
'emissiveIntensity',
2830
'emissiveMap',
2931
'envMap',
32+
'envMapIntensity',
3033
'gradientMap',
3134
'ior',
3235
'iridescence',
3336
'iridescenceIOR',
3437
'iridescenceMap',
3538
'iridescenceThicknessMap',
3639
'lightMap',
40+
'lightMapIntensity',
3741
'map',
3842
'matcap',
3943
'metalness',
@@ -1906,7 +1910,7 @@ class Node extends EventDispatcher {
19061910
type,
19071911
meta,
19081912
metadata: {
1909-
version: 4.6,
1913+
version: 4.7,
19101914
type: 'Node',
19111915
generator: 'Node.toJSON'
19121916
}
@@ -17551,6 +17555,15 @@ class NodeMaterial extends Material {
1755117555
*/
1755217556
this.alphaTestNode = null;
1755317557

17558+
17559+
/**
17560+
* Discards the fragment if the mask value is `false`.
17561+
*
17562+
* @type {?Node<bool>}
17563+
* @default null
17564+
*/
17565+
this.maskNode = null;
17566+
1755417567
/**
1755517568
* The local vertex positions are computed based on multiple factors like the
1755617569
* attribute data, morphing or skinning. This node property allows to overwrite
@@ -17768,7 +17781,9 @@ class NodeMaterial extends Material {
1776817781

1776917782
builder.addStack();
1777017783

17771-
const vertexNode = this.vertexNode || this.setupVertex( builder );
17784+
const mvp = this.setupVertex( builder );
17785+
17786+
const vertexNode = this.vertexNode || mvp;
1777217787

1777317788
builder.stack.outputNode = vertexNode;
1777417789

@@ -18096,6 +18111,14 @@ class NodeMaterial extends Material {
1809618111

1809718112
let colorNode = this.colorNode ? vec4( this.colorNode ) : materialColor;
1809818113

18114+
// MASK
18115+
18116+
if ( this.maskNode !== null ) {
18117+
18118+
bool( this.maskNode ).discard();
18119+
18120+
}
18121+
1809918122
// VERTEX COLORS
1810018123

1810118124
if ( this.vertexColors === true && geometry.hasAttribute( 'color' ) ) {
@@ -18104,7 +18127,7 @@ class NodeMaterial extends Material {
1810418127

1810518128
}
1810618129

18107-
// Instanced colors
18130+
// INSTANCED COLORS
1810818131

1810918132
if ( object.instanceColor ) {
1811018133

@@ -18122,7 +18145,6 @@ class NodeMaterial extends Material {
1812218145

1812318146
}
1812418147

18125-
1812618148
// COLOR
1812718149

1812818150
diffuseColor.assign( colorNode );
@@ -18134,14 +18156,20 @@ class NodeMaterial extends Material {
1813418156

1813518157
// ALPHA TEST
1813618158

18159+
let alphaTestNode;
18160+
1813718161
if ( this.alphaTestNode !== null || this.alphaTest > 0 ) {
1813818162

18139-
const alphaTestNode = this.alphaTestNode !== null ? float( this.alphaTestNode ) : materialAlphaTest;
18163+
alphaTestNode = this.alphaTestNode !== null ? float( this.alphaTestNode ) : materialAlphaTest;
18164+
18165+
} else {
1814018166

18141-
diffuseColor.a.lessThanEqual( alphaTestNode ).discard();
18167+
alphaTestNode = float( 0 );
1814218168

1814318169
}
1814418170

18171+
diffuseColor.a.lessThanEqual( alphaTestNode ).discard();
18172+
1814518173
// ALPHA HASH
1814618174

1814718175
if ( this.alphaHash === true ) {
@@ -18511,6 +18539,7 @@ class NodeMaterial extends Material {
1851118539
this.backdropNode = source.backdropNode;
1851218540
this.backdropAlphaNode = source.backdropAlphaNode;
1851318541
this.alphaTestNode = source.alphaTestNode;
18542+
this.maskNode = source.maskNode;
1851418543

1851518544
this.positionNode = source.positionNode;
1851618545
this.geometryNode = source.geometryNode;
@@ -39731,18 +39760,19 @@ const checker = /*@__PURE__*/ Fn( ( [ coord = uv() ] ) => {
3973139760
*/
3973239761
const shapeCircle = Fn( ( [ coord = uv() ], { renderer, material } ) => {
3973339762

39734-
const alpha = float( 1 ).toVar();
3973539763
const len2 = lengthSq( coord.mul( 2 ).sub( 1 ) );
3973639764

39765+
let alpha;
39766+
3973739767
if ( material.alphaToCoverage && renderer.samples > 1 ) {
3973839768

3973939769
const dlen = float( len2.fwidth() ).toVar();
3974039770

39741-
alpha.assign( smoothstep( dlen.oneMinus(), dlen.add( 1 ), len2 ).oneMinus() );
39771+
alpha = smoothstep( dlen.oneMinus(), dlen.add( 1 ), len2 ).oneMinus();
3974239772

3974339773
} else {
3974439774

39745-
len2.greaterThan( 1.0 ).discard();
39775+
alpha = select( len2.greaterThan( 1.0 ), 0, 1 );
3974639776

3974739777
}
3974839778

@@ -49516,6 +49546,8 @@ class XRManager extends EventDispatcher {
4951649546
resolveStencilBuffer: false
4951749547
} );
4951849548

49549+
renderTarget.autoAllocateDepthBuffer = true;
49550+
4951949551
const material = new MeshBasicMaterial( { color: 0xffffff, side: FrontSide } );
4952049552
material.map = renderTarget.texture;
4952149553
material.map.offset.y = 1;
@@ -49605,6 +49637,8 @@ class XRManager extends EventDispatcher {
4960549637
resolveStencilBuffer: false
4960649638
} );
4960749639

49640+
renderTarget.autoAllocateDepthBuffer = true;
49641+
4960849642
const material = new MeshBasicMaterial( { color: 0xffffff, side: BackSide } );
4960949643
material.map = renderTarget.texture;
4961049644
material.map.offset.y = 1;
@@ -49673,7 +49707,6 @@ class XRManager extends EventDispatcher {
4967349707

4967449708
layer.renderTarget.isXRRenderTarget = this._session !== null;
4967549709
layer.renderTarget.hasExternalTextures = layer.renderTarget.isXRRenderTarget;
49676-
layer.renderTarget.autoAllocateDepthBuffer = ! layer.renderTarget.isXRRenderTarget;
4967749710

4967849711
if ( layer.renderTarget.isXRRenderTarget && this._supportsLayers ) {
4967949712

@@ -49683,13 +49716,17 @@ class XRManager extends EventDispatcher {
4968349716
this._renderer.backend.setXRRenderTargetTextures(
4968449717
layer.renderTarget,
4968549718
glSubImage.colorTexture,
49686-
glSubImage.depthStencilTexture );
49719+
undefined );
4968749720

4968849721
this._renderer.setOutputRenderTarget( layer.renderTarget );
49722+
this._renderer.setRenderTarget( null );
49723+
49724+
} else {
49725+
49726+
this._renderer.setRenderTarget( layer.renderTarget );
4968949727

4969049728
}
4969149729

49692-
this._renderer.setRenderTarget( layer.renderTarget );
4969349730
layer.rendercall();
4969449731

4969549732
}
@@ -50321,7 +50358,6 @@ function createXRLayer( layer ) {
5032150358

5032250359
return this._glBinding.createQuadLayer( {
5032350360
transform: new XRRigidTransform( layer.translation, layer.quaternion ),
50324-
depthFormat: this._gl.DEPTH_COMPONENT,
5032550361
width: layer.width / 2,
5032650362
height: layer.height / 2,
5032750363
space: this._referenceSpace,
@@ -50333,7 +50369,6 @@ function createXRLayer( layer ) {
5033350369

5033450370
return this._glBinding.createCylinderLayer( {
5033550371
transform: new XRRigidTransform( layer.translation, layer.quaternion ),
50336-
depthFormat: this._gl.DEPTH_COMPONENT,
5033750372
radius: layer.radius,
5033850373
centralAngle: layer.centralAngle,
5033950374
aspectRatio: layer.aspectRatio,

‎build/three.webgpu.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)