super-three 0.181.0 → 0.185.0

package/src/nodes/Nodes.js

@@ -6,143 +6,158 @@ export { default as ArrayNode } from './core/ArrayNode.js';
 export { default as AssignNode } from './core/AssignNode.js';
 export { default as AttributeNode } from './core/AttributeNode.js';
 export { default as BypassNode } from './core/BypassNode.js';
-export { default as IsolateNode } from './core/IsolateNode.js';
 export { default as ConstNode } from './core/ConstNode.js';
 export { default as ContextNode } from './core/ContextNode.js';
 export { default as IndexNode } from './core/IndexNode.js';
+export { default as InputNode } from './core/InputNode.js';
+export { default as InspectorNode } from './core/InspectorNode.js';
+export { default as IsolateNode } from './core/IsolateNode.js';
 export { default as LightingModel } from './core/LightingModel.js';
+export { default as MRTNode } from './core/MRTNode.js';
 export { default as Node } from './core/Node.js';
-export { default as VarNode } from './core/VarNode.js';
 export { default as NodeAttribute } from './core/NodeAttribute.js';
 export { default as NodeBuilder } from './core/NodeBuilder.js';
 export { default as NodeCache } from './core/NodeCache.js';
 export { default as NodeCode } from './core/NodeCode.js';
+export { default as NodeError } from './core/NodeError.js';
 export { default as NodeFrame } from './core/NodeFrame.js';
 export { default as NodeFunctionInput } from './core/NodeFunctionInput.js';
 export { default as NodeUniform } from './core/NodeUniform.js';
 export { default as NodeVar } from './core/NodeVar.js';
 export { default as NodeVarying } from './core/NodeVarying.js';
+export { default as OutputStructNode } from './core/OutputStructNode.js';
+export { default as OverrideContextNode } from './core/OverrideContextNode.js';
 export { default as ParameterNode } from './core/ParameterNode.js';
 export { default as PropertyNode } from './core/PropertyNode.js';
 export { default as StackNode } from './core/StackNode.js';
+export { default as StackTrace } from './core/StackTrace.js';
+export { default as StructNode } from './core/StructNode.js';
+export { default as StructTypeNode } from './core/StructTypeNode.js';
+export { default as SubBuildNode } from './core/SubBuildNode.js';
 export { default as TempNode } from './core/TempNode.js';
 export { default as UniformGroupNode } from './core/UniformGroupNode.js';
 export { default as UniformNode } from './core/UniformNode.js';
+export { default as VarNode } from './core/VarNode.js';
 export { default as VaryingNode } from './core/VaryingNode.js';
-export { default as StructNode } from './core/StructNode.js';
-export { default as StructTypeNode } from './core/StructTypeNode.js';
-export { default as OutputStructNode } from './core/OutputStructNode.js';
-export { default as MRTNode } from './core/MRTNode.js';
-export { default as SubBuildNode } from './core/SubBuildNode.js';
 
 import * as NodeUtils from './core/NodeUtils.js';
 export { NodeUtils };
 
-// utils
-export { default as ArrayElementNode } from './utils/ArrayElementNode.js';
-export { default as ConvertNode } from './utils/ConvertNode.js';
-export { default as FunctionOverloadingNode } from './utils/FunctionOverloadingNode.js';
-export { default as JoinNode } from './utils/JoinNode.js';
-export { default as LoopNode } from './utils/LoopNode.js';
-export { default as MaxMipLevelNode } from './utils/MaxMipLevelNode.js';
-export { default as RemapNode } from './utils/RemapNode.js';
-export { default as RotateNode } from './utils/RotateNode.js';
-export { default as SetNode } from './utils/SetNode.js';
-export { default as SplitNode } from './utils/SplitNode.js';
-export { default as SpriteSheetUVNode } from './utils/SpriteSheetUVNode.js';
-export { default as StorageArrayElementNode } from './utils/StorageArrayElementNode.js';
-export { default as ReflectorNode } from './utils/ReflectorNode.js';
-export { default as RTTNode } from './utils/RTTNode.js';
-export { default as MemberNode } from './utils/MemberNode.js';
-export { default as DebugNode } from './utils/DebugNode.js';
-export { default as EventNode } from './utils/EventNode.js';
-
-// math
-export { default as BitcastNode } from './math/BitcastNode.js';
-
 // accessors
