|
@@ -3,7 +3,7 @@
|
|
* Copyright 2010-2023 Three.js Authors
|
|
* Copyright 2010-2023 Three.js Authors
|
|
* SPDX-License-Identifier: MIT
|
|
* SPDX-License-Identifier: MIT
|
|
*/
|
|
*/
|
|
-const REVISION = '163';
|
|
|
|
|
|
+const REVISION = '164dev';
|
|
|
|
|
|
const MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2, ROTATE: 0, DOLLY: 1, PAN: 2 };
|
|
const MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2, ROTATE: 0, DOLLY: 1, PAN: 2 };
|
|
const TOUCH = { ROTATE: 0, PAN: 1, DOLLY_PAN: 2, DOLLY_ROTATE: 3 };
|
|
const TOUCH = { ROTATE: 0, PAN: 1, DOLLY_PAN: 2, DOLLY_ROTATE: 3 };
|
|
@@ -24325,7 +24325,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
let mipmap;
|
|
let mipmap;
|
|
const mipmaps = texture.mipmaps;
|
|
const mipmaps = texture.mipmaps;
|
|
|
|
|
|
- const useTexStorage = ( texture.isVideoTexture !== true && glInternalFormat !== RGB_ETC1_Format );
|
|
|
|
|
|
+ const useTexStorage = ( texture.isVideoTexture !== true );
|
|
const allocateMemory = ( sourceProperties.__version === undefined ) || ( forceUpload === true );
|
|
const allocateMemory = ( sourceProperties.__version === undefined ) || ( forceUpload === true );
|
|
const dataReady = source.dataReady;
|
|
const dataReady = source.dataReady;
|
|
const levels = getMipLevels( texture, image );
|
|
const levels = getMipLevels( texture, image );
|
|
@@ -25770,33 +25770,15 @@ function WebGLUtils( gl, extensions ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- // ETC1
|
|
|
|
-
|
|
|
|
- if ( p === RGB_ETC1_Format ) {
|
|
|
|
-
|
|
|
|
- extension = extensions.get( 'WEBGL_compressed_texture_etc1' );
|
|
|
|
-
|
|
|
|
- if ( extension !== null ) {
|
|
|
|
-
|
|
|
|
- return extension.COMPRESSED_RGB_ETC1_WEBGL;
|
|
|
|
-
|
|
|
|
- } else {
|
|
|
|
-
|
|
|
|
- return null;
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- // ETC2
|
|
|
|
|
|
+ // ETC
|
|
|
|
|
|
- if ( p === RGB_ETC2_Format || p === RGBA_ETC2_EAC_Format ) {
|
|
|
|
|
|
+ if ( p === RGB_ETC1_Format || p === RGB_ETC2_Format || p === RGBA_ETC2_EAC_Format ) {
|
|
|
|
|
|
extension = extensions.get( 'WEBGL_compressed_texture_etc' );
|
|
extension = extensions.get( 'WEBGL_compressed_texture_etc' );
|
|
|
|
|
|
if ( extension !== null ) {
|
|
if ( extension !== null ) {
|
|
|
|
|
|
- if ( p === RGB_ETC2_Format ) return ( transfer === SRGBTransfer ) ? extension.COMPRESSED_SRGB8_ETC2 : extension.COMPRESSED_RGB8_ETC2;
|
|
|
|
|
|
+ if ( p === RGB_ETC1_Format || p === RGB_ETC2_Format ) return ( transfer === SRGBTransfer ) ? extension.COMPRESSED_SRGB8_ETC2 : extension.COMPRESSED_RGB8_ETC2;
|
|
if ( p === RGBA_ETC2_EAC_Format ) return ( transfer === SRGBTransfer ) ? extension.COMPRESSED_SRGB8_ALPHA8_ETC2_EAC : extension.COMPRESSED_RGBA8_ETC2_EAC;
|
|
if ( p === RGBA_ETC2_EAC_Format ) return ( transfer === SRGBTransfer ) ? extension.COMPRESSED_SRGB8_ALPHA8_ETC2_EAC : extension.COMPRESSED_RGBA8_ETC2_EAC;
|
|
|
|
|
|
} else {
|
|
} else {
|