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

Merge pull request #13 from vishesh/task/rename-make-scene-image

Browse Source 
Add color argument to makeSceneImage() function
This commit is contained in:
Jens Axel Søgaard 2015-05-04 22:03:39 +02:00
commit 9ce33a4e98
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -689,7 +689,7 @@ EXPORTS['empty-scene'] =
var height = checkNonNegativeReal(MACHINE, 'empty-scene', 1); var height = checkNonNegativeReal(MACHINE, 'empty-scene', 1);
var color = (MACHINE.a===3)? checkColor(MACHINE, 'empty-scene', 2) : null; var color = (MACHINE.a===3)? checkColor(MACHINE, 'empty-scene', 2) : null;
return new SceneImage(jsnums.toFixnum(width), return makeSceneImage(jsnums.toFixnum(width),
jsnums.toFixnum(height), jsnums.toFixnum(height),
color, color,
[], [],
@ -708,10 +708,11 @@ EXPORTS['put-image'] =
if (isScene(background)) { if (isScene(background)) {
return background.add(picture, jsnums.toFixnum(x), background.getHeight() - jsnums.toFixnum(y)); return background.add(picture, jsnums.toFixnum(x), background.getHeight() - jsnums.toFixnum(y));
} else { } else {
var newScene = makeSceneImage(background.getWidth(), var newScene = makeSceneImage(background.getWidth(),
background.getHeight(), background.getHeight(),
[], null,
false); [],
false);
newScene = newScene.add(background, background.getWidth()/2, background.getHeight()/2); newScene = newScene.add(background, background.getWidth()/2, background.getHeight()/2);
newScene = newScene.add(picture, jsnums.toFixnum(x), background.getHeight() - jsnums.toFixnum(y)); newScene = newScene.add(picture, jsnums.toFixnum(x), background.getHeight() - jsnums.toFixnum(y));
return newScene; return newScene;
@ -732,10 +733,11 @@ EXPORTS['place-image'] =
if (isScene(background)) { if (isScene(background)) {
return background.add(picture, jsnums.toFixnum(x), jsnums.toFixnum(y)); return background.add(picture, jsnums.toFixnum(x), jsnums.toFixnum(y));
} else { } else {
var newScene = makeSceneImage(background.getWidth(), var newScene = makeSceneImage(background.getWidth(),
background.getHeight(), background.getHeight(),
[], null,
false); [],
false);
newScene = newScene.add(background, background.getWidth()/2, background.getHeight()/2); newScene = newScene.add(background, background.getWidth()/2, background.getHeight()/2);
newScene = newScene.add(picture, jsnums.toFixnum(x), jsnums.toFixnum(y)); newScene = newScene.add(picture, jsnums.toFixnum(x), jsnums.toFixnum(y));
return newScene; return newScene;
@ -766,10 +768,11 @@ EXPORTS['place-image/align'] =
if (isScene(background)) { if (isScene(background)) {
return background.add(img, jsnums.toFixnum(x), jsnums.toFixnum(y)); return background.add(img, jsnums.toFixnum(x), jsnums.toFixnum(y));
} else { } else {
var newScene = makeSceneImage(background.getWidth(), var newScene = makeSceneImage(background.getWidth(),
background.getHeight(), background.getHeight(),
[], null,
false); [],
false);
newScene = newScene.add(background, background.getWidth()/2, background.getHeight()/2); newScene = newScene.add(background, background.getWidth()/2, background.getHeight()/2);
newScene = newScene.add(img, jsnums.toFixnum(x), jsnums.toFixnum(y)); newScene = newScene.add(img, jsnums.toFixnum(x), jsnums.toFixnum(y));
return newScene; return newScene;
@ -921,10 +924,11 @@ EXPORTS['scene+line'] =
var y2 = checkReal(MACHINE, "scene+line", 4); var y2 = checkReal(MACHINE, "scene+line", 4);
var c = checkColor(MACHINE, "scene+line", 5); var c = checkColor(MACHINE, "scene+line", 5);
// make a scene containing the image // make a scene containing the image
var newScene = makeSceneImage(jsnums.toFixnum(img.getWidth()), var newScene = makeSceneImage(jsnums.toFixnum(img.getWidth()),
jsnums.toFixnum(img.getHeight()), jsnums.toFixnum(img.getHeight()),
[], null,
false); [],
false);
newScene = newScene.add(img, img.getWidth()/2, img.getHeight()/2); newScene = newScene.add(img, img.getWidth()/2, img.getHeight()/2);
// make an image containing the line // make an image containing the line
var line = makeLineImage(jsnums.toFixnum(x2-x1), var line = makeLineImage(jsnums.toFixnum(x2-x1),

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

@ -288,7 +288,7 @@ var isScene = function(x) {
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SceneImage: primitive-number primitive-number color (listof image) -> Scene // SceneImage: primitive-number primitive-number color (listof image) boolean -> Scene
var SceneImage = function(width, height, color, children, withBorder) { var SceneImage = function(width, height, color, children, withBorder) {
BaseImage.call(this); BaseImage.call(this);
this.width = width; this.width = width;
@ -1311,8 +1311,8 @@ var colorListToImage = function(listOfColors,
var makeSceneImage = function(width, height, children, withBorder) { var makeSceneImage = function(width, height, color, children, withBorder) {
return new SceneImage(width, height, null, children, withBorder); return new SceneImage(width, height, color, children, withBorder);
}; };
var makeCircleImage = function(radius, style, color) { var makeCircleImage = function(radius, style, color) {
return new EllipseImage(2*radius, 2*radius, style, color); return new EllipseImage(2*radius, 2*radius, style, color);