-export { default as UniformArrayNode } from './accessors/UniformArrayNode.js';
 export { default as BufferAttributeNode } from './accessors/BufferAttributeNode.js';
 export { default as BufferNode } from './accessors/BufferNode.js';
-export { default as VertexColorNode } from './accessors/VertexColorNode.js';
+export { default as BuiltinNode } from './accessors/BuiltinNode.js';
+export { default as ClippingNode } from './accessors/ClippingNode.js';
 export { default as CubeTextureNode } from './accessors/CubeTextureNode.js';
-export { default as InstanceNode } from './accessors/InstanceNode.js';
-export { default as InstancedMeshNode } from './accessors/InstancedMeshNode.js';
-export { default as BatchNode } from './accessors/BatchNode.js';
 export { default as MaterialNode } from './accessors/MaterialNode.js';
 export { default as MaterialReferenceNode } from './accessors/MaterialReferenceNode.js';
-export { default as RendererReferenceNode } from './accessors/RendererReferenceNode.js';
-export { default as MorphNode } from './accessors/MorphNode.js';
 export { default as ModelNode } from './accessors/ModelNode.js';
 export { default as Object3DNode } from './accessors/Object3DNode.js';
 export { default as PointUVNode } from './accessors/PointUVNode.js';
+export { default as ReferenceBaseNode } from './accessors/ReferenceBaseNode.js';
 export { default as ReferenceNode } from './accessors/ReferenceNode.js';
-export { default as SkinningNode } from './accessors/SkinningNode.js';
-export { default as SceneNode } from './accessors/SceneNode.js';
+export { default as RendererReferenceNode } from './accessors/RendererReferenceNode.js';
 export { default as StorageBufferNode } from './accessors/StorageBufferNode.js';
-export { default as TextureNode } from './accessors/TextureNode.js';
-export { default as TextureSizeNode } from './accessors/TextureSizeNode.js';
+export { default as StorageTexture3DNode } from './accessors/StorageTexture3DNode.js';
 export { default as StorageTextureNode } from './accessors/StorageTextureNode.js';
 export { default as Texture3DNode } from './accessors/Texture3DNode.js';
+export { default as TextureNode } from './accessors/TextureNode.js';
+export { default as TextureSizeNode } from './accessors/TextureSizeNode.js';
+export { default as UniformArrayNode } from './accessors/UniformArrayNode.js';
 export { default as UserDataNode } from './accessors/UserDataNode.js';
+export { default as VelocityNode } from './accessors/VelocityNode.js';
+export { default as VertexColorNode } from './accessors/VertexColorNode.js';
+
+// code
+export { default as CodeNode } from './code/CodeNode.js';
+export { default as ExpressionNode } from './code/ExpressionNode.js';
+export { default as FunctionCallNode } from './code/FunctionCallNode.js';
+export { default as FunctionNode } from './code/FunctionNode.js';
 
 // display
 export { default as BumpMapNode } from './display/BumpMapNode.js';
 export { default as ColorSpaceNode } from './display/ColorSpaceNode.js';
 export { default as FrontFacingNode } from './display/FrontFacingNode.js';
 export { default as NormalMapNode } from './display/NormalMapNode.js';
-export { default as PosterizeNode } from './display/PosterizeNode.js';
-export { default as ToneMappingNode } from './display/ToneMappingNode.js';
-export { default as ScreenNode } from './display/ScreenNode.js';
-export { default as ViewportTextureNode } from './display/ViewportTextureNode.js';
-export { default as ViewportSharedTextureNode } from './display/ViewportSharedTextureNode.js';
-export { default as ViewportDepthTextureNode } from './display/ViewportDepthTextureNode.js';
-export { default as ViewportDepthNode } from './display/ViewportDepthNode.js';
-export { default as RenderOutputNode } from './display/RenderOutputNode.js';
 export { default as PassNode } from './display/PassNode.js';
