Skip to content

TSL: Use RGBA for batching color. #2236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Methuselah96 merged 6 commits into from
Jun 25, 2026
Merged

TSL: Use RGBA for batching color. #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c90a654
Update three.js
Methuselah96 Jun 24, 2026
be9e8d8
Add jsdoc
Methuselah96 Jun 24, 2026
d2c5375
Update patch and delete jsdoc
Methuselah96 Jun 24, 2026
503e67e
Update declarations
Methuselah96 Jun 24, 2026
8ca5221
Add examples
Methuselah96 Jun 25, 2026
65e7963
Update patch and delete examples
Methuselah96 Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

//

Expand Down
10 changes: 5 additions & 5 deletions jsdoc-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 @@
Expand All @@ -10904,14 +10904,14 @@ index 268433191..59c1bf68a 100644
/**
* TSL object representing a varying property for the batching color vector.
*
* @type {VaryingNode<vec3>}
* @type {VaryingNode<vec4>}
*/
-export const batchColor: VaryingNode<any>;
+export const batchColor: VaryingNode<'vec3'>;
-export const batchColor: VaryingNode<vec4>;
+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<any>;
@@ -13,4 +16,4 @@ export const batchColor: VaryingNode<vec4>;
* @function
* @param {BatchedMesh} batchMesh - The batched mesh.
*/
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 17 files
+3 −3 build/three.cjs
+3 −3 build/three.module.js
+1 −1 build/three.module.min.js
+193 −65 build/three.webgpu.js
+1 −1 build/three.webgpu.min.js
+193 −65 build/three.webgpu.nodes.js
+1 −1 build/three.webgpu.nodes.min.js
+2 −0 examples/jsm/shaders/VolumeShader.js
+1 −1 examples/misc_exporter_gltf_normals.html
+32 −28 manual/resources/lesson.js
+4 −4 src/nodes/accessors/Batch.js
+10 −9 src/nodes/core/NodeBuilder.js
+14 −1 src/renderers/common/RenderObject.js
+0 −6 src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl.js
+2 −2 src/renderers/shaders/ShaderChunk/normal_fragment_begin.glsl.js
+6 −0 src/renderers/shaders/ShaderChunk/normal_vertex.glsl.js
+1 −0 test/e2e/puppeteer.js
4 changes: 2 additions & 2 deletions types/three/src/nodes/accessors/Batch.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import VaryingNode from "../core/VaryingNode.js";
/**
* TSL object representing a varying property for the batching color vector.
*
* @type {VaryingNode<vec3>}
* @type {VaryingNode<vec4>}
*/
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.
Expand Down
Loading