Global: Remove deprecated code. (#1680)

Methuselah96 · web-flow · commit 6785e4345ddf · 2025-06-12T22:23:53.000-04:00
* Global: Remove deprecated code.

* Update three.js

* Update

* Add examples

* Update patch and delete examples

* Update
diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch
@@ -1354,7 +1354,7 @@ index ff6d6e2b..105aeb07 100644
      save(new Blob([buffer], { type: 'application/octet-stream' }), filename);
  }
 diff --git a/examples-testing/examples/misc_exporter_usdz.ts b/examples-testing/examples/misc_exporter_usdz.ts
-index 9a14919b..2d52e37b 100644
+index f1ce6548..5ec818dd 100644
 --- a/examples-testing/examples/misc_exporter_usdz.ts
 +++ b/examples-testing/examples/misc_exporter_usdz.ts
 @@ -7,7 +7,7 @@ import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
@@ -1384,7 +1384,7 @@ index 9a14919b..2d52e37b 100644
      const gradient = context.createRadialGradient(
          canvas.width / 2,
          canvas.height / 2,
-@@ -118,7 +118,7 @@ function onWindowResize() {
+@@ -119,7 +119,7 @@ function onWindowResize() {
  }
  
  function exportUSDZ() {
@@ -4051,32 +4051,10 @@ index a8195417..46230b4a 100644
  
          render();
 diff --git a/examples-testing/examples/webgl_geometries.ts b/examples-testing/examples/webgl_geometries.ts
-index 2b2d0261..d5820b37 100644
+index 0eb50120..a8181348 100644
 --- a/examples-testing/examples/webgl_geometries.ts
 +++ b/examples-testing/examples/webgl_geometries.ts
-@@ -2,7 +2,7 @@ import * as THREE from 'three';
- 
- import Stats from 'three/addons/libs/stats.module.js';
- 
--let camera, scene, renderer, stats;
-+let camera: THREE.PerspectiveCamera, scene: THREE.Scene, renderer: THREE.WebGLRenderer, stats: Stats;
- 
- init();
- 
-@@ -127,7 +127,7 @@ function render() {
-     camera.lookAt(scene.position);
- 
-     scene.traverse(function (object) {
--        if (object.isMesh === true) {
-+        if ((object as THREE.Mesh).isMesh === true) {
-             object.rotation.x = timer * 5;
-             object.rotation.y = timer * 2.5;
-         }
-diff --git a/examples-testing/examples/webgl_geometries_parametric.ts b/examples-testing/examples/webgl_geometries_parametric.ts
-index b9a0f520..fe7792cf 100644
---- a/examples-testing/examples/webgl_geometries_parametric.ts
-+++ b/examples-testing/examples/webgl_geometries_parametric.ts
-@@ -5,12 +5,12 @@ import Stats from 'three/addons/libs/stats.module.js';
+@@ -5,7 +5,7 @@ import Stats from 'three/addons/libs/stats.module.js';
  import { ParametricGeometry } from 'three/addons/geometries/ParametricGeometry.js';
  import { plane, klein, mobius } from 'three/addons/geometries/ParametricFunctions.js';
  
@@ -4085,13 +4063,7 @@ index b9a0f520..fe7792cf 100644
  
  init();
  
- function init() {
--    const container = document.getElementById('container');
-+    const container = document.getElementById('container')!;
- 
-     camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 2000);
-     camera.position.y = 400;
-@@ -93,7 +93,7 @@ function render() {
+@@ -155,7 +155,7 @@ function render() {
      camera.lookAt(scene.position);
  
      scene.traverse(function (object) {
@@ -8136,7 +8108,7 @@ index 1ecf95f2..2373eb7e 100644
  let needsUpdate = false;
  
 diff --git a/examples-testing/examples/webgl_materials_blending.ts b/examples-testing/examples/webgl_materials_blending.ts
-index 11cc009b..7f7fd73c 100644
+index fb2e6a91..6063485e 100644
 --- a/examples-testing/examples/webgl_materials_blending.ts
 +++ b/examples-testing/examples/webgl_materials_blending.ts
 @@ -1,7 +1,7 @@
@@ -8176,7 +8148,7 @@ index 11cc009b..7f7fd73c 100644
          for (let i = 0; i < blendings.length; i++) {
              const blending = blendings[i];
  
-@@ -115,9 +115,9 @@ function onWindowResize() {
+@@ -117,9 +117,9 @@ function onWindowResize() {
      camera.updateProjectionMatrix();
  }
  
@@ -8280,7 +8252,7 @@ index a09c2157..00fe46b6 100644
  
      mesh.position.y = -0.5;
 diff --git a/examples-testing/examples/webgl_materials_car.ts b/examples-testing/examples/webgl_materials_car.ts
-index e810f7b7..5f71ea26 100644
+index 4a0cd187..74be14c4 100644
 --- a/examples-testing/examples/webgl_materials_car.ts
 +++ b/examples-testing/examples/webgl_materials_car.ts
 @@ -8,16 +8,16 @@ import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
@@ -8641,7 +8613,7 @@ index c3f3f4f7..4ae4cb95 100644
          roughness: params.roughness,
          envMapIntensity: 1.0,
 diff --git a/examples-testing/examples/webgl_materials_envmaps_groundprojected.ts b/examples-testing/examples/webgl_materials_envmaps_groundprojected.ts
-index 48e0077f..09c67188 100644
+index 2c917caf..915aadca 100644
 --- a/examples-testing/examples/webgl_materials_envmaps_groundprojected.ts
 +++ b/examples-testing/examples/webgl_materials_envmaps_groundprojected.ts
 @@ -13,7 +13,7 @@ const params = {
@@ -18468,7 +18440,7 @@ index feec1fd5..fb8b6727 100644
  init();
  
 diff --git a/examples-testing/examples/webgpu_tsl_vfx_flames.ts b/examples-testing/examples/webgpu_tsl_vfx_flames.ts
-index aefe757e..95d55f3c 100644
+index c4808ba0..f8ad5737 100644
 --- a/examples-testing/examples/webgpu_tsl_vfx_flames.ts
 +++ b/examples-testing/examples/webgpu_tsl_vfx_flames.ts
 @@ -1,4 +1,4 @@
diff --git a/three.js b/three.js
@@ -1 +1 @@
-Subproject commit 8faa0688fb512c2af52011ea24a48339c70e476f
+Subproject commit ca6d896fd81df7a9e13a5715e331d75219d034bf
diff --git a/types/three/examples/jsm/capabilities/WebGL.d.ts b/types/three/examples/jsm/capabilities/WebGL.d.ts
@@ -3,15 +3,4 @@ export default class WebGL {
     static isColorSpaceAvailable(colorSpace: PredefinedColorSpace): boolean;
     static getWebGL2ErrorMessage(): HTMLElement;
     static getErrorMessage(version: number): HTMLElement;
-
-    /**
-     * @deprecated isWebGLAvailable() has been deprecated and will be removed in r178. Use isWebGL2Available() instead.
-     */
-    static isWebGLAvailable(): boolean;
-
-    /**
-     * @deprecated getWebGLErrorMessage() has been deprecated and will be removed in r178. Use getWebGL2ErrorMessage()
-     * instead.
-     */
-    static getWebGLErrorMessage(): HTMLElement;
 }
diff --git a/types/three/src/Three.TSL.d.ts b/types/three/src/Three.TSL.d.ts
@@ -118,7 +118,6 @@ export const colorSpaceToWorking: typeof TSL.colorSpaceToWorking;
 export const colorToDirection: typeof TSL.colorToDirection;
 export const compute: typeof TSL.compute;
 export const computeSkinning: typeof TSL.computeSkinning;
-export const cond: typeof TSL.cond;
 export const Const: typeof TSL.Const;
 export const context: typeof TSL.context;
 export const convert: typeof TSL.convert;
@@ -237,7 +236,6 @@ export const globalId: typeof TSL.globalId;
 export const log: typeof TSL.log;
 export const log2: typeof TSL.log2;
 export const logarithmicDepthToViewZ: typeof TSL.logarithmicDepthToViewZ;
-export const loop: typeof TSL.loop;
 export const luminance: typeof TSL.luminance;
 export const mediumpModelViewMatrix: typeof TSL.mediumpModelViewMatrix;
 export const mat2: typeof TSL.mat2;
@@ -405,7 +403,6 @@ export const refract: typeof TSL.refract;
 export const refractVector: typeof TSL.refractVector;
 export const refractView: typeof TSL.refractView;
 export const reinhardToneMapping: typeof TSL.reinhardToneMapping;
-export const remainder: typeof TSL.remainder;
 export const remap: typeof TSL.remap;
 export const remapClamp: typeof TSL.remapClamp;
 export const renderGroup: typeof TSL.renderGroup;
@@ -503,14 +500,12 @@ export const triNoise3D: typeof TSL.triNoise3D;
 export const triplanarTexture: typeof TSL.triplanarTexture;
 export const triplanarTextures: typeof TSL.triplanarTextures;
 export const trunc: typeof TSL.trunc;
-export const tslFn: typeof TSL.tslFn;
 export const uint: typeof TSL.uint;
 export const uniform: typeof TSL.uniform;
 export const uniformCubeTexture: typeof TSL.uniformCubeTexture;
 export const uniformArray: typeof TSL.uniformArray;
 export const uniformGroup: typeof TSL.uniformGroup;
 export const uniformTexture: typeof TSL.uniformTexture;
-export const uniforms: typeof TSL.uniforms;
 export const unpremultiplyAlpha: typeof TSL.unpremultiplyAlpha;
 export const userData: typeof TSL.userData;
 export const uv: typeof TSL.uv;
@@ -532,7 +527,6 @@ export const viewZToLogarithmicDepth: typeof TSL.viewZToLogarithmicDepth;
 export const viewZToOrthographicDepth: typeof TSL.viewZToOrthographicDepth;
 export const viewZToPerspectiveDepth: typeof TSL.viewZToPerspectiveDepth;
 export const viewport: typeof TSL.viewport;
-export const viewportBottomLeft: typeof TSL.viewportBottomLeft;
 export const viewportCoordinate: typeof TSL.viewportCoordinate;
 export const viewportDepthTexture: typeof TSL.viewportDepthTexture;
 export const viewportLinearDepth: typeof TSL.viewportLinearDepth;
@@ -542,7 +536,6 @@ export const viewportSafeUV: typeof TSL.viewportSafeUV;
 export const viewportSharedTexture: typeof TSL.viewportSharedTexture;
 export const viewportSize: typeof TSL.viewportSize;
 export const viewportTexture: typeof TSL.viewportTexture;
-export const viewportTopLeft: typeof TSL.viewportTopLeft;
 export const viewportUV: typeof TSL.viewportUV;
 export const wgsl: typeof TSL.wgsl;
 export const wgslFn: typeof TSL.wgslFn;
diff --git a/types/three/src/nodes/accessors/UniformArrayNode.d.ts b/types/three/src/nodes/accessors/UniformArrayNode.d.ts
@@ -24,8 +24,3 @@ declare class UniformArrayNode extends BufferNode<unknown[]> {
 export default UniformArrayNode;
 
 export const uniformArray: (values: unknown[], nodeType?: string | null) => ShaderNodeObject<UniformArrayNode>;
-
-/**
- * @deprecated uniforms() has been renamed to uniformArray().
- */
-export const uniforms: (values: unknown[], nodeType?: string | null) => ShaderNodeObject<UniformArrayNode>;
diff --git a/types/three/src/nodes/core/StackNode.d.ts b/types/three/src/nodes/core/StackNode.d.ts
@@ -21,16 +21,6 @@ declare class StackNode extends Node {
     Case(...params: Node[]): this;
 
     Default(method: () => void): this;
-
-    /**
-     * @deprecated Use {@link StackNode#ElseIf Else()} instead.
-     */
-    elseif(boolNode: Node, method: () => void): this;
-
-    /**
-     * @deprecated Use {@link StackNode#Else Else()} instead.
-     */
-    else(method: () => void): this;
 }
 
 export default StackNode;
diff --git a/types/three/src/nodes/display/ScreenNode.d.ts b/types/three/src/nodes/display/ScreenNode.d.ts
@@ -41,13 +41,3 @@ export const viewportUV: ShaderNodeObject<Node>;
  * @deprecated "viewportResolution" is deprecated. Use "screenSize" instead.
  */
 export const viewportResolution: ShaderNodeObject<ScreenNode>;
-
-/**
- * @deprecated "viewportTopLeft" is deprecated. Use "viewportUV" instead.
- */
-export const viewportTopLeft: ShaderNodeObject<ScreenNode>;
-
-/**
- * @deprecated "viewportBottomLeft" is deprecated. Use "viewportUV.flipY()" instead.
- */
-export const viewportBottomLeft: ShaderNodeObject<ScreenNode>;
diff --git a/types/three/src/nodes/math/ConditionalNode.d.ts b/types/three/src/nodes/math/ConditionalNode.d.ts
@@ -22,18 +22,3 @@ declare module "../tsl/TSLCore.js" {
         select: typeof select;
     }
 }
-
-/**
- * @deprecated cond() has been renamed to select()
- */
-export const cond: (
-    condNode: Node,
-    ifNode: Node | number,
-    elseNode?: Node | number | null,
-) => ShaderNodeObject<Node>;
-
-declare module "../tsl/TSLCore.js" {
-    interface NodeElements {
-        cond: typeof cond;
-    }
-}
diff --git a/types/three/src/nodes/math/OperatorNode.d.ts b/types/three/src/nodes/math/OperatorNode.d.ts
@@ -116,26 +116,13 @@ declare module "../tsl/TSLCore.js" {
     }
 }
 
-/**
- * @deprecated .remainder() has been renamed to .modInt().
- */
-export const remainder: (
-    aNode: OperatorNodeParameter,
-    bNode: OperatorNodeParameter,
-    ...params: OperatorNodeParameter[]
-) => ShaderNodeObject<OperatorNode>;
-
 /**
  * @deprecated "modInt()" is deprecated. Use "mod( int( ... ) )" instead.
  */
 export const modInt: (a: OperatorNodeParameter, b: OperatorNodeParameter) => ShaderNodeObject<OperatorNode>;
 
 declare module "../tsl/TSLCore.js" {
     interface NodeElements {
-        /**
-         * @deprecated .remainder() has been renamed to .modInt().
-         */
-        remainder: typeof remainder;
         /**
          * @deprecated "modInt()" is deprecated. Use "mod( int( ... ) )" instead.
          */
diff --git a/types/three/src/nodes/tsl/TSLCore.d.ts b/types/three/src/nodes/tsl/TSLCore.d.ts
@@ -435,20 +435,3 @@ export const split: (node: Node, channels?: string) => ShaderNodeObject<Node>;
  * @deprecated append() has been renamed to Stack().
  */
 export const append: (node: Node) => Node;
-
-/**
- * @deprecated tslFn() has been renamed to Fn()
- */
-export function tslFn<R extends Node = ShaderNodeObject<Node>>(jsFunc: () => R): () => R;
-/**
- * @deprecated tslFn() has been renamed to Fn()
- */
-export function tslFn<T extends any[], R extends Node = ShaderNodeObject<Node>>(
-    jsFunc: (args: T) => R,
-): (...args: ProxiedTuple<T>) => R;
-/**
- * @deprecated tslFn() has been renamed to Fn()
- */
-export function tslFn<T extends { [key: string]: unknown }, R extends Node = ShaderNodeObject<Node>>(
-    jsFunc: (args: T) => R,
-): (args: ProxiedObject<T>) => R;
diff --git a/types/three/src/nodes/utils/LoopNode.d.ts b/types/three/src/nodes/utils/LoopNode.d.ts
@@ -36,8 +36,3 @@ interface Loop {
 export const Loop: Loop;
 export const Continue: () => ShaderNodeObject<Node>;
 export const Break: () => ShaderNodeObject<Node>;
-
-/**
- * @deprecated loop() has been renamed to Loop()
- */
-export const loop: (...params: unknown[]) => ShaderNodeObject<Node>;
diff --git a/types/three/test/unit/src/nodes/tsl/TSLCore.ts b/types/three/test/unit/src/nodes/tsl/TSLCore.ts
@@ -2,7 +2,7 @@
  * Various tests of ShaderNode and related type inference
  */
 
-import { color, nodeArray, nodeImmutable, ShaderNode, ShaderNodeObject, Swizzable, tslFn, vec3 } from "three/tsl";
+import { color, Fn, nodeArray, nodeImmutable, ShaderNode, ShaderNodeObject, Swizzable, vec3 } from "three/tsl";
 import { ConstNode, MaterialNode, Node, PropertyNode } from "three/webgpu";
 
 // just to type check
@@ -25,11 +25,11 @@ const shader = new ShaderNode<{ a: Node; b: Node }>(params => {
 });
 assertSwizzable<Node>(shader.call({ a: s, b: new ConstNode(1) }));
 
-const fnWithoutArgs = tslFn(() => vec3(1, 2, 3));
+const fnWithoutArgs = Fn(() => vec3(1, 2, 3));
 assertSwizzable<Node>(fnWithoutArgs());
 
-const fnWithArrayArgs = tslFn(([a, b]: [a: ShaderNodeObject<Node>, b: ShaderNodeObject<Node>]) => a.add(b));
+const fnWithArrayArgs = Fn(([a, b]: [a: ShaderNodeObject<Node>, b: ShaderNodeObject<Node>]) => a.add(b));
 assertSwizzable<Node>(fnWithArrayArgs(0.5, color(0.0, 0.25, 0.5)));
 
-const fnWithArgs = tslFn(({ a, b }: { a: ShaderNodeObject<Node>; b: ShaderNodeObject<Node> }) => a.add(b));
+const fnWithArgs = Fn(({ a, b }: { a: ShaderNodeObject<Node>; b: ShaderNodeObject<Node> }) => a.add(b));
 assertSwizzable<Node>(fnWithArgs({ a: 0.5, b: color(0.0, 0.25, 0.5) }));
