diff --git a/examples/jsm/nodes/core/NodeBuilder.js b/examples/jsm/nodes/core/NodeBuilder.js index 9fe8a62c746eee..4d0e90e37dfae4 100644 --- a/examples/jsm/nodes/core/NodeBuilder.js +++ b/examples/jsm/nodes/core/NodeBuilder.js @@ -15,7 +15,7 @@ import { ColorNodeUniform, Matrix3NodeUniform, Matrix4NodeUniform } from '../../renderers/common/nodes/NodeUniform.js'; -import { REVISION, RenderTarget, NoColorSpace, LinearEncoding, sRGBEncoding, SRGBColorSpace, Color, Vector2, Vector3, Vector4, Float16BufferAttribute } from 'three'; +import { REVISION, RenderTarget, NoColorSpace, Color, Vector2, Vector3, Vector4, Float16BufferAttribute } from 'three'; import { stack } from './StackNode.js'; import { getCurrentStack, setCurrentStack } from '../shadernode/ShaderNode.js'; @@ -472,14 +472,6 @@ class NodeBuilder { } - /** @deprecated, r152 */ - getTextureEncodingFromMap( map ) { - - console.warn( 'THREE.NodeBuilder: Method .getTextureEncodingFromMap replaced by .getTextureColorSpaceFromMap in r152+.' ); - return this.getTextureColorSpaceFromMap( map ) === SRGBColorSpace ? sRGBEncoding : LinearEncoding; - - } - getTextureColorSpaceFromMap( map ) { let colorSpace; diff --git a/src/constants.js b/src/constants.js index 095489dd7abfc6..80eb8ff396c1da 100644 --- a/src/constants.js +++ b/src/constants.js @@ -148,10 +148,6 @@ export const AdditiveAnimationBlendMode = 2501; export const TrianglesDrawMode = 0; export const TriangleStripDrawMode = 1; export const TriangleFanDrawMode = 2; -/** @deprecated Use LinearSRGBColorSpace or NoColorSpace in three.js r152+. */ -export const LinearEncoding = 3000; -/** @deprecated Use SRGBColorSpace in three.js r152+. */ -export const sRGBEncoding = 3001; export const BasicDepthPacking = 3200; export const RGBADepthPacking = 3201; export const TangentSpaceNormalMap = 0; diff --git a/src/core/RenderTarget.js b/src/core/RenderTarget.js index 675fa29b49c5d2..3b8758e0aa03b8 100644 --- a/src/core/RenderTarget.js +++ b/src/core/RenderTarget.js @@ -1,9 +1,8 @@ import { EventDispatcher } from './EventDispatcher.js'; import { Texture } from '../textures/Texture.js'; -import { LinearFilter, NoColorSpace, SRGBColorSpace, sRGBEncoding } from '../constants.js'; +import { LinearFilter } from '../constants.js'; import { Vector4 } from '../math/Vector4.js'; import { Source } from '../textures/Source.js'; -import { warnOnce } from '../utils.js'; /* In options, we can specify: @@ -29,14 +28,6 @@ class RenderTarget extends EventDispatcher { const image = { width: width, height: height, depth: 1 }; - if ( options.encoding !== undefined ) { - - // @deprecated, r152 - warnOnce( 'THREE.WebGLRenderTarget: option.encoding has been replaced by option.colorSpace.' ); - options.colorSpace = options.encoding === sRGBEncoding ? SRGBColorSpace : NoColorSpace; - - } - options = Object.assign( { generateMipmaps: false, internalFormat: null, diff --git a/src/loaders/DataTextureLoader.js b/src/loaders/DataTextureLoader.js index 6616f375ec2c77..8a730ba06ed457 100644 --- a/src/loaders/DataTextureLoader.js +++ b/src/loaders/DataTextureLoader.js @@ -75,10 +75,6 @@ class DataTextureLoader extends Loader { texture.colorSpace = texData.colorSpace; - } else if ( texData.encoding !== undefined ) { // @deprecated, r152 - - texture.encoding = texData.encoding; - } if ( texData.flipY !== undefined ) { diff --git a/src/loaders/ObjectLoader.js b/src/loaders/ObjectLoader.js index 65a561475f9c6d..353de39261a627 100644 --- a/src/loaders/ObjectLoader.js +++ b/src/loaders/ObjectLoader.js @@ -659,7 +659,6 @@ class ObjectLoader extends Loader { if ( data.internalFormat !== undefined ) texture.internalFormat = data.internalFormat; if ( data.type !== undefined ) texture.type = data.type; if ( data.colorSpace !== undefined ) texture.colorSpace = data.colorSpace; - if ( data.encoding !== undefined ) texture.encoding = data.encoding; // @deprecated, r152 if ( data.minFilter !== undefined ) texture.minFilter = parseConstant( data.minFilter, TEXTURE_FILTER ); if ( data.magFilter !== undefined ) texture.magFilter = parseConstant( data.magFilter, TEXTURE_FILTER ); diff --git a/src/objects/Mesh.js b/src/objects/Mesh.js index 38b07c6fa781bf..dd3288d410bcc1 100644 --- a/src/objects/Mesh.js +++ b/src/objects/Mesh.js @@ -388,7 +388,6 @@ function checkGeometryIntersection( object, material, raycaster, ray, uv, uv1, n _uvC.fromBufferAttribute( uv1, c ); intersection.uv1 = Triangle.getInterpolation( _intersectionPoint, _vA, _vB, _vC, _uvA, _uvB, _uvC, new Vector2() ); - intersection.uv2 = intersection.uv1; // @deprecated, r152 } diff --git a/src/renderers/WebGLCubeRenderTarget.js b/src/renderers/WebGLCubeRenderTarget.js index a3271ed0d76f87..7d59d87e9731b8 100644 --- a/src/renderers/WebGLCubeRenderTarget.js +++ b/src/renderers/WebGLCubeRenderTarget.js @@ -1,4 +1,4 @@ -import { BackSide, LinearFilter, LinearMipmapLinearFilter, NoBlending, NoColorSpace, SRGBColorSpace, sRGBEncoding } from '../constants.js'; +import { BackSide, LinearFilter, LinearMipmapLinearFilter, NoBlending } from '../constants.js'; import { Mesh } from '../objects/Mesh.js'; import { BoxGeometry } from '../geometries/BoxGeometry.js'; import { ShaderMaterial } from '../materials/ShaderMaterial.js'; @@ -6,7 +6,6 @@ import { cloneUniforms } from './shaders/UniformsUtils.js'; import { WebGLRenderTarget } from './WebGLRenderTarget.js'; import { CubeCamera } from '../cameras/CubeCamera.js'; import { CubeTexture } from '../textures/CubeTexture.js'; -import { warnOnce } from '../utils.js'; class WebGLCubeRenderTarget extends WebGLRenderTarget { @@ -19,14 +18,6 @@ class WebGLCubeRenderTarget extends WebGLRenderTarget { const image = { width: size, height: size, depth: 1 }; const images = [ image, image, image, image, image, image ]; - if ( options.encoding !== undefined ) { - - // @deprecated, r152 - warnOnce( 'THREE.WebGLCubeRenderTarget: option.encoding has been replaced by option.colorSpace.' ); - options.colorSpace = options.encoding === sRGBEncoding ? SRGBColorSpace : NoColorSpace; - - } - this.texture = new CubeTexture( images, options.mapping, options.wrapS, options.wrapT, options.magFilter, options.minFilter, options.format, options.type, options.anisotropy, options.colorSpace ); // By convention -- likely based on the RenderMan spec from the 1990's -- cube maps are specified by WebGL (and three.js) diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index aae548d8df6e46..fe96c5b5be5d13 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -11,8 +11,6 @@ import { LinearMipmapLinearFilter, SRGBColorSpace, LinearSRGBColorSpace, - sRGBEncoding, - LinearEncoding, RGBAIntegerFormat, RGIntegerFormat, RedIntegerFormat, @@ -2576,20 +2574,6 @@ class WebGLRenderer { } - get outputEncoding() { // @deprecated, r152 - - console.warn( 'THREE.WebGLRenderer: Property .outputEncoding has been removed. Use .outputColorSpace instead.' ); - return this.outputColorSpace === SRGBColorSpace ? sRGBEncoding : LinearEncoding; - - } - - set outputEncoding( encoding ) { // @deprecated, r152 - - console.warn( 'THREE.WebGLRenderer: Property .outputEncoding has been removed. Use .outputColorSpace instead.' ); - this.outputColorSpace = encoding === sRGBEncoding ? SRGBColorSpace : LinearSRGBColorSpace; - - } - get useLegacyLights() { // @deprecated, r155 console.warn( 'THREE.WebGLRenderer: The property .useLegacyLights has been deprecated. Migrate your lighting according to the following guide: https://discourse.threejs.org/t/updates-to-lighting-in-three-js-r155/53733.' ); diff --git a/src/textures/Texture.js b/src/textures/Texture.js index 772056ba7b62be..bca2b5950e0098 100644 --- a/src/textures/Texture.js +++ b/src/textures/Texture.js @@ -8,16 +8,12 @@ import { LinearMipmapLinearFilter, LinearFilter, UVMapping, - sRGBEncoding, - SRGBColorSpace, NoColorSpace, - LinearEncoding } from '../constants.js'; import * as MathUtils from '../math/MathUtils.js'; import { Vector2 } from '../math/Vector2.js'; import { Matrix3 } from '../math/Matrix3.js'; import { Source } from './Source.js'; -import { warnOnce } from '../utils.js'; let _textureId = 0; @@ -66,17 +62,7 @@ class Texture extends EventDispatcher { this.flipY = true; this.unpackAlignment = 4; // valid values: 1, 2, 4, 8 (see http://www.khronos.org/opengles/sdk/docs/man/xhtml/glPixelStorei.xml) - if ( typeof colorSpace === 'string' ) { - - this.colorSpace = colorSpace; - - } else { // @deprecated, r152 - - warnOnce( 'THREE.Texture: Property .encoding has been replaced by .colorSpace.' ); - this.colorSpace = colorSpace === sRGBEncoding ? SRGBColorSpace : NoColorSpace; - - } - + this.colorSpace = colorSpace; this.userData = {}; @@ -315,20 +301,6 @@ class Texture extends EventDispatcher { } - get encoding() { // @deprecated, r152 - - warnOnce( 'THREE.Texture: Property .encoding has been replaced by .colorSpace.' ); - return this.colorSpace === SRGBColorSpace ? sRGBEncoding : LinearEncoding; - - } - - set encoding( encoding ) { // @deprecated, r152 - - warnOnce( 'THREE.Texture: Property .encoding has been replaced by .colorSpace.' ); - this.colorSpace = encoding === sRGBEncoding ? SRGBColorSpace : NoColorSpace; - - } - } Texture.DEFAULT_IMAGE = null;