From d24d7b2ab97db02fd7c8d1c99af767247848e307 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Mon, 2 Nov 2015 14:38:13 -0500 Subject: [PATCH] MTLLoader: Removed power of 2 code (WebGLRenderer does this now). --- examples/js/loaders/MTLLoader.js | 34 +------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/examples/js/loaders/MTLLoader.js b/examples/js/loaders/MTLLoader.js index 2ef3635f66..c10b20bbba 100644 --- a/examples/js/loaders/MTLLoader.js +++ b/examples/js/loaders/MTLLoader.js @@ -418,7 +418,7 @@ THREE.MTLLoader.MaterialCreator.prototype = { loader.setCrossOrigin( this.crossOrigin ); loader.load( url, function ( image ) { - texture.image = THREE.MTLLoader.ensurePowerOfTwo_( image ); + texture.image = image; texture.needsUpdate = true; if ( onLoad ) onLoad( texture ); @@ -435,36 +435,4 @@ THREE.MTLLoader.MaterialCreator.prototype = { }; -THREE.MTLLoader.ensurePowerOfTwo_ = function ( image ) { - - if ( ! THREE.Math.isPowerOfTwo( image.width ) || ! THREE.Math.isPowerOfTwo( image.height ) ) { - - var canvas = document.createElement( "canvas" ); - canvas.width = THREE.MTLLoader.nextHighestPowerOfTwo_( image.width ); - canvas.height = THREE.MTLLoader.nextHighestPowerOfTwo_( image.height ); - - var ctx = canvas.getContext( "2d" ); - ctx.drawImage( image, 0, 0, image.width, image.height, 0, 0, canvas.width, canvas.height ); - return canvas; - - } - - return image; - -}; - -THREE.MTLLoader.nextHighestPowerOfTwo_ = function( x ) { - - -- x; - - for ( var i = 1; i < 32; i <<= 1 ) { - - x = x | x >> i; - - } - - return x + 1; - -}; - THREE.EventDispatcher.prototype.apply( THREE.MTLLoader.prototype ); -- GitLab