Bläddra i källkod

ScriptableNode: Rename `global` to `ScriptableNodeResources` (#29736)

* Rename problematic name for variable in ScriptableNode

* rename global to ScriptableResources

* Rename: ScriptableResources -> ScriptableNodeResources

---------

Co-authored-by: sunag <sunagbrasil@gmail.com>
Scott Ashton 1 år sedan
förälder
incheckning
e7e4ceb890

+ 3 - 3
examples/webgpu_materials.html

@@ -27,7 +27,7 @@
 			import * as THREE from 'three';
 			import * as TSL from 'three/tsl';
 
-			import { Fn, wgslFn, positionLocal, scriptable, positionWorld, normalLocal, normalWorld, normalView, color, texture, uv, float, vec2, vec3, vec4, oscSine, triplanarTexture, screenUV, js, string, global, Loop, cameraProjectionMatrix } from 'three/tsl';
+			import { Fn, wgslFn, positionLocal, scriptable, positionWorld, normalLocal, normalWorld, normalView, color, texture, uv, float, vec2, vec3, vec4, oscSine, triplanarTexture, screenUV, js, string, Loop, cameraProjectionMatrix, ScriptableNodeResources } from 'three/tsl';
 
 			import { TeapotGeometry } from 'three/addons/geometries/TeapotGeometry.js';
 
@@ -240,8 +240,8 @@
 
 				// Scriptable
 
-				global.set( 'THREE', THREE );
-				global.set( 'TSL', TSL );
+				ScriptableNodeResources.set( 'THREE', THREE );
+				ScriptableNodeResources.set( 'TSL', TSL );
 
 				const asyncNode = scriptable( js( `
 

+ 6 - 6
playground/NodeEditor.js

@@ -24,14 +24,14 @@ export class NodeEditor extends THREE.EventDispatcher {
 		this.scene = scene;
 		this.renderer = renderer;
 
-		const { global } = Nodes;
+		const { ScriptableNodeResources } = Nodes;
 
-		global.set( 'THREE', THREE );
-		global.set( 'TSL', Nodes );
+		ScriptableNodeResources.set( 'THREE', THREE );
+		ScriptableNodeResources.set( 'TSL', Nodes );
 
-		global.set( 'scene', scene );
-		global.set( 'renderer', renderer );
-		global.set( 'composer', composer );
+		ScriptableNodeResources.set( 'scene', scene );
+		ScriptableNodeResources.set( 'renderer', renderer );
+		ScriptableNodeResources.set( 'composer', composer );
 
 		this.nodeClasses = [];
 

+ 3 - 3
playground/editors/ScriptableEditor.js

@@ -1,7 +1,7 @@
 import { BaseNodeEditor } from '../BaseNodeEditor.js';
 import { CodeEditorElement } from '../elements/CodeEditorElement.js';
 import { disposeScene, resetScene, createElementFromJSON, isGPUNode, onValidType } from '../NodeEditorUtils.js';
-import { global, scriptable, js, scriptableValue } from 'three/tsl';
+import { ScriptableNodeResources, scriptable, js, scriptableValue } from 'three/tsl';
 import { getColorFromType, setInputAestheticsFromType, setOutputAestheticsFromType } from '../DataTypeLib.js';
 
 const defaultTitle = 'Scriptable';
@@ -189,8 +189,8 @@ export class ScriptableEditor extends BaseNodeEditor {
 
 		if ( editor && editorOutput === editorOutputAdded ) return;
 
-		const scene = global.get( 'scene' );
-		const composer = global.get( 'composer' );
+		const scene = ScriptableNodeResources.get( 'scene' );
+		const composer = ScriptableNodeResources.get( 'composer' );
 
 		if ( editor ) {
 

+ 4 - 4
src/nodes/code/ScriptableNode.js

@@ -58,7 +58,7 @@ class Parameters {
 
 }
 
-export const global = new Resources();
+export const ScriptableNodeResources = new Resources();
 
 class ScriptableNode extends Node {
 
@@ -299,11 +299,11 @@ class ScriptableNode extends Node {
 
 		const parameters = new Parameters( this );
 
-		const THREE = global.get( 'THREE' );
-		const TSL = global.get( 'TSL' );
+		const THREE = ScriptableNodeResources.get( 'THREE' );
+		const TSL = ScriptableNodeResources.get( 'TSL' );
 
 		const method = this.getMethod( this.codeNode );
-		const params = [ parameters, this._local, global, refresh, setOutput, THREE, TSL ];
+		const params = [ parameters, this._local, ScriptableNodeResources, refresh, setOutput, THREE, TSL ];
 
 		this._object = method( ...params );
 

粤ICP备19079148号