diff --git a/docs/api/en/constants/Textures.html b/docs/api/en/constants/Textures.html index 5ddf43c700e5d1..8383f66b530b36 100644 --- a/docs/api/en/constants/Textures.html +++ b/docs/api/en/constants/Textures.html @@ -151,7 +151,6 @@

Formats

THREE.RGBAIntegerFormat THREE.LuminanceFormat THREE.LuminanceAlphaFormat - THREE.RGBEFormat THREE.DepthFormat THREE.DepthStencilFormat @@ -199,8 +198,6 @@

Formats

The same process occurs as for the [page:constant LuminanceFormat], except that the alpha channel may have values other than *1.0*.

- [page:constant RGBEFormat] is identical to [page:constant RGBAFormat].

- [page:constant DepthFormat] reads each element as a single depth value, converts it to floating point, and clamps to the range [0,1]. This is the default for [page:DepthTexture DepthTexture].

@@ -560,7 +557,6 @@

Encoding

THREE.LinearEncoding THREE.sRGBEncoding THREE.GammaEncoding - THREE.RGBEEncoding THREE.BasicDepthPacking THREE.RGBADepthPacking diff --git a/docs/api/en/extras/PMREMGenerator.html b/docs/api/en/extras/PMREMGenerator.html index 1d4f0d67094933..1754bf12b13cbc 100644 --- a/docs/api/en/extras/PMREMGenerator.html +++ b/docs/api/en/extras/PMREMGenerator.html @@ -42,7 +42,7 @@

