Skip to content

Commit

Permalink
Updated builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
mrdoob committed Sep 26, 2016
1 parent 888b6be commit a70b90b
Show file tree
Hide file tree
Showing 2 changed files with 333 additions and 312 deletions.
19 changes: 19 additions & 0 deletions build/three.js
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,14 @@

},

// https://en.wikipedia.org/wiki/Linear_interpolation

lerp: function ( x, y, t ) {

return ( 1 - t ) * x + t * y;

},

// http://en.wikipedia.org/wiki/Smoothstep

smoothstep: function ( x, min, max ) {
Expand Down Expand Up @@ -17632,6 +17640,17 @@

_gl.pixelStorei( _gl.UNPACK_FLIP_Y_WEBGL, texture.flipY );
_gl.pixelStorei( _gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultiplyAlpha );

if ( texture.isDataTexture && texture.unpackAlignment !== 1 &&
exports.Math.isPowerOfTwo( texture.image.width ) === false &&
texture.format === RGBFormat &&
texture.type === UnsignedByteType ) {

console.warn( 'THREE.WebGLRenderer: Changed unpackAlignment to 1. See #9566.', texture );
texture.unpackAlignment = 1;

}

_gl.pixelStorei( _gl.UNPACK_ALIGNMENT, texture.unpackAlignment );

var image = clampToMaxSize( texture.image, capabilities.maxTextureSize );
Expand Down
Loading

0 comments on commit a70b90b

Please sign in to comment.