Skip to content

Commit 86a663d

Browse files
authored
TSL: New color space name functions (#29259)
1 parent da92cd4 commit 86a663d

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

src/nodes/TSL.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export * from './accessors/VelocityNode.js';
8585
export * from './display/BlendMode.js';
8686
export { default as BumpMapNode, bumpMap } from './display/BumpMapNode.js';
8787
export * from './display/ColorAdjustment.js';
88-
export { default as ColorSpaceNode, linearSRGBToColorSpace, colorSpaceToLinearSRGB } from './display/ColorSpaceNode.js';
88+
export { default as ColorSpaceNode, toOutputColorSpace, toWorkingColorSpace } from './display/ColorSpaceNode.js';
8989
export { default as FrontFacingNode, frontFacing, faceDirection } from './display/FrontFacingNode.js';
9090
export { default as NormalMapNode, normalMap } from './display/NormalMapNode.js';
9191
export { default as PosterizeNode, posterize } from './display/PosterizeNode.js';

src/nodes/accessors/TextureNode.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { registerNode } from '../core/Node.js';
22
import UniformNode, { uniform } from '../core/UniformNode.js';
33
import { uv } from './UV.js';
44
import { textureSize } from './TextureSizeNode.js';
5-
import { colorSpaceToLinearSRGB } from '../display/ColorSpaceNode.js';
5+
import { toWorkingColorSpace } from '../display/ColorSpaceNode.js';
66
import { expression } from '../code/ExpressionNode.js';
77
import { maxMipLevel } from '../utils/MaxMipLevelNode.js';
88
import { nodeProxy, vec3, nodeObject } from '../tsl/TSLBase.js';
@@ -274,9 +274,9 @@ class TextureNode extends UniformNode {
274274
let snippet = propertyName;
275275
const nodeType = this.getNodeType( builder );
276276

277-
if ( builder.needsColorSpaceToLinearSRGB( texture ) ) {
277+
if ( builder.needsToWorkingColorSpace( texture ) ) {
278278

279-
snippet = colorSpaceToLinearSRGB( expression( snippet, nodeType ), texture.colorSpace ).setup( builder ).build( builder, nodeType );
279+
snippet = toWorkingColorSpace( expression( snippet, nodeType ), texture.colorSpace ).setup( builder ).build( builder, nodeType );
280280

281281
}
282282

src/nodes/core/NodeBuilder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ class NodeBuilder {
605605

606606
}
607607

608-
needsColorSpaceToLinearSRGB( /*texture*/ ) {
608+
needsToWorkingColorSpace( /*texture*/ ) {
609609

610610
return false;
611611

src/nodes/display/ColorSpaceNode.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ export default ColorSpaceNode;
7878

7979
ColorSpaceNode.type = /*@__PURE__*/ registerNode( 'ColorSpace', ColorSpaceNode );
8080

81-
export const linearSRGBToColorSpace = ( node, colorSpace = null ) => nodeObject( new ColorSpaceNode( nodeObject( node ), colorSpace, LinearSRGBColorSpace ) );
82-
export const colorSpaceToLinearSRGB = ( node, colorSpace = null ) => nodeObject( new ColorSpaceNode( nodeObject( node ), LinearSRGBColorSpace, colorSpace ) );
81+
export const toOutputColorSpace = ( node, colorSpace = null ) => nodeObject( new ColorSpaceNode( nodeObject( node ), colorSpace, LinearSRGBColorSpace ) );
82+
export const toWorkingColorSpace = ( node, colorSpace = null ) => nodeObject( new ColorSpaceNode( nodeObject( node ), LinearSRGBColorSpace, colorSpace ) );
8383

84-
addMethodChaining( 'linearSRGBToColorSpace', linearSRGBToColorSpace );
85-
addMethodChaining( 'colorSpaceToLinearSRGB', colorSpaceToLinearSRGB );
84+
addMethodChaining( 'toOutputColorSpace', toOutputColorSpace );
85+
addMethodChaining( 'toWorkingColorSpace', toWorkingColorSpace );

src/nodes/display/RenderOutputNode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class RenderOutputNode extends TempNode {
3737

3838
if ( outputColorSpace === SRGBColorSpace ) {
3939

40-
outputNode = outputNode.linearSRGBToColorSpace( outputColorSpace );
40+
outputNode = outputNode.toOutputColorSpace( outputColorSpace );
4141

4242
}
4343

src/renderers/webgpu/nodes/WGSLNodeBuilder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class WGSLNodeBuilder extends NodeBuilder {
163163

164164
}
165165

166-
needsColorSpaceToLinearSRGB( texture ) {
166+
needsToWorkingColorSpace( texture ) {
167167

168168
return texture.isVideoTexture === true && texture.colorSpace !== NoColorSpace;
169169

0 commit comments

Comments
 (0)