Merge pull request 'core: add Snake using Typescript' (#7 ) from snake into main

Reviewed-on: #7
snake: not adding last piece was correct, bool check was not
2024-11-09 01:26:09 -06:00 · 2024-11-09 01:23:11 -06:00 · 2024-11-09 01:20:05 -06:00 · 2024-11-09 01:10:24 -06:00 · 2024-11-05 21:23:34 -06:00 · 2024-11-05 21:21:16 -06:00
11 changed files with 414 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,11 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 # dependencies
 /node_modules
 # production
 /build
 # typescript
 *.tsbuildinfo
 next-env.d.ts
--- a/23
+++ b/23
@ -0,0 +1,23 @@
 FROM nginx:latest
 RUN apt-get update && apt-get install -y nodejs npm
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
 RUN npm run build
 WORKDIR /usr/share/nginx/html
 COPY index.html .
 RUN mkdir -p /usr/share/nginx/html/public
 COPY src/*.css ./public
 RUN cp /app/build/* ./public
 EXPOSE 80
--- a/23
+++ b/23
@ -0,0 +1,23 @@
 pipeline {
    agent any
    stages {
        stage('Checkout') {
            steps {
                checkout scm
            }
        }
        stage('Build') {
            steps {
                script {
                    docker.build('test.trianta.dev:latest')
                }
            }
        }
        stage('Deploy') {
            steps {
                sh 'docker stop test && docker rm test || exit 0'
                sh 'docker run -d -p 3466:80 --name test test.trianta.dev:latest'
            }
        }
    }
 }
--- a/index.html
+++ b/index.html
@ -3,10 +3,10 @@
 <head>
  <meta charset="utf-8"/>
  <title>Trianta</title>
-  <link rel="stylesheet" href="css/home.css" />
+  <link rel="stylesheet" href="public/home.css" />
 </head>
 <body>
-    <div id="navigation" style="margin-bottom: 30px;">
+    <div id="navigation">
        <a class="navItem" href="https://www.github.com/trimutex">GitHub</a>
        <a class="navItem" href="https://lab.trianta.dev/Trianta">Projects</a>
        <p class="navItem" style="text-align: right; flex-grow: 1;">Trianta</p>
@ -15,7 +15,7 @@
        <div class="card">
            <h2 class="cardTop">Pong</h2>
            <canvas width="750" height="585" id="pong"></canvas>
-            <script src="js/pong.js"></script>
+            <script src="public/pong.js"></script>
            <div id="gameover" hidden="true">
                <h1>Game Over</h1>      
            </div>
@ -24,7 +24,14 @@
            </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/js/pong.js">View Code</a>
+            <a class="navItem" href="https://lab.trianta.dev/Trianta/trianta.dev/src/branch/main/src/pong.js">View Code</a>
        </div>
        <div class="card">
            <h2 class="cardTop">Snake</h2>
            <canvas width="625" height="375" id="snake"></canvas>
            <script src="public/snake.js"></script>
            <p class="cardStats">Bottom Text<span></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>
--- a/package-lock.json
+++ b/package-lock.json
@ -0,0 +1,29 @@
 {
  "name": "trianta.dev",
  "version": "0.1.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "trianta.dev",
      "version": "0.1.0",
      "license": "MIT",
      "dependencies": {
        "typescript": "^5.5.4"
      }
    },
    "node_modules/typescript": {
      "version": "5.5.4",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
      "license": "Apache-2.0",
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
      },
      "engines": {
        "node": ">=14.17"
      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -0,0 +1,19 @@
 {
  "name": "trianta.dev",
  "version": "0.1.0",
  "description": "My personal website",
  "main": "index.html",
  "scripts": {
    "build": "tsc",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "repository": {
    "type": "git",
    "url": "https://lab.trianta.dev/Trianta/trianta.dev.git"
  },
  "author": "trianta",
  "license": "MIT",
  "dependencies": {
    "typescript": "^5.5.4"
  }
 }
--- a/src/home.css
+++ b/src/home.css
@ -125,8 +125,11 @@ a.button {
    border-top-left-radius: 18px;
    border-top-right-radius: 18px;
    animation: card 3s linear infinite;
-    max-width: 800px;
+    width: 800px;
    height: 800px;
    margin: 0px auto;
    margin-top: 25px;
    margin-bottom: 25px;
 }
 .cardTop {
--- a/src/pong.css
+++ b/src/pong.css
--- a/src/pong.js
+++ b/src/pong.js
--- a/src/snake.ts
+++ b/src/snake.ts
@ -0,0 +1,286 @@
 enum BoardState {
    SNAKE = 0,
    FOOD = 1,
    CHECKED = 2 // For search algorithms
 }
 // Bit functions for ease
 function isBitSet(value: number, bit: number): boolean {
    return ((value >> bit) % 2 != 0)
 }
 function bitSet(value: number, bit: number): number {
    return value | 1 << bit;
 }
 function bitClear(value: number, bit: number): number {
    return value & ~(1 << bit);
 }
 class Point {
    x: number;
    y: number;
    constructor(x = 0, y = 0) {
        this.x = x;
        this.y = y;
    }
    copy(other: Point) {
        this.x = other.x;
        this.y = other.y;
    }
    add(other: Point) {
        var result = new Point;
        result.x = this.x + other.x;
        result.y = this.y + other.y;
        return result;
    }
    subtract(other: Point) {
        var result = new Point;
        result.x = this.x - other.x;
        result.y = this.y - other.y;
        return result;
    }
 }
 class SnakeCore {
    canvas: HTMLCanvasElement;
    context: CanvasRenderingContext2D;
    grid: number;
    timeout: number;
    width: number;
    height: number;
    board: number[][];
    body: Point[];
    gameover: boolean;
    foodAte: boolean;
    constructor() {
        // TODO: Add CSS stuff for page
        this.canvas = document.getElementById('snake') as HTMLCanvasElement;
        this.context = this.canvas.getContext('2d') as CanvasRenderingContext2D;
        this.grid = 25; // size of grid squares
        this.timeout = 100; // speed in ms
        this.width = 25;
        this.height = 15;
        this.board = [];
        for (let i = 0; i < this.height; i++)
            this.board.push(new Array(this.width));
        this.body = [];
        this.gameover = false;
        this.foodAte = true;
        this.body.push(new Point(12, 8));
        this.board[8][12] = 1;
    }
    get head(): Point {
        return this.body[this.body.length - 1];
    }
    reset() {
        console.debug("[TRACE] Reset was triggered");
        this.gameover = false;
        this.foodAte = true;
        for (let i = 0; i < this.height; i++) {
            for (let j = 0; j < this.width; j++) {
                this.board[i][j] = 0;
            }
        }
        while (this.body.length > 0)
            this.body.pop();
        while (g_snakebot.path.length > 0)
            g_snakebot.path.pop();
        this.startRandom();
        this.foodRegen();
        this.draw();
    }
    startRandom() {
        this.body.push(new Point(Math.floor(Math.random() * this.width), Math.floor(Math.random() * this.height)));
    }
    foodRegen() {
        if (!this.foodAte)
            return;
        console.debug("[TRACE] Food reset was triggered");
        this.foodAte = false;
        while (true) {
            let tmp = new Point(Math.floor(Math.random() * this.width), Math.floor(Math.random() * this.height));
            if (isBitSet(this.board[tmp.y][tmp.x], BoardState.SNAKE))
                continue;
            this.board[tmp.y][tmp.x] = bitSet(this.board[tmp.y][tmp.x], BoardState.FOOD);
            return;
        }
    }
    // Simulate game logic
    simulate() {
        // Move snake
        let next: Point = new Point;
        next.copy(g_snakebot.nextMove());
        if (next.x < 0 || next.x > g_snake.width || next.y < 0 || next.y > g_snake.height) {
            g_snake.gameover = true;
            return;
        }
        if (isBitSet(g_snake.board[next.y][next.x], BoardState.SNAKE) && (g_snake.body.length > 1)) {
            g_snake.gameover = true; // Game should end (Snake touching snake)
            return;
        }
        g_snake.board[next.y][next.x] = bitSet(g_snake.board[next.y][next.x], BoardState.SNAKE);
        g_snake.body.push(next);
        if (!isBitSet(g_snake.board[next.y][next.x], BoardState.FOOD)) {
            let old: Point = g_snake.body.shift() as Point;
            g_snake.board[old.y][old.x] = bitClear(g_snake.board[old.y][old.x], BoardState.SNAKE);
        } else {
            g_snake.board[next.y][next.x] = bitClear(g_snake.board[next.y][next.x], BoardState.FOOD);
            g_snake.foodAte = true;
            while (g_snakebot.path.length > 0)
                g_snakebot.path.pop();
        }
    }
    // Draw game to canvas
    draw() {
        // Clear the screen
        g_snake.context.clearRect(0, 0, g_snake.canvas.width, g_snake.canvas.height);
        // Draw game
        for (let i = 0; i < g_snake.height; i++) {
            for (let j = 0; j < g_snake.width; j++) {
                if (isBitSet(g_snake.board[i][j], BoardState.SNAKE))
                    g_snake.context.fillStyle = "green";
                else if (isBitSet(g_snake.board[i][j], BoardState.FOOD))
                    g_snake.context.fillStyle = "red";
                else
                    g_snake.context.fillStyle = "black";
                g_snake.context.fillRect(j * g_snake.grid, i * g_snake.grid, g_snake.grid, g_snake.grid);
            }
        }
    }
 }
 class Bot {
    pathUntrimmed: Point[];
    path: Point[];
    constructor() {
        this.pathUntrimmed = [];
        this.path = [];
    }
    bfs() {
        var search: Point[] = [g_snake.head];
        while (search.length !== 0) {
            let current: Point = search.shift() as Point;
            if (isBitSet(g_snake.board[current.y][current.x], BoardState.CHECKED))
                continue;
            this.pathUntrimmed.push(current);
            let locals: Point[] = new Array(4);
            for (var i = 0; i < 4; i++) {
                locals[i] = new Point;
                locals[i].copy(current);
            }
            locals[0].y += 1;
            locals[1].x += 1;
            locals[2].y -= 1;
            locals[3].x -= 1;
            for (const local of locals) {
                if (local.x < 0 || local.x > g_snake.width - 1 || local.y < 0 || local.y > g_snake.height - 1)
                    continue;
                let value = g_snake.board[local.y][local.x];
                if (isBitSet(value, BoardState.FOOD)) {
                    this.pathUntrimmed.push(local);
                    return;
                }
                if (isBitSet(value, BoardState.CHECKED) || isBitSet(value, BoardState.SNAKE))
                    continue;
                search.push(local);
            }
            g_snake.board[current.y][current.x] = bitSet(g_snake.board[current.y][current.x], BoardState.CHECKED);
        }
    }
    // TODO: Fix trim function
    trim() {
        let reachedSnake = false;
        this.path.push(this.pathUntrimmed.pop() as Point); // Push food location
        while (this.pathUntrimmed.length !== 0) {
            let location: Point = this.pathUntrimmed.pop();
            if (reachedSnake)
                continue;
            if (isBitSet(g_snake.board[location.y][location.x], BoardState.SNAKE)) {
                reachedSnake = true;
                continue;
            }
            var delta = new Point;
            delta = location.subtract(this.path[this.path.length - 1]);
            if ((Math.abs(delta.x) + Math.abs(delta.y)) === 1)
                this.path.push(location);
        }
    }
    unvisit() {
        for (let i = 0; i < g_snake.height; i++) {
            for (let j = 0; j < g_snake.width; j++) {
                g_snake.board[i][j] = bitClear(g_snake.board[i][j], BoardState.CHECKED);
            }
        }
    }
    /*
        values:
        0 = left
        1 = up
        2 = right
        4 = down
    */
    nextMove() {
        // Get new path to food
        if (this.path.length === 0)
            this.pathRefresh();
        var next: Point = new Point;
        next.copy(this.path.pop());
        var delta = new Point;
        delta = next.subtract(g_snake.head);
        if (delta.x > 1)
            console.log("[ERR] delta.x > 1");
        else if (delta.x < -1)
            console.log("[ERR] delta.x < 1");
        if (delta.y > 1)
            console.log("[ERR] delta.y > 1");
        else if (delta.y < -1)
            console.log("[ERR] delta.y < 1");
        return next;
    }
    pathRefresh() {
        this.bfs();
        this.trim();
        this.unvisit();
    }
 }
 const g_snake: SnakeCore = new SnakeCore();
 const g_snakebot: Bot = new Bot();
 // game loop
 function snakeloop() {
    // Reset of needed
    if (g_snake.gameover)
        g_snake.reset();
    // Simulate movement of snake
    g_snake.simulate();
    // Regenerate food if needed
    g_snake.foodRegen();
    g_snake.draw();
 }
 // start the game
 setInterval(snakeloop, g_snake.timeout);
