Skip to content

Commit 9da45f5

Browse files
mrdoobmrdoob
authored
Merge pull request #20965 from Mugen87/dev1
Loaders: Replace inflate with fflate.
2 parents 9a5522d + 02990d7 commit 9da45f5

File tree

12 files changed

+50
-80
lines changed

12 files changed

+50
-80
lines changed

‎editor/sw.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const assets = [
1414

1515
'../examples/jsm/libs/chevrotain.module.min.js',
1616
'../examples/jsm/libs/fflate.module.min.js',
17-
'../examples/jsm/libs/inflate.module.min.js',
1817
'../examples/jsm/libs/jszip.module.min.js',
1918

2019
'../examples/js/libs/draco/draco_decoder.js',

‎examples/js/libs/fflate.min.js‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/js/libs/inflate.min.js‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎examples/js/loaders/EXRLoader.js‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,15 +1276,13 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
12761276

12771277
var compressed = info.array.slice( info.offset.value, info.offset.value + info.size );
12781278

1279-
if ( typeof Inflate === 'undefined' ) {
1279+
if ( typeof fflate === 'undefined' ) {
12801280

1281-
console.error( 'THREE.EXRLoader: External library Inflate.min.js required, obtain or import from https://github.com/imaya/zlib.js' );
1281+
console.error( 'THREE.EXRLoader: External library fflate.min.js required.' );
12821282

12831283
}
12841284

1285-
var inflate = new Inflate( compressed, { resize: true, verify: true } ); // eslint-disable-line no-undef
1286-
1287-
var rawBuffer = new Uint8Array( inflate.decompress().buffer );
1285+
var rawBuffer = fflate.unzlibSync( compressed ); // eslint-disable-line no-undef
12881286
var tmpBuffer = new Uint8Array( rawBuffer.length );
12891287

12901288
predictor( rawBuffer ); // revert predictor
@@ -1401,14 +1399,13 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
14011399

14021400
var compressed = info.array.slice( info.offset.value, info.offset.value + info.size );
14031401

1404-
if ( typeof Inflate === 'undefined' ) {
1402+
if ( typeof fflate === 'undefined' ) {
14051403

1406-
console.error( 'THREE.EXRLoader: External library Inflate.min.js required, obtain or import from https://github.com/imaya/zlib.js' );
1404+
console.error( 'THREE.EXRLoader: External library fflate.min.js required.' );
14071405

14081406
}
14091407

1410-
const inflate = new Inflate( compressed, { resize: true, verify: true } ); // eslint-disable-line no-undef
1411-
const rawBuffer = new Uint8Array( inflate.decompress().buffer );
1408+
var rawBuffer = fflate.unzlibSync( compressed ); // eslint-disable-line no-undef
14121409

14131410
const sz = info.lines * info.channels * info.width;
14141411
const tmpBuffer = ( info.type == 1 ) ? new Uint16Array( sz ) : new Uint32Array( sz );
@@ -1587,8 +1584,8 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
15871584
case DEFLATE:
15881585

15891586
var compressed = info.array.slice( inOffset.value, inOffset.value + dwaHeader.totalAcUncompressedCount );
1590-
var inflate = new Inflate( compressed, { resize: true, verify: true } ); // eslint-disable-line no-undef
1591-
var acBuffer = new Uint16Array( inflate.decompress().buffer );
1587+
var data = fflate.unzlibSync( compressed ); // eslint-disable-line no-undef
1588+
var acBuffer = new Uint16Array( data.buffer );
15921589
inOffset.value += dwaHeader.totalAcUncompressedCount;
15931590
break;
15941591

@@ -1614,8 +1611,8 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
16141611
if ( dwaHeader.rleRawSize > 0 ) {
16151612

16161613
var compressed = info.array.slice( inOffset.value, inOffset.value + dwaHeader.rleCompressedSize );
1617-
var inflate = new Inflate( compressed, { resize: true, verify: true } ); // eslint-disable-line no-undef
1618-
var rleBuffer = decodeRunLength( inflate.decompress().buffer );
1614+
var data = fflate.unzlibSync( compressed ); // eslint-disable-line no-undef
1615+
var rleBuffer = decodeRunLength( data.buffer );
16191616

16201617
inOffset.value += dwaHeader.rleCompressedSize;
16211618

‎examples/js/loaders/FBXLoader.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3563,14 +3563,14 @@ THREE.FBXLoader = ( function () {
35633563

35643564
}
35653565

3566-
if ( typeof Inflate === 'undefined' ) {
3566+
if ( typeof fflate === 'undefined' ) {
35673567

3568-
console.error( 'THREE.FBXLoader: External library Inflate.min.js required, obtain or import from https://github.com/imaya/zlib.js' );
3568+
console.error( 'THREE.FBXLoader: External library fflate.min.js required.' );
35693569

35703570
}
35713571

3572-
var inflate = new Inflate( new Uint8Array( reader.getArrayBuffer( compressedLength ) ) ); // eslint-disable-line no-undef
3573-
var reader2 = new BinaryReader( inflate.decompress().buffer );
3572+
var data = fflate.unzlibSync( new Uint8Array( reader.getArrayBuffer( compressedLength ) ) ); // eslint-disable-line no-undef
3573+
var reader2 = new BinaryReader( data.buffer );
35743574

35753575
switch ( type ) {
35763576

‎examples/js/loaders/VTKLoader.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -785,9 +785,8 @@ THREE.VTKLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
785785

786786
for ( var i = 0; i < dataOffsets.length - 1; i ++ ) {
787787

788-
var inflate = new Inflate( byteData.slice( dataOffsets[ i ], dataOffsets[ i + 1 ] ), { resize: true, verify: true } ); // eslint-disable-line no-undef
789-
content = inflate.decompress();
790-
content = content.buffer;
788+
var data = fflate.unzlibSync( byteData.slice( dataOffsets[ i ], dataOffsets[ i + 1 ] ) ); // eslint-disable-line no-undef
789+
content = data.buffer;
791790

792791
if ( ele.attributes.type === 'Float32' ) {
793792

0 commit comments

Comments
 (0)