BatchedMesh: Make the transform matrix / texture optional

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "three",
-  "version": "0.167.0",
+  "name": "@plastic-software/three",
+  "version": "0.167.4",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.cjs",

src/renderers/WebGLRenderer.js

@@ -1845,6 +1845,14 @@ class WebGLRenderer {
 
 					needsProgramChange = true;
 
+				} else if (object.isBatchedMesh && materialProperties.batchingMatrix === false && object._matricesTexture !== null) {
+
+					needsProgramChange = true;
+
+				} else if (object.isBatchedMesh && materialProperties.batchingMatrix === true && object._matricesTexture === null) {
+
+					needsProgramChange = true;
+
 				} else if ( object.isInstancedMesh && materialProperties.instancing === false ) {
 
 					needsProgramChange = true;
@@ -2035,10 +2043,18 @@ class WebGLRenderer {
 			if ( object.isBatchedMesh ) {
 
 				p_uniforms.setOptional( _gl, object, 'batchingTexture' );
-				p_uniforms.setValue( _gl, 'batchingTexture', object._matricesTexture, textures );
+				if ( objects._matricesTexture !== null ) {
+
+					p_uniforms.setValue( _gl, 'batchingTexture', object._matricesTexture, textures );
+
+				}
 
 				p_uniforms.setOptional( _gl, object, 'batchingIdTexture' );
-				p_uniforms.setValue( _gl, 'batchingIdTexture', object._indirectTexture, textures );
+				if ( object._indirectTexture !== null ) {
+
+					p_uniforms.setValue( _gl, 'batchingIdTexture', object._indirectTexture, textures );
+
+				}
 
 				p_uniforms.setOptional( _gl, object, 'batchingColorTexture' );
 				if ( object._colorsTexture !== null ) {

src/renderers/shaders/ShaderChunk/batching_pars_vertex.glsl.js

@@ -1,13 +1,13 @@
 export default /* glsl */`
-#ifdef USE_BATCHING
+#ifdef USE_BATCHING_MATRIX
 	#if ! defined( GL_ANGLE_multi_draw )
 	#define gl_DrawID _gl_DrawID
 	uniform int _gl_DrawID;
 	#endif
 
 	uniform highp sampler2D batchingTexture;
 	uniform highp usampler2D batchingIdTexture;
-	mat4 getBatchingMatrix( const in float i ) {
+	mat4 getBatchingMatrix( const in int i ) {
 
 		int size = textureSize( batchingTexture, 0 ).x;
 		int j = int( i ) * 4;

src/renderers/shaders/ShaderChunk/batching_vertex.glsl.js

@@ -1,5 +1,7 @@
 export default /* glsl */`
-#ifdef USE_BATCHING
-	mat4 batchingMatrix = getBatchingMatrix( getIndirectIndex( gl_DrawID ) );
+#ifdef USE_BATCHING_MATRIX
+	mat4 batchingMatrix = getBatchingMatrix( gl_DrawID );
+#elif defined ( USE_BATCHING )
+	mat4 batchingMatrix = mat4( 1.0 );
 #endif
 `;

src/renderers/shaders/ShaderLib/points.glsl.js

@@ -3,6 +3,7 @@ uniform float size;
 uniform float scale;
 
 #include <common>
+#include <batching_pars_vertex>
 #include <color_pars_vertex>
 #include <fog_pars_vertex>
 #include <morphtarget_pars_vertex>
@@ -27,6 +28,7 @@ void main() {
 	#include <color_vertex>
 	#include <morphinstance_vertex>
 	#include <morphcolor_vertex>
+	#include <batching_vertex>
 	#include <begin_vertex>
 	#include <morphtarget_vertex>
 	#include <project_vertex>

src/renderers/webgl/WebGLProgram.js

@@ -547,6 +547,7 @@ function WebGLProgram( renderer, cacheKey, parameters, bindingStates ) {
 
 			parameters.extensionClipCullDistance ? '#define USE_CLIP_DISTANCE' : '',
 			parameters.batching ? '#define USE_BATCHING' : '',
+			parameters.batchingMatrix ? '#define USE_BATCHING_MATRIX' : '',
 			parameters.batchingColor ? '#define USE_BATCHING_COLOR' : '',
 			parameters.instancing ? '#define USE_INSTANCING' : '',
 			parameters.instancingColor ? '#define USE_INSTANCING_COLOR' : '',

src/renderers/webgl/WebGLPrograms.js

@@ -47,7 +47,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 	}
 
 	function getParameters( material, lights, shadows, scene, object ) {
-
 		const fog = scene.fog;
 		const geometry = object.geometry;
 		const environment = material.isMeshStandardMaterial ? scene.environment : null;
@@ -192,6 +191,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 			precision: precision,
 
 			batching: IS_BATCHEDMESH,
+			batchingMatrix: IS_BATCHEDMESH && object._matricesTexture !== null,
 			batchingColor: IS_BATCHEDMESH && object._colorsTexture !== null,
 			instancing: IS_INSTANCEDMESH,
 			instancingColor: IS_INSTANCEDMESH && object.instanceColor !== null,
@@ -512,6 +512,8 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 			_programLayers.enable( 20 );
 		if ( parameters.batchingColor )
 			_programLayers.enable( 21 );
+		if ( parameters.batchingMatrix )
+			_programLayers.enable( 22 );
 
 		array.push( _programLayers.mask );
 		_programLayers.disableAll();