Update to latest createjs libs, latest canvas, working on recent node version

.gitignore

@@ -1 +1,3 @@
 .idea
+node_modules
+examples/output

examples/GraphicsTest.js

@@ -1,6 +1,5 @@
 var fs = require('fs');
-var Canvas = require('canvas');
-var Image = Canvas.Image;
+var { Canvas, Image } = require('canvas');
 
 require('../src/node-easel.js');
 

examples/SpriteSheetBuilderTest.js

@@ -1,6 +1,5 @@
 var fs = require('fs');
-var Canvas = require('canvas');
-var Image = Canvas.Image;
+var { Canvas, Image } = require('canvas');
 require('../src/node-easel.js');
 
 var SpriteSheetBuilderTest = function () {

examples/SpritesheetTest.js

@@ -1,5 +1,4 @@
-var Canvas = require('canvas');
-var Image = Canvas.Image;
+var { Canvas, Image } = require('canvas');
 var fs = require('fs');
 var exec = require('child_process').exec;
 
@@ -18,7 +17,7 @@ s.RUNNING_RATE = 2.5;
 p.init = function (success) {
 	var cmd = "find " + __dirname + "/output -name '*.mpg' -exec rm -f {} \\;";
 	console.log(cmd);
-	exec(cmd);
+	exec(cmd, execCallback);
 
 	this.success = success;
 
@@ -30,7 +29,7 @@ p.init = function (success) {
 	var spriteSheet = {"animations":{"run":[0, 25], "jump":[26, 63]}, "images":[this.loadImage("runningGrant.png")], "frames":{"regX":0, "height":292.5, "count":64, "regY":0, "width":165.75}};
 
 	var ss = new createjs.SpriteSheet(spriteSheet);
-	this.grant = new createjs.BitmapAnimation(ss);
+	this.grant = new createjs.Sprite(ss);
 
 	// Set up looping
 	ss.getAnimation("run").next = "run";
@@ -68,7 +67,7 @@ p.init = function (success) {
 
 	this.tickFunction = this.tick.bind(this);
 	var fps = 80;
-	createjs.Ticker.setFPS(fps);
+	createjs.Ticker.framerate = fps;
 	createjs.Ticker.addEventListener("tick", this.tickFunction);
 
 	var seconds = 10;
@@ -80,14 +79,19 @@ p.init = function (success) {
 p.stopCapture = function () {
 	createjs.Ticker.removeEventListener("tick", this.tickFunction);
 	console.log('begin video encoding');
-	exec('cd ' + __dirname + '/output && ffmpeg -f image2 -i test_%d.png -sameq video.mpg', this.handleVideoEncoded.bind(this));
+	var cmd = 'cd ' + __dirname + '/output && ffmpeg -f image2 -i test_%d.png -qscale 0 video.mpg';
+	exec(cmd, this.handleVideoEncoded.bind(this));
 }
 
-p.handleVideoEncoded = function () {
-	console.log('Video Encoded');
+p.handleVideoEncoded = function (err, stdout, stderr) {
+	if (err) {
+		execCallback(err, stdout, stderr);
+	} else {
+		console.log('Video Encoded');
+	}
 
 	var cmd = "find " + __dirname + "/output -name '*.png' -exec rm -f {} \\;";
-	exec(cmd);
+	exec(cmd, execCallback);
 	this.success('video.mpg');
 
 	createjs.Ticker.halt();
@@ -123,3 +127,19 @@ p.tick = function () {
 	var fileName = __dirname + '/output/test_' + (this.index++) + '.png';
 	fs.writeFileSync(fileName, this.canvas.toBuffer(), '');
 }
+
+/**
+ * Helper for reporting back exec errors
+ */
+function execCallback(error, stdout, stderr) {
+	if (error) {
+		console.error("exec error:" + error);
+		return;
+	}
+	if (stdout) {
+		console.log("stdout:" + stdout);
+	}
+	if (stderr) {
+		console.log("stderr:" + stderr);
+	}
+};

examples/captcha.js

@@ -23,8 +23,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 var fs = require('fs');
-var Canvas = require('canvas');
-var Image = Canvas.Image;
+var { Canvas, Image } = require('canvas');
 var Rnd = require('./public/com/gskinner/utils/Rnd.js').Rnd;
 
 require('../src/node-easel.js');
@@ -74,7 +73,6 @@ p.init = function (seed) {
 	}
 
 	var g = new createjs.Graphics();
-	g.initialize(ctx);
 
 	var shape = new createjs.Shape(g);
 	g.setStrokeStyle(1).beginStroke("#00acc");
@@ -86,7 +84,6 @@ p.init = function (seed) {
 	}
 
 	var g2 = new createjs.Graphics();
-	g2.initialize(ctx);
 
 	var shape2 = new createjs.Shape(g2);
 	length = 40;