diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index 75971c645..bd67a675b 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -1246,15 +1246,10 @@ index c19eb94a6..7900c0e18 100644 ctx.fillRect(0, 0, 64, 64); ctx.fillStyle = '#FFD500'; diff --git a/examples-testing/examples/misc_exporter_gltf_normals.ts b/examples-testing/examples/misc_exporter_gltf_normals.ts -index 6ca397191..4cbc0c74b 100644 +index c2981aa33..4cbc0c74b 100644 --- a/examples-testing/examples/misc_exporter_gltf_normals.ts +++ b/examples-testing/examples/misc_exporter_gltf_normals.ts -@@ -1,14 +1,15 @@ --import * as THREE from '../build/three.module.js'; -+import * as THREE from 'three'; - - import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; - import { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js'; +@@ -5,10 +5,11 @@ import { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js'; // diff --git a/jsdoc-testing/changes.patch b/jsdoc-testing/changes.patch index 14d3737ca..170cab49f 100644 --- a/jsdoc-testing/changes.patch +++ b/jsdoc-testing/changes.patch @@ -10894,7 +10894,7 @@ index e8ddddc6e..9a57cd2c3 100644 } -import { Interpolant } from '../Interpolant.js'; diff --git a/jsdoc-testing/jsdoc/src/nodes/accessors/Batch.d.ts b/jsdoc-testing/jsdoc/src/nodes/accessors/Batch.d.ts -index 268433191..59c1bf68a 100644 +index 4e35027cf..fd38c824e 100644 --- a/jsdoc-testing/jsdoc/src/nodes/accessors/Batch.d.ts +++ b/jsdoc-testing/jsdoc/src/nodes/accessors/Batch.d.ts @@ -1,9 +1,12 @@ @@ -10904,14 +10904,14 @@ index 268433191..59c1bf68a 100644 /** * TSL object representing a varying property for the batching color vector. * - * @type {VaryingNode} + * @type {VaryingNode} */ --export const batchColor: VaryingNode; -+export const batchColor: VaryingNode<'vec3'>; +-export const batchColor: VaryingNode; ++export const batchColor: VaryingNode<'vec4'>; /** * TSL function representing the vertex shader batching setup. * Applies the batch transformation matrix to positionLocal, normalLocal, and tangentLocal. -@@ -13,4 +16,4 @@ export const batchColor: VaryingNode; +@@ -13,4 +16,4 @@ export const batchColor: VaryingNode; * @function * @param {BatchedMesh} batchMesh - The batched mesh. */ diff --git a/three.js b/three.js index eb3cf0e71..eba081f82 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit eb3cf0e71cbd058a5fc0532e239675e8e9ee7d6d +Subproject commit eba081f82174247248dcf55bfbc60865407d03bf diff --git a/types/three/src/nodes/accessors/Batch.d.ts b/types/three/src/nodes/accessors/Batch.d.ts index 4a412e5e0..c40e0be33 100644 --- a/types/three/src/nodes/accessors/Batch.d.ts +++ b/types/three/src/nodes/accessors/Batch.d.ts @@ -4,9 +4,9 @@ import VaryingNode from "../core/VaryingNode.js"; /** * TSL object representing a varying property for the batching color vector. * - * @type {VaryingNode} + * @type {VaryingNode} */ -export const batchColor: VaryingNode<"vec3">; +export const batchColor: VaryingNode<"vec4">; /** * TSL function representing the vertex shader batching setup. * Applies the batch transformation matrix to positionLocal, normalLocal, and tangentLocal.