From 984554533ddff6fd1e0d24d3eb98b23adcd06619 Mon Sep 17 00:00:00 2001 From: Daniel Vasquez Date: Sat, 8 Jul 2017 05:02:44 -0400 Subject: [PATCH 1/3] Added mouseClicked and windowResized wiring --- lib/scenemanager.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/scenemanager.js b/lib/scenemanager.js index 163449b..f7f9912 100644 --- a/lib/scenemanager.js +++ b/lib/scenemanager.js @@ -22,7 +22,9 @@ function SceneManager(p) o.draw = function(){ me.draw(); }; o.mousePressed = function(){ me.mousePressed(); }; + o.mouseClicked = function(){ me.mouseClicked(); }; o.keyPressed = function(){ me.keyPressed(); }; + o.windowResized = function(){ me.windowResized(); }; return me; } @@ -45,7 +47,9 @@ function SceneManager(p) hasEnter : "enter" in oScene, hasDraw : "draw" in oScene, hasMousePressed : "mousePressed" in oScene, + hasMouseClicked : "mouseClicked" in oScene, hasKeyPressed : "keyPressed" in oScene, + hasWindowResized : "windowResized" in oScene, setupExecuted : false, enterExecuted : false }; @@ -162,6 +166,19 @@ function SceneManager(p) } } + // This will dispatch .mouseClicked() to the + // current scene .mouseClicked() method + this.mousePressed = function() + { + if ( this.scene == null ) + return; + + if ( this.scene.hasMouseClicked ) + { + this.scene.oScene.mouseClicked(); + } + } + // This will dispatch .keyPressed() to the // current scene .keyPressed() method this.keyPressed = function() @@ -174,4 +191,17 @@ function SceneManager(p) this.scene.oScene.keyPressed(); } } + + // This will dispatch .windowResized() to the + // current scene .windowResized() method + this.windowResized() = function() + { + if ( this.scene == null ) + return; + + if ( this.scene.hasWindowResized ) + { + this.scene.oScene.windowResized(); + } + } } From 6f743d0b1ec42a8589c0eed7d7bae24d0c062331 Mon Sep 17 00:00:00 2001 From: Daniel Vasquez Date: Sat, 8 Jul 2017 05:14:58 -0400 Subject: [PATCH 2/3] Fixed syntax error --- lib/scenemanager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scenemanager.js b/lib/scenemanager.js index f7f9912..e64d9e7 100644 --- a/lib/scenemanager.js +++ b/lib/scenemanager.js @@ -194,7 +194,7 @@ function SceneManager(p) // This will dispatch .windowResized() to the // current scene .windowResized() method - this.windowResized() = function() + this.windowResized = function() { if ( this.scene == null ) return; From 0e0c1fc4a3bb66e76f802fdef47f5fbbebacfe56 Mon Sep 17 00:00:00 2001 From: Daniel Vasquez Date: Sat, 8 Jul 2017 05:21:47 -0400 Subject: [PATCH 3/3] Fixed function name typo --- lib/scenemanager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scenemanager.js b/lib/scenemanager.js index e64d9e7..978a75e 100644 --- a/lib/scenemanager.js +++ b/lib/scenemanager.js @@ -168,7 +168,7 @@ function SceneManager(p) // This will dispatch .mouseClicked() to the // current scene .mouseClicked() method - this.mousePressed = function() + this.mouseClicked = function() { if ( this.scene == null ) return;