noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactored code

This commit is contained in:
Johannes Berthel 2021-04-07 19:16:21 +02:00 committed by Thomas Basler
parent 09ceb016b7
commit 359d349ba7
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
front/src/Phaser/Map/InteractiveLayer.ts
View File

@ -1,3 +1,4 @@
import Tileset = Phaser.Tilemaps.Tileset;
import Sprite = Phaser.GameObjects.Sprite; import Sprite = Phaser.GameObjects.Sprite;
import Container = Phaser.GameObjects.Container; import Container = Phaser.GameObjects.Container;
@ -214,10 +215,7 @@ export class InteractiveLayer extends Container {
// if an animation was found, add each frame to the image (if it doesn't already exist) // if an animation was found, add each frame to the image (if it doesn't already exist)
if (typeof scene.anims.get(key) === "undefined") { if (typeof scene.anims.get(key) === "undefined") {
for (const j in animation) { for (const j in animation) {
if (!tileset.image.has(String(animation[j].tileid))) { this.addFrameToTilesetImage(tileset, String(animation[j].tileid), animation[j].tileid + tileset.firstgid);
const frameCoordinates = (tileset.getTileTextureCoordinates(animation[j].tileid + tileset.firstgid) as any);
tileset.image.add(String(animation[j].tileid), 0, frameCoordinates.x, frameCoordinates.y, tileset.tileWidth, tileset.tileHeight);
}
} }
scene.anims.create({ scene.anims.create({
@ -235,14 +233,10 @@ export class InteractiveLayer extends Container {
scene.sys.updateList.add(sprite); scene.sys.updateList.add(sprite);
} else { } else {
// if no animation was found, just add the on e tile as a frame (if it doesn't already exist) // if no animation was found, just add the on e tile as a frame (if it doesn't already exist)
const id = index - tileset.firstgid; const id = String(index - tileset.firstgid);
this.addFrameToTilesetImage(tileset, id, index);
if (!tileset.image.has(String(id))) { sprite = new Sprite(scene, x, y, tileset.image, id);
const coordinates = (tileset.getTileTextureCoordinates(index) as any);
tileset.image.add(String(id), 0, coordinates.x, coordinates.y, tileset.tileWidth, tileset.tileHeight);
}
sprite = new Sprite(scene, x, y, tileset.image, String(id));
} }
this.add(sprite); this.add(sprite);
@ -262,9 +256,9 @@ export class InteractiveLayer extends Container {
* If non was found it will just return null. * If non was found it will just return null.
* *
* @param {number} index * @param {number} index
* @returns {Phaser.Tilemaps.Tileset|null} * @returns {Tileset|null}
*/ */
private getTilesetContainingTile(index: number): Phaser.Tilemaps.Tileset|null { private getTilesetContainingTile(index: number): Tileset|null {
const scene = this.getScene(); const scene = this.getScene();
for (const i in scene.Map.tilesets) { for (const i in scene.Map.tilesets) {
@ -281,11 +275,11 @@ export class InteractiveLayer extends Container {
/** /**
* Will return the animation from a tile. If non is defined it will return null. * Will return the animation from a tile. If non is defined it will return null.
* *
* @param {Phaser.Tilemaps.Tileset} tileset * @param {Tileset} tileset
* @param {number} index * @param {number} index
* @returns {TileAnimation[]|null} * @returns {TileAnimation[]|null}
*/ */
private getAnimationFromTile(tileset: Phaser.Tilemaps.Tileset, index: number): TileAnimation[]|null { private getAnimationFromTile(tileset: Tileset, index: number): TileAnimation[]|null {
const data = tileset.getTileData(index); const data = tileset.getTileData(index);
if (typeof data === "object" && data !== null && Array.isArray((data as any).animation)) { if (typeof data === "object" && data !== null && Array.isArray((data as any).animation)) {
@ -390,4 +384,18 @@ export class InteractiveLayer extends Container {
&& sprite.x + sprite.width * (radius + 1) > x // right && sprite.x + sprite.width * (radius + 1) > x // right
&& sprite.y + sprite.height * (radius + 1) > y // bottom && sprite.y + sprite.height * (radius + 1) > y // bottom
} }
/**
*
* @param {} tileset
* @param {string} key
* @param {number} index
* @returns {void}
*/
private addFrameToTilesetImage(tileset: Tileset, key: string, index: number): void {
if (!tileset.image.has(key)) {
const coordinates = (tileset.getTileTextureCoordinates(index) as any);
tileset.image.add(key, 0, coordinates.x, coordinates.y, tileset.tileWidth, tileset.tileHeight);
}
}
} }