Small cleanup
This commit is contained in:
parent
4f8517a50c
commit
4aa1309797
@ -13,8 +13,7 @@ import type { Character as CharacterT, Zone as ZoneT, ExtendedCharacter as Exten
|
|||||||
import ZoneTiles from '@/components/zone/ZoneTiles.vue'
|
import ZoneTiles from '@/components/zone/ZoneTiles.vue'
|
||||||
import ZoneObjects from '@/components/zone/ZoneObjects.vue'
|
import ZoneObjects from '@/components/zone/ZoneObjects.vue'
|
||||||
import Characters from '@/components/zone/Characters.vue'
|
import Characters from '@/components/zone/Characters.vue'
|
||||||
import { unduplicateArray } from '@/utilities'
|
import { loadZoneTiles } from '@/composables/zoneComposable'
|
||||||
import { FlattenZoneArray, loadZoneTileTexture } from '@/composables/zoneComposable'
|
|
||||||
|
|
||||||
const scene = useScene()
|
const scene = useScene()
|
||||||
const gameStore = useGameStore()
|
const gameStore = useGameStore()
|
||||||
@ -37,6 +36,7 @@ gameStore.connection!.on('zone:character:teleport', async (data: zoneLoadData) =
|
|||||||
zoneId: data.zone.id
|
zoneId: data.zone.id
|
||||||
})
|
})
|
||||||
|
|
||||||
|
await loadZoneTiles(response.zone, scene)
|
||||||
zoneStore.setZone(data.zone)
|
zoneStore.setZone(data.zone)
|
||||||
zoneStore.setCharacters(data.characters)
|
zoneStore.setCharacters(data.characters)
|
||||||
})
|
})
|
||||||
@ -55,13 +55,6 @@ gameStore.connection!.on('character:move', (data: ExtendedCharacterT) => {
|
|||||||
zoneStore.updateCharacter(data)
|
zoneStore.updateCharacter(data)
|
||||||
})
|
})
|
||||||
|
|
||||||
async function loadZoneTiles(zone: ZoneT, scene: Phaser.Scene) {
|
|
||||||
const tileArray = unduplicateArray(FlattenZoneArray(zone.tiles))
|
|
||||||
for (const tile of tileArray) {
|
|
||||||
await loadZoneTileTexture(scene, tile, new Date())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
// Emit zone:character:join event to server and wait for response, then set zone and characters
|
// Emit zone:character:join event to server and wait for response, then set zone and characters
|
||||||
gameStore!.connection!.emit('zone:character:join', async (response: zoneLoadData) => {
|
gameStore!.connection!.emit('zone:character:join', async (response: zoneLoadData) => {
|
||||||
|
@ -7,7 +7,7 @@ import config from '@/config'
|
|||||||
import { useScene } from 'phavuer'
|
import { useScene } from 'phavuer'
|
||||||
import { useZoneStore } from '@/stores/zoneStore'
|
import { useZoneStore } from '@/stores/zoneStore'
|
||||||
import { onBeforeUnmount } from 'vue'
|
import { onBeforeUnmount } from 'vue'
|
||||||
import { setLayerTiles, loadZoneTileTexture } from '@/composables/zoneComposable'
|
import { setLayerTiles } from '@/composables/zoneComposable'
|
||||||
import Controls from '@/components/utilities/Controls.vue'
|
import Controls from '@/components/utilities/Controls.vue'
|
||||||
|
|
||||||
const emit = defineEmits(['tilemap:create'])
|
const emit = defineEmits(['tilemap:create'])
|
||||||
|
@ -4,6 +4,8 @@ import TilemapLayer = Phaser.Tilemaps.TilemapLayer
|
|||||||
import Tileset = Phaser.Tilemaps.Tileset
|
import Tileset = Phaser.Tilemaps.Tileset
|
||||||
import Tile = Phaser.Tilemaps.Tile
|
import Tile = Phaser.Tilemaps.Tile
|
||||||
import { useAssetManager } from '@/managers/assetManager'
|
import { useAssetManager } from '@/managers/assetManager'
|
||||||
|
import type { Zone as ZoneT } from '@/types'
|
||||||
|
import { unduplicateArray } from '@/utilities'
|
||||||
|
|
||||||
export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
|
export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
|
||||||
const tile = layer.getTileAtWorldXY(x, y)
|
const tile = layer.getTileAtWorldXY(x, y)
|
||||||
@ -83,6 +85,13 @@ export function FlattenZoneArray(tiles: string[][]) {
|
|||||||
return normalArray
|
return normalArray
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function loadZoneTiles(zone: ZoneT, scene: Phaser.Scene) {
|
||||||
|
const tileArray = unduplicateArray(FlattenZoneArray(zone.tiles))
|
||||||
|
for (const tile of tileArray) {
|
||||||
|
await loadZoneTileTexture(scene, tile, new Date())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function loadZoneTileTexture(scene: Phaser.Scene, textureId: string, updatedAt: Date): Promise<boolean> {
|
export async function loadZoneTileTexture(scene: Phaser.Scene, textureId: string, updatedAt: Date): Promise<boolean> {
|
||||||
const assetManager = useAssetManager
|
const assetManager = useAssetManager
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user