From 4dbeaf5a22f0c0088e75b9a5489ddb8d1636a636 Mon Sep 17 00:00:00 2001 From: Dumitru Uzun Date: Sat, 2 Dec 2017 18:17:04 +0200 Subject: [PATCH 1/3] Don't touch global scope --- js/delta.js | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/js/delta.js b/js/delta.js index be7703b..60ea862 100644 --- a/js/delta.js +++ b/js/delta.js @@ -1,4 +1,4 @@ -Delta = function() { +Delta = (function() { 'use strict' @@ -1100,21 +1100,16 @@ Delta = function() { ]; - //=============================================================================================== - // LETS PLAY! - //=============================================================================================== - - run(); - - window.cfg = cfg; - window.engine = engine; - window.player = player; - window.bullets = bullets; - window.aliens = aliens; - window.rocks = rocks; - window.stars = stars; - window.renderer = renderer; + run.cfg = cfg; + run.engine = engine; + run.player = player; + run.bullets = bullets; + run.aliens = aliens; + run.rocks = rocks; + run.stars = stars; + run.renderer = renderer; + return run; //----------------------------------------------------------------------------------------------- -} +}()); From 90dd99bef117ee286ab60b3e0cd14880d1bb5de7 Mon Sep 17 00:00:00 2001 From: Dumitru Uzun Date: Sat, 2 Dec 2017 19:00:36 +0200 Subject: [PATCH 2/3] Don't use define() for StateMachine --- js/vendor.js | 10 +++++----- js/vendor/state-machine.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/js/vendor.js b/js/vendor.js index 16f4924..0637b55 100644 --- a/js/vendor.js +++ b/js/vendor.js @@ -2619,12 +2619,12 @@ AudioFX = function() { //=========================================================================== - if ("function" === typeof define) { - define(function(require) { return StateMachine; }); - } - else { + // if ("function" === typeof define) { + // define(function(require) { return StateMachine; }); + // } + // else { window.StateMachine = StateMachine; - } + // } }(this)); diff --git a/js/vendor/state-machine.js b/js/vendor/state-machine.js index 61aba92..66f6958 100755 --- a/js/vendor/state-machine.js +++ b/js/vendor/state-machine.js @@ -191,12 +191,12 @@ //=========================================================================== - if ("function" === typeof define) { - define(function(require) { return StateMachine; }); - } - else { + // if ("function" === typeof define) { + // define(function(require) { return StateMachine; }); + // } + // else { window.StateMachine = StateMachine; - } + // } }(this)); From 62a8009047ffe299efe9de5ee5575653cd68b3a3 Mon Sep 17 00:00:00 2001 From: Dumitru Uzun Date: Sat, 2 Dec 2017 21:00:48 +0200 Subject: [PATCH 3/3] Export game components on Delta --- js/delta.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/js/delta.js b/js/delta.js index 60ea862..fe50aa6 100644 --- a/js/delta.js +++ b/js/delta.js @@ -171,15 +171,15 @@ Delta = (function() { function run() { - engine = new Engine(); - renderer = new Renderer(); - sounds = new Sounds(); - player = new Player(); - bullets = new Bullets(); - aliens = new Aliens(); - rocks = new Rocks(); - effects = new Effects(); - stars = new Stars(); + run.engine = engine = new Engine(); + run.renderer = renderer = new Renderer(); + run.sounds = sounds = new Sounds(); + run.player = player = new Player(); + run.bullets = bullets = new Bullets(); + run.aliens = aliens = new Aliens(); + run.rocks = rocks = new Rocks(); + run.effects = effects = new Effects(); + run.stars = stars = new Stars(); Game.run({ fps: FPS,