Skip to content

EXRLoader: Clean up #16654

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
Jun 3, 2019
Merged

EXRLoader: Clean up #16654

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
31 changes: 10 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 @@ -96,7 +96,6 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {
const SHORT_ZEROCODE_RUN = 59;
const LONG_ZEROCODE_RUN = 63;
const SHORTEST_LONG_RUN = 2 + LONG_ZEROCODE_RUN - SHORT_ZEROCODE_RUN;
const LONGEST_LONG_RUN = 255 + SHORTEST_LONG_RUN;

const BYTES_PER_HALF = 2;

Expand Down Expand Up @@ -395,11 +394,6 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

}

var NBITS = 16;
var A_OFFSET = 1 << ( NBITS - 1 );
var M_OFFSET = 1 << ( NBITS - 1 );
var MOD_MASK = ( 1 << NBITS ) - 1;

function UInt16( value ) {

return ( value & 0xFFFF );
Expand Down Expand Up @@ -431,7 +425,7 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

}

function wav2Decode( j, buffer, nx, ox, ny, oy, mx ) {
function wav2Decode( j, buffer, nx, ox, ny, oy ) {

var n = ( nx > ny ) ? ny : nx;
var p = 1;
Expand Down Expand Up @@ -716,7 +710,7 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {
}

var lut = new Uint16Array( USHORT_RANGE );
var maxValue = reverseLutFromBitmap( bitmap, lut );
reverseLutFromBitmap( bitmap, lut );

var length = parseUint32( inDataView, inOffset );

Expand All @@ -728,10 +722,6 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

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

var exrChannelInfo = exrChannelInfos[ i ];

var pixelSize = 2; // assumes HALF_FLOAT

pizChannelData[ i ] = {};
pizChannelData[ i ][ 'start' ] = outBufferEnd;
pizChannelData[ i ][ 'end' ] = pizChannelData[ i ][ 'start' ];
Expand All @@ -755,8 +745,7 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {
pizChannelData[ i ].nx,
pizChannelData[ i ].size,
pizChannelData[ i ].ny,
pizChannelData[ i ].nx * pizChannelData[ i ].size,
maxValue
pizChannelData[ i ].nx * pizChannelData[ i ].size
);

}
Expand Down Expand Up @@ -1035,9 +1024,9 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

var EXRHeader = {};

var magic = bufferDataView.getUint32( 0, true );
var versionByteZero = bufferDataView.getUint8( 4, true );
var fullMask = bufferDataView.getUint8( 5, true );
bufferDataView.getUint32( 0, true ); // magic
bufferDataView.getUint8( 4, true ); // versionByteZero
bufferDataView.getUint8( 5, true ); // fullMask

// start of header

Expand Down Expand Up @@ -1080,7 +1069,7 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

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

var scanlineOffset = parseUlong( bufferDataView, offset );
parseUlong( bufferDataView, offset ); // scanlineOffset

}

