Skip to content

Commit 39b0500

Browse files
committed
WebGLRenderer: Clean up.
1 parent 6d15bf7 commit 39b0500

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

src/renderers/WebGLRenderer.js

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,21 @@ class WebGLRenderer {
111111

112112
}
113113

114+
const INTEGER_FORMATS = new Set( [
115+
RGBAIntegerFormat,
116+
RGIntegerFormat,
117+
RedIntegerFormat
118+
] );
119+
120+
const UNSIGNED_TYPES = new Set( [
121+
UnsignedByteType,
122+
UnsignedIntType,
123+
UnsignedShortType,
124+
UnsignedInt248Type,
125+
UnsignedShort4444Type,
126+
UnsignedShort5551Type
127+
] );
128+
114129
const uintClearColor = new Uint32Array( 4 );
115130
const intClearColor = new Int32Array( 4 );
116131

@@ -884,9 +899,7 @@ class WebGLRenderer {
884899
if ( _currentRenderTarget !== null ) {
885900

886901
const targetFormat = _currentRenderTarget.texture.format;
887-
isIntegerFormat = targetFormat === RGBAIntegerFormat ||
888-
targetFormat === RGIntegerFormat ||
889-
targetFormat === RedIntegerFormat;
902+
isIntegerFormat = INTEGER_FORMATS.has( targetFormat );
890903

891904
}
892905

@@ -895,12 +908,7 @@ class WebGLRenderer {
895908
if ( isIntegerFormat ) {
896909

897910
const targetType = _currentRenderTarget.texture.type;
898-
const isUnsignedType = targetType === UnsignedByteType ||
899-
targetType === UnsignedIntType ||
900-
targetType === UnsignedShortType ||
901-
targetType === UnsignedInt248Type ||
902-
targetType === UnsignedShort4444Type ||
903-
targetType === UnsignedShort5551Type;
911+
const isUnsignedType = UNSIGNED_TYPES.has( targetType );
904912

905913
const clearColor = background.getClearColor();
906914
const a = background.getClearAlpha();
@@ -1830,9 +1838,7 @@ class WebGLRenderer {
18301838

18311839
function renderScene( currentRenderList, scene, camera, viewport ) {
18321840

1833-
const opaqueObjects = currentRenderList.opaque;
1834-
const transmissiveObjects = currentRenderList.transmissive;
1835-
const transparentObjects = currentRenderList.transparent;
1841+
const { opaque: opaqueObjects, transmissive: transmissiveObjects, transparent: transparentObjects } = currentRenderList;
18361842

18371843
currentRenderState.setupLightsView( camera );
18381844

@@ -1937,10 +1943,7 @@ class WebGLRenderer {
19371943

19381944
const renderItem = transmissiveObjects[ i ];
19391945

1940-
const object = renderItem.object;
1941-
const geometry = renderItem.geometry;
1942-
const material = renderItem.material;
1943-
const group = renderItem.group;
1946+
const { object, geometry, material, group } = renderItem;
19441947

19451948
if ( material.side === DoubleSide && object.layers.test( camera.layers ) ) {
19461949

@@ -1987,9 +1990,7 @@ class WebGLRenderer {
19871990

19881991
const renderItem = renderList[ i ];
19891992

1990-
const object = renderItem.object;
1991-
const geometry = renderItem.geometry;
1992-
const group = renderItem.group;
1993+
const { object, geometry, group } = renderItem;
19931994
let material = renderItem.material;
19941995

19951996
if ( material.allowOverride === true && overrideMaterial !== null ) {

0 commit comments

Comments
 (0)