Skip to content

EXRLoader: Clean up #17907

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 1 commit into from
Nov 11, 2019
Merged

EXRLoader: Clean up #17907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions examples/js/loaders/EXRLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,16 +731,16 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade

while ( size > 0 ) {

var l = reader.getInt8( p++ );
var l = reader.getInt8( p ++ );

if ( l < 0 ) {

var count = -l;
var count = - l;
size -= count + 1;

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

out.push( reader.getUint8( p++ ) );
out.push( reader.getUint8( p ++ ) );

}

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

var value = reader.getUint8( p++ );
var value = reader.getUint8( p ++ );

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

out.push( value );

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

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

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

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

// offsets
var dataWindowHeight = EXRHeader.dataWindow.yMax + 1;

var uncompress;
var scanlineBlockSize;

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

case 'ZIP_COMPRESSION':

scanlineBlockSize = 16;
uncompress = uncompressZIP;
break;
Expand Down Expand Up @@ -1354,21 +1354,21 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade

var compressionInfo = {

array: uInt8Array,
viewer: bufferDataView,
offset: offset,
array: uInt8Array,
viewer: bufferDataView,
offset: offset,
channels: EXRHeader.channels.length,
width: width,
lines: scanlineBlockSize,
width: width,
lines: scanlineBlockSize,
size: 0

};

if ( EXRHeader.compression === 'NO_COMPRESSION' ||
EXRHeader.compression === 'ZIP_COMPRESSION' ||
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
EXRHeader.compression === 'RLE_COMPRESSION' ||
EXRHeader.compression === 'PIZ_COMPRESSION' ) {
if ( EXRHeader.compression === 'NO_COMPRESSION' ||
EXRHeader.compression === 'ZIP_COMPRESSION' ||
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
EXRHeader.compression === 'RLE_COMPRESSION' ||
EXRHeader.compression === 'PIZ_COMPRESSION' ) {

var size;
var viewer;
Expand Down Expand Up @@ -1467,4 +1467,4 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade

}

} );
} );
41 changes: 21 additions & 20 deletions examples/jsm/loaders/EXRLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,16 +742,16 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype

while ( size > 0 ) {

var l = reader.getInt8( p++ );
var l = reader.getInt8( p ++ );

if ( l < 0 ) {

var count = -l;
var count = - l;
size -= count + 1;

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

out.push( reader.getUint8( p++ ) );
out.push( reader.getUint8( p ++ ) );

}

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

var value = reader.getUint8( p++ );
var value = reader.getUint8( p ++ );

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

out.push( value );

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

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

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

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

// offsets
var dataWindowHeight = EXRHeader.dataWindow.yMax + 1;

var uncompress;
var scanlineBlockSize;

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

case 'ZIP_COMPRESSION':

scanlineBlockSize = 16;
uncompress = uncompressZIP;
break;
Expand Down Expand Up @@ -1365,21 +1365,21 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype

var compressionInfo = {

array: uInt8Array,
viewer: bufferDataView,
offset: offset,
array: uInt8Array,
viewer: bufferDataView,
offset: offset,
channels: EXRHeader.channels.length,
width: width,
lines: scanlineBlockSize,
width: width,
lines: scanlineBlockSize,
size: 0

};

if ( EXRHeader.compression === 'NO_COMPRESSION' ||
EXRHeader.compression === 'ZIP_COMPRESSION' ||
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
EXRHeader.compression === 'RLE_COMPRESSION' ||
EXRHeader.compression === 'PIZ_COMPRESSION' ) {
if ( EXRHeader.compression === 'NO_COMPRESSION' ||
EXRHeader.compression === 'ZIP_COMPRESSION' ||
EXRHeader.compression === 'ZIPS_COMPRESSION' ||
EXRHeader.compression === 'RLE_COMPRESSION' ||
EXRHeader.compression === 'PIZ_COMPRESSION' ) {

var size;
var viewer;
Expand Down Expand Up @@ -1479,4 +1479,5 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
}

} );

export { EXRLoader };