noxious/client
6
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http improvements, fixed link

Browse Source
This commit is contained in:
Dennis Postma
2024-12-27 00:48:36 +01:00
parent 231f19a30f
commit 6dad7bc9dd
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/composables/gameComposable.ts
View File

@ -1,4 +1,4 @@
import type { AssetDataT, Sprite } from '@/application/types'
import type { AssetDataT, HttpResponse, Sprite, SpriteAction } from '@/application/types'
import { useGameStore } from '@/stores/gameStore'
import { AssetStorage } from '@/storage/assetStorage'
import config from '@/application/config'
@ -59,8 +59,10 @@ export async function loadTexture(scene: Phaser.Scene, assetData: AssetDataT): P
export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
if (!sprite) return
const sprite_actions = await fetch(config.server_endpoint + '/assets/list_sprite_actions/' + sprite?.id).then((response) => response.json())
for await (const sprite_action of sprite_actions) {
// @TODO: Fix this
const sprite_actions: HttpResponse<any[]> = await fetch(config.server_endpoint + '/assets/list_sprite_actions/' + sprite?.id).then((response) => response.json())
for await (const sprite_action of sprite_actions.data ?? []) {
await loadTexture(scene, {
key: sprite_action.key,
data: sprite_action.data,
@ -72,7 +74,6 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
frameWidth: sprite_action.frameWidth,
frameHeight: sprite_action.frameHeight,
frameRate: sprite_action.frameRate,
frameCount: sprite_action.frameCount
} as AssetDataT)
// If the sprite is not animated, skip
@ -87,7 +88,7 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) {
scene.anims.create({
key: sprite_action.key,
frameRate: sprite_action.frameRate,
frames: scene.anims.generateFrameNumbers(sprite_action.key, { start: 0, end: sprite_action.frameCount! - 1 }),
frames: scene.anims.generateFrameNumbers(sprite_action.key, { start: 0, end: sprite_action.frameRate! - 1 }),
repeat: -1
})
}

6
src/composables/zoneComposable.ts
View File

@ -3,7 +3,7 @@ import Tilemap = Phaser.Tilemaps.Tilemap
import TilemapLayer = Phaser.Tilemaps.TilemapLayer
import Tileset = Phaser.Tilemaps.Tileset
import Tile = Phaser.Tilemaps.Tile
import type { AssetDataT, Zone as ZoneT } from '@/application/types'
import type { AssetDataT, HttpResponse, Zone as ZoneT } from '@/application/types'
import { loadTexture } from '@/composables/gameComposable'
export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
@ -86,10 +86,10 @@ export function FlattenZoneArray(tiles: string[][]) {
export async function loadZoneTilesIntoScene(zone: ZoneT, scene: Phaser.Scene) {
// Fetch the list of tiles from the server
const tileArray: AssetDataT[] = await fetch(config.server_endpoint + '/assets/list_tiles/' + zone.id).then((response) => response.json())
const tileArray: HttpResponse<AssetDataT[]> = await fetch(config.server_endpoint + '/assets/list_tiles/' + zone.id).then((response) => response.json())
// Load each tile into the scene
for (const tile of tileArray) {
for (const tile of tileArray.data ?? []) {
await loadTexture(scene, tile)
}
}