--- a/tsconfig.json
+++ b/tsconfig.json
@ -0,0 +1,8 @@
 {
  "compilerOptions": {
    "outDir": "./build",
    "allowJs": true,
    "target": "es5"
  },
  "include": ["./src/**/*"]
 }
Author	SHA1	Message	Date
Trianta	3bbc9701c5	Merge pull request 'core: add Snake using Typescript' (#7 ) from snake into main Reviewed-on: #7	2024-11-09 01:26:09 -06:00
Trianta	3699ed465b	snake: not adding last piece was correct, bool check was not	2024-11-09 01:23:11 -06:00
Trianta	b6fe678367	snake: add snake, but ignore when counting length left	2024-11-09 01:20:05 -06:00
Trianta	f59e7cf747	snake: don't add the snake itself to path	2024-11-09 01:10:24 -06:00
Trianta	33d5c491c2	snake: move extraneous logging to debug	2024-11-05 21:23:34 -06:00
Trianta	de80157f2e	snake: revert last commit and minor cleanups	2024-11-05 21:21:16 -06:00
Trianta	86ef363d3b	snake: attempt to move path refresh to post-regen	2024-11-05 21:11:46 -06:00
Trianta	727e13a1c9	snake: minor adjustment to trimming logic	2024-11-05 20:59:27 -06:00
Trianta	acc1e2b042	snake: add enums for bit states	2024-11-05 20:08:55 -06:00
Trianta	2916b4e127	snake: clear path on reset	2024-11-05 18:26:53 -06:00
Trianta	61f59208a0	snake: rename global variables	2024-11-05 18:17:44 -06:00
Trianta	7f23f4a40c	snake: add stashed changes	2024-11-05 17:29:07 -06:00
Trianta	457c7a22fa	jenkins: remove old container instead of just stopping if exists	2024-09-17 20:12:37 -05:00
Trianta	6667a2f79b	jenkins: remove old container if exists	2024-09-17 20:11:37 -05:00
Trianta	de5f4c5eaf	docker: fix directories when in container	2024-09-17 20:03:26 -05:00
Trianta	2967663a82	docker: correctly set up image	2024-09-17 19:49:49 -05:00
Trianta	477ce1461e	docker: build before deploy	2024-09-17 19:20:32 -05:00
Trianta	3641cfd836	docker: deploy website to nginx dir	2024-09-17 19:19:15 -05:00
Trianta	bda79f51a6	jenkins: add name to container on deploy	2024-09-17 19:14:33 -05:00
Trianta	98149cae07	docker: use nginx internal port	2024-09-17 19:09:54 -05:00
Trianta	e0c09898ae	jenkins: detach container on deploy	2024-09-17 19:03:13 -05:00
Trianta	0e34226b43	docker: use base image with apt	2024-09-17 18:43:39 -05:00
Trianta	4f6fbc4196	docker: use npm for Typescript stuff	2024-09-17 18:40:58 -05:00
Trimutex	b8198afd25	dockerfile: use nginx to host static site	2024-09-17 14:51:59 -05:00
Trimutex	08645727a8	docker: remove start script	2024-09-17 02:53:37 -05:00
Trimutex	c317e7ab08	npm: add build script	2024-09-17 02:51:23 -05:00
Trimutex	4f41b247ba	jenkins: fix deploy	2024-09-17 02:46:51 -05:00
Trimutex	10db37262c	jenkins: add initial Jenkinsfile	2024-09-17 02:31:19 -05:00
Trimutex	ceeb1f552b	docker: add initial Dockerfile	2024-09-17 02:30:55 -05:00
Trianta	8e626448a2	snake: fix snake body skipping placement half the time	2024-09-01 05:05:49 -05:00
Trianta	f975b0a045	snake: move core game pieces into separate functions instead of just the main loop	2024-08-28 00:29:51 -05:00
Trianta	06b7aa8c6f	index: use new files after move and ts conversion	2024-08-27 23:34:13 -05:00
Trianta	53af784952	core: move files to src and convert snake to ts	2024-08-27 23:32:54 -05:00
Trianta	eb6c023578	tsconfig: adjust build dir name	2024-08-27 23:29:51 -05:00
Trianta	0cbdb1f7fc	core: add typescript and npm	2024-08-27 23:28:36 -05:00
Trianta	50942522fe	snake: add most of snake, needs trim function to be fixed	2024-08-24 06:26:38 -05:00