Refactoring of modalShown booleans

src/composables/mapComposable.ts

@@ -9,10 +9,10 @@ import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 import Tileset = Phaser.Tilemaps.Tileset
 import Tile = Phaser.Tilemaps.Tile
 
+import type { Tile as TileT } from '@/application/types'
+
 export function getTile(layer: TilemapLayer | Tilemap, positionX: number, positionY: number): Tile | null {
-  const tile = layer?.getTileAtWorldXY(positionX, positionY)
-  if (!tile) return null
-  return tile
+  return layer.getTileAtWorldXY(positionX, positionY)
 }
 
 export function tileToWorldXY(layer: TilemapLayer | Tilemap, positionX: number, positionY: number) {
@@ -77,14 +77,18 @@ export const calculateIsometricDepth = (positionX: number, positionY: number, wi
   return baseDepth + (width + height) / (2 * config.tile_size.width)
 }
 
-export function FlattenMapArray(tiles: string[][]) {
-  const normalArray = []
-
-  for (const row of tiles) {
-    normalArray.push(...row)
+async function getTiles(tiles: TileT[], scene: Phaser.Scene) {
+  // Load each tile into the scene
+  for (const tile of tiles) {
+    if (!tile) continue
+    const textureData = {
+      key: tile.id,
+      data: '/textures/tiles/' + tile.id + '.png',
+      group: 'tiles',
+      updatedAt: tile.updatedAt
+    } as TextureData
+    await loadTexture(scene, textureData)
   }
-
-  return normalArray
 }
 
 export async function loadMapTilesIntoScene(map_id: UUID, scene: Phaser.Scene) {
@@ -93,50 +97,22 @@ export async function loadMapTilesIntoScene(map_id: UUID, scene: Phaser.Scene) {
   const map = await mapStorage.get(map_id)
   if (!map) return
 
-  const tileArray = unduplicateArray(FlattenMapArray(map.tiles))
+  const tileArray = unduplicateArray(map.tiles)
   const tiles = await tileStorage.getByIds(tileArray)
 
-  // Load each tile into the scene
-  for (const tile of tiles) {
-    const textureData = {
-      key: tile.id,
-      data: '/textures/tiles/' + tile.id + '.png',
-      group: 'tiles',
-      updatedAt: tile.updatedAt
-    } as TextureData
-    await loadTexture(scene, textureData)
-  }
+  await getTiles(tiles, scene)
 }
 
 export async function loadTilesIntoScene(tileIds: string[], scene: Phaser.Scene) {
   const tileStorage = new TileStorage()
-
   const tiles = await tileStorage.getByIds(tileIds)
 
-  // Load each tile into the scene
-  for (const tile of tiles) {
-    const textureData = {
-      key: tile.id,
-      data: '/textures/tiles/' + tile.id + '.png',
-      group: 'tiles',
-      updatedAt: tile.updatedAt
-    } as TextureData
-    await loadTexture(scene, textureData)
-  }
+  await getTiles(tiles, scene)
 }
 
 export async function loadAllTilesIntoScene(scene: Phaser.Scene) {
   const tileStorage = new TileStorage()
   const tiles = await tileStorage.getAll()
 
-  // Load each tile into the scene
-  for (const tile of tiles) {
-    const textureData = {
-      key: tile.id,
-      data: '/textures/tiles/' + tile.id + '.png',
-      group: 'tiles',
-      updatedAt: tile.updatedAt
-    } as TextureData
-    await loadTexture(scene, textureData)
-  }
+  getTiles(tiles, scene)
 }

src/composables/pointerHandlers/useGamePointerHandlers.ts

@@ -25,7 +25,7 @@ export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilema
   }
 
   function handlePointerDown(pointer: Phaser.Input.Pointer) {
-    pointerStartPosition.value = { x: pointer.x, y: pointer.y }
+    pointerStartPosition.value = pointer.position
     gameStore.setPlayerDraggingCamera(true)
   }
 
@@ -34,10 +34,9 @@ export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilema
 
     if (!gameStore.game.isPlayerDraggingCamera) return
 
-    const distance = Phaser.Math.Distance.Between(pointerStartPosition.value.x, pointerStartPosition.value.y, pointer.x, pointer.y)
-
     // If the distance is less than the drag threshold, return
     // We do this to prevent the camera from scrolling too quickly
+    const distance = Phaser.Math.Distance.Between(pointerStartPosition.value.x, pointerStartPosition.value.y, pointer.x, pointer.y)
     if (distance <= dragThreshold) return
 
     camera.setScroll(camera.scrollX - (pointer.x - pointer.prevPosition.x) / camera.zoom, camera.scrollY - (pointer.y - pointer.prevPosition.y) / camera.zoom)
@@ -46,12 +45,6 @@ export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilema
   function handlePointerUp(pointer: Phaser.Input.Pointer) {
     gameStore.setPlayerDraggingCamera(false)
 
-    const distance = Phaser.Math.Distance.Between(pointerStartPosition.value.x, pointerStartPosition.value.y, pointer.x, pointer.y)
-
-    // If the distance is greater than the drag threshold, return
-    // We do this to prevent the camera from scrolling too quickly
-    if (distance > dragThreshold) return
-
     const pointerTile = getTile(layer, pointer.worldX, pointer.worldY)
     if (!pointerTile) return
 

src/composables/pointerHandlers/useMapEditorPointerHandlers.ts

@@ -28,7 +28,7 @@ export function useMapEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.T
   }
 
   function handlePointerDown(pointer: Phaser.Input.Pointer) {
-    pointerStartPosition.value = { x: pointer.x, y: pointer.y }
+    pointerStartPosition.value = pointer.position
     if (isMoveTool.value || pointer.event.shiftKey) {
       gameStore.setPlayerDraggingCamera(true)
     }
@@ -37,8 +37,9 @@ export function useMapEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.T
   function dragMap(pointer: Phaser.Input.Pointer) {
     if (!gameStore.game.isPlayerDraggingCamera) return
 
+    // If the distance is less than the drag threshold, return
+    // We do this to prevent the camera from scrolling too quickly
     const distance = Phaser.Math.Distance.Between(pointerStartPosition.value.x, pointerStartPosition.value.y, pointer.x, pointer.y)
-
     if (distance <= dragThreshold) return
 
     camera.setScroll(camera.scrollX - (pointer.x - pointer.prevPosition.x) / camera.zoom, camera.scrollY - (pointer.y - pointer.prevPosition.y) / camera.zoom)