Skip to content
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
19 changes: 0 additions & 19 deletions src/nodes/accessors/StorageBufferNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { varying } from '../tsl/TSLBase.js';
import { storageElement } from '../utils/StorageArrayElementNode.js';
import { NodeAccess } from '../core/constants.js';
import { getTypeFromLength } from '../core/NodeUtils.js';
import { warn } from '../../utils.js';

/**
* This node is used in context of compute shaders and allows to define a
Expand Down Expand Up @@ -398,21 +397,3 @@ export default StorageBufferNode;
* @returns {StorageBufferNode}
*/
export const storage = ( value, type = null, count = 0 ) => new StorageBufferNode( value, type, count );

/**
* @tsl
* @function
* @deprecated since r171. Use `storage().setPBO( true )` instead.
*
* @param {StorageBufferAttribute|StorageInstancedBufferAttribute|BufferAttribute} value - The buffer data.
* @param {?string} type - The buffer type (e.g. `'vec3'`).
* @param {number} count - The buffer count.
* @returns {StorageBufferNode}
*/
export const storageObject = ( value, type, count ) => { // @deprecated, r171

warn( 'TSL: "storageObject()" is deprecated. Use "storage().setPBO( true )" instead.' );

return storage( value, type, count ).setPBO( true );

};
15 changes: 0 additions & 15 deletions src/nodes/accessors/TextureNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -605,21 +605,6 @@ class TextureNode extends UniformNode {

// @TODO: Move to TSL

/**
* @function
* @deprecated since r172. Use {@link TextureNode#sample} instead.
*
* @param {Node} uvNode - The uv node.
* @return {TextureNode} A texture node representing the texture sample.
*/
uv( uvNode ) { // @deprecated, r172

warn( 'TextureNode: .uv() has been renamed. Use .sample() instead.' );

return this.sample( uvNode );

}

/**
* Samples the texture with the given uv node.
*
Expand Down
64 changes: 0 additions & 64 deletions src/nodes/display/BlendModes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Fn, If, vec4 } from '../tsl/TSLBase.js';
import { mix, min, step } from '../math/MathNode.js';
import { warn } from '../../utils.js';

/**
* Represents a "Color Burn" blend mode.
Expand Down Expand Up @@ -170,66 +169,3 @@ export const unpremultiplyAlpha = /*@__PURE__*/ Fn( ( [ color ] ) => {
return vec4( color.rgb.div( color.a ), color.a );

}, { color: 'vec4', return: 'vec4' } );


// Deprecated

/**
* @tsl
* @function
* @deprecated since r171. Use {@link blendBurn} instead.
*
* @param {...any} params
* @returns {Function}
*/
export const burn = ( ...params ) => { // @deprecated, r171

warn( 'TSL: "burn" has been renamed. Use "blendBurn" instead.' );
return blendBurn( params );

};

/**
* @tsl
* @function
* @deprecated since r171. Use {@link blendDodge} instead.
*
* @param {...any} params
* @returns {Function}
*/
export const dodge = ( ...params ) => { // @deprecated, r171

warn( 'TSL: "dodge" has been renamed. Use "blendDodge" instead.' );
return blendDodge( params );

};

/**
* @tsl
* @function
* @deprecated since r171. Use {@link blendScreen} instead.
*
* @param {...any} params
* @returns {Function}
*/
export const screen = ( ...params ) => { // @deprecated, r171

warn( 'TSL: "screen" has been renamed. Use "blendScreen" instead.' );
return blendScreen( params );

};

/**
* @tsl
* @function
* @deprecated since r171. Use {@link blendOverlay} instead.
*
* @param {...any} params
* @returns {Function}
*/
export const overlay = ( ...params ) => { // @deprecated, r171

warn( 'TSL: "overlay" has been renamed. Use "blendOverlay" instead.' );
return blendOverlay( params );

};
36 changes: 0 additions & 36 deletions src/nodes/fog/Fog.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { positionView } from '../accessors/Position.js';
import { smoothstep } from '../math/MathNode.js';
import { Fn, output, vec4 } from '../tsl/TSLBase.js';
import { warn } from '../../utils.js';

/**
* Returns a node that represents the `z` coordinate in view space
Expand Down Expand Up @@ -77,38 +76,3 @@ export const fog = Fn( ( [ color, factor ] ) => {
return vec4( factor.toFloat().mix( output.rgb, color.toVec3() ), output.a );

} );

// Deprecated

/**
* @tsl
* @function
* @deprecated since r171. Use `fog( color, rangeFogFactor( near, far ) )` instead.
*
* @param {Node} color
* @param {Node} near
* @param {Node} far
* @returns {Function}
*/
export function rangeFog( color, near, far ) { // @deprecated, r171

warn( 'TSL: "rangeFog( color, near, far )" is deprecated. Use "fog( color, rangeFogFactor( near, far ) )" instead.' );
return fog( color, rangeFogFactor( near, far ) );

}

/**
* @tsl
* @function
* @deprecated since r171. Use `fog( color, densityFogFactor( density ) )` instead.
*
* @param {Node} color
* @param {Node} density
* @returns {Function}
*/
export function densityFog( color, density ) { // @deprecated, r171

warn( 'TSL: "densityFog( color, density )" is deprecated. Use "fog( color, densityFogFactor( density ) )" instead.' );
return fog( color, densityFogFactor( density ) );

}
7 changes: 0 additions & 7 deletions src/nodes/lighting/ShadowNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { resetRendererAndSceneState, restoreRendererAndSceneState } from '../../
import { getDataFromObject } from '../core/NodeUtils.js';
import { getShadowMaterial, disposeShadowMaterial, BasicShadowFilter, PCFShadowFilter, PCFSoftShadowFilter, VSMShadowFilter } from './ShadowFilterNode.js';
import ChainMap from '../../renderers/common/ChainMap.js';
import { warn } from '../../utils.js';
import { textureSize } from '../accessors/TextureSizeNode.js';
import { uv } from '../accessors/UV.js';

Expand Down Expand Up @@ -604,12 +603,6 @@ class ShadowNode extends ShadowBaseNode {

}

if ( builder.material.shadowNode ) { // @deprecated, r171

warn( 'NodeMaterial: ".shadowNode" is deprecated. Use ".castShadowNode" instead.' );

}

if ( builder.material.receivedShadowNode ) {

node = builder.material.receivedShadowNode( node );
Expand Down
39 changes: 1 addition & 38 deletions src/nodes/math/MathNode.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import TempNode from '../core/TempNode.js';
import { sub, mul, div, mod, equal } from './OperatorNode.js';
import { sub, mul, div, mod } from './OperatorNode.js';
import { addMethodChaining, nodeObject, nodeProxyIntent, float, vec2, vec3, vec4, Fn } from '../tsl/TSLCore.js';
import { WebGLCoordinateSystem, WebGPUCoordinateSystem } from '../../constants.js';
import { warn } from '../../utils.js';
Expand Down Expand Up @@ -784,23 +784,6 @@ export const inverse = /*@__PURE__*/ nodeProxyIntent( MathNode, MathNode.INVERSE

// 2 inputs

/**
* Returns `true` if `x` equals `y`.
*
* @tsl
* @function
* @param {Node | number} x - The first parameter.
* @param {Node | number} y - The second parameter.
* @deprecated since r175. Use {@link equal} instead.
* @returns {Node<bool>}
*/
export const equals = ( x, y ) => { // @deprecated, r172

warn( 'TSL: "equals" is deprecated. Use "equal" inside a vector instead, like: "bvec*( equal( ... ) )"' );
return equal( x, y );

};

/**
* Returns the least of the given values.
*
Expand Down Expand Up @@ -1081,24 +1064,6 @@ export const smoothstepElement = ( x, low, high ) => smoothstep( low, high, x );
*/
export const stepElement = ( x, edge ) => step( edge, x );

/**
* Returns the arc-tangent of the quotient of its parameters.
*
* @tsl
* @function
* @deprecated since r172. Use {@link atan} instead.
*
* @param {Node | number} y - The y parameter.
* @param {Node | number} x - The x parameter.
* @returns {Node}
*/
export const atan2 = ( y, x ) => { // @deprecated, r172

warn( 'TSL: "atan2" is overloaded. Use "atan" instead.' );
return atan( y, x );

};

// GLSL alias function

export const faceforward = faceForward;
Expand All @@ -1108,7 +1073,6 @@ export const inversesqrt = inverseSqrt;

addMethodChaining( 'all', all );
addMethodChaining( 'any', any );
addMethodChaining( 'equals', equals );

addMethodChaining( 'radians', radians );
addMethodChaining( 'degrees', degrees );
Expand Down Expand Up @@ -1140,7 +1104,6 @@ addMethodChaining( 'round', round );
addMethodChaining( 'reciprocal', reciprocal );
addMethodChaining( 'trunc', trunc );
addMethodChaining( 'fwidth', fwidth );
addMethodChaining( 'atan2', atan2 );
addMethodChaining( 'min', min );
addMethodChaining( 'max', max );
addMethodChaining( 'step', stepElement );
Expand Down
22 changes: 2 additions & 20 deletions src/renderers/WebGLRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3172,27 +3172,9 @@ class WebGLRenderer {
* @param {?(Box2|Box3)} [srcRegion=null] - A bounding box which describes the source region. Can be two or three-dimensional.
* @param {?(Vector2|Vector3)} [dstPosition=null] - A vector that represents the origin of the destination region. Can be two or three-dimensional.
* @param {number} [srcLevel=0] - The source mipmap level to copy.
* @param {?number} [dstLevel=null] - The destination mipmap level.
* @param {?number} [dstLevel=0] - The destination mipmap level.
*/
this.copyTextureToTexture = function ( srcTexture, dstTexture, srcRegion = null, dstPosition = null, srcLevel = 0, dstLevel = null ) {

// support the previous signature with just a single dst mipmap level
if ( dstLevel === null ) {

if ( srcLevel !== 0 ) {

// @deprecated, r171
warnOnce( 'WebGLRenderer: copyTextureToTexture function signature has changed to support src and dst mipmap levels.' );
dstLevel = srcLevel;
srcLevel = 0;

} else {

dstLevel = 0;

}

}
this.copyTextureToTexture = function ( srcTexture, dstTexture, srcRegion = null, dstPosition = null, srcLevel = 0, dstLevel = 0 ) {

// gather the necessary dimensions to copy
let width, height, depth, minX, minY, minZ;
Expand Down