Skip to content

Commit 66f7aa8

Browse files
authored
Node: Rename .setReference() -> .updateReference() and use reference in renderMap/frameMap (#28010)
* NodeFrame: Use reference in renderMap/frameMap * Node: Rename `.setReference()` -> `.updateReference()` * ViewportSharedTextureNode: Fix reference
1 parent 5eea9d7 commit 66f7aa8

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

examples/jsm/nodes/accessors/MaterialReferenceNode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MaterialReferenceNode extends ReferenceNode {
2424
2525
}*/
2626

27-
setReference( state ) {
27+
updateReference( state ) {
2828

2929
this.reference = this.material !== null ? this.material : state.material;
3030

examples/jsm/nodes/accessors/ReferenceNode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class ReferenceNode extends Node {
110110

111111
}
112112

113-
setReference( state ) {
113+
updateReference( state ) {
114114

115115
this.reference = this.object !== null ? this.object : state.object;
116116

examples/jsm/nodes/accessors/RendererReferenceNode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class RendererReferenceNode extends ReferenceNode {
1212

1313
}
1414

15-
setReference( state ) {
15+
updateReference( state ) {
1616

1717
this.reference = this.renderer !== null ? this.renderer : state.renderer;
1818

examples/jsm/nodes/accessors/TextureNode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class TextureNode extends UniformNode {
7979

8080
}
8181

82-
setReference( /*state*/ ) {
82+
updateReference( /*state*/ ) {
8383

8484
return this.value;
8585

examples/jsm/nodes/core/Node.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Node extends EventDispatcher {
8282

8383
}
8484

85-
setReference( /*state*/ ) {
85+
updateReference( /*state*/ ) {
8686

8787
return this;
8888

@@ -282,7 +282,7 @@ class Node extends EventDispatcher {
282282

283283
if ( buildStage === 'setup' ) {
284284

285-
this.setReference( builder );
285+
this.updateReference( builder );
286286

287287
const properties = builder.getNodeProperties( this );
288288

examples/jsm/nodes/core/NodeFrame.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ class NodeFrame {
4545
updateBeforeNode( node ) {
4646

4747
const updateType = node.getUpdateBeforeType();
48-
const reference = node.setReference( this );
48+
const reference = node.updateReference( this );
4949

5050
if ( updateType === NodeUpdateType.FRAME ) {
5151

5252
const { frameMap } = this._getMaps( this.updateBeforeMap, reference );
5353

54-
if ( frameMap.get( node ) !== this.frameId ) {
54+
if ( frameMap.get( reference ) !== this.frameId ) {
5555

5656
if ( node.updateBefore( this ) !== false ) {
5757

58-
frameMap.set( node, this.frameId );
58+
frameMap.set( reference, this.frameId );
5959

6060
}
6161

@@ -65,11 +65,11 @@ class NodeFrame {
6565

6666
const { renderMap } = this._getMaps( this.updateBeforeMap, reference );
6767

68-
if ( renderMap.get( node ) !== this.renderId ) {
68+
if ( renderMap.get( reference ) !== this.renderId ) {
6969

7070
if ( node.updateBefore( this ) !== false ) {
7171

72-
renderMap.set( node, this.renderId );
72+
renderMap.set( reference, this.renderId );
7373

7474
}
7575

@@ -86,17 +86,17 @@ class NodeFrame {
8686
updateNode( node ) {
8787

8888
const updateType = node.getUpdateType();
89-
const reference = node.setReference( this );
89+
const reference = node.updateReference( this );
9090

9191
if ( updateType === NodeUpdateType.FRAME ) {
9292

9393
const { frameMap } = this._getMaps( this.updateMap, reference );
9494

95-
if ( frameMap.get( node ) !== this.frameId ) {
95+
if ( frameMap.get( reference ) !== this.frameId ) {
9696

9797
if ( node.update( this ) !== false ) {
9898

99-
frameMap.set( node, this.frameId );
99+
frameMap.set( reference, this.frameId );
100100

101101
}
102102

@@ -106,11 +106,11 @@ class NodeFrame {
106106

107107
const { renderMap } = this._getMaps( this.updateMap, reference );
108108

109-
if ( renderMap.get( node ) !== this.renderId ) {
109+
if ( renderMap.get( reference ) !== this.renderId ) {
110110

111111
if ( node.update( this ) !== false ) {
112112

113-
renderMap.set( node, this.renderId );
113+
renderMap.set( reference, this.renderId );
114114

115115
}
116116

examples/jsm/nodes/display/ViewportSharedTextureNode.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ class ViewportSharedTextureNode extends ViewportTextureNode {
2020

2121
}
2222

23+
updateReference() {
24+
25+
return this;
26+
27+
}
28+
2329
}
2430

2531
export default ViewportSharedTextureNode;

0 commit comments

Comments
 (0)