+export { default as RenderOutputNode } from './display/RenderOutputNode.js';
+export { default as ScreenNode } from './display/ScreenNode.js';
+export { default as ToneMappingNode } from './display/ToneMappingNode.js';
 export { default as ToonOutlinePassNode } from './display/ToonOutlinePassNode.js';
-
-// code
-export { default as ExpressionNode } from './code/ExpressionNode.js';
-export { default as CodeNode } from './code/CodeNode.js';
-export { default as FunctionCallNode } from './code/FunctionCallNode.js';
-export { default as FunctionNode } from './code/FunctionNode.js';
-export { default as ScriptableNode } from './code/ScriptableNode.js';
-export { default as ScriptableValueNode } from './code/ScriptableValueNode.js';
+export { default as ViewportDepthNode } from './display/ViewportDepthNode.js';
+export { default as ViewportDepthTextureNode } from './display/ViewportDepthTextureNode.js';
+export { default as ViewportSharedTextureNode } from './display/ViewportSharedTextureNode.js';
+export { default as ViewportTextureNode } from './display/ViewportTextureNode.js';
 
 // geometry
 export { default as RangeNode } from './geometry/RangeNode.js';
 
 // gpgpu
+export { default as AtomicFunctionNode } from './gpgpu/AtomicFunctionNode.js';
+export { default as BarrierNode } from './gpgpu/BarrierNode.js';
+export { default as ComputeBuiltinNode } from './gpgpu/ComputeBuiltinNode.js';
 export { default as ComputeNode } from './gpgpu/ComputeNode.js';
+export { default as SubgroupFunctionNode } from './gpgpu/SubgroupFunctionNode.js';
+export { default as WorkgroupInfoNode } from './gpgpu/WorkgroupInfoNode.js';
 
 // lighting
-export { default as PointLightNode } from './lighting/PointLightNode.js';
+export { default as AmbientLightNode } from './lighting/AmbientLightNode.js';
+export { default as AnalyticLightNode } from './lighting/AnalyticLightNode.js';
+export { default as AONode } from './lighting/AONode.js';
+export { default as BasicEnvironmentNode } from './lighting/BasicEnvironmentNode.js';
+export { default as BasicLightMapNode } from './lighting/BasicLightMapNode.js';
 export { default as DirectionalLightNode } from './lighting/DirectionalLightNode.js';
-export { default as RectAreaLightNode } from './lighting/RectAreaLightNode.js';
-export { default as SpotLightNode } from './lighting/SpotLightNode.js';
+export { default as EnvironmentNode } from './lighting/EnvironmentNode.js';
+export { default as HemisphereLightNode } from './lighting/HemisphereLightNode.js';
 export { default as IESSpotLightNode } from './lighting/IESSpotLightNode.js';
-export { default as ProjectorLightNode } from './lighting/ProjectorLightNode.js';
-export { default as AmbientLightNode } from './lighting/AmbientLightNode.js';
-export { default as LightsNode } from './lighting/LightsNode.js';
-export { default as LightingNode } from './lighting/LightingNode.js';
+export { default as IrradianceNode } from './lighting/IrradianceNode.js';
 export { default as LightingContextNode } from './lighting/LightingContextNode.js';
-export { default as HemisphereLightNode } from './lighting/HemisphereLightNode.js';
+export { default as LightingNode } from './lighting/LightingNode.js';
 export { default as LightProbeNode } from './lighting/LightProbeNode.js';
-export { default as EnvironmentNode } from './lighting/EnvironmentNode.js';
-export { default as BasicEnvironmentNode } from './lighting/BasicEnvironmentNode.js';
-export { default as IrradianceNode } from './lighting/IrradianceNode.js';
-export { default as AONode } from './lighting/AONode.js';
-export { default as AnalyticLightNode } from './lighting/AnalyticLightNode.js';
+export { default as LightsNode } from './lighting/LightsNode.js';
+export { default as PointLightNode } from './lighting/PointLightNode.js';
+export { default as PointShadowNode } from './lighting/PointShadowNode.js';
+export { default as ProjectorLightNode } from './lighting/ProjectorLightNode.js';
+export { default as RectAreaLightNode } from './lighting/RectAreaLightNode.js';
 export { default as ShadowBaseNode } from './lighting/ShadowBaseNode.js';
 export { default as ShadowNode } from './lighting/ShadowNode.js';
