From d2fc0871f9d292b93511011d15934ac779cd88b7 Mon Sep 17 00:00:00 2001
From: Job Vonk <job@jobbel.nl>
Date: Mon, 11 May 2020 16:26:40 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=B1=20Added=20logoScreen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/asdf-logo.png   | Bin 0 -> 2896 bytes
 src/index.js        |  16 ++++++++++------
 src/screens/game.js |   2 +-
 src/screens/logo.js |  36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 res/asdf-logo.png
 create mode 100644 src/screens/logo.js

diff --git a/res/asdf-logo.png b/res/asdf-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..be7b72be498b2e407733f3bc7f25c5a5fa310a36
GIT binary patch
literal 2896
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
IQ=W-`0!5!{TmS$7

literal 0
HcmV?d00001

diff --git a/src/index.js b/src/index.js
index 7e03c64..091c520 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,7 +8,7 @@ const { Game, KeyControls, MouseControls } = asdf;
 // TODO: Add more screens
 
 const 
-  //Logo = require(__dirname + "/../src/screens/logo.js"),
+  LogoScreen = require(__dirname + "/../src/screens/logo.js"),
   //Title = require(__dirname + "/../src/screens/title.js"),
   GameScreen = require(__dirname + "/../src/screens/game.js")
   //Gameover = require(__dirname + "/../src/screens/gameover.js")
@@ -30,15 +30,19 @@ const controls = {
 //   game.scene = new Title(game, keys, newGame, tutorial, remote.app.quit);
 // }
 
-function gameOver() {
-  //game.scene = new Gameover(game, keys, titleScreen);
-}
-
 function newGame() {
   game.scene = new GameScreen(game, controls, gameOver);
 }
 
-newGame();
+function logoScreen() {
+  game.scene = new LogoScreen(newGame);
+}
+
+function gameOver() {
+  //game.scene = new Gameover(game, keys, titleScreen);
+}
+
+logoScreen();
 
 game.run(() => {
 
diff --git a/src/screens/game.js b/src/screens/game.js
index c37322e..5c2e586 100644
--- a/src/screens/game.js
+++ b/src/screens/game.js
@@ -26,7 +26,7 @@ class GameScreen extends Container {
     this.players = {};
 
     // Connect to TanksJS-Server instance
-    this.socket = io("http://arnweb.nl:3000");
+    this.socket = io("http://127.0.0.1:3000");
     this.socket.on("identify", () => {
       this.socket.emit("identification", {
         name: "Arn",
diff --git a/src/screens/logo.js b/src/screens/logo.js
new file mode 100644
index 0000000..72c56a3
--- /dev/null
+++ b/src/screens/logo.js
@@ -0,0 +1,36 @@
+const { Container, Texture, Sprite, Rect } = require("asdf-games");
+
+class LogoScreen extends Container {
+  constructor(onDone) {
+    super();
+    this.onDone = onDone;
+    // Timer variable
+    this.period = 0;
+    // Alpha control variable
+    this.alpha = 1;
+
+    // Asdf logo in the center of the screen.
+    const logo = new Sprite(new Texture(__dirname + "/../../res/asdf-logo.png"));
+    logo.pos = { x: (740 - 412) / 2, y: (480 - 140) / 2 };
+    this.add(logo);
+
+    // Overlay to control the fade
+    const overlay = new Rect(740, 480, { fill: "rgba(0,0,0,1)" });
+    this.add(overlay);
+  }
+
+  update(dt) {
+    // Update the overlay's alpha.
+    this.children[1].style.fill = `rgba(0,0,0,${this.alpha})`;
+
+    // If the period is below 2, fade in (alpha <= 0 is fully visible)
+    // else fade out.
+    this.alpha += this.period >= 2 ? 2 * dt : -dt;
+
+    // Timer for when the next screen needs to start.
+    this.period += dt;
+    if (this.period >= 3) this.onDone();
+  }
+}
+
+module.exports = LogoScreen;
\ No newline at end of file