pong: reset counter on idle and increase idle length

Reviewed-on: Trianta/trianta.dev#12

Dockerfile

@@ -15,6 +15,7 @@ RUN npm run build
 WORKDIR /usr/share/nginx/html
 COPY index.html .
 COPY default.css .
+COPY pages/ .
 
 RUN mkdir -p /usr/share/nginx/html/public
 

default.css

@@ -1,82 +1,94 @@
+/*
+ * base text: #06CDFF
+ * important text: #8200FF
+ * background: #03001C
+ */
+
 body {
     font-family: Arial, sans-serif;
-    font-size: 14px;
+    font-weight: 800;
-    color: #4c4f69;
+    color: #06CDFF;
+    background: #03001C;
     line-height: 1.5;
-    max-width: 1920px;
     margin-inline: auto;
-    background: #eff1f5;
+    margin: 0 auto;
-    margin: 0px auto;
 }
 
-#navigation {
+.inside {
-    display: flex;
+    max-width: 60rem;
+    margin: 0 auto;
+    padding: 2rem 1.5rem;
 }
 
-.navItem {
+nav {
-    margin: 6px;
+    padding: 1rem;
-    margin-top: 0px;
+    text-align: center;
-    padding: 8px;
+    width: 6rem;
-    line-height: 21px;
-    display: inline-block;
-    text-align: right;
 }
 
-#top {
+nav ul {
-    margin-bottom: 6px;
+    list-style: none;
-    border-radius: 16px;
+    margin: 0;
-    border-top-left-radius: 0px;
+    padding: 0;
-    margin: 4px auto;
-    margin-top: 0px;
-    height: 55px;
 }
 
-#main {
+.gap {
-    margin: 0px 120px;
+    width: 4rem;
-    display: flex;
+}
+
+.content {
+    width: 48rem;
+    text-align: left;
+}
+
+@media screen and (max-width: 600px) {
+    .column {
+        width: 100%;
+    }
+    .gap {
+        visibility: hidden;
+    }
+}
+
+.trianta {
+    border: none !important;
+    color: #06CDFF !important;
+    font-size: 2.5rem !important;
+    min-width: 12rem;
+    margin: -1rem;
 }
 
 .canvas {
-    width: 780px;
+    margin: auto;
-    height: 600px;
+    display: inline-block;
-    align-items: center;
+    width: 60rem;
-    justify-content: center;
+    vertical-align: bottom;
-    display: flex;
+    border: solid 4px #06CDFF;
 }
 
-.cardStats {
+.stats {
     font-size: 18px;
+    display: inline-block;
+    width: 12rem;
+    vertical-align: middle;
 }
 
 h1 {
-    width: 130px;
+    max-width: 650px;
-    text-align: center;
+    text-align: left;
-    display: inline-block;
+    padding: 8px 1.5rem;
-    font-size: 1.8rem;
-    margin: 0px;
-    padding: 8px;
-    border-top-left-radius: 18px;
-    border-top-right-radius: 18px;
 }
 
 h2 {
-    color: #6c6f85;
+    border: solid 2px #06CDFF;
-    font-size: 1.8rem;
+    margin: auto;
+    padding: 8px;
     text-align: center;
-    margin-top: 0;
+    width: 400px;
-    margin-bottom: 0.5rem;
 }
 
 h3 {
-    color: #dc8a78;
+    text-align: center;
-    font-size: 1.3rem;
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-h4 {
-    color: #8c8fa1;
-    font-size: 1.1rem;
     margin-top: 0;
     margin-bottom: 0.5rem;
 }
@@ -86,31 +98,38 @@ p {
 }
 
 a {
-    text-decoration: none;
+    background-color: #03001C;
+    border: solid 2px #06CDFF;
+    border-radius: 12px;
+    color: #06CDFF;
+    display: inline-block;
+    margin: 6px;
+    margin-top: 0px;
+    max-width: 8rem;
     padding: 8px;
-    color: #8aadf4;
+    text-align: center;
+    text-decoration: none;
+    width: 100%;
 }
 
 a:hover, a:active {
-    border-radius: 9px;
     text-decoration: underline;
-    text-shadow: 1px 1px 1px #333;
-    animation: hover 3s linear infinite;
 }
 
 a.button {
     margin: 14px 10%;
     padding: 4px 12px;
-    border: 1px outset #bcc0cc;
-    border-radius: 9px;
-    color: #1e66f5;
     display: inline-block;
-    background-color: #ccd0da;
     text-decoration: none;
     width: 80px;
     text-align: center;
 }
 
+a:visited {
+    border: solid 2px #8200FF;
+    color: #8200FF;
+}
+
 @keyframes hover {
     0% { box-shadow: 0 0 8px 4px #eff1f5; }
     15% { box-shadow: 0 0 8px 4px #bcc0cc; }
@@ -121,30 +140,22 @@ a.button {
 
 @keyframes card {
     0% { box-shadow: 0 0 8px 4px #eff1f5; }
-    50% { box-shadow: 0 0 8px 4px #df8e1d; }
+    50% { box-shadow: 0 0 8px 4px #fe640b; }
     100% { box-shadow: 0 0 8px 4px #eff1f5; }
 }
 
 .card {
-    background: #ccd0da;
     text-align: center;
-    border-radius: 18px;
-    animation: card 3s linear infinite;
-    width: 800px;
-    height: 800px;
     margin: 0px auto;
     margin-top: 25px;
     margin-bottom: 25px;
 }
 
-.cardTop {
+.reserve {
-    background: #e6e9ef;
+    max-height: 800px;
-    border-top-left-radius: 18px;
-    border-top-right-radius: 18px;
 }
 
 #pong {
     margin: 6px;
-    border-radius: 9px;
+    background: #03001C;
-    background: #494d64;
 }

index.html

@@ -1,48 +1,29 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8"/>
+    <meta charset="utf-8"/>
-  <title>Trianta</title>
+    <title>Trianta</title>
-  <link rel="stylesheet" href="default.css" />
+    <link rel="stylesheet" href="/default.css" />
 </head>
 <body>
-    <div id="navigation">
+    <div class="inside">
-        <p class="navItem" style="text-align: left; flex-grow: 1;">Trianta</p>
+        <div>
-        <a class="navItem" href="https://www.github.com/trimutex">GitHub</a>
+            <a href="/" class="trianta">TRIANTA</a>
-        <a class="navItem" href="https://lab.trianta.dev/Trianta">Projects</a>
+            <p>Function over form by design</p>
-    </div>
-    <div id="main">
-        <div class="card">
-            <h2 class="cardTop">Pong</h2>
-            <div class="canvas">
-                <canvas width="750" height="585" id="pong"></canvas>
-                <script src="public/pong.js"></script>
-                <div id="gameover" hidden="true">
-                    <h1>Game Over</h1>      
-                </div>
-                <div id="restart" hidden="true">
-                    <button class="button" type="button" onclick = "restartGame()">Restart Game</a>
-                </div>
-            </div>
-            <p class="cardStats">Left Paddle Height: <span id="leftPaddle"></span></p>
-            <p class="cardStats">Right Paddle Height: <span id="rightPaddle"></span></p>
-            <a class="navItem" href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/pong.js">View Code</a>
         </div>
-        <div class="card">
+        <div style="display: flex;">
-            <h2 class="cardTop">Snake</h2>
+            <nav class="column">
-            <div class="canvas">
+                <ul>
-                <canvas width="625" height="375" id="snake"></canvas>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
-                <script src="public/snake.js"></script>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
-            </div>
+                    <li><a href="/completed">Completed</a></li>
-            <p class="cardStats">
+                    <li><a href="/current">Current</a></li>
-                Adjust game size -- Width: 
+                    <li><a href="/other">Other</a></li>
-                <input class="cardStats" id="snakeWidth" type="number" min="2" max="31" value="25">
+                    <li><a href="/contact">Contact</a></li>
-                Height: 
+                </ul>
-                <input class="cardStats" id="snakeHeight" type="number" min="2" max="24" value="15">
+            </nav>
-            </p>
+            <div class="column gap"></div>
-            <p class="cardStats">Snake Head Location: <span id="snakeHead"></span></p>
+            <div class="column content"></div>
-            <p class="cardStats">Food Location: <span id="snakeFood"></span></p>
-            <a class="navItem" href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/snake.ts">View Code</a>
         </div>
     </div>
 </body>

pages/completed/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/completed/index.html

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Completed Projects</h2>
+                <div class="card reserve">
+                    <div class="canvas">
+                        <canvas width="750" height="585" id="pong"></canvas>
+                        <script src="/public/pong.js"></script>
+                        <div id="gameover" hidden="true">
+                            <h3>Game Over</h3>      
+                        </div>
+                        <div id="restart" hidden="true">
+                            <button class="button" type="button" onclick = "restartGame()">Restart Game</a>
+                        </div>
+                    </div>
+                    <div class="stats">
+                        <p style="font-size: 22px;">Pong</p>
+                        <p>Left Paddle Height: <span id="leftPaddle"></span></p>
+                        <p>Right Paddle Height: <span id="rightPaddle"></span></p>
+                        <a href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/pong.js">View Code</a>
+                    </div>
+                </div>
+                <div class="card reserve">
+                    <div class="canvas">
+                        <canvas width="625" height="375" id="snake"></canvas>
+                        <script src="/public/snake.js"></script>
+                    </div>
+                    <div class="stats">
+                        <p style="font-size: 22px;">Snake</p>
+                        <p>
+                            Adjust game size -- Width: 
+                            <input id="snakeWidth" type="number" min="2" max="31" value="31">
+                            Height: 
+                            <input id="snakeHeight" type="number" min="2" max="24" value="24">
+                        </p>
+                        <p>Snake Head Location: <span id="snakeHead"></span></p>
+                        <p>Food Location: <span id="snakeFood"></span></p>
+                        <a href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/snake.ts">View Code</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

pages/contact/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/contact/index.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Contact Methods</h2>
+                <p>E-mail: gregcraw2001@gmail.com</p>
+                <p>Discord: trianta</p>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

pages/current/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/current/index.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Current Personal Projects</h2>
+                <div class="card">
+                    <h3>Wrench</h3>
+                    <p>Description: A simple application to handle all of your Linux configuration needs.</p>
+                    <p>Language: C++26</p>
+                    <p>Tools: CMake</p>
+                    <p>Frameworks: Qt6</p>
+                    <a href="https://github.com/Trimutex/wrench">View Repository</a>
+                </div>
+                <div class="card">
+                    <h3>Synopsis</h3>
+                    <p>Description: A markdown repository containing details and changes of servers I maintain.</p>
+                    <a href="https://github.com/Trimutex/synopsis">View Repository</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

pages/other/.htaccess

@@ -0,0 +1 @@
+DirectoryIndex index.html

pages/other/index.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Trianta</title>
+    <link rel="stylesheet" href="/default.css" />
+</head>
+<body>
+    <div class="inside">
+        <div>
+            <a href="/" class="trianta">TRIANTA</a>
+            <p>Function over form by design</p>
+        </div>
+        <div style="display: flex;">
+            <nav class="column">
+                <ul>
+                    <li><a href="https://www.github.com/trimutex">GitHub</a></li>
+                    <li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
+                    <li><a href="/completed">Completed</a></li>
+                    <li><a href="/current">Current</a></li>
+                    <li><a href="/other">Other</a></li>
+                    <li><a href="/contact">Contact</a></li>
+                </ul>
+            </nav>
+            <div class="column gap"></div>
+            <div class="column content">
+                <h2>Other Projects</h2>
+                <div class="card">
+                    <h3>Hyprland</h3>
+                    <p>Description: An independent, highly customizable, dynamic tiling Wayland compositor that doesn't sacrifice on its looks. </p>
+                    <a href="https://github.com/hyprwm/Hyprland">View Repository</a>
+                    <p>Language: C++26</p>
+                    <p>Tools: CMake</p>
+                    <p>and various libraries.</p>
+                    <p>Contributions (newest first)</p>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/8323">hyprwm/Hyprland#8323</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/8044">hyprwm/Hyprland#8044</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7959">hyprwm/Hyprland#7959</a>
+                    <br>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7755">hyprwm/Hyprland#7755</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7683">hyprwm/Hyprland#7683</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7633">hyprwm/Hyprland#7633</a>
+                    <br>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7575">hyprwm/Hyprland#7575</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/7458">hyprwm/Hyprland#7458</a>
+                    <a href="https://github.com/hyprwm/Hyprland/pull/6652">hyprwm/Hyprland#6652</a>
+                </div>
+                <div class="card">
+                    <h3>Proxy</h3>
+                    <p>Description: A program written in C++ to act as a proxy for another server.</p>
+                    <a href="https://lab.trianta.dev/Trianta/proxy-network">View Repository</a>
+                    <p>Language: C++11</p>
+                    <p>Tools: CMake</p>
+                    <p>Testing Frameworks: <a href="https://github.com/ThrowTheSwitch/Unity">Unity Test (ThrowTheSwitch)</a></p>
+                </div>
+                <div class="card">
+                    <h3>Cloudcare</h3>
+                    <p>Description: A sample repository that uses downloaded .bed files to train a model on DNA using PyTorch.</p>
+                    <a href="https://github.com/Trimutex/cloudcare">View Repository</a>
+                    <p>Languages: Python, Bash</p>
+                    <p>Libraries: PyTorch</p>
+                    <p>Tools: Conda</p>
+                </div>
+                <div class="card">
+                    <h3>N-Queens</h3>
+                    <p>Description: The N-Queens problem recreated in C++ which gets solved using a Genetic Algorithm.</p>
+                    <a href="https://lab.trianta.dev/Trianta/n-queens">View Repository</a>
+                    <p>Language: C++11</p>
+                    <p>Tools: CMake</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

src/pong.js

@@ -1,226 +0,0 @@
-const canvas = document.getElementById('pong');
-const context = canvas.getContext('2d');
-const grid = 15;
-const paddleHeight = grid * 5; // 80
-const maxPaddleY = canvas.height - grid - paddleHeight;
-
-var paddleSpeed = 6;
-var ballSpeed = 5;
-
-var leftScore = 0;
-var rightScore = 0;
-
-const leftPaddle = {
-  // start in the middle of the game on the left side
-  x: grid * 2,
-  y: canvas.height / 2 - paddleHeight / 2,
-  width: grid,
-  height: paddleHeight,
-
-  // paddle velocity
-  dy: 0
-};
-const rightPaddle = {
-  // start in the middle of the game on the right side
-  x: canvas.width - grid * 3,
-  y: canvas.height / 2 - paddleHeight / 2,
-  width: grid,
-  height: paddleHeight,
-
-  // paddle velocity
-  dy: 0
-};
-const ball = {
-  // start in the middle of the game
-  x: canvas.width / 2,
-  y: canvas.height / 2,
-  width: grid,
-  height: grid,
-
-  // keep track of when need to reset the ball position
-  resetting: false,
-
-  // ball velocity (start going to the top-right corner)
-  dx: ballSpeed,
-  dy: -ballSpeed
-};
-
-// check for collision between two objects using axis-aligned bounding box (AABB)
-// @see https://developer.mozilla.org/en-US/docs/Games/Techniques/2D_collision_detection
-function collides(obj1, obj2) {
-  return obj1.x < obj2.x + obj2.width &&
-         obj1.x + obj1.width > obj2.x &&
-         obj1.y < obj2.y + obj2.height &&
-         obj1.y + obj1.height > obj2.y;
-}
-
-function gameOver() {
-    context.clearRect(0, 0, canvas.width, canvas.height);
-    let restartGame = document.getElementById("restart");
-    let gameOverText = document.getElementById("gameover");
-    restartGame.hidden = false;
-    gameOverText.hidden = false;
-}
-
-function restartGame() {
-    leftScore = 0;
-    rightScore = 0;
-    let restartGame = document.getElementById("restart");
-    restartGame.hidden = true;
-    requestAnimationFrame(loop);
-}
-
-function BotMovesPaddle(paddle) {
-  ballRegion = Math.floor(ball.y / 15);
-  paddleRegion = Math.floor(paddle.y / 15);
-  if (ballRegion < paddleRegion) paddle.dy = -paddleSpeed; 
-  if (ballRegion > paddleRegion) paddle.dy = paddleSpeed; 
-  if (ballRegion === paddleRegion) paddle.dy = 0; 
-}
-
-// game loop
-function loop() {
-        //if (leftScore < 7 && rightScore < 7) {
-            requestAnimationFrame(loop);
-        //} else if (leftScore >= 7 || rightScore >= 7) {
-        //    gameOver();
-        //}
-        context.clearRect(0,0,canvas.width,canvas.height);
-
-        if (ball.dx < 0) {
-            BotMovesPaddle(leftPaddle);
-            document.getElementById("leftPaddle").innerHTML = leftPaddle.y;
-        }
-        if (ball.dx > 0) {
-            BotMovesPaddle(rightPaddle);
-            document.getElementById("rightPaddle").innerHTML = rightPaddle.y;
-        }
-
-        // move paddles by their velocity
-        leftPaddle.y += leftPaddle.dy;
-        rightPaddle.y += rightPaddle.dy;
-
-        // prevent paddles from going through walls
-        if (leftPaddle.y < grid) {
-            leftPaddle.y = grid;
-        }
-        else if (leftPaddle.y > maxPaddleY) {
-            leftPaddle.y = maxPaddleY;
-        }
-
-        if (rightPaddle.y < grid) {
-            rightPaddle.y = grid;
-        }
-        else if (rightPaddle.y > maxPaddleY) {
-            rightPaddle.y = maxPaddleY;
-        }
-
-        // draw paddles
-        context.fillStyle = 'white';
-        context.fillRect(leftPaddle.x, leftPaddle.y, leftPaddle.width, leftPaddle.height);
-        context.fillRect(rightPaddle.x, rightPaddle.y, rightPaddle.width, rightPaddle.height);
-
-        // move ball by its velocity
-        ball.x += ball.dx;
-        ball.y += ball.dy;
-
-        // prevent ball from going through walls by changing its velocity
-        if (ball.y < grid) {
-            ball.y = grid;
-            ball.dy *= -1;
-        }
-        else if (ball.y + grid > canvas.height - grid) {
-            ball.y = canvas.height - grid * 2;
-            ball.dy *= -1;
-        }
-
-        // reset ball if it goes past paddle (but only if we haven't already done so)
-        if ( (ball.x < 0 || ball.x > canvas.width) && !ball.resetting) {
-            ball.resetting = true;
-
-            if (ball.x < 0) {
-                rightScore++;
-            }
-            if (ball.x > canvas.width) {
-                leftScore++;
-            }
-
-            // give some time for the player to recover before launching the ball again
-            setTimeout(() => {
-                ball.resetting = false;
-                ball.x = canvas.width / 2;
-                ball.y = canvas.height / 2;
-            }, 400);
-        }
-
-        // check to see if ball collides with paddle. if they do change x velocity
-        if (collides(ball, leftPaddle)) {
-            ball.dx *= -1;
-            leftPaddle.dy = 0;
-
-            // move ball next to the paddle otherwise the collision will happen again
-            // in the next frame
-            ball.x = leftPaddle.x + leftPaddle.width;
-        }
-        else if (collides(ball, rightPaddle)) {
-            ball.dx *= -1;
-            rightPaddle.dy = 0;
-
-            // move ball next to the paddle otherwise the collision will happen again
-            // in the next frame
-            ball.x = rightPaddle.x - ball.width;
-        }
-
-        // draw score
-        context.font = "30px Arial";
-        context.fillText(leftScore, 200, 50);
-        context.fillText(rightScore, 560, 50);
-
-        // draw ball
-        context.fillRect(ball.x, ball.y, ball.width, ball.height);
-
-        // draw walls
-        context.fillStyle = "#f4dbd6";
-        context.fillRect(0, 0, canvas.width, grid);
-        context.fillRect(0, canvas.height - grid, canvas.width, canvas.height);
-
-        // draw dotted line down the middle
-        for (let i = grid; i < canvas.height - grid; i += grid * 2) {
-            context.fillRect(canvas.width / 2 - grid / 2, i, grid, grid);
-        }
-}
-
-// listen to keyboard events to move the paddles
-document.addEventListener('keydown', function(e) {
-    // up arrow key
-    if (e.which === 38) {
-        rightPaddle.dy = -paddleSpeed;
-    }
-    // down arrow key
-    else if (e.which === 40) {
-        rightPaddle.dy = paddleSpeed;
-    }
-
-    // w key
-    if (e.which === 87) {
-        leftPaddle.dy = -paddleSpeed;
-    }
-    // a key
-    else if (e.which === 83) {
-        leftPaddle.dy = paddleSpeed;
-    }
-});
-
-// listen to keyboard events to stop the paddle if key is released
-document.addEventListener('keyup', function(e) {
-    if (e.which === 38 || e.which === 40) {
-        rightPaddle.dy = 0;
-    }
-    if (e.which === 83 || e.which === 87) {
-        leftPaddle.dy = 0;
-    }
-});
-
-// start the game
-requestAnimationFrame(loop);
-

src/pong.ts

@@ -0,0 +1,311 @@
+class Box {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+
+    constructor(_x: number, _y: number, _width: number, _height: number) {
+        this.x = _x;
+        this.y = _y;
+        this.width = _width;
+        this.height = _height;
+    }
+
+    collides(other: Box) {
+        return this.x < other.x + other.width &&
+                this.x + this.width > other.x &&
+                this.y < other.y + other.height &&
+                this.y + this.height > other.y;
+    }
+}
+
+class Ball {
+    geometry: Box;
+    speed: number;
+    dx: number;
+    dy: number;
+    resetting: boolean;
+
+    constructor(_geometry: Box) {
+        // start in the middle of the game
+        this.geometry = _geometry;
+        this.speed = 5;
+        // ball velocity (start going to the top-right corner)
+        this.dx = this.speed;
+        this.dy = -this.speed;
+        // keep track of when need to reset the ball position
+        this.resetting = false;
+    }
+}
+
+class Paddle {
+    geometry: Box;
+    speed: number;
+    isBot: boolean;
+    isLeft: boolean;
+    score: number;
+    dy: number;
+    idleCounter: number;
+
+    constructor(_geometry: Box, _isLeft: boolean) {
+        this.geometry = _geometry;
+        this.isLeft = _isLeft;
+        this.speed = 6;
+        this.isBot = true;
+        this.score = 0;
+        this.dy = 0;
+        this.idleCounter = 0;
+    }
+
+    scored() {
+        this.score++;
+    }
+}
+
+class PongCore {
+    canvas: HTMLCanvasElement;
+    context: CanvasRenderingContext2D;
+    grid: number;
+    timeout: number;
+    width: number;
+    height: number;
+    gameover: boolean;
+    ball: Ball;
+    left: Paddle;
+    right: Paddle;
+    paddleHeight: number;
+    paddleHeightMax: number;
+    paddleSpeed: number;
+
+    constructor() {
+        this.canvas = document.getElementById('pong') as HTMLCanvasElement;
+        this.context = this.canvas.getContext('2d') as CanvasRenderingContext2D;
+        this.grid = 15; // size of grid squares
+        this.paddleHeight = this.grid * 5;
+        this.paddleHeightMax = this.canvas.height - this.grid - this.paddleHeight;
+        this.timeout = 4; // speed in ms
+        this.width = this.canvas.width;
+        this.height = this.canvas.height;
+        this.gameover = false;
+        this.paddleSpeed = 6;
+        this.ball = new Ball(new Box(this.width / 2, this.height / 2, this.grid, this.grid));
+        this.left = new Paddle(new Box(this.grid * 2, this.height / 2 - this.paddleHeight / 2, this.grid, this.paddleHeight), true);
+        this.right = new Paddle(new Box(this.width - this.grid * 3, this.height / 2 - this.paddleHeight / 2, this.grid, this.paddleHeight), false);
+    }
+
+    start() {
+        setInterval(this.loop, this.timeout);
+    }
+
+    reset() {
+        this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
+        let restartGame = document.getElementById("restart");
+        let gameOverText = document.getElementById("gameover");
+        restartGame.hidden = false;
+        gameOverText.hidden = false;
+        console.debug("[TRACE] Reset was triggered");
+        this.gameover = false;
+        this.left.score = 0;
+        this.right.score = 0;
+        this.draw();
+    }
+
+    // Game loop
+    loop() {
+        // Reset of needed
+        if (g_pong.gameover)
+            g_pong.reset();
+
+        g_pong.simulate();
+
+        g_pong.draw();
+        g_pong.updatePageText();
+    }
+
+    // Simulate game logic
+    simulate() {
+        if (this.ball.dx < 0) {
+            this.botInput(this.left);
+            this.botIdle(this.right);
+        } else {
+            this.botInput(this.right);
+            this.botIdle(this.left);
+        }
+
+        // move paddles by their velocity
+        this.left.geometry.y += this.left.dy;
+        this.right.geometry.y += this.right.dy;
+
+        // prevent paddles from going through walls
+        if (this.left.geometry.y < this.grid) {
+            this.left.geometry.y = this.grid;
+        }
+        else if (this.left.geometry.y > this.paddleHeightMax) {
+            this.left.geometry.y = this.paddleHeightMax;
+        }
+
+        if (this.right.geometry.y < this.grid) {
+            this.right.geometry.y = this.grid;
+        }
+        else if (this.right.geometry.y > this.paddleHeightMax) {
+            this.right.geometry.y = this.paddleHeightMax;
+        }
+
+        // move ball by its velocity
+        this.ball.geometry.x += this.ball.dx;
+        this.ball.geometry.y += this.ball.dy;
+
+        // prevent ball from going through walls by changing its velocity
+        if (this.ball.geometry.y < this.grid) {
+            this.ball.geometry.y = this.grid;
+            this.ball.dy *= -1;
+        }
+        else if (this.ball.geometry.y + this.grid > this.canvas.height - this.grid) {
+            this.ball.geometry.y = this.canvas.height - this.grid * 2;
+            this.ball.dy *= -1;
+        }
+
+        // reset ball if it goes past paddle (but only if we haven't already done so)
+        if ( (this.ball.geometry.x < 0 || this.ball.geometry.x > this.canvas.width) && !this.ball.resetting) {
+            this.ball.resetting = true;
+
+            if (this.ball.geometry.x < 0) {
+                this.right.scored();
+            }
+            if (this.ball.geometry.x > this.canvas.width) {
+                this.left.scored();
+            }
+
+            // give some time for the player to recover before launching the ball again
+            setTimeout(() => {
+                this.ball.resetting = false;
+                this.ball.geometry.x = this.canvas.width / 2;
+                this.ball.geometry.y = this.canvas.height / 2;
+            }, 400);
+        }
+
+        // check to see if ball collides with paddle. if they do change x velocity
+        if (this.left.geometry.collides(this.ball.geometry)) {
+            this.ball.dx *= -1;
+            this.left.dy = 0;
+
+            // move ball next to the paddle otherwise the collision will happen again
+            // in the next frame
+            this.ball.geometry.x = this.left.geometry.x + this.left.geometry.width;
+        }
+        else if (this.right.geometry.collides(this.ball.geometry)) {
+            this.ball.dx *= -1;
+            this.right.dy = 0;
+
+            // move ball next to the paddle otherwise the collision will happen again
+            // in the next frame
+            this.ball.geometry.x = this.right.geometry.x - this.ball.geometry.width;
+        }
+
+    }
+
+    // Draw game to canvas
+    draw() {
+        // Clear the screen
+        this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
+
+        // draw score
+        this.context.font = "30px Arial";
+        this.context.fillText(this.left.score.toString(), 200, 50);
+        this.context.fillText(this.right.score.toString(), 560, 50);
+
+        // draw paddles
+        this.context.fillStyle = 'white';
+        this.fillRect(this.left.geometry);
+        this.fillRect(this.right.geometry);
+
+        // draw ball
+        this.fillRect(this.ball.geometry);
+
+        // draw walls
+        this.context.fillStyle = "#f4dbd6";
+        this.fillRect(new Box(0, 0, this.canvas.width, this.grid));
+        this.fillRect(new Box(0, this.canvas.height - this.grid, this.canvas.width, this.canvas.height));
+
+        // draw dotted line down the middle
+        for (let i = this.grid; i < this.canvas.height - this.grid; i += this.grid * 2) {
+            this.fillRect(new Box(this.canvas.width / 2 - this.grid / 2, i, this.grid, this.grid));
+        }
+    }
+    
+    fillRect(_box: Box) {
+        this.context.fillRect(_box.x, _box.y, _box.width, _box.height);
+    }
+
+    // Update text on page to match game
+    updatePageText() {
+        document.getElementById("leftPaddle").innerHTML = this.left.geometry.y.toString();
+        document.getElementById("rightPaddle").innerHTML = this.right.geometry.y.toString();
+    }
+
+    // Function for bot to play as a paddle
+    botInput(player: Paddle) {
+        if (!player.isBot)
+            return;
+        let ballRegion = Math.floor(this.ball.geometry.y / 15);
+        let paddleRegion = Math.floor(player.geometry.y / 15);
+        if (ballRegion < paddleRegion) player.dy = -player.speed; 
+        if (ballRegion > paddleRegion) player.dy = player.speed; 
+        if (ballRegion === paddleRegion) player.dy = 0; 
+    }
+
+    // Randomly move the bot paddle when ball not towards it
+    botIdle(player: Paddle) {
+        player.idleCounter++;
+        if (player.idleCounter < 20)
+            return;
+        else
+            player.idleCounter = 0;
+        let direction: number = Math.floor(Math.random() * 3);
+        switch (direction) {
+            case 0:
+                player.dy = 0;
+                break;
+            case 1:
+                player.dy = -player.speed;
+                break;
+            case 2:
+                player.dy = player.speed;
+                break;
+        }
+    }
+}
+
+// listen to keyboard events to move the paddles
+document.addEventListener('keydown', function(e) {
+    // up arrow key
+    if (e.which === 38) {
+        g_pong.right.dy = -g_pong.paddleSpeed;
+    }
+    // down arrow key
+    else if (e.which === 40) {
+        g_pong.right.dy = g_pong.paddleSpeed;
+    }
+
+    // w key
+    if (e.which === 87) {
+        g_pong.left.dy = -g_pong.paddleSpeed;
+    }
+    // a key
+    else if (e.which === 83) {
+        g_pong.left.dy = g_pong.paddleSpeed;
+    }
+});
+
+// listen to keyboard events to stop the paddle if key is released
+document.addEventListener('keyup', function(e) {
+    if (e.which === 38 || e.which === 40) {
+        g_pong.right.dy = 0;
+    }
+    if (e.which === 83 || e.which === 87) {
+        g_pong.left.dy = 0;
+    }
+});
+
+const g_pong: PongCore = new PongCore();
+g_pong.start();

src/snake.ts

@@ -158,7 +158,7 @@ class SnakeCore {
                 else if (isBitSet(g_snake.board[i][j], BoardState.FOOD))
                     g_snake.context.fillStyle = "red";
                 else
-                    g_snake.context.fillStyle = "black";
+                    continue;
                 g_snake.context.fillRect(j * g_snake.grid, i * g_snake.grid, g_snake.grid, g_snake.grid);
             }
         }