+export { default as SpotLightNode } from './lighting/SpotLightNode.js';
 
-// pmrem
-export { default as PMREMNode } from './pmrem/PMREMNode.js';
+// math
+export { default as BitcastNode } from './math/BitcastNode.js';
+export { default as BitcountNode } from './math/BitcountNode.js';
+export { default as ConditionalNode } from './math/ConditionalNode.js';
+export { default as MathNode } from './math/MathNode.js';
+export { default as OperatorNode } from './math/OperatorNode.js';
+export { default as PackFloatNode } from './math/PackFloatNode.js';
+export { default as UnpackFloatNode } from './math/UnpackFloatNode.js';
 
 // parsers
 export { default as GLSLNodeParser } from './parsers/GLSLNodeParser.js'; // @TODO: Move to jsm/renderers/webgl.
 
+// pmrem
+export { default as PMREMNode } from './pmrem/PMREMNode.js';
+
+// utils
+export { default as ArrayElementNode } from './utils/ArrayElementNode.js';
+export { default as ConvertNode } from './utils/ConvertNode.js';
+export { default as CubeMapNode } from './utils/CubeMapNode.js';
+export { default as DebugNode } from './utils/DebugNode.js';
+export { default as EventNode } from './utils/EventNode.js';
+export { default as FlipNode } from './utils/FlipNode.js';
+export { default as FunctionOverloadingNode } from './utils/FunctionOverloadingNode.js';
+export { default as JoinNode } from './utils/JoinNode.js';
+export { default as LoopNode } from './utils/LoopNode.js';
+export { default as MaxMipLevelNode } from './utils/MaxMipLevelNode.js';
+export { default as MemberNode } from './utils/MemberNode.js';
+export { default as ReflectorNode } from './utils/ReflectorNode.js';
+export { default as RotateNode } from './utils/RotateNode.js';
+export { default as RTTNode } from './utils/RTTNode.js';
+export { default as SampleNode } from './utils/SampleNode.js';
+export { default as SetNode } from './utils/SetNode.js';
+export { default as SplitNode } from './utils/SplitNode.js';
+export { default as StorageArrayElementNode } from './utils/StorageArrayElementNode.js';
+
 // lighting models
 export { default as PhongLightingModel } from './functions/PhongLightingModel.js';
 export { default as PhysicalLightingModel } from './functions/PhysicalLightingModel.js';

package/src/nodes/TSL.js

@@ -7,6 +7,7 @@ export * from './core/AttributeNode.js';
 export * from './core/BypassNode.js';
 export * from './core/IsolateNode.js';
 export * from './core/ContextNode.js';
+export * from './core/OverrideContextNode.js';
 export * from './core/IndexNode.js';
 export * from './core/ParameterNode.js';
 export * from './core/PropertyNode.js';
@@ -20,8 +21,11 @@ export * from './core/MRTNode.js';
 
 // math
 export * from './math/BitcastNode.js';
+export * from './math/BitcountNode.js';
 export * from './math/Hash.js';
 export * from './math/MathUtils.js';
+export * from './math/PackFloatNode.js';
+export * from './math/UnpackFloatNode.js';
 export * from './math/TriNoise3D.js';
 
 // utils
@@ -32,12 +36,12 @@ export * from './utils/MatcapUV.js';
 export * from './utils/MaxMipLevelNode.js';
 export * from './utils/Oscillators.js';
 export * from './utils/Packing.js';
-export * from './utils/RemapNode.js';
+export * from './utils/Remap.js';
 export * from './utils/UVUtils.js';
 export * from './utils/SpriteUtils.js';
 export * from './utils/ViewportUtils.js';
 export * from './utils/RotateNode.js';
