From 5593bf2d364667d8402daa8fde8f43647f7360a6 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 5 Nov 2018 01:09:01 +0100 Subject: data: remove obsolete collision matrix --- dist/resources/map/test.json | 14 -------------- src/model/data/map.ts | 7 ++----- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dist/resources/map/test.json b/dist/resources/map/test.json index 707961e..bb0b1da 100644 --- a/dist/resources/map/test.json +++ b/dist/resources/map/test.json @@ -3,20 +3,6 @@ "stone/floor", "stone/plate" ], - "collision": [ - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false], - [false, false, false, false, false, false, false, false, false, false, false, false] - ], "layers": [ [ [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], diff --git a/src/model/data/map.ts b/src/model/data/map.ts index 50b9175..d6fd835 100644 --- a/src/model/data/map.ts +++ b/src/model/data/map.ts @@ -1,12 +1,10 @@ export interface Input { readonly tiles: string[]; - readonly collision: boolean[][]; readonly layers: number[][][]; } export class MapData { public readonly tiles: string[]; - public readonly collision: boolean[][]; public readonly layers: number[][][]; public readonly width: number; @@ -14,10 +12,9 @@ export class MapData { constructor(data: Input) { this.tiles = data.tiles; - this.collision = data.collision; this.layers = data.layers; - this.height = this.collision.length; - this.width = this.collision[0].length; + this.height = this.layers[0].length; + this.width = this.layers[0][0].length; } } -- cgit v1.2.3