Skip to content

Commit 7f03b0f

Browse files
authored
ContextNode: Rename .context -> .value (#1191)
* ContextNode: Rename .context -> .value * Update three.js * Add src * Update patch and delete src
1 parent 20edaa7 commit 7f03b0f

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

src-testing/changes.patch

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ index 6cffa933..5d5cc161 100644
426426

427427
addNodeClass('FunctionNode', FunctionNode);
428428
diff --git a/src-testing/src/nodes/core/ContextNode.ts b/src-testing/src/nodes/core/ContextNode.ts
429-
index fcd488eb..84e3c972 100644
429+
index 674f1cda..cfb748a8 100644
430430
--- a/src-testing/src/nodes/core/ContextNode.ts
431431
+++ b/src-testing/src/nodes/core/ContextNode.ts
432432
@@ -1,8 +1,14 @@
@@ -436,19 +436,19 @@ index fcd488eb..84e3c972 100644
436436
+import NodeBuilder from './NodeBuilder.js';
437437

438438
-class ContextNode extends Node {
439-
- constructor(node, context = {}) {
439+
- constructor(node, value = {}) {
440440
+class ContextNode<TContext> extends Node {
441441
+ readonly isContextNode: true;
442442
+
443443
+ node: Node;
444-
+ context: TContext;
444+
+ value: TContext;
445445
+
446-
+ constructor(node: Node, context: TContext = {} as TContext) {
446+
+ constructor(node: Node, value: TContext = {} as TContext) {
447447
super();
448448

449449
this.isContextNode = true;
450450
@@ -11,15 +17,15 @@ class ContextNode extends Node {
451-
this.context = context;
451+
this.value = value;
452452
}
453453

454454
- getNodeType(builder) {
@@ -465,7 +465,7 @@ index fcd488eb..84e3c972 100644
465465
+ setup(builder: NodeBuilder) {
466466
const previousContext = builder.getContext();
467467

468-
builder.setContext({ ...builder.context, ...this.context });
468+
builder.setContext({ ...builder.context, ...this.value });
469469
@@ -31,7 +37,7 @@ class ContextNode extends Node {
470470
return node;
471471
}
@@ -474,7 +474,7 @@ index fcd488eb..84e3c972 100644
474474
+ generate(builder: NodeBuilder, output?: string | null) {
475475
const previousContext = builder.getContext();
476476

477-
builder.setContext({ ...builder.context, ...this.context });
477+
builder.setContext({ ...builder.context, ...this.value });
478478
@@ -47,7 +53,7 @@ class ContextNode extends Node {
479479
export default ContextNode;
480480

@@ -2518,10 +2518,10 @@ index 9417df5a..43761555 100644
25182518

25192519
const getViewZ = builder.context.getViewZ;
25202520
diff --git a/src-testing/src/nodes/lighting/LightingContextNode.ts b/src-testing/src/nodes/lighting/LightingContextNode.ts
2521-
index 02a8b51f..1d11c859 100644
2521+
index a6262f9a..22657e2e 100644
25222522
--- a/src-testing/src/nodes/lighting/LightingContextNode.ts
25232523
+++ b/src-testing/src/nodes/lighting/LightingContextNode.ts
2524-
@@ -1,9 +1,31 @@
2524+
@@ -1,9 +1,30 @@
25252525
import ContextNode from '../core/ContextNode.js';
25262526
-import { addNodeClass } from '../core/Node.js';
25272527
-import { addNodeElement, nodeProxy, float, vec3 } from '../shadernode/ShaderNode.js';
@@ -2547,17 +2547,16 @@ index 02a8b51f..1d11c859 100644
25472547
+}
25482548
+
25492549
+class LightingContextNode extends ContextNode<LightingContext> {
2550-
+ // lightingModel;
25512550
+ backdropNode: Node | null;
25522551
+ backdropAlphaNode: Node | null;
25532552
+
2554-
+ _context: LightingContext | null;
2553+
+ _value: LightingContext | null;
25552554
+
25562555
+ constructor(node: Node, lightingModel = null, backdropNode = null, backdropAlphaNode = null) {
25572556
super(node);
25582557

25592558
this.lightingModel = lightingModel;
2560-
@@ -28,7 +50,7 @@ class LightingContextNode extends ContextNode {
2559+
@@ -28,7 +49,7 @@ class LightingContextNode extends ContextNode {
25612560
indirectSpecular,
25622561
};
25632562

@@ -2566,14 +2565,14 @@ index 02a8b51f..1d11c859 100644
25662565
radiance: vec3().temp('radiance'),
25672566
irradiance: vec3().temp('irradiance'),
25682567
iblIrradiance: vec3().temp('iblIrradiance'),
2569-
@@ -41,7 +63,7 @@ class LightingContextNode extends ContextNode {
2568+
@@ -41,7 +62,7 @@ class LightingContextNode extends ContextNode {
25702569
return context;
25712570
}
25722571

25732572
- setup(builder) {
25742573
+ setup(builder: NodeBuilder) {
2575-
this.context = this._context || (this._context = this.getContext());
2576-
this.context.lightingModel = this.lightingModel || builder.context.lightingModel;
2574+
this.value = this._value || (this._value = this.getContext());
2575+
this.value.lightingModel = this.lightingModel || builder.context.lightingModel;
25772576

25782577
diff --git a/src-testing/src/nodes/lighting/LightsNode.ts b/src-testing/src/nodes/lighting/LightsNode.ts
25792578
index 9a41cc7d..df337a72 100644

types/three/src/nodes/core/ContextNode.d.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.j
22
import Node from "./Node.js";
33
import { NodeBuilderContext } from "./NodeBuilder.js";
44

5-
export default class ContextNode extends Node {
6-
isContextNode: true;
5+
declare class ContextNode extends Node {
6+
readonly isContextNode: true;
7+
78
node: Node;
8-
context: NodeBuilderContext;
9+
value: NodeBuilderContext;
910

10-
constructor(node: Node, context: NodeBuilderContext);
11+
constructor(node: Node, value?: NodeBuilderContext);
1112
}
1213

13-
export const context: (node: NodeRepresentation, context: NodeBuilderContext) => ShaderNodeObject<ContextNode>;
14+
export default ContextNode;
15+
16+
export const context: (node: NodeRepresentation, context?: NodeBuilderContext) => ShaderNodeObject<ContextNode>;
1417
export const label: (node: NodeRepresentation, label: string) => ShaderNodeObject<ContextNode>;
1518

1619
declare module "../shadernode/ShaderNode.js" {

0 commit comments

Comments
 (0)