Skip to content

Commit 5760cc0

Browse files
committed
Updated builds.
1 parent e681ffb commit 5760cc0

File tree

7 files changed

+117
-39
lines changed

7 files changed

+117
-39
lines changed

build/three.cjs

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43618,9 +43618,10 @@ class LoadingManager {
4361843618
/**
4361943619
* Used for aborting ongoing requests in loaders using this manager.
4362043620
*
43621-
* @type {AbortController}
43621+
* @private
43622+
* @type {AbortController | null}
4362243623
*/
43623-
this.abortController = new AbortController();
43624+
this._abortController = null;
4362443625

4362543626
/**
4362643627
* This should be called by any loader using the manager when the loader
@@ -43831,15 +43832,36 @@ class LoadingManager {
4383143832
*/
4383243833
this.abort = function () {
4383343834

43835+
4383443836
this.abortController.abort();
43835-
this.abortController = new AbortController();
43837+
this._abortController = null;
4383643838

4383743839
return this;
4383843840

4383943841
};
4384043842

4384143843
}
4384243844

43845+
// TODO: Revert this back to a single member variable once this issue has been fixed
43846+
// https://github.com/cloudflare/workerd/issues/3657
43847+
43848+
/**
43849+
* Used for aborting ongoing requests in loaders using this manager.
43850+
*
43851+
* @type {AbortController}
43852+
*/
43853+
get abortController() {
43854+
43855+
if ( ! this._abortController ) {
43856+
43857+
this._abortController = new AbortController();
43858+
43859+
}
43860+
43861+
return this._abortController;
43862+
43863+
}
43864+
4384343865
}
4384443866

4384543867
/**

build/three.core.js

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43616,9 +43616,10 @@ class LoadingManager {
4361643616
/**
4361743617
* Used for aborting ongoing requests in loaders using this manager.
4361843618
*
43619-
* @type {AbortController}
43619+
* @private
43620+
* @type {AbortController | null}
4362043621
*/
43621-
this.abortController = new AbortController();
43622+
this._abortController = null;
4362243623

4362343624
/**
4362443625
* This should be called by any loader using the manager when the loader
@@ -43829,15 +43830,36 @@ class LoadingManager {
4382943830
*/
4383043831
this.abort = function () {
4383143832

43833+
4383243834
this.abortController.abort();
43833-
this.abortController = new AbortController();
43835+
this._abortController = null;
4383443836

4383543837
return this;
4383643838

4383743839
};
4383843840

4383943841
}
4384043842

43843+
// TODO: Revert this back to a single member variable once this issue has been fixed
43844+
// https://github.com/cloudflare/workerd/issues/3657
43845+
43846+
/**
43847+
* Used for aborting ongoing requests in loaders using this manager.
43848+
*
43849+
* @type {AbortController}
43850+
*/
43851+
get abortController() {
43852+
43853+
if ( ! this._abortController ) {
43854+
43855+
this._abortController = new AbortController();
43856+
43857+
}
43858+
43859+
return this._abortController;
43860+
43861+
}
43862+
4384143863
}
4384243864

4384343865
/**

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: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,7 +1499,7 @@ class Node extends EventDispatcher {
14991499

15001500
//
15011501

1502-
const values = [ this.id ];
1502+
const values = [];
15031503

15041504
for ( const { property, childNode } of this._getChildren( ignores ) ) {
15051505

@@ -1525,7 +1525,7 @@ class Node extends EventDispatcher {
15251525
*/
15261526
customCacheKey() {
15271527

1528-
return 0;
1528+
return this.id;
15291529

15301530
}
15311531

@@ -4511,6 +4511,12 @@ class PropertyNode extends Node {
45114511

45124512
}
45134513

