From 6cec1104795de141a07932556590ee236a29453a Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Mon, 27 Jun 2016 12:56:24 -0700 Subject: [PATCH] TextureLoader: Clean up. --- src/loaders/TextureLoader.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/loaders/TextureLoader.js b/src/loaders/TextureLoader.js index 602b8691a2..c81645c64a 100644 --- a/src/loaders/TextureLoader.js +++ b/src/loaders/TextureLoader.js @@ -20,10 +20,8 @@ Object.assign( THREE.TextureLoader.prototype, { loader.load( url, function ( image ) { // JPEGs can't have an alpha channel, so memory can be saved by storing them as RGB. - var isJPEG = url.search(/\.(jpg|jpeg)$/) > 0; - if (!isJPEG) { - isJPEG = url.search(/^data\:image\/jpeg/) == 0; - } + var isJPEG = url.search( /\.(jpg|jpeg)$/ ) > 0 || url.search( /^data\:image\/jpeg/ ) === 0; + texture.format = isJPEG ? THREE.RGBFormat : THREE.RGBAFormat; texture.image = image; texture.needsUpdate = true; -- GitLab