[method:WebGLRenderTarget fromEquirectangular]( [param:Texture equirectangul

[page:Texture equirectangular] - The equirectangular texture.

- Generates a PMREM from an equirectangular texture, which can be either LDR (RGBFormat) or HDR (RGBEFormat). + Generates a PMREM from an equirectangular texture, which can be either LDR or HDR. The ideal input image size is 1k (1024 x 512), as this matches best with the 256 x 256 cubemap output.

@@ -50,7 +50,7 @@

[method:WebGLRenderTarget fromCubemap]( [param:CubeTexture cubemap] )

[page:CubeTexture cubemap] - The cubemap texture.

- Generates a PMREM from an cubemap texture, which can be either LDR (RGBFormat) or HDR (RGBEFormat). + Generates a PMREM from an cubemap texture, which can be either LDR or HDR. The ideal input cube size is 256 x 256, as this matches best with the 256 x 256 cubemap output.

diff --git a/docs/api/ko/constants/Textures.html b/docs/api/ko/constants/Textures.html index 0e387e1a2fafd8..498edbb6289f79 100644 --- a/docs/api/ko/constants/Textures.html +++ b/docs/api/ko/constants/Textures.html @@ -148,7 +148,6 @@

포맷

THREE.RGBAIntegerFormat THREE.LuminanceFormat THREE.LuminanceAlphaFormat - THREE.RGBEFormat THREE.DepthFormat THREE.DepthStencilFormat @@ -195,8 +194,6 @@

포맷

The same process occurs as for the [page:constant LuminanceFormat]와 같은 절차가 이루어지며, 알파 채널에 *1.0* 이외의 값이 들어갈 수 있다는 점만 다릅니다.

- [page:constant RGBEFormat]은 [page:constant RGBAFormat]과 동일합니다..

- [page:constant DepthFormat]은 각 요소를 단일 깊이 값으로 일거들이며 부동 소수점으로 변환하고, [0,1]범위에 고정합니다. [page:DepthTexture DepthTexture]의 기본값이기도 합니다.

@@ -554,7 +551,6 @@

인코딩

THREE.LinearEncoding THREE.sRGBEncoding THREE.GammaEncoding - THREE.RGBEEncoding THREE.BasicDepthPacking THREE.RGBADepthPacking diff --git a/docs/api/ko/extras/PMREMGenerator.html b/docs/api/ko/extras/PMREMGenerator.html index 2dd845dcf77c98..e6f5a2b69cec1d 100644 --- a/docs/api/ko/extras/PMREMGenerator.html +++ b/docs/api/ko/extras/PMREMGenerator.html @@ -11,7 +11,7 @@

[name]

이 클래스는 큐브맵 환경 텍스처로부터 사전 필터링된 Mipmap Radiance Environment Map(PMREM)을 생성합니다. -이를 통해 재질의 거칠기에 따라 다양한 수준의 블러를 빠르게 적용할 수 있습니다. RGBE와 같은 비선형 형식을 지원할 수 있도록 사용자 지정 보간을 수행할 수 있는 특수 CubeUV 형식으로 포장되어 있습니다. +이를 통해 재질의 거칠기에 따라 다양한 수준의 블러를 빠르게 적용할 수 있습니다. RGBE와 같은 비선형 형식을 지원할 수 있도록 사용자 지정 보간을 수행할 수 있는 특수 CubeUV 형식으로 포장되어 있습니다. 기존의 mipmap 체인과는 달리, LOD_MIN 수준까지만 내려가며(위), 더 높은 거칠기 수준과 연관된 동일한 LOD_MIN 해상도에서 훨씬 더 많은 필터링된 'mips'를 생성합니다. 이러한 방법으로 샘플링 계산을 제한하면서 확산 조명을 부드럽게 보간하기 위한 해상도를 유지합니다.

@@ -40,7 +40,7 @@

[method:WebGLRenderTarget fromEquirectangular]( [param:Texture equirectangul

[page:Texture equirectangular] - 등장방형 텍스쳐입니다.

- LDR(RGBFormat) 또는 HDR(RGBEFormat)일 수 있는 등장방형 텍스처로부터 PMREM을 생성합니다. + LDR 또는 HDR일 수 있는 등장방형 텍스처로부터 PMREM을 생성합니다. 이상적인 입력 이미지 크기는 1k(1024 x 512)로, 256 x 256 큐브 맵 출력과 가장 잘 일치합니다.

@@ -48,7 +48,7 @@

[method:WebGLRenderTarget fromCubemap]( [param:CubeTexture cubemap] )

[page:CubeTexture cubemap] - 큐브맵 텍스쳐입니다.

- LDR(RGBFormat) 또는 HDR(RGBEFormat)일 수 있는 큐브맵 텍스처로부터 PMREM을 생성합니다. + LDR 또는 HDR일 수 있는 큐브맵 텍스처로부터 PMREM을 생성합니다. 이상적인 입력 이미지 크기는 1k(1024 x 512)로, 256 x 256 큐브 맵 출력과 가장 잘 일치합니다.

@@ -64,8 +64,8 @@

[method:undefined compileEquirectangularShader]()

[method:undefined dispose]()

- PMREM 제너레이터의 내장 메모리를 폐기합니다. - PMREMGenerator는 정적 클래스이므로 두 개 이상의 PMREMGenerator 개체가 필요하지 않습니다. + PMREM 제너레이터의 내장 메모리를 폐기합니다. + PMREMGenerator는 정적 클래스이므로 두 개 이상의 PMREMGenerator 개체가 필요하지 않습니다. 이 경우 둘 중 하나에 대해 dispose()를 호출하면 다른 항목도 사용할 수 없게 됩니다.

diff --git a/docs/api/zh/constants/Textures.html b/docs/api/zh/constants/Textures.html index 0133c641829900..436d8fab5f0249 100644 --- a/docs/api/zh/constants/Textures.html +++ b/docs/api/zh/constants/Textures.html @@ -141,7 +141,6 @@

格式

THREE.RGBAIntegerFormat THREE.LuminanceFormat THREE.LuminanceAlphaFormat - THREE.RGBEFormat THREE.DepthFormat THREE.DepthStencilFormat @@ -185,8 +184,6 @@

格式

[page:constant LuminanceAlphaFormat] 将每个元素同时作为亮度分量和Alpha分量来读取。 和上面[page:constant LuminanceFormat]的处理过程是一致的，除了Alpha分量具有除了*1.0*以外的值。

- [page:constant RGBEFormat] 与 [page:constant RGBAFormat] 是相同的。

- [page:constant DepthFormat]将每个元素作为单独的深度值来读取，将其转换为范围限制在[0,1]区间的浮点数。 它是[page:DepthTexture DepthTexture]的默认值。

@@ -549,7 +546,6 @@

编码

THREE.LinearEncoding THREE.sRGBEncoding THREE.GammaEncoding - THREE.RGBEEncoding THREE.BasicDepthPacking THREE.RGBADepthPacking diff --git a/docs/api/zh/extras/PMREMGenerator.html b/docs/api/zh/extras/PMREMGenerator.html index 310dfc309c88be..98576d94aa5783 100644 --- a/docs/api/zh/extras/PMREMGenerator.html +++ b/docs/api/zh/extras/PMREMGenerator.html @@ -42,7 +42,7 @@

[method:WebGLRenderTarget fromEquirectangular]( [param:Texture equirectangul

[page:Texture equirectangular] - The equirectangular texture.

- Generates a PMREM from an equirectangular texture, which can be either LDR (RGBFormat) or HDR (RGBEFormat). + Generates a PMREM from an equirectangular texture, which can be either LDR or HDR. The ideal input image size is 1k (1024 x 512), as this matches best with the 256 x 256 cubemap output.

@@ -50,7 +50,7 @@

[method:WebGLRenderTarget fromCubemap]( [param:CubeTexture cubemap] )

[page:CubeTexture cubemap] - The cubemap texture.

- Generates a PMREM from an cubemap texture, which can be either LDR (RGBFormat) or HDR (RGBEFormat). + Generates a PMREM from an cubemap texture, which can be either LDR or HDR. The ideal input cube size is 256 x 256, as this matches best with the 256 x 256 cubemap output.

diff --git a/editor/js/libs/ui.three.js b/editor/js/libs/ui.three.js index bc85373e4a5921..a5bdfd0bd8b2aa 100644 --- a/editor/js/libs/ui.three.js +++ b/editor/js/libs/ui.three.js @@ -56,7 +56,7 @@ class UITexture extends UISpan { // assuming RGBE/Radiance HDR iamge format - const loader = new RGBELoader().setDataType( THREE.FloatType ); + const loader = new RGBELoader(); loader.load( event.target.result, function ( hdrTexture ) { hdrTexture.sourceFile = file.name; diff --git a/examples/jsm/loaders/HDRCubeTextureLoader.js b/examples/jsm/loaders/HDRCubeTextureLoader.js index 84458ae3ebbfdc..d55fec78987d5d 100644 --- a/examples/jsm/loaders/HDRCubeTextureLoader.js +++ b/examples/jsm/loaders/HDRCubeTextureLoader.js @@ -7,11 +7,7 @@ import { LinearEncoding, LinearFilter, Loader, - NearestFilter, - RGBAFormat, - RGBEEncoding, - RGBFormat, - UnsignedByteType + RGBFormat } from '../../../build/three.module.js'; import { RGBELoader } from '../loaders/RGBELoader.js'; @@ -47,15 +43,6 @@ class HDRCubeTextureLoader extends Loader { switch ( texture.type ) { - case UnsignedByteType: - - texture.encoding = RGBEEncoding; - texture.format = RGBAFormat; - texture.minFilter = NearestFilter; - texture.magFilter = NearestFilter; - texture.generateMipmaps = false; - break; - case FloatType: texture.encoding = LinearEncoding; diff --git a/examples/jsm/loaders/RGBELoader.js b/examples/jsm/loaders/RGBELoader.js index 9edd8a48dbf5ea..b3df5301074ca7 100644 --- a/examples/jsm/loaders/RGBELoader.js +++ b/examples/jsm/loaders/RGBELoader.js @@ -5,11 +5,7 @@ import { HalfFloatType, LinearEncoding, LinearFilter, - NearestFilter, - RGBEEncoding, - RGBEFormat, RGBFormat, - UnsignedByteType } from '../../../build/three.module.js'; // https://github.com/mrdoob/three.js/issues/5552 @@ -378,13 +374,6 @@ class RGBELoader extends DataTextureLoader { switch ( this.type ) { - case UnsignedByteType: - - data = image_rgba_data; - format = RGBEFormat; // handled as THREE.RGBAFormat in shaders - type = UnsignedByteType; - break; - case FloatType: numElements = image_rgba_data.length / 4; @@ -455,15 +444,6 @@ class RGBELoader extends DataTextureLoader { switch ( texture.type ) { - case UnsignedByteType: - - texture.encoding = RGBEEncoding; - texture.minFilter = NearestFilter; - texture.magFilter = NearestFilter; - texture.generateMipmaps = false; - texture.flipY = true; - break; - case FloatType: texture.encoding = LinearEncoding; diff --git a/examples/jsm/nodes/utils/ColorSpaceNode.js b/examples/jsm/nodes/utils/ColorSpaceNode.js index c07c0401bdeba1..fb07bbcb257d20 100644 --- a/examples/jsm/nodes/utils/ColorSpaceNode.js +++ b/examples/jsm/nodes/utils/ColorSpaceNode.js @@ -1,7 +1,6 @@ import { GammaEncoding, LinearEncoding, - RGBEEncoding, sRGBEncoding } from '../../../../build/three.module.js'; @@ -143,33 +142,12 @@ ColorSpaceNode.Nodes = ( function () { }` ); - const RGBEToLinear = new FunctionNode( /* glsl */` - vec4 RGBEToLinear( in vec4 value ) { - - return vec4( value.rgb * exp2( value.a * 255.0 - 128.0 ), 1.0 ); - - }` - ); - - const LinearToRGBE = new FunctionNode( /* glsl */` - vec4 LinearToRGBE( in vec4 value ) { - - float maxComponent = max( max( value.r, value.g ), value.b ); - float fExp = clamp( ceil( log2( maxComponent ) ), -128.0, 127.0 ); - return vec4( value.rgb / exp2( fExp ), ( fExp + 128.0 ) / 255.0 ); - - }` - ); - - return { LinearToLinear: LinearToLinear, GammaToLinear: GammaToLinear, LinearToGamma: LinearToGamma, sRGBToLinear: sRGBToLinear, - LinearTosRGB: LinearTosRGB, - RGBEToLinear: RGBEToLinear, - LinearToRGBE: LinearToRGBE + LinearTosRGB: LinearTosRGB }; } )(); @@ -182,9 +160,6 @@ ColorSpaceNode.LINEAR_TO_GAMMA = 'LinearToGamma'; ColorSpaceNode.SRGB_TO_LINEAR = 'sRGBToLinear'; ColorSpaceNode.LINEAR_TO_SRGB = 'LinearTosRGB'; -ColorSpaceNode.RGBE_TO_LINEAR = 'RGBEToLinear'; -ColorSpaceNode.LINEAR_TO_RGBE = 'LinearToRGBE'; - ColorSpaceNode.getEncodingComponents = function ( encoding ) { switch ( encoding ) { @@ -193,8 +168,6 @@ ColorSpaceNode.getEncodingComponents = function ( encoding ) { return [ 'Linear' ]; case sRGBEncoding: return [ 'sRGB' ]; - case RGBEEncoding: - return [ 'RGBE' ]; case GammaEncoding: return [ 'Gamma', new ExpressionNode( 'float( GAMMA_FACTOR )', 'f' ) ]; diff --git a/examples/jsm/renderers/nodes/display/ColorSpaceNode.js b/examples/jsm/renderers/nodes/display/ColorSpaceNode.js index 8b0df5c3d5e16f..5e4257e285f3db 100644 --- a/examples/jsm/renderers/nodes/display/ColorSpaceNode.js +++ b/examples/jsm/renderers/nodes/display/ColorSpaceNode.js @@ -5,7 +5,7 @@ import { ShaderNode, lessThanEqual } from '../ShaderNode.js'; import { LinearEncoding, - sRGBEncoding/*, RGBEEncoding, GammaEncoding*/ } from '../../../../../build/three.module.js'; + sRGBEncoding/*, GammaEncoding*/ } from '../../../../../build/three.module.js'; export const LinearToLinear = new ShaderNode( ( inputs ) => { @@ -60,8 +60,6 @@ function getEncodingComponents( encoding ) { case sRGBEncoding: return [ 'sRGB' ]; /* - case RGBEEncoding: - return [ 'RGBE' ]; case GammaEncoding: return [ 'Gamma', new CodeNode( 'float( GAMMA_FACTOR )' ) ]; */ @@ -79,9 +77,6 @@ class ColorSpaceNode extends TempNode { /* static GAMMA_TO_LINEAR = 'GammaToLinear'; static LINEAR_TO_GAMMA = 'LinearToGamma'; - - static RGBE_TO_LINEAR = 'RGBEToLinear'; - static LINEAR_TO_RGBE = 'LinearToRGBE'; */ constructor( method, node ) { diff --git a/examples/misc_controls_arcball.html b/examples/misc_controls_arcball.html index f24cc6a93edefa..0446d7e853104a 100644 --- a/examples/misc_controls_arcball.html +++ b/examples/misc_controls_arcball.html @@ -143,7 +143,6 @@ render(); new RGBELoader() - .setDataType( THREE.UnsignedByteType ) .setPath( 'textures/equirectangular/' ) .load( 'venice_sunset_1k.hdr', function ( hdrEquirect ) { diff --git a/examples/webgl_loader_texture_hdr.html b/examples/webgl_loader_texture_hdr.html index 914336ddf50a91..bc76fe8a40d502 100644 --- a/examples/webgl_loader_texture_hdr.html +++ b/examples/webgl_loader_texture_hdr.html @@ -48,7 +48,6 @@ camera = new THREE.OrthographicCamera( - aspect, aspect, 1, - 1, 0, 1 ); new RGBELoader() - .setDataType( THREE.UnsignedByteType ) // alt: FloatType, HalfFloatType .load( 'textures/memorial.hdr', function ( texture, textureData ) { //console.log( textureData ); diff --git a/examples/webgl_materials_envmaps_hdr.html b/examples/webgl_materials_envmaps_hdr.html index c67db604db7252..ef903dd3a353e4 100644 --- a/examples/webgl_materials_envmaps_hdr.html +++ b/examples/webgl_materials_envmaps_hdr.html @@ -89,7 +89,6 @@ const hdrUrls = [ 'px.hdr', 'nx.hdr', 'py.hdr', 'ny.hdr', 'pz.hdr', 'nz.hdr' ]; hdrCubeMap = new HDRCubeTextureLoader() .setPath( './textures/cube/pisaHDR/' ) - .setDataType( THREE.UnsignedByteType ) .load( hdrUrls, function () { hdrCubeRenderTarget = pmremGenerator.fromCubemap( hdrCubeMap ); diff --git a/examples/webgl_materials_envmaps_hdr_nodes.html b/examples/webgl_materials_envmaps_hdr_nodes.html index 5c149cc16ca827..7c6275326a2e91 100644 --- a/examples/webgl_materials_envmaps_hdr_nodes.html +++ b/examples/webgl_materials_envmaps_hdr_nodes.html @@ -98,7 +98,6 @@ const hdrUrls = [ 'px.hdr', 'nx.hdr', 'py.hdr', 'ny.hdr', 'pz.hdr', 'nz.hdr' ]; hdrCubeMap = new HDRCubeTextureLoader() .setPath( './textures/cube/pisaHDR/' ) - .setDataType( THREE.UnsignedByteType ) .load( hdrUrls, function () { hdrCubeRenderTarget = pmremGenerator.fromCubemap( hdrCubeMap ); diff --git a/examples/webgl_materials_envmaps_pmrem_nodes.html b/examples/webgl_materials_envmaps_pmrem_nodes.html index 7c65cb70844cde..3cb29042d56dbd 100644 --- a/examples/webgl_materials_envmaps_pmrem_nodes.html +++ b/examples/webgl_materials_envmaps_pmrem_nodes.html @@ -106,7 +106,6 @@ const hdrUrls = [ 'px.hdr', 'nx.hdr', 'py.hdr', 'ny.hdr', 'pz.hdr', 'nz.hdr' ]; hdrCubeMap = new HDRCubeTextureLoader() .setPath( './textures/cube/pisaHDR/' ) - .setDataType( THREE.UnsignedByteType ) .load( hdrUrls, function () { hdrCubeRenderTarget = pmremGenerator.fromCubemap( hdrCubeMap ); diff --git a/examples/webgl_materials_standard_nodes.html b/examples/webgl_materials_standard_nodes.html index 05cd90694fdef4..a1e0db41583a9c 100644 --- a/examples/webgl_materials_standard_nodes.html +++ b/examples/webgl_materials_standard_nodes.html @@ -135,7 +135,6 @@ const filename = environments[ name ].filename; new RGBELoader() - .setDataType( THREE.UnsignedByteType ) .setPath( 'textures/equirectangular/' ) .load( filename, function ( hdrEquirect ) { diff --git a/examples/webgl_pmrem_test.html b/examples/webgl_pmrem_test.html index 31b2dd0eab5338..ffff5d30e00d78 100644 --- a/examples/webgl_pmrem_test.html +++ b/examples/webgl_pmrem_test.html @@ -127,7 +127,6 @@ let radianceMap = null; new RGBELoader() - .setDataType( THREE.UnsignedByteType ) // .setDataType( THREE.FloatType ) .setPath( 'textures/equirectangular/' ) .load( 'spot1Lux.hdr', function ( texture ) { diff --git a/examples/webxr_ar_lighting.html b/examples/webxr_ar_lighting.html index 3151e71201249a..0824864772601c 100644 --- a/examples/webxr_ar_lighting.html +++ b/examples/webxr_ar_lighting.html @@ -83,7 +83,6 @@ // new RGBELoader() - .setDataType( THREE.UnsignedByteType ) .setPath( 'textures/equirectangular/' ) .load( 'royal_esplanade_1k.hdr', function ( texture ) { diff --git a/src/constants.js b/src/constants.js index 23b6d8feef3e15..73d66af92ee9e2 100644 --- a/src/constants.js +++ b/src/constants.js @@ -91,7 +91,6 @@ export const RGBFormat = 1022; export const RGBAFormat = 1023; export const LuminanceFormat = 1024; export const LuminanceAlphaFormat = 1025; -export const RGBEFormat = RGBAFormat; export const DepthFormat = 1026; export const DepthStencilFormat = 1027; export const RedFormat = 1028; @@ -158,7 +157,6 @@ export const TriangleFanDrawMode = 2; export const LinearEncoding = 3000; export const sRGBEncoding = 3001; export const GammaEncoding = 3007; -export const RGBEEncoding = 3002; export const BasicDepthPacking = 3200; export const RGBADepthPacking = 3201; export const TangentSpaceNormalMap = 0; diff --git a/src/extras/PMREMGenerator.js b/src/extras/PMREMGenerator.js index b89ef1c9b240e6..6b9042209af9fe 100644 --- a/src/extras/PMREMGenerator.js +++ b/src/extras/PMREMGenerator.js @@ -7,7 +7,6 @@ import { LinearFilter, NoToneMapping, NoBlending, - RGBEEncoding, RGBAFormat, UnsignedByteType, sRGBEncoding, @@ -47,7 +46,6 @@ const MAX_SAMPLES = 20; const ENCODINGS = { [ LinearEncoding ]: 0, [ sRGBEncoding ]: 1, - [ RGBEEncoding ]: 2, [ GammaEncoding ]: 6 }; @@ -132,7 +130,7 @@ class PMREMGenerator { /** * Generates a PMREM from an equirectangular texture, which can be either LDR - * (RGBFormat) or HDR (RGBEFormat). The ideal input image size is 1k (1024 x 512), + * or HDR. The ideal input image size is 1k (1024 x 512), * as this matches best with the 256 x 256 cubemap output. */ fromEquirectangular( equirectangular ) { @@ -143,7 +141,7 @@ class PMREMGenerator { /** * Generates a PMREM from an cubemap texture, which can be either LDR - * (RGBFormat) or HDR (RGBEFormat). The ideal input cube size is 256 x 256, + * or HDR. The ideal input cube size is 256 x 256, * as this matches best with the 256 x 256 cubemap output. */ fromCubemap( cubemap ) { @@ -910,10 +908,6 @@ function _getEncodings() { return sRGBToLinear( value ); - } else if ( inputEncoding == 2 ) { - - return RGBEToLinear( value ); - } else { return GammaToLinear( value, 2.2 ); diff --git a/src/renderers/shaders/ShaderChunk/encodings_pars_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/encodings_pars_fragment.glsl.js index 806bdd9b5445bd..ad208608d69ed2 100644 --- a/src/renderers/shaders/ShaderChunk/encodings_pars_fragment.glsl.js +++ b/src/renderers/shaders/ShaderChunk/encodings_pars_fragment.glsl.js @@ -21,15 +21,4 @@ vec4 LinearTosRGB( in vec4 value ) { return vec4( mix( pow( value.rgb, vec3( 0.41666 ) ) * 1.055 - vec3( 0.055 ), value.rgb * 12.92, vec3( lessThanEqual( value.rgb, vec3( 0.0031308 ) ) ) ), value.a ); } -vec4 RGBEToLinear( in vec4 value ) { - return vec4( value.rgb * exp2( value.a * 255.0 - 128.0 ), 1.0 ); -} - -vec4 LinearToRGBE( in vec4 value ) { - float maxComponent = max( max( value.r, value.g ), value.b ); - float fExp = clamp( ceil( log2( maxComponent ) ), -128.0, 127.0 ); - return vec4( value.rgb / exp2( fExp ), ( fExp + 128.0 ) / 255.0 ); - // return vec4( value.brg, ( 3.0 + 128.0 ) / 256.0 ); -} - `; diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js index eceefc1cb25c0c..bc64fb54866abc 100644 --- a/src/renderers/webgl/WebGLProgram.js +++ b/src/renderers/webgl/WebGLProgram.js @@ -1,7 +1,7 @@ import { WebGLUniforms } from './WebGLUniforms.js'; import { WebGLShader } from './WebGLShader.js'; import { ShaderChunk } from '../shaders/ShaderChunk.js'; -import { RGBFormat, NoToneMapping, AddOperation, MixOperation, MultiplyOperation, CubeRefractionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, CustomToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBEEncoding, sRGBEncoding, LinearEncoding, GLSL3 } from '../../constants.js'; +import { RGBFormat, NoToneMapping, AddOperation, MixOperation, MultiplyOperation, CubeRefractionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, CustomToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, sRGBEncoding, LinearEncoding, GLSL3 } from '../../constants.js'; let programIdCount = 0; @@ -27,8 +27,6 @@ function getEncodingComponents( encoding ) { return [ 'Linear', '( value )' ]; case sRGBEncoding: return [ 'sRGB', '( value )' ]; - case RGBEEncoding: - return [ 'RGBE', '( value )' ]; case GammaEncoding: return [ 'Gamma', '( value, float( GAMMA_FACTOR ) )' ]; default: diff --git a/test/unit/src/constants.tests.js b/test/unit/src/constants.tests.js index bf8fa835196b64..0f2145a1777735 100644 --- a/test/unit/src/constants.tests.js +++ b/test/unit/src/constants.tests.js @@ -91,7 +91,6 @@ export default QUnit.module( 'Constants', () => { assert.equal( Constants.RGBAFormat, 1023, 'RGBAFormat is equal to 1023' ); assert.equal( Constants.LuminanceFormat, 1024, 'LuminanceFormat is equal to 1024' ); assert.equal( Constants.LuminanceAlphaFormat, 1025, 'LuminanceAlphaFormat is equal to 1025' ); - assert.equal( Constants.RGBEFormat, Constants.RGBAFormat, 'RGBEFormat is equal to RGBAFormat' ); assert.equal( Constants.DepthFormat, 1026, 'DepthFormat is equal to 1026' ); assert.equal( Constants.DepthStencilFormat, 1027, 'DepthStencilFormat is equal to 1027' ); assert.equal( Constants.RGB_S3TC_DXT1_Format, 33776, 'RGB_S3TC_DXT1_Format is equal to 33776' ); @@ -132,7 +131,6 @@ export default QUnit.module( 'Constants', () => { assert.equal( Constants.LinearEncoding, 3000, 'LinearEncoding is equal to 3000' ); assert.equal( Constants.sRGBEncoding, 3001, 'sRGBEncoding is equal to 3001' ); assert.equal( Constants.GammaEncoding, 3007, 'GammaEncoding is equal to 3007' ); - assert.equal( Constants.RGBEEncoding, 3002, 'RGBEEncoding is equal to 3002' ); assert.equal( Constants.BasicDepthPacking, 3200, 'BasicDepthPacking is equal to 3200' ); assert.equal( Constants.RGBADepthPacking, 3201, 'RGBADepthPacking is equal to 3201' );