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

in the middle of converting image library to whalesong

Browse Source
This commit is contained in:
Danny Yoo 2011-07-13 12:35:58 -04:00
parent 70187d3b26
commit fb36d1e855
4 changed files with 274 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

349
image/private/js-impl.js
View File

@ -74,6 +74,9 @@ var checkByte = plt.baselib.check.checkByte;
var checkReal = plt.baselib.check.checkReal; var checkReal = plt.baselib.check.checkReal;
var checkBoolean = plt.baselib.check.checkBoolean; var checkBoolean = plt.baselib.check.checkBoolean;
var checkNonNegativeReal = plt.baselib.check.checkNonNegativeReal;
var _checkColor = plt.baselib.check.makeCheckArgumentType( var _checkColor = plt.baselib.check.makeCheckArgumentType(
isColorOrColorString, isColorOrColorString,
'color'); 'color');
@ -90,6 +93,9 @@ var checkImage = plt.baselib.check.makeCheckArgumentType(
isImage, isImage,
'image'); 'image');
var checkImageOrScene = plt.baselib.check.makeCheckArgumentType(
function(x) { return isImage(x) || isScene(x); },
'image or scene');
var checkFontFamily = plt.baselib.check.makeCheckArgumentType( var checkFontFamily = plt.baselib.check.makeCheckArgumentType(
isFontFamily, isFontFamily,
@ -112,6 +118,11 @@ var checkPlaceY = plt.baselib.check.makeCheckArgumentType(
'y-place'); 'y-place');
var checkAngle = plt.baselib.check.makeCheckArgumentType(
isAngle,
'angle');
@ -221,7 +232,7 @@ EXPORTS['overlay'] =
plt.baselib.arity.makeArityAtLeast(2), plt.baselib.arity.makeArityAtLeast(2),
function(MACHINE) { function(MACHINE) {
var img1 = checkImage(MACHINE, "overlay", 0); var img1 = checkImage(MACHINE, "overlay", 0);
var img2 = checkImage(MACHINE, "overlay" 1); var img2 = checkImage(MACHINE, "overlay", 1);
var restImages = []; var restImages = [];
for (var i = 2; i < MACHINE.argcount; i++) { for (var i = 2; i < MACHINE.argcount; i++) {
restImages.push(checkImage(MACHINE, "overlay", i)); restImages.push(checkImage(MACHINE, "overlay", i));
@ -336,78 +347,215 @@ EXPORTS['underlay/align'] =
placeX.toString(), placeX.toString(),
placeY.toString()); placeY.toString());
for (var i = 0; i < restImages.length; i++) for (var i = 0; i < restImages.length; i++) {
img = makeOverlayImage(restImages[i], img = makeOverlayImage(restImages[i],
img, img,
placeX.toString(), placeX.toString(),
placeY.toString()); placeY.toString());
}
return img; return img;
}); });
// EXPORTS['beside'] = EXPORTS['beside'] =
// makePrimitiveProcedure( makePrimitiveProcedure(
// 'beside', 'beside',
// ???, plt.baselib.arity.makeArityAtLeast(2),
// function(MACHINE) { function(MACHINE) {
// ... var img1 = checkImage(MACHINE, "beside", 0);
// }); var img2 = checkImage(MACHINE, "beside", 1);
var restImages = [];
for (var i = 2; i < MACHINE.argcount; i++) {
restImages.push(checkImage(MACHINE, "beside", i));
}
var img = makeOverlayImage(img1,
img2,
"beside",
"middle");
for (var i = 0; i < restImages.length; i++) {
img = makeOverlayImage(img, restImages[i], "beside", "middle");
}
});
EXPORTS['beside/align'] =
makePrimitiveProcedure(
'beside/align',
plt.baselib.arity.makeArityAtLeast(3),
function(MACHINE) {
var placeY = checkPlaceY(MACHINE, "beside/align", 0);
var img1 = checkImage(MACHINE, "beside/align", "image", 1);
var img2 = checkImage(MACHINE, "beside/align", 2);
var restImages = [];
for (var i = 3; i < MACHINE.argcount; i++) {
restImages.push(checkImage(MACHINE, "beside/align", i));
}
var img = makeOverlayImage(img1,
img2,
"beside",
placeY.toString());
for (var i = 0; i < restImages.length; i++) {
img = makeOverlayImage(img,
restImages[i],
"beside",
placeY.toString());
}
return img;
});
EXPORTS['above'] =
makePrimitiveProcedure(
'above',
plt.baselib.arity.makeArityAtLeast(2),
function(MACHINE) {
var img1 = checkImage(MACHINE, "above", 0);
var img2 = checkImage(MACHINE, "above", 1);
var restImages = [];
for (var i = 2; i < MACHINE.argcount; i++) {
restImages.push(checkImage(MACHINE, "above", i));
}
var img = makeOverlayImage(img1,
img2,
"middle",
"above");
for (var i = 0; i < restImages.length; i++)
img = makeOverlayImage(img,
restImages[i],
"middle",
"above");
return img;
});
EXPORTS['above/align'] =
makePrimitiveProcedure(
'above/align',
plt.baselib.arity.makeArityAtLeast(3),
function(MACHINE) {
var placeX = checkPlaceX(MACHINE, "above/align", 0);
var img1 = checkImage(MACHINE, "above/align", 1);
var img2 = checkImage(MACHINE, "above/align", 2);
var restImages = [];
for (var i = 3; i < MACHINE.argcount; i++) {
restImages.push(checkImage(MACHINE, "above/align", i));
}
var img = makeOverlayImage(img1,
img2,
placeX.toString(),
"above");
for (var i = 0; i < restImages.length; i++)
img = makeOverlayImage(img,
restImages[i],
placeX.toString(),
"above");
return img;
});
EXPORTS['place-image'] =
makePrimitiveProcedure(
'place-image',
4,
function(MACHINE) {
var picture = checkImage(MACHINE, "place-image", 0);
var x = checkReal(MACHINE, "place-image", 1);
var y = checkReal(MACHINE, "place-image", 2);
var background = checkImageOrScene(MACHINE, "place-image", 3);
if (isScene(background)) {
return background.add(picture, jsnums.toFixnum(x), jsnums.toFixnum(y));
} else {
var newScene = makeSceneImage(background.getWidth(),
background.getHeight(),
[],
false);
newScene = newScene.add(background.updatePinhole(0, 0), 0, 0);
newScene = newScene.add(picture, jsnums.toFixnum(x), jsnums.toFixnum(y));
return newScene;
}
});
EXPORTS['place-image/align'] =
makePrimitiveProcedure(
'place-image/align',
6,
function(MACHINE) {
var img = checkImage(MACHINE, "place-image/align", 0);
var x = checkReal(MACHINE, "place-image/align", 1);
var y = checkReal(MACHINE, "place-image/align", 2);
var placeX = checkPlaceX(MACHINE, "place-image/align", 3);
var placeY = checkPlaceY(MACHINE, "place-image/align", 4);
var background = checkImageOrScene(MACHINE, "place-image/align", 5);
// calculate x and y based on placeX and placeY
if (placeX == "left") x = x + img.pinholeX;
else if (placeX == "right") x = x - img.pinholeX;
if (placeY == "top") y = y + img.pinholeY;
else if (placeY == "bottom") y = y - img.pinholeY;
if (isScene(background)) {
return background.add(img, jsnums.toFixnum(x), jsnums.toFixnum(y));
} else {
var newScene = makeSceneImage(background.getWidth(),
background.getHeight(),
[],
false);
newScene = newScene.add(background.updatePinhole(0, 0), 0, 0);
newScene = newScene.add(img, jsnums.toFixnum(x), jsnums.toFixnum(y));
return newScene;
}
});
// EXPORTS['beside/align'] =
// makePrimitiveProcedure(
// 'beside/align',
// ???,
// function(MACHINE) {
// ...
// });
// EXPORTS['above'] =
// makePrimitiveProcedure(
// 'above',
// ???,
// function(MACHINE) {
// ...
// });
// EXPORTS['above/align'] =
// makePrimitiveProcedure(
// 'above/align',
// ???,
// function(MACHINE) {
// ...
// });
// EXPORTS['place-image/align'] =
// makePrimitiveProcedure(
// 'place-image/align',
// ???,
// function(MACHINE) {
// ...
// });
EXPORTS['rotate'] = EXPORTS['rotate'] =
makePrimitiveProcedure( makePrimitiveProcedure(
'rotate', 'rotate',
2, 2,
function(MACHINE) { function(MACHINE) {
var angle = checkReal(MACHINE, "rotate", 0); var angle = checkAngle(MACHINE, "rotate", 0);
var img = checkImage(MACHINE, "rotate", 1); var img = checkImage(MACHINE, "rotate", 1);
return makeRotateImage(jsnums.toFixnum(angle), img); return makeRotateImage(jsnums.toFixnum(-angle), img);
}); });
EXPORTS['scale'] = EXPORTS['scale'] =
makePrimitiveProcedure( makePrimitiveProcedure(
'scale', 'scale',
2, 2,
function(MACHINE) { function(MACHINE) {
var factor = checkReal(MACHINE, "scale", 0); var factor = checkReal(MACHINE, "scale", 0);
var img = checkImage(MACHINE, "scale", 1); var img = checkImage(MACHINE, "image", 1);
return makeScaleImage(jsnums.toFixnum(factor), return makeScaleImage(jsnums.toFixnum(factor),
jsnums.toFixnum(factor), jsnums.toFixnum(factor),
img); img);
}); });
EXPORTS['scale/xy'] = EXPORTS['scale/xy'] =
makePrimitiveProcedure( makePrimitiveProcedure(
'scale/xy', 'scale/xy',
@ -417,70 +565,97 @@ EXPORTS['scale/xy'] =
var yFactor = checkReal(MACHINE, "scale/xy", 1); var yFactor = checkReal(MACHINE, "scale/xy", 1);
var img = checkImage(MACHINE, "scale/xy", 2); var img = checkImage(MACHINE, "scale/xy", 2);
return makeScaleImage(jsnums.toFixnum(xFactor), return makeScaleImage(jsnums.toFixnum(xFactor),
jsnums.toFixnum(yFactor), jsnums.toFixnum(yFactor),
img); img);
}); });
// EXPORTS['flip-horizontal'] =
// makePrimitiveProcedure(
// 'flip-horizontal',
// ???,
// function(MACHINE) {
// ...
// });
// EXPORTS['flip-vertical'] = EXPORTS['flip-horizontal'] =
// makePrimitiveProcedure( makePrimitiveProcedure(
// 'flip-vertical', 'flip-horizontal',
// ???, 1,
// function(MACHINE) { function(MACHINE) {
// ... var img = checkImage(MACHINE, "flip-horizontal", 0);
// }); return makeFlipImage(img, "horizontal");
});
EXPORTS['flip-vertical'] =
makePrimitiveProcedure(
'flip-vertical',
1,
function(MACHINE) {
var img = checkImage(MACHINE, "flip-vertical", 0);
return makeFlipImage(img, "vertical");
});
EXPORTS['frame'] =
makePrimitiveProcedure(
'frame',
1,
function(MACHINE) {
var img = checkImage(MACHINE, "frame", 0);
return makeFrameImage(img);
});
EXPORTS['crop'] =
makePrimitiveProcedure(
'crop',
5,
function(MACHINE) {
var x = checkReal(MACHINE, "crop", 0);
var y = checkReal(MACHINE, "crop", 1);
var width = checkNonNegativeReal(MACHINE, "crop", 2);
var height = checkNonNegativeReal(MACHINE, "crop", 3);
var img = checkImage(MACHINE, "crop", 4);
return makeCropImage(jsnums.toFixnum(x),
jsnums.toFixnum(y),
jsnums.toFixnum(width),
jsnums.toFixnum(height),
img);
});
// EXPORTS['frame'] =
// makePrimitiveProcedure(
// 'frame',
// ???,
// function(MACHINE) {
// ...
// });
// EXPORTS['crop'] =
// makePrimitiveProcedure(
// 'crop',
// ???,
// function(MACHINE) {
// ...
// });
EXPORTS['line'] = EXPORTS['line'] =
makePrimitiveProcedure( makePrimitiveProcedure(
'line', 'line',
3, 3,
function(MACHINE) { function(MACHINE) {
var x = checkReal(MACHINE, "line", 0); var x = checkReal(MACHINE, 'line', 0);
var y = checkReal(MACHINE, "line", 1); var y = checkReal(MACHINE, 'line', 1);
var c = checkColor(MACHINE, "line", 2); var c = checkColor(MACHINE, 'line', 2);
if (colorDb.get(c)) { return makeLineImage(jsnums.toFixnum(x),
c = colorDb.get(c); jsnums.toFixnum(y),
} c,
var line = makeLineImage(jsnums.toFixnum(x), true);
jsnums.toFixnum(y),
c);
return line;
}); });
// EXPORTS['add-line'] = EXPORTS['add-line'] =
// makePrimitiveProcedure( makePrimitiveProcedure(
// 'add-line', 'add-line',
// ???, 6,
// function(MACHINE) { function(MACHINE) {
// ... var img = checkImage(MACHINE, "add-line", 0);
// }); var x1 = checkReal(MACHINE, "add-line", 1);
var y1 = checkReal(MACHINE, "add-line", 2);
var x2 = checkReal(MACHINE, "add-line", 3);
var y2 = checkReal(MACHINE, "add-line", 4);
var c = checkColor(MACHINE, "add-line", 5);
var line = makeLineImage(jsnums.toFixnum(x2-x1),
jsnums.toFixnum(y2-y1),
c,
true);
return makeOverlayImage(line, img, "middle", "middle");
});
// EXPORTS['scene+line'] = // EXPORTS['scene+line'] =
// makePrimitiveProcedure( // makePrimitiveProcedure(

