super-three 0.136.1 → 0.137.0

package/examples/jsm/renderers/CSS3DRenderer.js

@@ -239,57 +239,63 @@ class CSS3DRenderer {
 
 			if ( object.isCSS3DObject ) {
 
-				object.onBeforeRender( _this, scene, camera );
+				const visible = object.visible && object.layers.test( camera.layers );
+				object.element.style.display = visible ? '' : 'none';
 
-				let style;
+				// only getObjectCSSMatrix when object.visible
+				if ( visible ) {
 
-				if ( object.isCSS3DSprite ) {
+					object.onBeforeRender( _this, scene, camera );
 
-					// http://swiftcoder.wordpress.com/2008/11/25/constructing-a-billboard-matrix/
+					let style;
 
-					_matrix.copy( camera.matrixWorldInverse );
-					_matrix.transpose();
+					if ( object.isCSS3DSprite ) {
 
-					if ( object.rotation2D !== 0 ) _matrix.multiply( _matrix2.makeRotationZ( object.rotation2D ) );
+						// http://swiftcoder.wordpress.com/2008/11/25/constructing-a-billboard-matrix/
 
-					object.matrixWorld.decompose( _position, _quaternion, _scale );
-					_matrix.setPosition( _position );
-					_matrix.scale( _scale );
+						_matrix.copy( camera.matrixWorldInverse );
+						_matrix.transpose();
 
-					_matrix.elements[ 3 ] = 0;
-					_matrix.elements[ 7 ] = 0;
-					_matrix.elements[ 11 ] = 0;
-					_matrix.elements[ 15 ] = 1;
+						if ( object.rotation2D !== 0 ) _matrix.multiply( _matrix2.makeRotationZ( object.rotation2D ) );
 
-					style = getObjectCSSMatrix( _matrix );
+						object.matrixWorld.decompose( _position, _quaternion, _scale );
+						_matrix.setPosition( _position );
+						_matrix.scale( _scale );
 
-				} else {
+						_matrix.elements[ 3 ] = 0;
+						_matrix.elements[ 7 ] = 0;
+						_matrix.elements[ 11 ] = 0;
+						_matrix.elements[ 15 ] = 1;
 
-					style = getObjectCSSMatrix( object.matrixWorld );
+						style = getObjectCSSMatrix( _matrix );
 
-				}
+					} else {
 
-				const element = object.element;
-				const cachedObject = cache.objects.get( object );
+						style = getObjectCSSMatrix( object.matrixWorld );
 
-				if ( cachedObject === undefined || cachedObject.style !== style ) {
+					}
 
-					element.style.transform = style;
+					const element = object.element;
+					const cachedObject = cache.objects.get( object );
 
-					const objectData = { style: style };
-					cache.objects.set( object, objectData );
+					if ( cachedObject === undefined || cachedObject.style !== style ) {
 
-				}
+						element.style.transform = style;
 
-				element.style.display = object.visible ? '' : 'none';
+						const objectData = { style: style };
+						cache.objects.set( object, objectData );
 
-				if ( element.parentNode !== cameraElement ) {
+					}
 
-					cameraElement.appendChild( element );
+					if ( element.parentNode !== cameraElement ) {
 
-				}
+						cameraElement.appendChild( element );
 
-				object.onAfterRender( _this, scene, camera );
+					}
+
+					object.onAfterRender( _this, scene, camera );
+
+				}
 
 			}
 

package/examples/jsm/renderers/nodes/accessors/UVNode.js

@@ -2,19 +2,19 @@ import AttributeNode from '../core/AttributeNode.js';
 
 class UVNode extends AttributeNode {
 
-	constructor( value = 0 ) {
+	constructor( index = 0 ) {
 
 		super( null, 'vec2' );
 
-		this.value = value;
+		this.index = index;
 
 	}
 
 	getAttributeName( /*builder*/ ) {
 
-		const value = this.value;
+		const index = this.index;
 
-		return 'uv' + ( value > 0 ? value + 1 : '' );
+		return 'uv' + ( index > 0 ? index + 1 : '' );
 
 	}
 

package/examples/jsm/renderers/nodes/core/NodeBuilder.js

@@ -8,7 +8,8 @@ import { NodeUpdateType } from './constants.js';
 
 import { REVISION, LinearEncoding } from 'three';
 
-const shaderStages = [ 'fragment', 'vertex' ];
+export const shaderStages = [ 'fragment', 'vertex' ];
+export const vector = [ 'x', 'y', 'z', 'w' ];
 
 class NodeBuilder {
 

package/examples/jsm/renderers/nodes/utils/SplitNode.js

@@ -1,4 +1,5 @@
 import Node from '../core/Node.js';
+import { vector } from '../core/NodeBuilder.js';
 
 class SplitNode extends Node {
 
@@ -11,6 +12,20 @@ class SplitNode extends Node {
 
 	}
 
+	getVectorLength() {
+
+		let vectorLength = this.components.length;
+
+		for ( const c of this.components ) {
+
+			vectorLength = Math.max( vector.indexOf( c ) + 1, vectorLength );
+
+		}
+
+		return vectorLength;
+
+	}
+
 	getNodeType( builder ) {
 
 		return builder.getTypeFromLength( this.components.length );
@@ -24,15 +39,15 @@ class SplitNode extends Node {
 
 		if ( nodeTypeLength > 1 ) {
 
-			const components = this.components;
-
 			let type = null;
 
-			if ( components.length >= nodeTypeLength ) {
+			const componentsLength = this.getVectorLength();
+
+			if ( componentsLength >= nodeTypeLength ) {
 
 				// need expand the input node
 
-				type = this.getNodeType( builder );
+				type = builder.getTypeFromLength( this.getVectorLength() );
 
 			}
 

package/examples/jsm/utils/LDrawUtils.js

@@ -62,8 +62,11 @@ class LDrawUtils {
 					arr: [ geometry ]
 				};
 
+			} else {
+
+				geoms.arr.push( geometry );
+
 			}
-			else geoms.arr.push( geometry );
 
 		}
 
@@ -111,22 +114,23 @@ class LDrawUtils {
 
 				const elemSize = c.isMesh ? 3 : 2;
 
+				const geometry = c.geometry.clone();
 				const matrixIsInverted = c.matrixWorld.determinant() < 0;
 				if ( matrixIsInverted ) {
 
-					permuteAttribute( c.geometry.attributes.position, elemSize );
-					permuteAttribute( c.geometry.attributes.normal, elemSize );
+					permuteAttribute( geometry.attributes.position, elemSize );
+					permuteAttribute( geometry.attributes.normal, elemSize );
 
 				}
 
-				c.geometry.applyMatrix4( c.matrixWorld );
+				geometry.applyMatrix4( c.matrixWorld );
 
 				if ( c.isConditionalLine ) {
 
-					c.geometry.attributes.control0.applyMatrix4( c.matrixWorld );
-					c.geometry.attributes.control1.applyMatrix4( c.matrixWorld );
+					geometry.attributes.control0.applyMatrix4( c.matrixWorld );
+					geometry.attributes.control1.applyMatrix4( c.matrixWorld );
 					normalMatrix.getNormalMatrix( c.matrixWorld );
-					c.geometry.attributes.direction.applyNormalMatrix( normalMatrix );
+					geometry.attributes.direction.applyNormalMatrix( normalMatrix );
 
 				}
 
@@ -134,17 +138,20 @@ class LDrawUtils {
 
 				if ( Array.isArray( c.material ) ) {
 
-					for ( const groupIndex in c.geometry.groups ) {
+					for ( const groupIndex in geometry.groups ) {
 
-						const group = c.geometry.groups[ groupIndex ];
+						const group = geometry.groups[ groupIndex ];
 						const mat = c.material[ group.materialIndex ];
-						const newGeometry = extractGroup( c.geometry, group, elemSize, c.isConditionalLine );
+						const newGeometry = extractGroup( geometry, group, elemSize, c.isConditionalLine );
 						addGeometry( mat, newGeometry, geometries );
 
 					}
 
+				} else {
+
+					addGeometry( c.material, geometry, geometries );
+
 				}
-				else addGeometry( c.material, c.geometry, geometries );
 
 			}
 

package/package.json

@@ -1,9 +1,18 @@
 {
   "name": "super-three",
-  "version": "0.136.1",
+  "version": "0.137.0",
   "description": "JavaScript 3D library",
-  "main": "build/three.js",
-  "module": "build/three.module.js",
+  "type": "module",
+  "main": "./build/three.js",
+  "module": "./build/three.module.js",
+  "exports": {
+    ".": {
+      "import": "./build/three.module.js",
+      "require": "./build/three.cjs"
+    },
+    "./examples/jsm/*": "./examples/jsm/*.js",
+    "./src/*": "./src/*.js"
+  },
   "repository": {
     "type": "git",
     "url": "supermedium/three.js"
@@ -11,6 +20,7 @@
   "sideEffects": false,
   "files": [
     "build/three.js",
+    "build/three.cjs",
     "build/three.min.js",
     "build/three.module.js",
     "examples/js",
@@ -41,7 +51,6 @@
     "globals": {
       "__THREE_DEVTOOLS__": "readonly",
       "WebGL2ComputeRenderingContext": "readonly",
-
       "potpack": "readonly",
       "fflate": "readonly",
       "bodymovin": "readonly",
@@ -49,10 +58,10 @@
       "Stats": "readonly",
       "XRWebGLBinding": "readonly",
       "XRWebGLLayer": "readonly",
-
       "GPUShaderStage": "readonly",
       "GPUBufferUsage": "readonly",
-      "GPUTextureUsage": "readonly"
+      "GPUTextureUsage": "readonly",
+      "QUnit": "readonly"
     },
     "rules": {
       "no-throw-literal": [
@@ -87,8 +96,7 @@
     "test-e2e": "node test/e2e/puppeteer.js",
     "test-e2e-cov": "node test/e2e/check-coverage.js",
     "test-treeshake": "rollup -c test/rollup.treeshake.config.js",
-    "make-screenshot": "node test/e2e/puppeteer.js --make",
-    "prepublishOnly": "node utils/prepublish.js"
+    "make-screenshot": "node test/e2e/puppeteer.js --make"
   },
   "keywords": [
     "three",
@@ -124,7 +132,6 @@
     "eslint": "^7.32.0",
     "eslint-config-mdcs": "^5.0.0",
     "eslint-plugin-html": "^6.2.0",
-    "glob": "^7.2.0",
     "rollup": "^2.57.0",
     "rollup-plugin-filesize": "^9.1.1",
     "rollup-plugin-terser": "^7.0.2",

package/src/constants.js

@@ -1,4 +1,4 @@
-export const REVISION = '137dev';
+export const REVISION = '137';
 export const MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2, ROTATE: 0, DOLLY: 1, PAN: 2 };
 export const TOUCH = { ROTATE: 0, PAN: 1, DOLLY_PAN: 2, DOLLY_ROTATE: 3 };
 export const CullFaceNone = 0;
@@ -84,7 +84,6 @@ export const FloatType = 1015;
 export const HalfFloatType = 1016;
 export const UnsignedShort4444Type = 1017;
 export const UnsignedShort5551Type = 1018;
-export const UnsignedShort565Type = 1019;
 export const UnsignedInt248Type = 1020;
 export const AlphaFormat = 1021;
 export const RGBAFormat = 1023;
@@ -96,7 +95,6 @@ export const RedFormat = 1028;
 export const RedIntegerFormat = 1029;
 export const RGFormat = 1030;
 export const RGIntegerFormat = 1031;
-export const RGBIntegerFormat = 1032;
 export const RGBAIntegerFormat = 1033;
 
 export const RGB_S3TC_DXT1_Format = 33776;

package/src/core/BufferGeometry.js

@@ -8,7 +8,7 @@ import { Object3D } from './Object3D.js';
 import { Matrix4 } from '../math/Matrix4.js';
 import { Matrix3 } from '../math/Matrix3.js';
 import * as MathUtils from '../math/MathUtils.js';
-import { arrayMax } from '../utils.js';
+import { arrayNeedsUint32 } from '../utils.js';
 
 let _id = 0;
 
@@ -59,7 +59,7 @@ class BufferGeometry extends EventDispatcher {
 
 		if ( Array.isArray( index ) ) {
 
-			this.index = new ( arrayMax( index ) > 65535 ? Uint32BufferAttribute : Uint16BufferAttribute )( index, 1 );
+			this.index = new ( arrayNeedsUint32( index ) ? Uint32BufferAttribute : Uint16BufferAttribute )( index, 1 );
 
 		} else {
 

package/src/geometries/LatheGeometry.js

@@ -152,7 +152,7 @@ class LatheGeometry extends BufferGeometry {
 				// faces
 
 				indices.push( a, b, d );
-				indices.push( b, c, d );
+				indices.push( c, d, b );
 
 			}
 

package/src/loaders/FileLoader.js

@@ -69,6 +69,10 @@ class FileLoader extends Loader {
 			// An abort controller could be added within a future PR
 		} );
 
+		// record states ( avoid data race )
+		const mimeType = this.mimeType;
+		const responseType = this.responseType;
+
 		// start the fetch
 		fetch( req )
 			.then( response => {
@@ -147,7 +151,7 @@ class FileLoader extends Loader {
 			} )
 			.then( response => {
 
-				switch ( this.responseType ) {
+				switch ( responseType ) {
 
 					case 'arraybuffer':
 
@@ -163,7 +167,7 @@ class FileLoader extends Loader {
 							.then( text => {
 
 								const parser = new DOMParser();
-								return parser.parseFromString( text, this.mimeType );
+								return parser.parseFromString( text, mimeType );
 
 							} );
 
@@ -173,7 +177,20 @@ class FileLoader extends Loader {
 
 					default:
 
-						return response.text();
+						if ( mimeType === undefined ) {
+
+							return response.text();
+
+						} else {
+
+							// sniff encoding
+							const re = /charset="?([^;"\s]*)"?/i;
+							const exec = re.exec( mimeType );
+							const label = exec && exec[ 1 ] ? exec[ 1 ].toLowerCase() : undefined;
+							const decoder = new TextDecoder( label );
+							return response.arrayBuffer().then( ab => decoder.decode( ab ) );
+
+						}
 
 				}
 

package/src/math/Box3.js

@@ -109,11 +109,11 @@ class Box3 {
 
 	}
 
-	setFromObject( object ) {
+	setFromObject( object, precise = false ) {
 
 		this.makeEmpty();
 
-		return this.expandByObject( object );
+		return this.expandByObject( object, precise );
 
 	}
 
@@ -188,7 +188,7 @@ class Box3 {
 
 	}
 
-	expandByObject( object ) {
+	expandByObject( object, precise = false ) {
 
 		// Computes the world-axis-aligned bounding box of an object (including its children),
 		// accounting for both the object's, and children's, world transforms
@@ -199,16 +199,30 @@ class Box3 {
 
 		if ( geometry !== undefined ) {
 
-			if ( geometry.boundingBox === null ) {
+			if ( precise && geometry.attributes != undefined && geometry.attributes.position !== undefined ) {
 
-				geometry.computeBoundingBox();
+				const position = geometry.attributes.position;
+				for ( let i = 0, l = position.count; i < l; i ++ ) {
 
-			}
+					_vector.fromBufferAttribute( position, i ).applyMatrix4( object.matrixWorld );
+					this.expandByPoint( _vector );
+
+				}
+
+			} else {
+
+				if ( geometry.boundingBox === null ) {
 
-			_box.copy( geometry.boundingBox );
-			_box.applyMatrix4( object.matrixWorld );
+					geometry.computeBoundingBox();
 
-			this.union( _box );
+				}
+
+				_box.copy( geometry.boundingBox );
+				_box.applyMatrix4( object.matrixWorld );
+
+				this.union( _box );
+
+			}
 
 		}
 
@@ -216,7 +230,7 @@ class Box3 {
 
 		for ( let i = 0, l = children.length; i < l; i ++ ) {
 
-			this.expandByObject( children[ i ] );
+			this.expandByObject( children[ i ], precise );
 
 		}
 

package/src/renderers/WebGLRenderTarget.js

@@ -86,7 +86,10 @@ class WebGLRenderTarget extends EventDispatcher {
 		this.viewport.copy( source.viewport );
 
 		this.texture = source.texture.clone();
-		this.texture.image = { ...this.texture.image }; // See #20328.
+
+		// ensure image object is not shared, see #20328
+
+		this.texture.image = Object.assign( {}, source.texture.image );
 
 		this.depthBuffer = source.depthBuffer;
 		this.stencilBuffer = source.stencilBuffer;

package/src/renderers/WebGLRenderer.js

@@ -202,7 +202,7 @@ function WebGLRenderer( parameters = {} ) {
 	try {
 
 		const contextAttributes = {
-			alpha: _alpha,
+			alpha: true,
 			depth: _depth,
 			stencil: _stencil,
 			antialias: _antialias,
@@ -301,7 +301,7 @@ function WebGLRenderer( parameters = {} ) {
 		materials = new WebGLMaterials( properties );
 		renderLists = new WebGLRenderLists();
 		renderStates = new WebGLRenderStates( extensions, capabilities );
-		background = new WebGLBackground( _this, cubemaps, state, objects, _premultipliedAlpha );
+		background = new WebGLBackground( _this, cubemaps, state, objects, _alpha, _premultipliedAlpha );
 		shadowMap = new WebGLShadowMap( _this, objects, capabilities );
 
 		bufferRenderer = new WebGLBufferRenderer( _gl, extensions, info, capabilities );
@@ -1420,7 +1420,7 @@ function WebGLRenderer( parameters = {} ) {
 
 		const fog = scene.fog;
 		const environment = material.isMeshStandardMaterial ? scene.environment : null;
-		const encoding = ( _currentRenderTarget === null ) ? _this.outputEncoding : _currentRenderTarget.texture.encoding;
+		const encoding = ( _currentRenderTarget === null ) ? _this.outputEncoding : ( _currentRenderTarget.isXRRenderTarget === true ? _currentRenderTarget.texture.encoding : LinearEncoding );
 		const envMap = ( material.isMeshStandardMaterial ? cubeuvmaps : cubemaps ).get( material.envMap || environment );
 		const vertexAlphas = material.vertexColors === true && !! geometry.attributes.color && geometry.attributes.color.itemSize === 4;
 		const vertexTangents = !! material.normalMap && !! geometry.attributes.tangent;

package/src/renderers/shaders/ShaderChunk/morphnormal_vertex.glsl.js

@@ -10,7 +10,7 @@ export default /* glsl */`
 
 		for ( int i = 0; i < MORPHTARGETS_COUNT; i ++ ) {
 
-			if ( morphTargetInfluences[ i ] > 0.0 ) objectNormal += getMorph( gl_VertexID, i, 1, 2 ) * morphTargetInfluences[ i ];
+			if ( morphTargetInfluences[ i ] != 0.0 ) objectNormal += getMorph( gl_VertexID, i, 1, 2 ) * morphTargetInfluences[ i ];
 
 		}
 

package/src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl.js

@@ -12,11 +12,11 @@ export default /* glsl */`
 
 			#ifndef USE_MORPHNORMALS
 
-				if ( morphTargetInfluences[ i ] > 0.0 ) transformed += getMorph( gl_VertexID, i, 0, 1 ) * morphTargetInfluences[ i ];
+				if ( morphTargetInfluences[ i ] != 0.0 ) transformed += getMorph( gl_VertexID, i, 0, 1 ) * morphTargetInfluences[ i ];
 
 			#else
 
-				if ( morphTargetInfluences[ i ] > 0.0 ) transformed += getMorph( gl_VertexID, i, 0, 2 ) * morphTargetInfluences[ i ];
+				if ( morphTargetInfluences[ i ] != 0.0 ) transformed += getMorph( gl_VertexID, i, 0, 2 ) * morphTargetInfluences[ i ];
 
 			#endif
 

package/src/renderers/webgl/WebGLBackground.js

@@ -7,10 +7,10 @@ import { Mesh } from '../../objects/Mesh.js';
 import { ShaderLib } from '../shaders/ShaderLib.js';
 import { cloneUniforms } from '../shaders/UniformsUtils.js';
 
-function WebGLBackground( renderer, cubemaps, state, objects, premultipliedAlpha ) {
+function WebGLBackground( renderer, cubemaps, state, objects, alpha, premultipliedAlpha ) {
 
 	const clearColor = new Color( 0x000000 );
-	let clearAlpha = 0;
+	let clearAlpha = alpha === true ? 0 : 1;
 
 	let planeMesh;
 	let boxMesh;

package/src/renderers/webgl/WebGLGeometries.js

@@ -1,5 +1,5 @@
 import { Uint16BufferAttribute, Uint32BufferAttribute } from '../../core/BufferAttribute.js';
-import { arrayMax } from '../../utils.js';
+import { arrayNeedsUint32 } from '../../utils.js';
 
 function WebGLGeometries( gl, attributes, info, bindingStates ) {
 
@@ -133,7 +133,7 @@ function WebGLGeometries( gl, attributes, info, bindingStates ) {
 
 		}
 
-		const attribute = new ( arrayMax( indices ) > 65535 ? Uint32BufferAttribute : Uint16BufferAttribute )( indices, 1 );
+		const attribute = new ( arrayNeedsUint32( indices ) ? Uint32BufferAttribute : Uint16BufferAttribute )( indices, 1 );
 		attribute.version = version;
 
 		// Updating index buffer in VAO now. See WebGLBindingStates

package/src/renderers/webgl/WebGLPrograms.js

@@ -1,4 +1,4 @@
-import { BackSide, DoubleSide, CubeUVRefractionMapping, CubeUVReflectionMapping, ObjectSpaceNormalMap, TangentSpaceNormalMap, NoToneMapping, sRGBEncoding } from '../../constants.js';
+import { BackSide, DoubleSide, CubeUVRefractionMapping, CubeUVReflectionMapping, ObjectSpaceNormalMap, TangentSpaceNormalMap, NoToneMapping, LinearEncoding, sRGBEncoding } from '../../constants.js';
 import { Layers } from '../../core/Layers.js';
 import { WebGLProgram } from './WebGLProgram.js';
 import { WebGLShaderCache } from './WebGLShaderCache.js';
@@ -148,7 +148,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 			instancingColor: object.isInstancedMesh === true && object.instanceColor !== null,
 
 			supportsVertexTextures: vertexTextures,
-			outputEncoding: ( currentRenderTarget !== null ) ? currentRenderTarget.texture.encoding : renderer.outputEncoding,
+			outputEncoding: ( currentRenderTarget === null ) ? renderer.outputEncoding : ( currentRenderTarget.isXRRenderTarget === true ? currentRenderTarget.texture.encoding : LinearEncoding ),
 			map: !! material.map,
 			matcap: !! material.matcap,
 			envMap: !! envMap,

package/src/renderers/webgl/WebGLState.js

@@ -641,7 +641,7 @@ function WebGLState( gl, extensions, capabilities ) {
 							break;
 
 						case SubtractiveBlending:
-							gl.blendFuncSeparate( gl.ZERO, gl.ZERO, gl.ONE_MINUS_SRC_COLOR, gl.ONE_MINUS_SRC_ALPHA );
+							gl.blendFuncSeparate( gl.ZERO, gl.ONE_MINUS_SRC_COLOR, gl.ZERO, gl.ONE );
 							break;
 
 						case MultiplyBlending:
@@ -667,7 +667,7 @@ function WebGLState( gl, extensions, capabilities ) {
 							break;
 
 						case SubtractiveBlending:
-							gl.blendFunc( gl.ZERO, gl.ONE_MINUS_SRC_COLOR );
+							gl.blendFuncSeparate( gl.ZERO, gl.ONE_MINUS_SRC_COLOR, gl.ZERO, gl.ONE );
 							break;
 
 						case MultiplyBlending:

package/src/renderers/webgl/WebGLTextures.js

@@ -153,11 +153,11 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		}
 
-		if ( glFormat === _gl.RGB ) {
+		if ( glFormat === _gl.RG ) {
 
-			if ( glType === _gl.FLOAT ) internalFormat = _gl.RGB32F;
-			if ( glType === _gl.HALF_FLOAT ) internalFormat = _gl.RGB16F;
-			if ( glType === _gl.UNSIGNED_BYTE ) internalFormat = _gl.RGB8;
+			if ( glType === _gl.FLOAT ) internalFormat = _gl.RG32F;
+			if ( glType === _gl.HALF_FLOAT ) internalFormat = _gl.RG16F;
+			if ( glType === _gl.UNSIGNED_BYTE ) internalFormat = _gl.RG8;
 
 		}
 
@@ -166,10 +166,13 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 			if ( glType === _gl.FLOAT ) internalFormat = _gl.RGBA32F;
 			if ( glType === _gl.HALF_FLOAT ) internalFormat = _gl.RGBA16F;
 			if ( glType === _gl.UNSIGNED_BYTE ) internalFormat = ( encoding === sRGBEncoding && isVideoTexture === false ) ? _gl.SRGB8_ALPHA8 : _gl.RGBA8;
+			if ( glType === _gl.UNSIGNED_SHORT_4_4_4_4 ) internalFormat = _gl.RGBA4;
+			if ( glType === _gl.UNSIGNED_SHORT_5_5_5_1 ) internalFormat = _gl.RGB5_A1;
 
 		}
 
 		if ( internalFormat === _gl.R16F || internalFormat === _gl.R32F ||
+			internalFormat === _gl.RG16F || internalFormat === _gl.RG32F ||
 			internalFormat === _gl.RGBA16F || internalFormat === _gl.RGBA32F ) {
 
 			extensions.get( 'EXT_color_buffer_float' );
@@ -1631,13 +1634,13 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 		const format = texture.format;
 		const type = texture.type;
 
-		if ( texture.isCompressedTexture === true || texture.format === _SRGBAFormat ) return image;
+		if ( texture.isCompressedTexture === true || texture.isVideoTexture === true || texture.format === _SRGBAFormat ) return image;
 
 		if ( encoding !== LinearEncoding ) {
 
 			// sRGB
 
-			if ( encoding === sRGBEncoding && texture.isVideoTexture !== true ) {
+			if ( encoding === sRGBEncoding ) {
 
 				if ( isWebGL2 === false ) {