Merge branch 'master' of https://github.com/photonstorm/phaser

Author: pavle-goloskokovic

v3/copy-to-examples.js

@@ -1,7 +1,8 @@
-var fs = require('fs-extra');
+let fs = require('fs-extra');
+let sloc = require('node-sloc');
 
-var source = './dist/phaser.js';
-var dest = '../../phaser3-examples/public/build/dev.js';
+let source = './dist/phaser.js';
+let dest = '../../phaser3-examples/public/build/dev.js';
 
 if (fs.existsSync(dest))
 {
@@ -14,6 +15,15 @@ if (fs.existsSync(dest))
 
         console.log('Build copied to ' + dest);
 
+        const options = {
+            path: './src',
+            extensions: [ '.js' ]
+        };
+ 
+        sloc(options).then((res) => {
+            console.log('Source files: ' + res.sloc.files + '\nLines of code: ' + res.sloc.sloc);
+        });
+
     });
 }
 else

v3/package.json

@@ -1,6 +1,4 @@
 {
-  "//": "git tag 3.0.0-beta.6",
-  "//": "git push",
   "//": "npm publish --tag beta",
   "name": "phaser",
   "version": "3.0.0-beta.6",
@@ -21,7 +19,8 @@
   "scripts": {
     "build": "webpack",
     "dist": "webpack --config webpack.dist.config.js",
-    "lint": "eslint --config .eslintrc.json \"src/**/*.js\""
+    "lint": "eslint --config .eslintrc.json \"src/**/*.js\"",
+    "sloc": "node-sloc './src' --include-extensions \"js\""
   },
   "keywords": [
     "2d",
@@ -38,6 +37,7 @@
   "devDependencies": {
     "eslint": "^4.3.0",
     "fs-extra": "^4.0.0",
+    "node-sloc": "^0.1.10",
     "uglifyjs-webpack-plugin": "^0.4.6",
     "uuid": "^3.1.0",
     "webpack": "^3.4.1",

v3/src/actions/GridAlign.js

@@ -1,7 +1,7 @@
-var CONST = require('../utils/align/const');
-var AlignIn = require('../utils/align/AlignIn');
-var Zone = require('../gameobjects/zone/Zone');
+var AlignIn = require('../display/align/in/QuickSet');
+var CONST = require('../display/align/const');
 var GetValue = require('../utils/object/GetValue');
+var Zone = require('../gameobjects/zone/Zone');
 
 var tempZone = new Zone({ sys: { sortChildrenFlag: false }}, 0, 0, 1, 1);
 

v3/src/boot/Config.js

@@ -3,7 +3,7 @@ var CONST = require('../const');
 var GetValue = require('../utils/object/GetValue');
 var MATH = require('../math/const');
 var NOOP = require('../utils/NOOP');
-var ValueToColor = require('../graphics/color/ValueToColor');
+var ValueToColor = require('../display/color/ValueToColor');
 
 /**
  * This callback type is completely empty, a no-operation.

v3/src/boot/CreateRenderer.js

@@ -1,7 +1,7 @@
 var CONST = require('../const');
-var CanvasPool = require('../dom/CanvasPool');
+var CanvasPool = require('../display/canvas/CanvasPool');
 var Features = require('../device/Features');
-var CanvasInterpolation = require('../dom/CanvasInterpolation');
+var CanvasInterpolation = require('../display/canvas/CanvasInterpolation');
 
 /**
  * [description]

v3/src/camera/2d/Camera.js

@@ -1,7 +1,7 @@
 var Class = require('../../utils/Class');
 var Rectangle = require('../../geom/rectangle/Rectangle');
 var TransformMatrix = require('../../gameobjects/components/TransformMatrix');
-var ValueToColor = require('../../graphics/color/ValueToColor');
+var ValueToColor = require('../../display/color/ValueToColor');
 
 var Camera = new Class({
 

v3/src/camera/2d/inc/SetBackgroundColor.js

@@ -1,4 +1,4 @@
-var ValueToColor = require('../../../graphics/color/ValueToColor');
+var ValueToColor = require('../../../display/color/ValueToColor');
 
 var SetBackgroundColor = function (color)
 {

v3/src/canvas/GetContext.js

@@ -1,6 +1,6 @@
 var GetValue = require('../utils/object/GetValue');
 var Arne16 = require('./palettes/Arne16');
-var CanvasPool = require('../dom/CanvasPool');
+var CanvasPool = require('../display/canvas/CanvasPool');
 
 var GenerateTexture = function (config)
 {

v3/src/create/GenerateTexture.js

@@ -1,4 +1,4 @@
-var CanvasPool = require('../dom/CanvasPool');
+var CanvasPool = require('../display/canvas/CanvasPool');
 
 var CanvasFeatures = {