Skip to content
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.

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

Remove deprecated code. #28068

Merged
merged 1 commit into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions examples/jsm/nodes/code/FunctionNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,4 @@ const nativeFn = ( code, includes = [], language = '' ) => {
export const glslFn = ( code, includes ) => nativeFn( code, includes, 'glsl' );
export const wgslFn = ( code, includes ) => nativeFn( code, includes, 'wgsl' );

export const func = ( code, includes ) => { // @deprecated, r154

console.warn( 'TSL: func() is deprecated. Use nativeFn(), wgslFn() or glslFn() instead.' );

return nodeObject( new FunctionNode( code, includes ) );

};

addNodeClass( 'FunctionNode', FunctionNode );
8 changes: 0 additions & 8 deletions examples/jsm/nodes/shadernode/ShaderNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -474,14 +474,6 @@ export const nodeArray = ( val, altType = null ) => new ShaderNodeArray( val, al
export const nodeProxy = ( ...params ) => new ShaderNodeProxy( ...params );
export const nodeImmutable = ( ...params ) => new ShaderNodeImmutable( ...params );

export const shader = ( jsFunc ) => { // @deprecated, r154

console.warn( 'TSL: shader() is deprecated. Use tslFn() instead.' );

return new ShaderNode( jsFunc );

};

export const tslFn = ( jsFunc ) => {

const shaderNode = new ShaderNode( jsFunc );
Expand Down
6 changes: 1 addition & 5 deletions src/renderers/webgl/WebGLProgram.js
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,7 @@ function resolveIncludes( string ) {

}

const shaderChunkMap = new Map( [
[ 'encodings_fragment', 'colorspace_fragment' ], // @deprecated, r154
[ 'encodings_pars_fragment', 'colorspace_pars_fragment' ], // @deprecated, r154
[ 'output_fragment', 'opaque_fragment' ], // @deprecated, r154
] );
const shaderChunkMap = new Map();

function includeReplacer( match, include ) {

Expand Down