-export * from './utils/SpriteSheetUVNode.js';
+export * from './utils/SpriteSheetUV.js';
 export * from './utils/Timer.js';
 export * from './utils/TriplanarTextures.js';
 export * from './utils/ReflectorNode.js';
@@ -60,14 +64,13 @@ export * from './accessors/BuiltinNode.js';
 export * from './accessors/Camera.js';
 export * from './accessors/VertexColorNode.js';
 export * from './accessors/CubeTextureNode.js';
-export * from './accessors/InstanceNode.js';
-export * from './accessors/InstancedMeshNode.js';
-export * from './accessors/BatchNode.js';
+export * from './accessors/Instance.js';
+export * from './accessors/Batch.js';
 export * from './accessors/MaterialNode.js';
 export * from './accessors/MaterialProperties.js';
 export * from './accessors/MaterialReferenceNode.js';
 export * from './accessors/RendererReferenceNode.js';
-export * from './accessors/MorphNode.js';
+export * from './accessors/Morph.js';
 export * from './accessors/TextureBicubic.js';
 export * from './accessors/ModelNode.js';
 export * from './accessors/ModelViewProjectionNode.js';
@@ -77,13 +80,14 @@ export * from './accessors/PointUVNode.js';
 export * from './accessors/Position.js';
 export * from './accessors/ReferenceNode.js';
 export * from './accessors/ReflectVector.js';
-export * from './accessors/SkinningNode.js';
-export * from './accessors/SceneNode.js';
+export * from './accessors/Skinning.js';
+export * from './accessors/SceneProperties.js';
 export * from './accessors/StorageBufferNode.js';
+export * from './accessors/StorageTexture3DNode.js';
+export * from './accessors/StorageTextureNode.js';
 export * from './accessors/Tangent.js';
 export * from './accessors/TextureNode.js';
 export * from './accessors/TextureSizeNode.js';
-export * from './accessors/StorageTextureNode.js';
 export * from './accessors/Texture3DNode.js';
 export * from './accessors/UV.js';
 export * from './accessors/UserDataNode.js';
@@ -96,7 +100,7 @@ export * from './display/ColorAdjustment.js';
 export * from './display/ColorSpaceNode.js';
 export * from './display/FrontFacingNode.js';
 export * from './display/NormalMapNode.js';
-export * from './display/PosterizeNode.js';
+export * from './display/PremultiplyAlphaFunctions.js';
 export * from './display/ToneMappingNode.js';
 export * from './display/ScreenNode.js';
 export * from './display/ViewportTextureNode.js';
@@ -116,8 +120,6 @@ export * from './code/ExpressionNode.js';
 export * from './code/CodeNode.js';
 export * from './code/FunctionCallNode.js';
 export * from './code/FunctionNode.js';
-export * from './code/ScriptableNode.js';
-export * from './code/ScriptableValueNode.js';
 
 // fog
 export * from './fog/Fog.js';
@@ -160,7 +162,7 @@ export * from './materialx/MaterialXNodes.js';
 export { default as BRDF_GGX } from './functions/BSDF/BRDF_GGX.js';
 export { default as BRDF_Lambert } from './functions/BSDF/BRDF_Lambert.js';
 export { default as D_GGX } from './functions/BSDF/D_GGX.js';
-export { default as DFGApprox } from './functions/BSDF/DFGApprox.js';
+export { default as DFGLUT } from './functions/BSDF/DFGLUT.js';
 export { default as F_Schlick } from './functions/BSDF/F_Schlick.js';
 export { default as Schlick_to_F0 } from './functions/BSDF/Schlick_to_F0.js';
 export { default as V_GGX_SmithCorrelated } from './functions/BSDF/V_GGX_SmithCorrelated.js';

package/src/nodes/accessors/Arrays.js

