Skip to content

EXRLoader: bug fixes #13825

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
Apr 12, 2018
Merged

EXRLoader: bug fixes #13825

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
14 changes: 9 additions & 5 deletions examples/js/loaders/EXRLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

} else if ( type == 'chromaticities' ) {

return parseChromaticities( buffer, offset );
return parseChromaticities( dataView, offset );

} else if ( type == 'compression' ) {

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

return parseV2f( dataView, offset );

} else if ( type == 'int' ) {
Copy link
Collaborator

@Mugen87 Mugen87 Apr 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please use the strict comparison operator (===) in EXRLoader? That would be great for code style 😇

Copy link
Owner

@mrdoob mrdoob Apr 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll clean it up 👌


return parseUint32( dataView, offset );

} else {

throw 'Cannot parse value for unsupported type: ' + type;
Expand Down Expand Up @@ -916,8 +920,8 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {

for ( var y = 0; y < height; y ++ ) {

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

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

Expand All @@ -928,9 +932,9 @@ THREE.EXRLoader.prototype._parser = function ( buffer ) {
// HALF
for ( var x = 0; x < width; x ++ ) {

var val = parseFloat16( buffer, offset );
var val = parseFloat16( bufferDataView, offset );

byteArray[ ( ( ( width - y_scanline ) * ( height * numChannels ) ) + ( x * numChannels ) ) + cOff ] = val;
byteArray[ ( ( (height - y_scanline) * ( width * numChannels ) ) + ( x * numChannels ) ) + cOff ] = val;

}

Expand Down