10
image/private/kernel.js
View File

@ -19,6 +19,14 @@ var clone = plt.baselib.clone;
var isAngle = function(x) {
return plt.baselib.numbers.isReal(x) &&
jsnums.greaterThanOrEqual(x, 0) &&
jsnums.lessThan(x, 360);
};
// Produces true if the value is a color or a color string. // Produces true if the value is a color or a color string.
// On the Racket side of things, this is exposed as image-color?. // On the Racket side of things, this is exposed as image-color?.
@ -1522,6 +1530,8 @@ EXPORTS.makeVideoImage = makeVideoImage;
EXPORTS.isImage = isImage; EXPORTS.isImage = isImage;
EXPORTS.isScene = isScene; EXPORTS.isScene = isScene;
EXPORTS.isColorOrColorString = isColorOrColorString; EXPORTS.isColorOrColorString = isColorOrColorString;
EXPORTS.isAngle = isAngle;
EXPORTS.isSceneImage = isSceneImage; EXPORTS.isSceneImage = isSceneImage;
EXPORTS.isCircleImage = isCircleImage; EXPORTS.isCircleImage = isCircleImage;

1
image/private/main.rkt
View File

@ -24,6 +24,7 @@
beside/align beside/align
above above
above/align above/align
place-image
place-image/align place-image/align
rotate rotate
scale scale

1
image/private/racket-impl.rkt
View File

@ -17,6 +17,7 @@
beside/align beside/align
above above
above/align above/align
place-image
place-image/align place-image/align
rotate rotate
scale scale