@@ -16,9 +16,9 @@ export const attributeArray = ( count, type = 'float' ) => {
 
 	let itemSize, typedArray;
 
-	if ( type.isStruct === true ) {
+	if ( type.isStructTypeNode === true ) {
 
-		itemSize = type.layout.getLength();
+		itemSize = type.getLength();
 		typedArray = getTypedArrayFromType( 'float' );
 
 	} else {
@@ -48,9 +48,9 @@ export const instancedArray = ( count, type = 'float' ) => {
 
 	let itemSize, typedArray;
 
-	if ( type.isStruct === true ) {
+	if ( type.isStructTypeNode === true ) {
 
-		itemSize = type.layout.getLength();
+		itemSize = type.getLength();
 		typedArray = getTypedArrayFromType( 'float' );
 
 	} else {
@@ -61,7 +61,7 @@ export const instancedArray = ( count, type = 'float' ) => {
 	}
 
 	const buffer = new StorageInstancedBufferAttribute( count, itemSize, typedArray );
-	const node = storage( buffer, type, count );
+	const node = storage( buffer, type, buffer.count );
 
 	return node;
 

package/src/nodes/accessors/Batch.js

@@ -0,0 +1,108 @@
+
+import { normalLocal } from './Normal.js';
+import { positionLocal } from './Position.js';
+import { vec3, mat3, mat4, int, ivec2, float, Fn } from '../tsl/TSLBase.js';
+import { textureLoad } from './TextureNode.js';
+import { textureSize } from './TextureSizeNode.js';
+import { tangentLocal } from './Tangent.js';
+import { instanceIndex, drawIndex } from '../core/IndexNode.js';
+import { varyingProperty } from '../core/PropertyNode.js';
+
+/**
+ * TSL function that retrieves the batching color for a given instance ID from a colors texture.
+ *
+ * @param {Node<texture>} colorsTexture - The colors texture.
+ * @param {Node<int>} id - The instance or batch ID.
+ * @returns {Node<vec4>} The retrieved color.
+ */
+const getBatchingColor = /*@__PURE__*/ Fn( ( [ colorsTexture, id ] ) => {
+
+	const size = int( textureSize( textureLoad( colorsTexture ), 0 ).x ).toConst();
+	const j = int( id );
+	const x = j.mod( size ).toConst();
+	const y = j.div( size ).toConst();
+	return textureLoad( colorsTexture, ivec2( x, y ) );
+
+} );
+
+/**
+ * TSL function that retrieves the indirect index for a given batch ID.
+ *
+ * @param {BatchedMesh} batchMesh - The batched mesh.
+ * @param {Node<int>} id - The draw or instance ID.
+ * @returns {Node<uint>} The indirect index.
+ */
+const getIndirectIndex = /*@__PURE__*/ Fn( ( [ indirectTexture, id ] ) => {
+
+	const size = int( textureSize( textureLoad( indirectTexture ), 0 ).x ).toConst();
+	const x = int( id ).mod( size ).toConst();
+	const y = int( id ).div( size ).toConst();
+	return textureLoad( indirectTexture, ivec2( x, y ) ).x;
+
+} );
+
+/**
+ * TSL object representing a varying property for the batching color vector.
+ *
+ * @type {VaryingNode<vec4>}
+ */
+export const batchColor = /*@__PURE__*/ varyingProperty( 'vec4', 'vBatchColor' );
+
+/**
+ * TSL function representing the vertex shader batching setup.
+ * Applies the batch transformation matrix to positionLocal, normalLocal, and tangentLocal.
+ * Also assigns the batch color if a color texture is present.
+ *
+ * @tsl
+ * @function
+ * @param {BatchedMesh} batchMesh - The batched mesh.
+ */
+export const batch = /*@__PURE__*/ Fn( ( [ batchMesh ], builder ) => {
+
+	const batchingIdNode = builder.getDrawIndex() === null ? instanceIndex : drawIndex;
+
+	const indirectId = getIndirectIndex( batchMesh._indirectTexture, int( batchingIdNode ) );
+
+	const matricesTexture = batchMesh._matricesTexture;
+
+	const size = int( textureSize( textureLoad( matricesTexture ), 0 ).x ).toConst();
+	const j = float( indirectId ).mul( 4 ).toInt().toConst();
+
+	const x = j.mod( size ).toConst();
+	const y = j.div( size ).toConst();
+	const batchingMatrix = mat4(
+		textureLoad( matricesTexture, ivec2( x, y ) ),
+		textureLoad( matricesTexture, ivec2( x.add( 1 ), y ) ),
+		textureLoad( matricesTexture, ivec2( x.add( 2 ), y ) ),
+		textureLoad( matricesTexture, ivec2( x.add( 3 ), y ) )
+	);
+
+	const colorsTexture = batchMesh._colorsTexture;
+
+	if ( colorsTexture !== null ) {
+
+		const color = getBatchingColor( colorsTexture, indirectId );
+
+		batchColor.assign( color );
+
+	}
+
+	const bm = mat3( batchingMatrix );
+
+	positionLocal.assign( batchingMatrix.mul( positionLocal ) );
+
+	const transformedNormal = normalLocal.div( vec3( bm[ 0 ].dot( bm[ 0 ] ), bm[ 1 ].dot( bm[ 1 ] ), bm[ 2 ].dot( bm[ 2 ] ) ) );
+
+	const batchingNormal = bm.mul( transformedNormal ).xyz;
+
+	normalLocal.assign( batchingNormal );
+
+	if ( builder.hasGeometryAttribute( 'tangent' ) ) {
+
+		tangentLocal.mulAssign( bm );
+
+	}
+
+}, 'void' );
+
+

package/src/nodes/accessors/Bitangent.js

@@ -2,7 +2,7 @@ import { Fn } from '../tsl/TSLCore.js';
 import { normalGeometry, normalLocal, normalView, normalWorld } from './Normal.js';
 import { tangentGeometry, tangentLocal, tangentView, tangentWorld } from './Tangent.js';
 import { bitangentViewFrame } from './TangentUtils.js';
-import { directionToFaceDirection } from '../display/FrontFacingNode.js';
+import { negateOnBackSide } from '../display/FrontFacingNode.js';
 
 /**
  * Returns the bitangent node and assigns it to a varying if the material is not flat shaded.
@@ -13,11 +13,11 @@ import { directionToFaceDirection } from '../display/FrontFacingNode.js';
  * @param {string} varyingName - The name of the varying to assign the bitangent to.
  * @returns {Node<vec3>} The bitangent node.
  */
-const getBitangent = /*@__PURE__*/ Fn( ( [ crossNormalTangent, varyingName ], { subBuildFn, material } ) => {
+const getBitangent = /*@__PURE__*/ Fn( ( [ crossNormalTangent, varyingName ], builder ) => {
 
 	let bitangent = crossNormalTangent.mul( tangentGeometry.w ).xyz;
 
-	if ( subBuildFn === 'NORMAL' && material.flatShading !== true ) {
+	if ( builder.subBuildFn === 'NORMAL' && builder.isFlatShading() !== true ) {
 
 		bitangent = bitangent.toVarying( varyingName );
 
@@ -49,11 +49,11 @@ export const bitangentLocal = /*@__PURE__*/ getBitangent( normalLocal.cross( tan
  * @tsl
  * @type {Node<vec3>}
  */
-export const bitangentView = /*@__PURE__*/ ( Fn( ( { subBuildFn, geometry, material } ) => {
+export const bitangentView = /*@__PURE__*/ ( Fn( ( builder ) => {
 
 	let node;
 
-	if ( subBuildFn === 'VERTEX' || geometry.hasAttribute( 'tangent' ) ) {
+	if ( builder.subBuildFn === 'VERTEX' || builder.geometry.hasAttribute( 'tangent' ) ) {
 
 		node = getBitangent( normalView.cross( tangentView ), 'v_bitangentView' ).normalize();
 
@@ -63,9 +63,9 @@ export const bitangentView = /*@__PURE__*/ ( Fn( ( { subBuildFn, geometry, mater
 
 	}
 
-	if ( material.flatShading !== true ) {
+	if ( builder.isFlatShading() !== true ) {
 
-		node = directionToFaceDirection( node );
+		node = negateOnBackSide( node );
 
 	}