Improve physics

backend/src/objects/character-physical.ts

@@ -1,27 +1,64 @@
 import { vec2 } from 'gl-matrix';
-import { id, CharacterBase } from 'shared';
+import {
+  id,
+  CharacterBase,
+  StepCommand,
+  settings,
+  CommandExecutors,
+  MoveActionCommand,
+} from 'shared';
 
 import { ImmutableBoundingBox } from '../physics/bounding-boxes/immutable-bounding-box';
 
 import { CirclePhysical } from './circle-physical';
 import { Physical } from '../physics/physical';
+import { PhysicalContainer } from '../physics/containers/physical-container';
 
 export class CharacterPhysical extends CharacterBase implements Physical {
   public readonly canCollide = true;
   public readonly isInverted = false;
   public readonly canMove = true;
 
+  public head: CirclePhysical;
+  public leftFoot: CirclePhysical;
+  public rightFoot: CirclePhysical;
+
+  private movementActions: Array<MoveActionCommand> = [];
+
+  protected commandExecutors: CommandExecutors = {
+    [StepCommand.type]: this.step.bind(this),
+    [MoveActionCommand.type]: (c: MoveActionCommand) => this.movementActions.push(c),
+  };
+
   private static readonly headOffset = vec2.fromValues(0, 40);
   private static readonly leftFootOffset = vec2.fromValues(-20, -10);
   private static readonly rightFootOffset = vec2.fromValues(20, -10);
 
-  constructor() {
+  constructor(container: PhysicalContainer) {
     super(
       id(),
-      new CirclePhysical(vec2.clone(CharacterPhysical.headOffset), 50, null),
-      new CirclePhysical(vec2.clone(CharacterPhysical.leftFootOffset), 20, null),
-      new CirclePhysical(vec2.clone(CharacterPhysical.rightFootOffset), 20, null)
+      new CirclePhysical(vec2.clone(CharacterPhysical.headOffset), 50, null, container),
+      new CirclePhysical(
+        vec2.clone(CharacterPhysical.leftFootOffset),
+        20,
+        null,
+        container
+      ),
+      new CirclePhysical(
+        vec2.clone(CharacterPhysical.rightFootOffset),
+        20,
+        null,
+        container
+      )
     );
+
+    this.head.owner = this;
+    this.leftFoot.owner = this;
+    this.rightFoot.owner = this;
+
+    container.addObject(this.head);
+    container.addObject(this.leftFoot);
+    container.addObject(this.rightFoot);
   }
 
   private _boundingBox?: ImmutableBoundingBox;
@@ -42,16 +79,51 @@ export class CharacterPhysical extends CharacterBase implements Physical {
   public distance(_: vec2): number {
     return 0;
   }
-  /*
-  public step() {
-    const movementForce = vec2.fromValues(right - left, up - down);
+
+  private sumAndResetMovementActions(): vec2 {
+    if (this.movementActions.length === 0) {
+      return vec2.create();
+    }
+
+    const movementForce = this.movementActions.reduce(
+      (sum, current) => vec2.add(sum, sum, current.delta),
+      vec2.create()
+    );
+
+    vec2.scale(movementForce, movementForce, 1 / this.movementActions.length);
+
+    this.movementActions = [];
+
+    return movementForce;
+  }
+
+  public step(c: StepCommand) {
+    const deltaTime = c.deltaTimeInMiliseconds;
+
+    const movementForce = this.sumAndResetMovementActions();
+    if (!this.leftFoot.isAirborne || !this.rightFoot.isAirborne) {
+      movementForce.y = 0;
+    }
+
     this.head.applyForce(movementForce, deltaTime);
     this.head.applyForce(settings.gravitationalForce, deltaTime);
 
-    const bodyCenter = vec2.sub(vec2.create(), this.head.center, this.headOffset);
+    const bodyCenter = vec2.sub(
+      vec2.create(),
+      this.head.center,
+      CharacterPhysical.headOffset
+    );
 
-    const leftFootPositon = vec2.add(vec2.create(), bodyCenter, this.leftFootOffset);
-    const rightFootPositon = vec2.add(vec2.create(), bodyCenter, this.rightFootOffset);
+    const leftFootPositon = vec2.add(
+      vec2.create(),
+      bodyCenter,
+      CharacterPhysical.leftFootOffset
+    );
+    const rightFootPositon = vec2.add(
+      vec2.create(),
+      bodyCenter,
+      CharacterPhysical.rightFootOffset
+    );
 
     const leftFootDelta = vec2.sub(vec2.create(), this.leftFoot.center, leftFootPositon);
     const rightFootDelta = vec2.sub(
@@ -80,13 +152,13 @@ export class CharacterPhysical extends CharacterBase implements Physical {
     this.leftFoot.step(deltaTime);
     this.rightFoot.step(deltaTime);
 
-    this.flashlight.center = vec2.add(
+    /*this.flashlight.center = vec2.add(
       vec2.create(),
       this.head.center,
       vec2.fromValues(0, 0)
-    );
+    );*/
   }
-*/
+
   public toJSON(): any {
     const { type, id, head, leftFoot, rightFoot } = this;
     return [type, id, head, leftFoot, rightFoot];