From 764cd8344df2dc9b2c271d868ae193b98b829af7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 24 Dec 2019 20:13:47 +0100 Subject: Fix lint issues --- src/renderer/runtime/controller/collision.ts | 53 +++++++++++++--------------- 1 file changed, 24 insertions(+), 29 deletions(-) (limited to 'src/renderer/runtime/controller/collision.ts') diff --git a/src/renderer/runtime/controller/collision.ts b/src/renderer/runtime/controller/collision.ts index a44ffa4..3c12945 100644 --- a/src/renderer/runtime/controller/collision.ts +++ b/src/renderer/runtime/controller/collision.ts @@ -12,26 +12,25 @@ export function mkCollision(collision: Collision[]): Collidable[] { for (const c of collision) { switch (c.type) { - case 'polygon': - if (!c.vertices.length) - continue; - - let prev = c.vertices[c.vertices.length - 1]; - - for (const v of c.vertices) { - ret.push(LineSegment.fromPoints(vec2.clone(prev), vec2.clone(v))); - prev = v; - } - - for (const v of c.vertices) { - ret.push(new Point(vec2.clone(v))); - prev = v; - } - break; - - case 'circle': - ret.push(new Circle(vec2.clone(c.center), c.radius)); - break; + case 'polygon': + if (!c.vertices.length) continue; + + let prev = c.vertices[c.vertices.length - 1]; + + for (const v of c.vertices) { + ret.push(LineSegment.fromPoints(vec2.clone(prev), vec2.clone(v))); + prev = v; + } + + for (const v of c.vertices) { + ret.push(new Point(vec2.clone(v))); + prev = v; + } + break; + + case 'circle': + ret.push(new Circle(vec2.clone(c.center), c.radius)); + break; } } @@ -39,24 +38,20 @@ export function mkCollision(collision: Collision[]): Collidable[] { } export interface CollidableGroup { - getTranslation(): vec2|null; + getTranslation(): vec2 | null; getCollidables(): Collidable[]; } export function collide(collision: CollidableGroup, out: vec2, move: Movement, radius: number): boolean { const t = collision.getTranslation(); - if (t) - move = move.translate(vec2.negate(vec2.create(), t)); + if (t) move = move.translate(vec2.negate(vec2.create(), t)); for (const c of collision.getCollidables()) { - if (!c.collide(out, move, radius)) - continue; + if (!c.collide(out, move, radius)) continue; - if (vec2.squaredDistance(move.src, out) >= vec2.squaredDistance(move.src, move.dest)) - continue; + if (vec2.squaredDistance(move.src, out) >= vec2.squaredDistance(move.src, move.dest)) continue; - if (t) - vec2.add(out, out, t); + if (t) vec2.add(out, out, t); return true; } -- cgit v1.2.3