diff --git a/src/core/display/Sprite.js b/src/core/display/Sprite.js index 867ac89..cba46f8 100644 --- a/src/core/display/Sprite.js +++ b/src/core/display/Sprite.js @@ -208,11 +208,10 @@ var tx = worldTransform.tx; var ty = worldTransform.ty; - var maxX = -Infinity; - var maxY = -Infinity; - - var minX = Infinity; - var minY = Infinity; + var minX, + maxX, + minY, + maxY; if(b === 0 && c === 0) { @@ -246,22 +245,22 @@ var x4 = a * w1 + c * h0 + tx; var y4 = d * h0 + b * w1 + ty; - minX = x1 < minX ? x1 : minX; + minX = x1; minX = x2 < minX ? x2 : minX; minX = x3 < minX ? x3 : minX; minX = x4 < minX ? x4 : minX; - minY = y1 < minY ? y1 : minY; + minY = y1; minY = y2 < minY ? y2 : minY; minY = y3 < minY ? y3 : minY; minY = y4 < minY ? y4 : minY; - maxX = x1 > maxX ? x1 : maxX; + maxX = x1; maxX = x2 > maxX ? x2 : maxX; maxX = x3 > maxX ? x3 : maxX; maxX = x4 > maxX ? x4 : maxX; - maxY = y1 > maxY ? y1 : maxY; + maxY = y1; maxY = y2 > maxY ? y2 : maxY; maxY = y3 > maxY ? y3 : maxY; maxY = y4 > maxY ? y4 : maxY; diff --git a/src/core/display/Sprite.js b/src/core/display/Sprite.js index 867ac89..cba46f8 100644 --- a/src/core/display/Sprite.js +++ b/src/core/display/Sprite.js @@ -208,11 +208,10 @@ var tx = worldTransform.tx; var ty = worldTransform.ty; - var maxX = -Infinity; - var maxY = -Infinity; - - var minX = Infinity; - var minY = Infinity; + var minX, + maxX, + minY, + maxY; if(b === 0 && c === 0) { @@ -246,22 +245,22 @@ var x4 = a * w1 + c * h0 + tx; var y4 = d * h0 + b * w1 + ty; - minX = x1 < minX ? x1 : minX; + minX = x1; minX = x2 < minX ? x2 : minX; minX = x3 < minX ? x3 : minX; minX = x4 < minX ? x4 : minX; - minY = y1 < minY ? y1 : minY; + minY = y1; minY = y2 < minY ? y2 : minY; minY = y3 < minY ? y3 : minY; minY = y4 < minY ? y4 : minY; - maxX = x1 > maxX ? x1 : maxX; + maxX = x1; maxX = x2 > maxX ? x2 : maxX; maxX = x3 > maxX ? x3 : maxX; maxX = x4 > maxX ? x4 : maxX; - maxY = y1 > maxY ? y1 : maxY; + maxY = y1; maxY = y2 > maxY ? y2 : maxY; maxY = y3 > maxY ? y3 : maxY; maxY = y4 > maxY ? y4 : maxY; diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js index be6ad48..692c8ac 100644 --- a/src/core/renderers/webgl/utils/WebGLGraphics.js +++ b/src/core/renderers/webgl/utils/WebGLGraphics.js @@ -701,9 +701,7 @@ webGLData.alpha = graphicsData.fillAlpha; webGLData.color = utils.hex2rgb(graphicsData.fillColor); - /* - calclate the bounds.. - */ + // calclate the bounds.. var minX = Infinity; var maxX = -Infinity; diff --git a/src/core/display/Sprite.js b/src/core/display/Sprite.js index 867ac89..cba46f8 100644 --- a/src/core/display/Sprite.js +++ b/src/core/display/Sprite.js @@ -208,11 +208,10 @@ var tx = worldTransform.tx; var ty = worldTransform.ty; - var maxX = -Infinity; - var maxY = -Infinity; - - var minX = Infinity; - var minY = Infinity; + var minX, + maxX, + minY, + maxY; if(b === 0 && c === 0) { @@ -246,22 +245,22 @@ var x4 = a * w1 + c * h0 + tx; var y4 = d * h0 + b * w1 + ty; - minX = x1 < minX ? x1 : minX; + minX = x1; minX = x2 < minX ? x2 : minX; minX = x3 < minX ? x3 : minX; minX = x4 < minX ? x4 : minX; - minY = y1 < minY ? y1 : minY; + minY = y1; minY = y2 < minY ? y2 : minY; minY = y3 < minY ? y3 : minY; minY = y4 < minY ? y4 : minY; - maxX = x1 > maxX ? x1 : maxX; + maxX = x1; maxX = x2 > maxX ? x2 : maxX; maxX = x3 > maxX ? x3 : maxX; maxX = x4 > maxX ? x4 : maxX; - maxY = y1 > maxY ? y1 : maxY; + maxY = y1; maxY = y2 > maxY ? y2 : maxY; maxY = y3 > maxY ? y3 : maxY; maxY = y4 > maxY ? y4 : maxY; diff --git a/src/core/renderers/webgl/utils/WebGLGraphics.js b/src/core/renderers/webgl/utils/WebGLGraphics.js index be6ad48..692c8ac 100644 --- a/src/core/renderers/webgl/utils/WebGLGraphics.js +++ b/src/core/renderers/webgl/utils/WebGLGraphics.js @@ -701,9 +701,7 @@ webGLData.alpha = graphicsData.fillAlpha; webGLData.color = utils.hex2rgb(graphicsData.fillColor); - /* - calclate the bounds.. - */ + // calclate the bounds.. var minX = Infinity; var maxX = -Infinity; diff --git a/src/extras/TilingSprite.js b/src/extras/TilingSprite.js index f557dc6..67080f3 100644 --- a/src/extras/TilingSprite.js +++ b/src/extras/TilingSprite.js @@ -295,28 +295,27 @@ var x4 = a * w1 + c * h0 + tx; var y4 = d * h0 + b * w1 + ty; - var maxX = -Infinity; - var maxY = -Infinity; + var minX, + maxX, + minY, + maxY; - var minX = Infinity; - var minY = Infinity; - - minX = x1 < minX ? x1 : minX; + minX = x1; minX = x2 < minX ? x2 : minX; minX = x3 < minX ? x3 : minX; minX = x4 < minX ? x4 : minX; - minY = y1 < minY ? y1 : minY; + minY = y1; minY = y2 < minY ? y2 : minY; minY = y3 < minY ? y3 : minY; minY = y4 < minY ? y4 : minY; - maxX = x1 > maxX ? x1 : maxX; + maxX = x1; maxX = x2 > maxX ? x2 : maxX; maxX = x3 > maxX ? x3 : maxX; maxX = x4 > maxX ? x4 : maxX; - maxY = y1 > maxY ? y1 : maxY; + maxY = y1; maxY = y2 > maxY ? y2 : maxY; maxY = y3 > maxY ? y3 : maxY; maxY = y4 > maxY ? y4 : maxY;