Rebrand

.vscode/settings.json

@@ -3,7 +3,7 @@
     "Deserializable",
     "Deserialization",
     "Respawn",
-    "decla",
+    "doppler",
     "overridable",
     "serializable"
   ]

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-# decla.red game server (the `declared-server` package).
+# doppler game server (the `doppler-server` package).
 # The frontend is a static site and is NOT built here — see .forgejo/workflows.
 
 # ---- Stage 1: build the shared lib, then bundle the server -------------------

README.md

@@ -1,8 +1,8 @@
-# [decla.red](https://decla.red)
+# doppler
 
 A 2-dimensional multiplayer game utilising ray tracing.
 
-> **Available at [decla.red](https://decla.red).**
+> **Available at [doppler.schmelczer.dev](https://doppler.schmelczer.dev).**
 
 ![screenshot of in-game fight](media/game-pc.png)
 ![three screenshots taken at iPhone SE screen size](media/collage-iphone.png)
@@ -15,7 +15,7 @@ CI/CD runs on Forgejo Actions (`.forgejo/workflows/deploy.yml`). On a push to
 `main` it:
 
 - builds the static frontend and rsyncs `frontend/dist/` to the `/pages/declared`
-  mount on the runner host, and
+  mount on the runner host (the mount keeps its pre-rebrand name), and
 - builds the server image from the root `Dockerfile` and pushes it to the Forgejo
   container registry as `<registry>/<owner>/<repo>-server`.
 
@@ -30,6 +30,6 @@ edit it to add or remove game-server origins.
 Run the server image locally:
 
 ```sh
-docker build -t declared-server .
-docker run -p 3000:3000 declared-server --name "My server" --playerLimit 16
+docker build -t doppler-server .
+docker run -p 3000:3000 doppler-server --name "My server" --playerLimit 16
 ```

backend/deployment/README.md

@@ -1,14 +0,0 @@
-# Setup a decla.red server on a fresh debian/ubuntu machine
-
-> The method was tested on Debian 10 DigitalOcean droplets.
-
-- Copy the files from this directory to the target machine.
-- Execute the following commands.
-- ```sh
-  chmod +x setup.sh
-  ./setup.sh serverX
-  ```
-
-  > Where `serverX` is the serverX.decla.red subdomain pointing to the server.
-
-- Optionally, change the arguments in [declared-servers.sh](declared-servers.sh).

backend/deployment/declared-servers.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=declared-server
-
-Requires=basic.target network.target
-
-[Service]
-Type=simple
-ExecStart=/bin/sh /root/declared-servers.sh
-
-[Install]
-WantedBy=multi-user.target

backend/deployment/declared-servers.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-NODE_ENV=production declared-server --port=3000 --name="Simonyi" --playerLimit=256 --npcCount=48 --scoreLimit=20000

backend/deployment/nginx.conf

@@ -1,49 +0,0 @@
-user www-data;
-worker_processes auto;
-pid /run/nginx.pid;
-
-events {
-	worker_connections 768;
-}
-
-http {
-	sendfile on;
-	tcp_nopush on;
-	tcp_nodelay on;
-	keepalive_timeout 65;
-	types_hash_max_size 2048;
-	server_tokens off;
-
-	include /etc/nginx/mime.types;
-	default_type application/octet-stream;
-
-	ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-	ssl_prefer_server_ciphers on;
-
-	access_log /var/log/nginx/access.log;
-	error_log /var/log/nginx/error.log;
-
-  map $http_upgrade $connection_upgrade {
-    default upgrade;
-    ''      close;
-  }
-
-  server {
-    listen 443 ssl;
-
-    include /etc/letsencrypt/options-ssl-nginx.conf;
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-    ssl_certificate /etc/letsencrypt/live/serverName.decla.red/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/serverName.decla.red/privkey.pem;
-
-    server_name serverName.decla.red;
-
-    location / {
-      proxy_pass http://127.0.0.1:3000/;
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection $connection_upgrade;
-      proxy_set_header Host $host;
-    }
-  }
-}

backend/deployment/setup.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -z "$1" ]; then
-  echo "Please specify a domain" 1>&2
-  exit 1
-fi
-
-domain="$1"
-
-apt install -y curl
-curl -sL https://deb.nodesource.com/setup_15.x | bash -
-apt update 
-apt install -y nodejs nginx certbot python3-certbot-nginx
-npm i -g declared-server
-
-certbot certonly --nginx -m schmelczerandras@gmail.com -d "$domain".decla.red --agree-tos --non-interactive
-
-mv nginx.conf /etc/nginx/nginx.conf
-sed -i "s/serverName/$domain/g" /etc/nginx/nginx.conf
-nginx -s reload
-
-chmod +x /root/declared-servers.sh
-chown root:root /root/declared-servers.sh
-cp declared-servers.service /etc/systemd/system/declared-servers.service
-systemctl enable declared-servers.service
-systemctl start declared-servers

backend/package.json

@@ -1,12 +1,12 @@
 {
-  "name": "declared-server",
+  "name": "doppler-server",
   "version": "0.1.0",
-  "description": "Game server for decla.red",
+  "description": "Game server for doppler",
   "keywords": [],
   "author": "András Schmelczer <andras@schmelczer.dev> (https://schmelczer.dev/)",
   "main": "dist/main.js",
   "bin": {
-    "declared-server": "dist/main.js"
+    "doppler-server": "dist/main.js"
   },
   "scripts": {
     "build": "npx webpack --mode production",

backend/src/commands/generate-points.ts

@@ -2,7 +2,7 @@ import { Command } from 'shared';
 
 export class GeneratePointsCommand extends Command {
   public constructor(
-    public readonly decla: number,
+    public readonly blue: number,
     public readonly red: number,
   ) {
     super();

backend/src/game-server.ts

@@ -30,7 +30,7 @@ export class GameServer extends CommandReceiver {
   private deltaTimes!: Array<number>;
   private deltaTimeCalculator!: DeltaTimeCalculator;
 
-  private declaPoints = 0;
+  private bluePoints = 0;
   private redPoints = 0;
   private matchPointAnnounced: Partial<Record<CharacterTeam, boolean>> = {};
 
@@ -52,7 +52,7 @@ export class GameServer extends CommandReceiver {
     );
     this.deltaTimeCalculator = new DeltaTimeCalculator();
     this.deltaTimes = [];
-    this.declaPoints = 0;
+    this.bluePoints = 0;
     this.redPoints = 0;
     this.matchPointAnnounced = {};
     this.isInEndGame = false;
@@ -118,19 +118,19 @@ export class GameServer extends CommandReceiver {
     this.handlePhysics();
   }
 
-  private addPoints({ decla, red }: GeneratePointsCommand) {
+  private addPoints({ blue, red }: GeneratePointsCommand) {
     if (this.isInEndGame) {
       return;
     }
 
-    this.declaPoints += decla;
+    this.bluePoints += blue;
     this.redPoints += red;
-    if (this.declaPoints >= this.options.scoreLimit) {
-      this.endGame(CharacterTeam.decla);
+    if (this.bluePoints >= this.options.scoreLimit) {
+      this.endGame(CharacterTeam.blue);
     } else if (this.redPoints >= this.options.scoreLimit) {
       this.endGame(CharacterTeam.red);
     } else {
-      this.announceMatchPointOnce(CharacterTeam.decla, this.declaPoints);
+      this.announceMatchPointOnce(CharacterTeam.blue, this.bluePoints);
       this.announceMatchPointOnce(CharacterTeam.red, this.redPoints);
     }
   }
@@ -179,7 +179,7 @@ export class GameServer extends CommandReceiver {
     if ((this.timeSinceLastPointUpdate += delta) > 0.5) {
       this.timeSinceLastPointUpdate = 0;
       this.players.queueCommandForEachClient(
-        new UpdateGameState(this.declaPoints, this.redPoints, this.options.scoreLimit),
+        new UpdateGameState(this.bluePoints, this.redPoints, this.options.scoreLimit),
       );
     }
 
@@ -224,7 +224,7 @@ export class GameServer extends CommandReceiver {
   }
 
   private get gameProgress(): number {
-    return (Math.max(this.declaPoints, this.redPoints) / this.options.scoreLimit) * 100;
+    return (Math.max(this.bluePoints, this.redPoints) / this.options.scoreLimit) * 100;
   }
 
   public get serverInfo(): ServerInformation {

backend/src/objects/character-physical.ts

@@ -151,10 +151,10 @@ export class CharacterPhysical extends CharacterBase implements DynamicPhysical
   private getPoints(game: CommandReceiver) {
     if (!this.isAlive && !this.hasGeneratedPoints) {
       this.hasGeneratedPoints = true;
-      const decla = this.team === CharacterTeam.decla ? 0 : settings.playerKillPoint;
+      const blue = this.team === CharacterTeam.blue ? 0 : settings.playerKillPoint;
       const red = this.team === CharacterTeam.red ? 0 : settings.playerKillPoint;
 
-      game.handleCommand(new GeneratePointsCommand(decla, red));
+      game.handleCommand(new GeneratePointsCommand(blue, red));
     }
   }
 
@@ -443,6 +443,8 @@ export class CharacterPhysical extends CharacterBase implements DynamicPhysical
 
       this.setDirection(vec2.length(sumForce) === 0 ? vec2.fromValues(0, -1) : sumForce);
     } else {
+      this.carryWithRotatingPlanet(deltaTimeInSeconds);
+
       const leftFootGravity = this.currentPlanet!.getForce(this.leftFoot.center);
       const rightFootGravity = this.currentPlanet!.getForce(this.rightFoot.center);
 
@@ -493,6 +495,38 @@ export class CharacterPhysical extends CharacterBase implements DynamicPhysical
     );
   }
 
+  // While standing on a planet, ride its spin: rigidly rotate the whole body
+  // around the planet centre by the same per-tick angle the renderer and the
+  // collision SDF use, so the player is carried around and turned with the
+  // surface instead of it sliding frictionlessly underneath. The positional
+  // change becomes velocity in setPropertyUpdates, so the motion syncs and the
+  // client extrapolates it smoothly.
+  private carryWithRotatingPlanet(deltaTimeInSeconds: number) {
+    const planet = this.currentPlanet;
+    if (!planet) {
+      return;
+    }
+
+    // Negative: the rendered/collidable surface turns by R(-rotation) — see
+    // PlanetPhysical.distance (toLocalFrame) and planet-shape.ts.
+    const angle = -planet.angularVelocity * deltaTimeInSeconds;
+    const center = planet.center;
+
+    this.head.center = vec2.rotate(vec2.create(), this.head.center, center, angle);
+    this.leftFoot.center = vec2.rotate(
+      vec2.create(),
+      this.leftFoot.center,
+      center,
+      angle,
+    );
+    this.rightFoot.center = vec2.rotate(
+      vec2.create(),
+      this.rightFoot.center,
+      center,
+      angle,
+    );
+  }
+
   private keepPosture() {
     const center = this.center;
     this.springMove(

backend/src/objects/circle-physical.ts

@@ -8,6 +8,7 @@ import {
 } from 'shared';
 import { BoundingBox } from '../physics/bounding-boxes/bounding-box';
 import { BoundingBoxBase } from '../physics/bounding-boxes/bounding-box-base';
+import { depenetrateCircle } from '../physics/functions/depenetrate-circle';
 import { moveCircle } from '../physics/functions/move-circle';
 import { PhysicalContainer } from '../physics/containers/physical-container';
 import { DynamicPhysical } from '../physics/physicals/dynamic-physical';
@@ -100,6 +101,8 @@ export class CirclePhysical extends CommandReceiver implements Circle, DynamicPh
       .filter((b) => b.gameObject !== this.gameObject && b.canCollide);
     this.radius -= vec2.length(delta);
 
+    depenetrateCircle(this, intersecting);
+
     const { normal, hitSurface, hitObject } = moveCircle(this, delta, intersecting);
 
     if (hitSurface) {

backend/src/players/player-container.ts

@@ -79,11 +79,11 @@ export class PlayerContainer {
 
   private getTeamOfNextPlayer(isNpc = false): CharacterTeam {
     const players = isNpc ? this.players : this._players;
-    const declaCount = players.filter((p) => p.team === CharacterTeam.decla).length;
+    const blueCount = players.filter((p) => p.team === CharacterTeam.blue).length;
     const redCount = players.filter((p) => p.team === CharacterTeam.red).length;
 
-    if ((declaCount === redCount && Random.getRandom() >= 0.5) || declaCount < redCount) {
-      return CharacterTeam.decla;
+    if ((blueCount === redCount && Random.getRandom() >= 0.5) || blueCount < redCount) {
+      return CharacterTeam.blue;
     } else {
       return CharacterTeam.red;
     }

frontend/.firebaserc

@@ -1,5 +0,0 @@
-{
-  "projects": {
-    "default": "decla-red
-  }
-}

frontend/firebase.json

@@ -1,16 +0,0 @@
-{
-  "hosting": {
-    "public": "dist",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ],
-    "rewrites": [
-      {
-        "source": "**",
-        "destination": "/index.html"
-      }
-    ]
-  }
-}

frontend/package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "decla.red-frontend",
+  "name": "doppler-frontend",
   "version": "0.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "decla.red-frontend",
+      "name": "doppler-frontend",
       "version": "0.0.0",
       "devDependencies": {
         "@plausible-analytics/tracker": "^0.4.5",

frontend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "decla.red-frontend",
+  "name": "doppler-frontend",
   "version": "0.0.0",
   "description": "",
   "keywords": [],

frontend/src/index.html

@@ -9,13 +9,13 @@
     />
     <meta name="theme-color" content="#b7455e" />
 
-    <meta property="og:url" content="https://decla.red" />
-    <meta property="og:image" content="https://decla.red/og-image.png" />
+    <meta property="og:url" content="https://doppler.schmelczer.dev" />
+    <meta property="og:image" content="https://doppler.schmelczer.dev/og-image.png" />
     <meta property="og:image:width" content="2086" />
     <meta property="og:image:height" content="940" />
     <meta
       property="og:image:alt"
-      content="Dimly lit planets surrounding a text saying 'decla.red'"
+      content="Dimly lit planets surrounding a text saying 'doppler'"
     />
     <meta name="theme-color" content="#b33951" />
     <meta
@@ -27,7 +27,7 @@
     <link rel="icon" type="image/png" sizes="32x32" href="static/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="16x16" href="static/favicon-16x16.png" />
 
-    <title>decla.red</title>
+    <title>doppler</title>
   </head>
 
   <body>
@@ -37,7 +37,7 @@
     <div id="overlay"></div>
 
     <section id="landing-ui">
-      <h1>decla.<span class="red">red</span></h1>
+      <h1>doppler</h1>
       <form id="join-game-form">
         <fieldset class="content">
           <legend>Join a game</legend>

frontend/src/main.scss

@@ -41,6 +41,18 @@ h1 {
   font-size: 6rem;
   text-align: center;
   padding-bottom: $medium-padding;
+  width: fit-content;
+  margin-inline: auto;
+  background: linear-gradient(90deg, $bright-blue, $bright-red);
+  background-clip: text;
+  -webkit-background-clip: text;
+  color: transparent;
+
+  &::selection {
+    color: white;
+    -webkit-text-fill-color: white;
+    background-color: $accent;
+  }
 
   @media (max-width: $height-breakpoint) {
     font-size: 4.5rem;
@@ -51,15 +63,6 @@ h1 {
   }
 }
 
-.red {
-  color: $accent;
-
-  &::selection {
-    color: $accent;
-    background-color: white;
-  }
-}
-
 html,
 body,
 canvas {
@@ -126,14 +129,14 @@ body {
       border-radius: 1000px;
       transition: transform 200ms;
 
-      &.decla {
-        color: $bright-decla;
+      &.blue {
+        color: $bright-blue;
 
         .health {
-          background-color: $bright-decla;
+          background-color: $bright-blue;
 
           &:before {
-            background-color: $bright-decla;
+            background-color: $bright-blue;
             opacity: 0.3;
           }
         }
@@ -211,8 +214,8 @@ body {
       font-weight: 700;
       animation: falling-point 2s ease-out forwards;
 
-      &.decla {
-        color: $bright-decla;
+      &.blue {
+        color: $bright-blue;
       }
 
       &.red {
@@ -232,8 +235,8 @@ body {
       mask-image: url('../static/chevron.svg');
       mask-size: contain;
 
-      &.decla {
-        background-color: $bright-decla;
+      &.blue {
+        background-color: $bright-blue;
       }
 
       &.red {
@@ -324,8 +327,8 @@ body {
         display: none;
       }
 
-      .decla {
-        color: $bright-decla;
+      .blue {
+        color: $bright-blue;
       }
 
       .red {
@@ -374,10 +377,10 @@ body {
         transition: width $animation-time;
       }
 
-      .fill.decla {
+      .fill.blue {
         right: 50%;
-        background: $bright-decla;
-        color: $bright-decla;
+        background: $bright-blue;
+        color: $bright-blue;
         border-radius: 1000px 0 0 1000px;
       }
 
@@ -425,7 +428,7 @@ body {
           font-size $animation-time;
       }
 
-      .score.decla {
+      .score.blue {
         right: calc(50% + #{$small-padding});
       }
 
@@ -438,10 +441,10 @@ body {
         font-size: 1.2rem;
       }
 
-      .score.decla.leading {
+      .score.blue.leading {
         text-shadow:
           0 0 3px rgba(0, 0, 0, 0.95),
-          0 0 8px $bright-decla;
+          0 0 8px $bright-blue;
       }
 
       .score.red.leading {
@@ -471,9 +474,9 @@ body {
           border-bottom: 5px solid currentColor;
         }
 
-        &.decla {
+        &.blue {
           right: calc(50% + #{$small-padding});
-          color: $bright-decla;
+          color: $bright-blue;
         }
 
         &.red {