Skip to content

Loaders: Replace inflate with fflate. #20965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 30, 2020
Merged

Loaders: Replace inflate with fflate. #20965

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2efbc0
Loaders: Replace inflate with fflate.
Mugen87 Dec 29, 2020
0aa0fa7
Add license comment to fflate.
Mugen87 Dec 29, 2020
02990d7
EXRloader: Remove buggy line.
Mugen87 Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion editor/sw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const assets = [

'../examples/jsm/libs/chevrotain.module.min.js',
'../examples/jsm/libs/fflate.module.min.js',
'../examples/jsm/libs/inflate.module.min.js',
'../examples/jsm/libs/jszip.module.min.js',

'../examples/js/libs/draco/draco_decoder.js',
Expand Down
6 changes: 6 additions & 0 deletions examples/js/libs/fflate.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions examples/js/libs/inflate.min.js
View file
Open in desktop

This file was deleted.

24 changes: 11 additions & 13 deletions examples/js/loaders/EXRLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,15 +1276,13 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade

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

if ( typeof Inflate === 'undefined' ) {
if ( typeof fflate === 'undefined' ) {

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

}

var inflate = new Inflate( compressed, { resize: true, verify: true } ); // eslint-disable-line no-undef

var rawBuffer = new Uint8Array( inflate.decompress().buffer );
var rawBuffer = fflate.unzlibSync( compressed ); // eslint-disable-line no-undef
var tmpBuffer = new Uint8Array( rawBuffer.length );

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

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

if ( typeof Inflate === 'undefined' ) {
if ( typeof fflate === 'undefined' ) {

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

}

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

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

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

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

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

inOffset.value += dwaHeader.rleCompressedSize;

Expand Down
8 changes: 4 additions & 4 deletions examples/js/loaders/FBXLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3563,14 +3563,14 @@ THREE.FBXLoader = ( function () {

}

if ( typeof Inflate === 'undefined' ) {
if ( typeof fflate === 'undefined' ) {

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

}

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

switch ( type ) {

Expand Down
5 changes: 2 additions & 3 deletions examples/js/loaders/VTKLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,9 +785,8 @@ THREE.VTKLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype

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

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

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

Expand Down
Loading