Skip to content

Commit a1282ab

Browse files
mrdoobmrdoob
authored
Merge pull request #17907 from WestLangley/dev_exrloader_cleanup
EXRLoader: Clean up
2 parents 7495712 + 3e24632 commit a1282ab

File tree

2 files changed

+42
-41
lines changed

2 files changed

+42
-41
lines changed

‎examples/js/loaders/EXRLoader.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -731,16 +731,16 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
731731

732732
while ( size > 0 ) {
733733

734-
var l = reader.getInt8( p++ );
734+
var l = reader.getInt8( p ++ );
735735

736736
if ( l < 0 ) {
737737

738-
var count = -l;
738+
var count = - l;
739739
size -= count + 1;
740740

741-
for ( var i = 0; i < count; i++ ) {
741+
for ( var i = 0; i < count; i ++ ) {
742742

743-
out.push( reader.getUint8( p++ ) );
743+
out.push( reader.getUint8( p ++ ) );
744744

745745
}
746746

@@ -750,9 +750,9 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
750750
var count = l;
751751
size -= 2;
752752

753-
var value = reader.getUint8( p++ );
753+
var value = reader.getUint8( p ++ );
754754

755-
for ( var i = 0; i < count+1; i++ ) {
755+
for ( var i = 0; i < count + 1; i ++ ) {
756756

757757
out.push( value );
758758

@@ -890,9 +890,9 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
890890
var tmpOffset = 0;
891891
var n = info.width * 2;
892892

893-
for ( var y = 0; y < info.lines; y++ ) {
893+
for ( var y = 0; y < info.lines; y ++ ) {
894894

895-
for ( var c = 0; c < info.channels; c++ ) {
895+
for ( var c = 0; c < info.channels; c ++ ) {
896896

897897
var cd = pizChannelData[ c ];
898898
var cp = new Uint8Array( outBuffer.buffer, cd.end * 2 + y * n, n );
@@ -1206,7 +1206,7 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
12061206

12071207
// offsets
12081208
var dataWindowHeight = EXRHeader.dataWindow.yMax + 1;
1209-
1209+
12101210
var uncompress;
12111211
var scanlineBlockSize;
12121212

@@ -1231,7 +1231,7 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
12311231
break;
12321232

12331233
case 'ZIP_COMPRESSION':
1234-
1234+
12351235
scanlineBlockSize = 16;
12361236
uncompress = uncompressZIP;
12371237
break;
@@ -1354,21 +1354,21 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
13541354

13551355
var compressionInfo = {
13561356

1357-
array: uInt8Array,
1358-
viewer: bufferDataView,
1359-
offset: offset,
1357+
array: uInt8Array,
1358+
viewer: bufferDataView,
1359+
offset: offset,
13601360
channels: EXRHeader.channels.length,
1361-
width: width,
1362-
lines: scanlineBlockSize,
1361+
width: width,
1362+
lines: scanlineBlockSize,
13631363
size: 0
13641364

13651365
};
13661366

1367-
if ( EXRHeader.compression === 'NO_COMPRESSION' ||
1368-
EXRHeader.compression === 'ZIP_COMPRESSION' ||
1369-
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
1370-
EXRHeader.compression === 'RLE_COMPRESSION' ||
1371-
EXRHeader.compression === 'PIZ_COMPRESSION' ) {
1367+
if ( EXRHeader.compression === 'NO_COMPRESSION' ||
1368+
EXRHeader.compression === 'ZIP_COMPRESSION' ||
1369+
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
1370+
EXRHeader.compression === 'RLE_COMPRESSION' ||
1371+
EXRHeader.compression === 'PIZ_COMPRESSION' ) {
13721372

13731373
var size;
13741374
var viewer;
@@ -1467,4 +1467,4 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
14671467

14681468
}
14691469

1470-
} );
1470+
} );

‎examples/jsm/loaders/EXRLoader.js‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -742,16 +742,16 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
742742

743743
while ( size > 0 ) {
744744

745-
var l = reader.getInt8( p++ );
745+
var l = reader.getInt8( p ++ );
746746

747747
if ( l < 0 ) {
748748

749-
var count = -l;
749+
var count = - l;
750750
size -= count + 1;
751751

752-
for ( var i = 0; i < count; i++ ) {
752+
for ( var i = 0; i < count; i ++ ) {
753753

754-
out.push( reader.getUint8( p++ ) );
754+
out.push( reader.getUint8( p ++ ) );
755755

756756
}
757757

@@ -761,9 +761,9 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
761761
var count = l;
762762
size -= 2;
763763

764-
var value = reader.getUint8( p++ );
764+
var value = reader.getUint8( p ++ );
765765

766-
for ( var i = 0; i < count+1; i++ ) {
766+
for ( var i = 0; i < count + 1; i ++ ) {
767767

768768
out.push( value );
769769

@@ -901,9 +901,9 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
901901
var tmpOffset = 0;
902902
var n = info.width * 2;
903903

904-
for ( var y = 0; y < info.lines; y++ ) {
904+
for ( var y = 0; y < info.lines; y ++ ) {
905905

906-
for ( var c = 0; c < info.channels; c++ ) {
906+
for ( var c = 0; c < info.channels; c ++ ) {
907907

908908
var cd = pizChannelData[ c ];
909909
var cp = new Uint8Array( outBuffer.buffer, cd.end * 2 + y * n, n );
@@ -1217,7 +1217,7 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
12171217

12181218
// offsets
12191219
var dataWindowHeight = EXRHeader.dataWindow.yMax + 1;
1220-
1220+
12211221
var uncompress;
12221222
var scanlineBlockSize;
12231223

@@ -1242,7 +1242,7 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
12421242
break;
12431243

12441244
case 'ZIP_COMPRESSION':
1245-
1245+
12461246
scanlineBlockSize = 16;
12471247
uncompress = uncompressZIP;
12481248
break;
@@ -1365,21 +1365,21 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
13651365

13661366
var compressionInfo = {
13671367

1368-
array: uInt8Array,
1369-
viewer: bufferDataView,
1370-
offset: offset,
1368+
array: uInt8Array,
1369+
viewer: bufferDataView,
1370+
offset: offset,
13711371
channels: EXRHeader.channels.length,
1372-
width: width,
1373-
lines: scanlineBlockSize,
1372+
width: width,
1373+
lines: scanlineBlockSize,
13741374
size: 0
13751375

13761376
};
13771377

1378-
if ( EXRHeader.compression === 'NO_COMPRESSION' ||
1379-
EXRHeader.compression === 'ZIP_COMPRESSION' ||
1380-
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
1381-
EXRHeader.compression === 'RLE_COMPRESSION' ||
1382-
EXRHeader.compression === 'PIZ_COMPRESSION' ) {
1378+
if ( EXRHeader.compression === 'NO_COMPRESSION' ||
1379+
EXRHeader.compression === 'ZIP_COMPRESSION' ||
1380+
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
1381+
EXRHeader.compression === 'RLE_COMPRESSION' ||
1382+
EXRHeader.compression === 'PIZ_COMPRESSION' ) {
13831383

13841384
var size;
13851385
var viewer;
@@ -1479,4 +1479,5 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
14791479
}
14801480

14811481
} );
1482+
14821483
export { EXRLoader };

0 commit comments

Comments
 (0)