4514+
customCacheKey() {
4515+
4516+
return hashString( this.type + ':' + ( this.name || '' ) + ':' + ( this.varying ? '1' : '0' ) );
4517+
4518+
}
4519+
45144520
getHash( builder ) {
45154521

45164522
return this.name || super.getHash( builder );
@@ -27990,7 +27996,7 @@ class ChainMap {
2799027996

2799127997
}
2799227998

27993-
let _id$9 = 0;
27999+
let _id$a = 0;
2799428000

2799528001
function getKeys( obj ) {
2799628002

@@ -28062,7 +28068,7 @@ class RenderObject {
2806228068
*/
2806328069
constructor( nodes, geometries, renderer, object, material, scene, camera, lightsNode, renderContext, clippingContext ) {
2806428070

28065-
this.id = _id$9 ++;
28071+
this.id = _id$a ++;
2806628072

2806728073
/**
2806828074
* Renderer component for managing nodes related logic.
@@ -28859,6 +28865,8 @@ class RenderObject {
2885928865

2886028866
}
2886128867

28868+
cacheKey = hash$1( cacheKey, this.camera.id );
28869+
2886228870
return cacheKey;
2886328871

2886428872
}
@@ -29943,7 +29951,7 @@ class ComputePipeline extends Pipeline {
2994329951

2994429952
}
2994529953

29946-
let _id$8 = 0;
29954+
let _id$9 = 0;
2994729955

2994829956
/**
2994929957
* Class for representing programmable stages which are vertex,
@@ -29970,7 +29978,7 @@ class ProgrammableStage {
2997029978
*
2997129979
* @type {number}
2997229980
*/
29973-
this.id = _id$8 ++;
29981+
this.id = _id$9 ++;
2997429982

2997529983
/**
2997629984
* The shader code.
@@ -31328,7 +31336,7 @@ class RenderLists {
3132831336

3132931337
}
3133031338

31331-
let _id$7 = 0;
31339+
let _id$8 = 0;
3133231340

3133331341
/**
3133431342
* Any render or compute command is executed in a specific context that defines
@@ -31350,7 +31358,7 @@ class RenderContext {
3135031358
*
3135131359
* @type {number}
3135231360
*/
31353-
this.id = _id$7 ++;
31361+
this.id = _id$8 ++;
3135431362

3135531363
/**
3135631364
* Whether the current active framebuffer has a color attachment.
@@ -32705,9 +32713,6 @@ class StackNode extends Node {
3270532713

3270632714
if ( buildStage === 'setup' ) {
3270732715

32708-
const nodeData = builder.getDataFromNode( node );
32709-
nodeData.stack = this;
32710-
3271132716
node.build( builder );
3271232717

3271332718
} else if ( buildStage === 'analyze' ) {
@@ -46167,7 +46172,7 @@ class Background extends DataMap {
4616746172

4616846173
}
4616946174

46170-
let _id$6 = 0;
46175+
let _id$7 = 0;
4617146176

4617246177
/**
4617346178
* A bind group represents a collection of bindings and thus a collection
@@ -46221,7 +46226,7 @@ class BindGroup {
4622146226
*
4622246227
* @type {number}
4622346228
*/
46224-
this.id = _id$6 ++;
46229+
this.id = _id$7 ++;
4622546230

4622646231
}
4622746232

@@ -46682,7 +46687,7 @@ class NodeCode {
4668246687

4668346688
}
4668446689

46685-
let _id$5 = 0;
46690+
let _id$6 = 0;
4668646691

4668746692
/**
4668846693
* This utility class is used in {@link NodeBuilder} as an internal
@@ -46703,7 +46708,7 @@ class NodeCache {
4670346708
* @type {number}
4670446709
* @readonly
4670546710
*/
46706-
this.id = _id$5 ++;
46711+
this.id = _id$6 ++;
4670746712

4670846713
/**
4670946714
* A weak map for managing node data.
@@ -47531,6 +47536,8 @@ class Matrix4NodeUniform extends Matrix4Uniform {
4753147536

4753247537
}
4753347538

47539+
let _id$5 = 0;
47540+
4753447541
const rendererCache = new WeakMap();
4753547542

4753647543
const typeFromArray = new Map( [
@@ -47957,6 +47964,8 @@ class NodeBuilder {
4795747964
*/
4795847965
this.fnCall = null;
4795947966

47967+
Object.defineProperty( this, 'id', { value: _id$5 ++ } );
47968+
4796047969
}
4796147970

4796247971
/**
@@ -49179,6 +49188,14 @@ class NodeBuilder {
4917949188
removeStack() {
4918049189

4918149190
const lastStack = this.stack;
49191+
49192+
for ( const node of lastStack.nodes ) {
49193+
49194+
const nodeData = this.getDataFromNode( node );
49195+
nodeData.stack = lastStack;
49196+
49197+
}
49198+
4918249199
this.stack = lastStack.parent;
4918349200

4918449201
setCurrentStack( this.stacks.pop() );

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)