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

Merge pull request #11 from vishesh/master

Browse Source 
FIX: invalid number of arguments passed to SceneImage #10
This commit is contained in:
Jens Axel Søgaard 2015-05-02 10:36:48 +02:00
commit dbab390431
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -687,8 +687,9 @@ EXPORTS['empty-scene'] =
function(MACHINE) { function(MACHINE) {
var width = checkNonNegativeReal(MACHINE, 'empty-scene', 0); var width = checkNonNegativeReal(MACHINE, 'empty-scene', 0);
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 makeSceneImage(jsnums.toFixnum(width),
return new SceneImage(jsnums.toFixnum(width),
jsnums.toFixnum(height), jsnums.toFixnum(height),
color, color,
[], [],

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

@ -303,6 +303,7 @@ SceneImage.prototype = heir(BaseImage.prototype);
SceneImage.prototype.add = function(anImage, x, y) { SceneImage.prototype.add = function(anImage, x, y) {
return new SceneImage(this.width, return new SceneImage(this.width,
this.height, this.height,
null,
this.children.concat([[anImage, this.children.concat([[anImage,
x - anImage.getWidth()/2, x - anImage.getWidth()/2,
y - anImage.getHeight()/2]]), y - anImage.getHeight()/2]]),
@ -1311,7 +1312,7 @@ var colorListToImage = function(listOfColors,
var makeSceneImage = function(width, height, children, withBorder) { var makeSceneImage = function(width, height, children, withBorder) {
return new SceneImage(width, height, children, withBorder); return new SceneImage(width, height, null, 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);