Expand All @@ -1104,7 +1093,7 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {
for ( var y = 0; y < height; y ++ ) {

var y_scanline = parseUint32( bufferDataView, offset );
var dataSize = parseUint32( bufferDataView, offset );
parseUint32( bufferDataView, offset ); // dataSize

for ( var channelID = 0; channelID < EXRHeader.channels.length; channelID ++ ) {

Expand Down Expand Up @@ -1135,8 +1124,8 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

for ( var scanlineBlockIdx = 0; scanlineBlockIdx < height / scanlineBlockSize; scanlineBlockIdx ++ ) {

var line_no = parseUint32( bufferDataView, offset );
var data_len = parseUint32( bufferDataView, offset );
parseUint32( bufferDataView, offset ); // line_no
parseUint32( bufferDataView, offset ); // data_len

var tmpBufferSize = width * scanlineBlockSize * ( EXRHeader.channels.length * BYTES_PER_HALF );
var tmpBuffer = new Uint16Array( tmpBufferSize );
Expand Down
31 changes: 10 additions & 21 deletions examples/jsm/loaders/EXRLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ EXRLoader.prototype._parser = function ( buffer ) {
const SHORT_ZEROCODE_RUN = 59;
const LONG_ZEROCODE_RUN = 63;
const SHORTEST_LONG_RUN = 2 + LONG_ZEROCODE_RUN - SHORT_ZEROCODE_RUN;
const LONGEST_LONG_RUN = 255 + SHORTEST_LONG_RUN;

const BYTES_PER_HALF = 2;

Expand Down Expand Up @@ -403,11 +402,6 @@ EXRLoader.prototype._parser = function ( buffer ) {

}

var NBITS = 16;
var A_OFFSET = 1 << ( NBITS - 1 );
var M_OFFSET = 1 << ( NBITS - 1 );
var MOD_MASK = ( 1 << NBITS ) - 1;

function UInt16( value ) {

return ( value & 0xFFFF );
Expand Down Expand Up @@ -439,7 +433,7 @@ EXRLoader.prototype._parser = function ( buffer ) {

}

function wav2Decode( j, buffer, nx, ox, ny, oy, mx ) {
function wav2Decode( j, buffer, nx, ox, ny, oy ) {

var n = ( nx > ny ) ? ny : nx;
var p = 1;
Expand Down Expand Up @@ -724,7 +718,7 @@ EXRLoader.prototype._parser = function ( buffer ) {
}

var lut = new Uint16Array( USHORT_RANGE );
var maxValue = reverseLutFromBitmap( bitmap, lut );
reverseLutFromBitmap( bitmap, lut );

var length = parseUint32( inDataView, inOffset );

Expand All @@ -736,10 +730,6 @@ EXRLoader.prototype._parser = function ( buffer ) {

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

var exrChannelInfo = exrChannelInfos[ i ];

var pixelSize = 2; // assumes HALF_FLOAT

pizChannelData[ i ] = {};
pizChannelData[ i ][ 'start' ] = outBufferEnd;
pizChannelData[ i ][ 'end' ] = pizChannelData[ i ][ 'start' ];
Expand All @@ -763,8 +753,7 @@ EXRLoader.prototype._parser = function ( buffer ) {
pizChannelData[ i ].nx,
pizChannelData[ i ].size,
pizChannelData[ i ].ny,
pizChannelData[ i ].nx * pizChannelData[ i ].size,
maxValue
pizChannelData[ i ].nx * pizChannelData[ i ].size
);

}
Expand Down Expand Up @@ -1043,9 +1032,9 @@ EXRLoader.prototype._parser = function ( buffer ) {

var EXRHeader = {};

var magic = bufferDataView.getUint32( 0, true );
var versionByteZero = bufferDataView.getUint8( 4, true );
var fullMask = bufferDataView.getUint8( 5, true );
bufferDataView.getUint32( 0, true ); // magic
bufferDataView.getUint8( 4, true ); // versionByteZero
bufferDataView.getUint8( 5, true ); // fullMask

// start of header

Expand Down Expand Up @@ -1088,7 +1077,7 @@ EXRLoader.prototype._parser = function ( buffer ) {

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

var scanlineOffset = parseUlong( bufferDataView, offset );
parseUlong( bufferDataView, offset ); // scanlineOffset

}

Expand All @@ -1112,7 +1101,7 @@ EXRLoader.prototype._parser = function ( buffer ) {
for ( var y = 0; y < height; y ++ ) {

var y_scanline = parseUint32( bufferDataView, offset );
var dataSize = parseUint32( bufferDataView, offset );
parseUint32( bufferDataView, offset ); // dataSize

for ( var channelID = 0; channelID < EXRHeader.channels.length; channelID ++ ) {

Expand Down Expand Up @@ -1143,8 +1132,8 @@ EXRLoader.prototype._parser = function ( buffer ) {

for ( var scanlineBlockIdx = 0; scanlineBlockIdx < height / scanlineBlockSize; scanlineBlockIdx ++ ) {

var line_no = parseUint32( bufferDataView, offset );
var data_len = parseUint32( bufferDataView, offset );
parseUint32( bufferDataView, offset ); // line_no
parseUint32( bufferDataView, offset ); // data_len

var tmpBufferSize = width * scanlineBlockSize * ( EXRHeader.channels.length * BYTES_PER_HALF );
var tmpBuffer = new Uint16Array( tmpBufferSize );
Expand Down