suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Image corrections; thanks to Marco Morazan for helping track these down

Browse Source
This commit is contained in:
Danny Yoo 2013-01-30 14:37:47 -07:00
parent 579d977df8
commit 68f76395e9
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
image/private/kernel.js
View File

@ -221,7 +221,7 @@ var isScene = function(x) {
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SceneImage: primitive-number primitive-number (listof image) -> Scene // SceneImage: primitive-number primitive-number (listof image) -> Scene
var SceneImage = function(width, height, children, withBorder) { var SceneImage = function(width, height, children, withBorder) {
BaseImage.call(this, 0, 0); BaseImage.call(this, Math.floor(width/2), Math.floor(height/2));
this.width = width; this.width = width;
this.height = height; this.height = height;
this.children = children; // arrayof [image, number, number] this.children = children; // arrayof [image, number, number]
@ -544,39 +544,40 @@ OverlayImage.prototype.equals = function(other, aUnionFind) {
// based on http://stackoverflow.com/questions/3276467/adjusting-div-width-and-height-after-rotated // based on http://stackoverflow.com/questions/3276467/adjusting-div-width-and-height-after-rotated
var RotateImage = function(angle, img) { var RotateImage = function(angle, img) {
var sin = Math.sin(angle * Math.PI / 180), var sin = Math.sin(angle * Math.PI / 180),
cos = Math.cos(angle * Math.PI / 180); cos = Math.cos(angle * Math.PI / 180);
var width = img.getWidth();
var height = img.getHeight();
// (w,0) rotation // (w,0) rotation
var x1 = Math.floor(cos * img.getWidth()), var x1 = (cos * width),
y1 = Math.floor(sin * img.getWidth()); y1 = (sin * width);
// (0,h) rotation // (0,h) rotation
var x2 = Math.floor(-sin * img.getHeight()), var x2 = (-sin * height),
y2 = Math.floor( cos * img.getHeight()); y2 = ( cos * height);
// (w,h) rotation // (w,h) rotation
var x3 = Math.floor(cos * img.getWidth() - sin * img.getHeight()), var x3 = (cos * width - sin * height),
y3 = Math.floor(sin * img.getWidth() + cos * img.getHeight()); y3 = (sin * width + cos * height);
var minX = Math.min(0, x1, x2, x3), var minX = Math.min(0, x1, x2, x3),
maxX = Math.max(0, x1, x2, x3), maxX = Math.max(0, x1, x2, x3),
minY = Math.min(0, y1, y2, y3), minY = Math.min(0, y1, y2, y3),
maxY = Math.max(0, y1, y2, y3); maxY = Math.max(0, y1, y2, y3);
var rotatedWidth = maxX - minX, var rotatedWidth = maxX - minX,
rotatedHeight = maxY - minY; rotatedHeight = maxY - minY;
// resize the image // resize the image
BaseImage.call(this, BaseImage.call(this,
Math.floor(rotatedWidth / 2), Math.floor(rotatedWidth / 2),
Math.floor(rotatedHeight / 2)); Math.floor(rotatedHeight / 2));
this.img = img; this.img = img;
this.width = rotatedWidth; this.width = Math.floor(rotatedWidth);
this.height = rotatedHeight; this.height = Math.floor(rotatedHeight);
this.angle = angle; this.angle = angle;
this.translateX = -minX; this.translateX = Math.floor(-minX);
this.translateY = -minY; this.translateY = Math.floor(-minY);
}; };
RotateImage.prototype = heir(BaseImage.prototype); RotateImage.prototype = heir(BaseImage.prototype);
@ -1669,4 +1670,4 @@ EXPORTS.isColor = isColor;
EXPORTS.colorRed = colorRed; EXPORTS.colorRed = colorRed;
EXPORTS.colorGreen = colorGreen; EXPORTS.colorGreen = colorGreen;
EXPORTS.colorBlue = colorBlue; EXPORTS.colorBlue = colorBlue;
EXPORTS.colorAlpha = colorAlpha; EXPORTS.colorAlpha = colorAlpha;