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

Merge pull request #33 from vishesh/master

Browse Source 
FIX: Check for undefined pinholes in place-image/align #28
This commit is contained in:
Jens Axel Søgaard 2015-06-08 16:52:55 +02:00
commit d6ab1366a0
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -754,20 +754,23 @@ EXPORTS['place-image/align'] =
6, 6,
function(MACHINE) { function(MACHINE) {
var img = checkImage(MACHINE, "place-image/align", 0); var img = checkImage(MACHINE, "place-image/align", 0);
var x = checkReal(MACHINE, "place-image/align", 1); var x = jsnums.toFixnum(checkReal(MACHINE, "place-image/align", 1));
var y = checkReal(MACHINE, "place-image/align", 2); var y = jsnums.toFixnum(checkReal(MACHINE, "place-image/align", 2));
var placeX = checkPlaceX(MACHINE, "place-image/align", 3); var placeX = checkPlaceX(MACHINE, "place-image/align", 3);
var placeY = checkPlaceY(MACHINE, "place-image/align", 4); var placeY = checkPlaceY(MACHINE, "place-image/align", 4);
var background = checkImageOrScene(MACHINE, "place-image/align", 5); var background = checkImageOrScene(MACHINE, "place-image/align", 5);
var pinholeX = img.pinholeX || img.getWidth() / 2;
var pinholeY = img.pinholeY || img.getHeight() / 2;
// calculate x and y based on placeX and placeY // calculate x and y based on placeX and placeY
if (placeX == "left") x = x + img.pinholeX; if (placeX == "left") x = x + pinholeX;
else if (placeX == "right") x = x - img.pinholeX; else if (placeX == "right") x = x - pinholeX;
if (placeY == "top") y = y + img.pinholeY; if (placeY == "top") y = y + pinholeY;
else if (placeY == "bottom") y = y - img.pinholeY; else if (placeY == "bottom") y = y - pinholeY;
if (isScene(background)) { if (isScene(background)) {
return background.add(img, jsnums.toFixnum(x), jsnums.toFixnum(y)); return background.add(img, x, y);
} else { } else {
var newScene = makeSceneImage(background.getWidth(), var newScene = makeSceneImage(background.getWidth(),
background.getHeight(), background.getHeight(),
@ -775,7 +778,7 @@ EXPORTS['place-image/align'] =
[], [],
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, x, y);
return newScene; return newScene;
} }
}); });