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

whalesong/image rotate accepts any real num

Browse Source
This commit is contained in:
Stephen Chang 2015-06-04 13:49:20 -04:00
parent 0b6ab32f8d
commit 4eb732101d
3 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
whalesong/image/private/js-impl.js
View File

@ -89,8 +89,6 @@ var less = function(lhs, rhs) {
return (rhs - lhs) > 0.00001;
}
var checkString = plt.baselib.check.checkString;
var checkStringOrFalse = plt.baselib.check.makeCheckArgumentType(
function(x) { return plt.baselib.strings.isString(x) || x === false; },
@ -782,28 +780,26 @@ EXPORTS['place-image/align'] =
}
});
//////////////////////////////////////////////////////////////////////
// rotate: angle image -> image
// Rotates image by angle degrees in a counter-clockwise direction.
EXPORTS['rotate'] =
makePrimitiveProcedure(
'rotate',
2,
function(MACHINE) {
var angle = checkRotateAngle(MACHINE, "rotate", 0);
var angle360 = angle % 360;
var img = checkImage(MACHINE, "rotate", 1);
if (jsnums.lessThan(angle, 0)) {
return makeRotateImage(jsnums.toFixnum(-(360 + angle)), img);
// convert to clockwise rotation for makeRotateImage
if (angle360 < 0) {
return makeRotateImage(jsnums.toFixnum(-(360 + angle360)), img);
} else {
return makeRotateImage(jsnums.toFixnum(-angle), img);
return makeRotateImage(jsnums.toFixnum(-angle360), img);
}
});
EXPORTS['scale'] =
makePrimitiveProcedure(
'scale',

9
whalesong/image/private/kernel.js
View File

@ -28,9 +28,7 @@ var isAngle = function(x) {
};
// differentiate between rotation angle and other angles
var isRotateAngle = function(x) {
return plt.baselib.numbers.isReal(x) &&
jsnums.greaterThan(x, -360) &&
jsnums.lessThan(x, 360);
return plt.baselib.numbers.isReal(x);
};
@ -672,8 +670,9 @@ OverlayImage.prototype.equals = function(other, aUnionFind) {
//////////////////////////////////////////////////////////////////////
// rotate: angle image -> image
// Rotates image by angle degrees in a counter-clockwise direction.
// RotateImage: angle image -> image
// Rotates image by angle degrees in a *clockwise* direction.
// NOTE: the angle direction differs from the rotate function.
// TODO: special case for ellipse?
var RotateImage = function(angle, img) {
BaseImage.call(this);

30
whalesong/tests/test-images.rkt
View File

@ -601,8 +601,34 @@ Australia2
(flip-horizontal
(rotate 30 (square 50 "solid" "blue"))))
"A solid blue triangle, rotated 30 degrees. Should be flush left"
(rotate 30 (triangle 100 "solid" "blue"))
(define blue-tri (triangle 100 "solid" "blue"))
"A solid blue triangle, rotated 0 degrees. Should be pointing up."
(rotate 0 blue-tri)
"A solid blue triangle, rotated 30 degrees ccw. Should be flush left"
(rotate 30 blue-tri)
"A solid blue triangle, rotated 90 degrees ccw. Should be pointing left."
(rotate 90 blue-tri)
"A solid blue triangle, rotated 180 degrees ccw. Should be pointing down."
(rotate 180 blue-tri)
"A solid blue triangle, rotated 270 degrees ccw. Should be pointing right."
(rotate 270 blue-tri)
"A solid blue triangle, rotated 630 degrees ccw. Should be pointing right."
(rotate 630 blue-tri)
"A solid blue triangle, rotated 360 degrees ccw. Should be pointing up."
(rotate 360 blue-tri)
"A solid blue triangle, rotated 360.1 degrees ccw. Should be approximately pointing up."
(rotate 360.1 blue-tri)
"A solid blue triangle, rotated 720.5 degrees ccw. Should be approximately pointing up."
(rotate 720.5 blue-tri)
"A solid blue triangle, rotated 1.5 degrees cw. Should be approximately pointing up."
(rotate -1.5 blue-tri)
"A solid blue triangle, rotated -90 degrees ccw (90 cw). Should be pointing right."
(rotate -90 blue-tri)
"A solid blue triangle, rotated -450 degrees ccw (450 cw). Should be pointing right."
(rotate -450 blue-tri)
"A solid blue triangle, rotated -810 degrees ccw (810 cw). Should be pointing right."
(rotate -810 blue-tri)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; SCALE & SCALE/XY