Improve multiplayer

shared/src/commands/types/move-action.ts

@@ -4,11 +4,11 @@ import { Command } from '../command';
 
 @serializable
 export class MoveActionCommand extends Command {
-  public constructor(public readonly delta: vec2) {
+  public constructor(public readonly direction: vec2) {
     super();
   }
 
   public toArray(): Array<any> {
-    return [this.delta];
+    return [this.direction];
   }
 }

shared/src/commands/types/set-aspect-ratio-action.ts

@@ -0,0 +1,13 @@
+import { serializable } from '../../transport/serialization/serializable';
+import { Command } from '../command';
+
+@serializable
+export class SetAspectRatioActionCommand extends Command {
+  public constructor(public readonly aspectRatio: number) {
+    super();
+  }
+
+  public toArray(): Array<any> {
+    return [this.aspectRatio];
+  }
+}

shared/src/commands/types/set-view-area-action.ts

@@ -1,14 +0,0 @@
-import { Rectangle } from '../../helper/rectangle';
-import { serializable } from '../../transport/serialization/serializable';
-import { Command } from '../command';
-
-@serializable
-export class SetViewAreaActionCommand extends Command {
-  public constructor(public readonly viewArea: Rectangle) {
-    super();
-  }
-
-  public toArray(): Array<any> {
-    return [this.viewArea];
-  }
-}

shared/src/helper/calculate-view-area.ts

@@ -0,0 +1,22 @@
+import { vec2 } from 'gl-matrix';
+import { Rectangle, settings } from '../main';
+
+export const calculateViewArea = (
+  center: vec2,
+  aspectRatio: number,
+  oversizeRatio = 1,
+): Rectangle => {
+  const viewArea = new Rectangle();
+
+  viewArea.size = vec2.fromValues(
+    Math.sqrt(settings.inViewAreaSize * oversizeRatio * aspectRatio),
+    Math.sqrt((settings.inViewAreaSize * oversizeRatio) / aspectRatio),
+  );
+
+  viewArea.topLeft = vec2.fromValues(
+    center.x - viewArea.size.x / 2,
+    center.y + viewArea.size.y / 2,
+  );
+
+  return viewArea;
+};

shared/src/helper/circle.ts

@@ -9,6 +9,10 @@ export class Circle {
     return vec2.distance(this.center, target) - this.radius;
   }
 
+  public distanceBetween(target: Circle): number {
+    return vec2.distance(target.center, this.center) - this.radius - target.radius;
+  }
+
   public toArray(): Array<any> {
     return [this.center, this.radius];
   }

shared/src/main.ts

@@ -6,15 +6,18 @@ export * from './commands/types/update-objects';
 export * from './commands/types/step';
 export * from './commands/types/ternary-action';
 export * from './commands/types/move-action';
-export * from './commands/types/set-view-area-action';
+export * from './commands/types/set-aspect-ratio-action';
 export * from './commands/types/primary-action';
 export * from './commands/types/secondary-action';
 export * from './commands/command-receiver';
 export * from './commands/command-executors';
 export * from './commands/command-generator';
 export * from './commands/broadcast-commands';
+export * from './commands/types/set-aspect-ratio-action';
 export * from './helper/array';
+export * from './helper/last';
 export * from './helper/clamp';
+export * from './helper/calculate-view-area';
 export * from './helper/pretty-print';
 export * from './helper/circle';
 export * from './helper/rectangle';

shared/src/settings.ts

@@ -5,13 +5,15 @@ export const settings = {
   hitDetectionCirclePointCount: 32,
   hitDetectionMaxOverlap: 0.01,
   physicsMaxStep: 5,
-  gravitationalForce: vec2.fromValues(0, -0.0055),
-  maxVelocityX: 1,
-  maxAccelerationX: 0.005,
-  maxAccelerationY: 0.01,
-  targetPhysicsDeltaTimeInMilliseconds: 10,
+  gravitationalForce: vec2.fromValues(0, -200),
+  maxVelocityX: 500,
+  maxVelocityY: 750,
+  maxAccelerationX: 16000,
+  maxAccelerationY: 5500,
+  targetPhysicsDeltaTimeInMilliseconds: 15,
   minPhysicsSleepTime: 4,
-  velocityAttenuation: 0.99,
+  velocityAttenuation: 0.5,
+  frictionMinVelocity: 400,
   inViewAreaSize: 1920 * 1080 * 3,
-  defaultJumpEnergy: 600,
+  defaultJumpEnergy: 0.75,
 };

shared/src/transport/identity.ts

@@ -1 +1 @@
-export type Id = number;
+export type Id = number | null;

shared/src/transport/transport-events.ts

@@ -2,4 +2,6 @@ export enum TransportEvents {
   PlayerJoining = 'PlayerJoining',
   PlayerToServer = 'PlayerToServer',
   ServerToPlayer = 'ServerToPlayer',
+  Ping = 'Ping',
+  Pong = 'Pong',
 }

shared/tsconfig.json

@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
-    "target": "es5",
     "outDir": "lib",
     "sourceMap": true,
     "declaration": true,
     "declarationMap": true,
+    "target": "es6",
     "esModuleInterop": true,
     "strict": true,
     "experimentalDecorators": true,