From ad3acb716ba4ad8bb87bc8877ef5f2e280af0d6e Mon Sep 17 00:00:00 2001
From: Guilherme Avila <guilhermebav@gmail.com>
Date: Sun, 10 Nov 2019 16:10:07 -0300
Subject: [PATCH] EXRLoader: clean up

---
 examples/js/loaders/EXRLoader.js  | 45 ++++++++++++++++++-------------
 examples/jsm/loaders/EXRLoader.js | 45 ++++++++++++++++++-------------
 2 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/examples/js/loaders/EXRLoader.js b/examples/js/loaders/EXRLoader.js
index b8e7c0fb79..87c80e3653 100644
--- a/examples/js/loaders/EXRLoader.js
+++ b/examples/js/loaders/EXRLoader.js
@@ -769,7 +769,7 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
 
 		function uncompressRaw( info ) {
 
-			return new DataView( info.array.buffer, info.offset.value, info.size ); // 
+			return new DataView( info.array.buffer, info.offset.value, info.size );
 
 		}
 
@@ -1206,38 +1206,45 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
 
 		// offsets
 		var dataWindowHeight = EXRHeader.dataWindow.yMax + 1;
-		var scanlineBlockSize = 1; // 1 for NO_COMPRESSION
 		
 		var uncompress;
+		var scanlineBlockSize;
 
-		if ( EXRHeader.compression === 'NO_COMPRESSION' ) {
+		switch ( EXRHeader.compression ) {
 
-			scanlineBlockSize = 1;
-			uncompress = uncompressRaw;
+			case 'NO_COMPRESSION':
 
-		} else if ( EXRHeader.compression === 'RLE_COMPRESSION' ) {
+				scanlineBlockSize = 1;
+				uncompress = uncompressRaw;
+				break;
 
-			scanlineBlockSize = 1;
-			uncompress = uncompressRLE;
+			case 'RLE_COMPRESSION':
 
-		} else if ( EXRHeader.compression === 'ZIPS_COMPRESSION' ) {
+				scanlineBlockSize = 1;
+				uncompress = uncompressRLE;
+				break;
 
-			scanlineBlockSize = 1;
-			uncompress = uncompressZIP;
+			case 'ZIPS_COMPRESSION':
 
-		} else if ( EXRHeader.compression === 'ZIP_COMPRESSION' ) {
+				scanlineBlockSize = 1;
+				uncompress = uncompressZIP;
+				break;
 
-			scanlineBlockSize = 16;
-			uncompress = uncompressZIP;
+			case 'ZIP_COMPRESSION':
+					
+				scanlineBlockSize = 16;
+				uncompress = uncompressZIP;
+				break;
 
-		} else if ( EXRHeader.compression === 'PIZ_COMPRESSION' ) {
+			case 'PIZ_COMPRESSION':
 
-			scanlineBlockSize = 32;
-			uncompress = uncompressPIZ;
+				scanlineBlockSize = 32;
+				uncompress = uncompressPIZ;
+				break;
 
-		} else {
+			default:
 
-			throw 'EXRLoader.parse: ' + EXRHeader.compression + ' is unsupported';
+				throw 'EXRLoader.parse: ' + EXRHeader.compression + ' is unsupported';
 
 		}
 
diff --git a/examples/jsm/loaders/EXRLoader.js b/examples/jsm/loaders/EXRLoader.js
index e011dd32f8..6e5609ad51 100644
--- a/examples/jsm/loaders/EXRLoader.js
+++ b/examples/jsm/loaders/EXRLoader.js
@@ -780,7 +780,7 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
 
 		function uncompressRaw( info ) {
 
-			return new DataView( info.array.buffer, info.offset.value, info.size ); // 
+			return new DataView( info.array.buffer, info.offset.value, info.size );
 
 		}
 
@@ -1217,38 +1217,45 @@ EXRLoader.prototype = Object.assign( Object.create( DataTextureLoader.prototype
 
 		// offsets
 		var dataWindowHeight = EXRHeader.dataWindow.yMax + 1;
-		var scanlineBlockSize = 1; // 1 for NO_COMPRESSION
 		
 		var uncompress;
+		var scanlineBlockSize;
 
-		if ( EXRHeader.compression === 'NO_COMPRESSION' ) {
+		switch ( EXRHeader.compression ) {
 
-			scanlineBlockSize = 1;
-			uncompress = uncompressRaw;
+			case 'NO_COMPRESSION':
 
-		} else if ( EXRHeader.compression === 'RLE_COMPRESSION' ) {
+				scanlineBlockSize = 1;
+				uncompress = uncompressRaw;
+				break;
 
-			scanlineBlockSize = 1;
-			uncompress = uncompressRLE;
+			case 'RLE_COMPRESSION':
 
-		} else if ( EXRHeader.compression === 'ZIPS_COMPRESSION' ) {
+				scanlineBlockSize = 1;
+				uncompress = uncompressRLE;
+				break;
 
-			scanlineBlockSize = 1;
-			uncompress = uncompressZIP;
+			case 'ZIPS_COMPRESSION':
 
-		} else if ( EXRHeader.compression === 'ZIP_COMPRESSION' ) {
+				scanlineBlockSize = 1;
+				uncompress = uncompressZIP;
+				break;
 
-			scanlineBlockSize = 16;
-			uncompress = uncompressZIP;
+			case 'ZIP_COMPRESSION':
+					
+				scanlineBlockSize = 16;
+				uncompress = uncompressZIP;
+				break;
 
-		} else if ( EXRHeader.compression === 'PIZ_COMPRESSION' ) {
+			case 'PIZ_COMPRESSION':
 
-			scanlineBlockSize = 32;
-			uncompress = uncompressPIZ;
+				scanlineBlockSize = 32;
+				uncompress = uncompressPIZ;
+				break;
 
-		} else {
+			default:
 
-			throw 'EXRLoader.parse: ' + EXRHeader.compression + ' is unsupported';
+				throw 'EXRLoader.parse: ' + EXRHeader.compression + ' is unsupported';
 
 		}
 
-- 
GitLab