#206 remove tileSize from char

Annoraaq · Oct 17, 2021 · 3bce776 · 3bce776
1 parent 0d55ddc
commit 3bce776
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/src/GridCharacter/GridCharacter.test.ts b/src/GridCharacter/GridCharacter.test.ts
@@ -61,6 +61,8 @@ describe("GridCharacter", () => {
       isBlocking: jest.fn(),
       getDepthOfCharLayer: jest.fn().mockReturnValue(DEPTH_OF_CHAR_LAYER),
       getTransition: jest.fn(),
+      getTileWidth: jest.fn().mockReturnValue(TILE_WIDTH),
+      getTileHeight: jest.fn().mockReturnValue(TILE_HEIGHT),
     };
     gridSpriteMock = <any>{
       getRawSprite: jest.fn(),
@@ -73,7 +75,6 @@ describe("GridCharacter", () => {
     gridCharacter = new GridCharacter("player", {
       sprite: gridSpriteMock,
       tilemap: gridTilemapMock,
-      tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
       speed: 3,
       collides: true,
       walkingAnimationMapping: 3,
@@ -84,7 +85,6 @@ describe("GridCharacter", () => {
     gridCharacter = new GridCharacter("player", {
       sprite: gridSpriteMock,
       tilemap: gridTilemapMock,
-      tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
       speed: 3,
       collides: true,
       charLayer: "someLayer",
@@ -98,7 +98,6 @@ describe("GridCharacter", () => {
     gridCharacter = new GridCharacter("player", {
       sprite: gridSpriteMock,
       tilemap: gridTilemapMock,
-      tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
       speed: 3,
       collides: true,
     });
@@ -107,7 +106,6 @@ describe("GridCharacter", () => {
     gridCharacter = new GridCharacter("player", {
       sprite: gridSpriteMock,
       tilemap: gridTilemapMock,
-      tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
       speed: 3,
       collides: false,
     });
@@ -377,7 +375,6 @@ describe("GridCharacter", () => {
     gridCharacter = new GridCharacter("player", {
       sprite: gridSpriteMock,
       tilemap: gridTilemapMock,
-      tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
       speed: 3,
       offsetX: customOffsetX,
       offsetY: customOffsetY,
@@ -754,7 +751,6 @@ describe("GridCharacter", () => {
       gridCharacter = new GridCharacter("player", {
         sprite: gridSpriteMock,
         tilemap: gridTilemapMock,
-        tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
         speed: 3,
         collides: false,
         walkingAnimationMapping: 3,
@@ -894,7 +890,6 @@ describe("GridCharacter", () => {
       gridCharacter = new GridCharacter("player", {
         sprite: gridSpriteMock,
         tilemap: gridTilemapMock,
-        tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
         speed: 3,
         walkingAnimationMapping: 3,
         container: containerMock,

diff --git a/src/GridCharacter/GridCharacter.ts b/src/GridCharacter/GridCharacter.ts
@@ -30,7 +30,6 @@ export interface CharConfig {
   sprite: GridSprite;
   // sprite2: Phaser.GameObjects.Sprite;
   tilemap: GridTilemap;
-  tileSize: Vector2;
   speed: number;
   collides: boolean;
   walkingAnimationMapping?: CharacterIndex | WalkingAnimationMapping;
@@ -86,8 +85,10 @@ export class GridCharacter {
     this.speed = config.speed;
     this.collides = config.collides;
     this.customOffset = new Vector2(config.offsetX || 0, config.offsetY || 0);
-    this.tileSize = config.tileSize.clone();
-
+    this.tileSize = new Vector2(
+      this.tilemap.getTileWidth(),
+      this.tilemap.getTileHeight()
+    );
     this._tilePos.layer = config.charLayer;
 
     this.sprite = config.sprite;

diff --git a/src/GridCharacter/IsometricGridCharacter/IsometricGridCharacter.test.ts b/src/GridCharacter/IsometricGridCharacter/IsometricGridCharacter.test.ts
@@ -52,6 +52,8 @@ describe("IsometricGridCharacter", () => {
       isBlocking: jest.fn().mockReturnValue(false),
       getDepthOfCharLayer: jest.fn().mockReturnValue(DEPTH_OF_CHAR_LAYER),
       getTransition: jest.fn(),
+      getTileWidth: jest.fn().mockReturnValue(TILE_WIDTH),
+      getTileHeight: jest.fn().mockReturnValue(TILE_HEIGHT),
     };
     gridSpriteMock = <any>{
       getRawSprite: jest.fn(),
@@ -64,7 +66,6 @@ describe("IsometricGridCharacter", () => {
     gridCharacter = new IsometricGridCharacter("player", {
       sprite: gridSpriteMock,
       tilemap: gridTilemapMock,
-      tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
       speed: 1,
       walkingAnimationMapping: 3,
       collides: true,
@@ -77,7 +78,6 @@ describe("IsometricGridCharacter", () => {
     gridCharacter = new IsometricGridCharacter("player", {
       sprite: gridSpriteMock,
       tilemap: gridTilemapMock,
-      tileSize: new Vector2(TILE_WIDTH, TILE_HEIGHT),
       speed: 1,
       offsetX: customOffsetX,
       offsetY: customOffsetY,

diff --git a/src/GridEngine.test.ts b/src/GridEngine.test.ts
@@ -244,7 +244,6 @@ describe("GridEngine", () => {
     expect(GridCharacter).toHaveBeenCalledWith("player", {
       sprite: mockGridSprite,
       tilemap: mockGridTileMap,
-      tileSize: new Vector2(32, 32),
       speed: 4,
       container: containerMock,
       offsetX: undefined,
@@ -271,7 +270,6 @@ describe("GridEngine", () => {
     expect(IsometricGridCharacter).toHaveBeenCalledWith("player", {
       sprite: playerSpriteMock,
       tilemap: mockGridTileMap,
-      tileSize: new Vector2(32, 32),
       speed: 4,
       container: undefined,
       offsetX: undefined,
@@ -311,7 +309,6 @@ describe("GridEngine", () => {
     });
     expect(GridCharacter).toHaveBeenCalledWith("player", {
       sprite: playerSpriteMock,
-      tileSize: new Vector2(32, 32),
       tilemap: mockGridTileMap,
       speed: 4,
       collides: true,
@@ -356,7 +353,6 @@ describe("GridEngine", () => {
     });
     expect(GridCharacter).toHaveBeenCalledWith("player", {
       sprite: playerSpriteMock,
-      tileSize: new Vector2(32, 32),
       tilemap: mockGridTileMap,
       speed: 4,
       walkingAnimationMapping,
@@ -440,7 +436,6 @@ describe("GridEngine", () => {
     });
     expect(GridCharacter).toHaveBeenCalledWith("player", {
       sprite: playerSpriteMock,
-      tileSize: new Vector2(32, 32),
       tilemap: mockGridTileMap,
       speed: 2,
       walkingAnimationMapping: 3,
@@ -464,7 +459,6 @@ describe("GridEngine", () => {
     });
     expect(GridCharacter).toHaveBeenCalledWith("player", {
       sprite: playerSpriteMock,
-      tileSize: new Vector2(32, 32),
       tilemap: mockGridTileMap,
       speed: 4,
       walkingAnimationMapping: 3,
@@ -488,7 +482,6 @@ describe("GridEngine", () => {
     });
     expect(GridCharacter).toHaveBeenCalledWith("player", {
       sprite: playerSpriteMock,
-      tileSize: new Vector2(32, 32),
       tilemap: mockGridTileMap,
       speed: 2,
       walkingAnimationMapping: 3,

diff --git a/src/GridEngine.ts b/src/GridEngine.ts
@@ -261,10 +261,6 @@ export class GridEngine {
       // sprite2,
       speed: charData.speed || 4,
       tilemap: this.gridTilemap,
-      tileSize: new Vector2(
-        this.gridTilemap.getTileWidth(),
-        this.gridTilemap.getTileHeight()
-      ),
       walkingAnimationMapping: charData.walkingAnimationMapping,
       container: charData.container,
       offsetX: charData.offsetX,