From 4d88917526d2928427b8cf983cad241b6f6f2561 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Mon, 13 Jan 2025 11:02:04 +0100
Subject: [PATCH] Loading placed map objects works again

---
 src/components/game/map/MapTiles.vue                      | 2 +-
 src/components/game/map/partials/PlacedMapObject.vue      | 2 +-
 src/components/gameMaster/mapEditor/MapEditor.vue         | 8 +++-----
 .../gameMaster/mapEditor/mapPartials/PlacedMapObject.vue  | 2 +-
 .../gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue | 2 +-
 src/components/screens/MapEditor.vue                      | 1 -
 src/stores/gameStore.ts                                   | 5 +----
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/components/game/map/MapTiles.vue b/src/components/game/map/MapTiles.vue
index 030894c..d93fe3e 100644
--- a/src/components/game/map/MapTiles.vue
+++ b/src/components/game/map/MapTiles.vue
@@ -11,7 +11,7 @@ import { FlattenMapArray, loadMapTilesIntoScene, setLayerTiles } from '@/composa
 import { MapStorage } from '@/storage/storages'
 import { useMapStore } from '@/stores/mapStore'
 import { useScene } from 'phavuer'
-import { onBeforeUnmount, onMounted, shallowRef } from 'vue'
+import { onBeforeUnmount, shallowRef } from 'vue'
 
 import Tileset = Phaser.Tilemaps.Tileset
 
diff --git a/src/components/game/map/partials/PlacedMapObject.vue b/src/components/game/map/partials/PlacedMapObject.vue
index 6d0c94e..6d0d76c 100644
--- a/src/components/game/map/partials/PlacedMapObject.vue
+++ b/src/components/game/map/partials/PlacedMapObject.vue
@@ -1,5 +1,5 @@
 <template>
-  <Image v-if="gameStore.isAssetLoaded(props.placedMapObject.mapObject)" v-bind="imageProps" />
+  <Image v-if="gameStore.isTextureLoaded(props.placedMapObject.mapObject)" v-bind="imageProps" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/gameMaster/mapEditor/MapEditor.vue b/src/components/gameMaster/mapEditor/MapEditor.vue
index 14bca6c..47f921f 100644
--- a/src/components/gameMaster/mapEditor/MapEditor.vue
+++ b/src/components/gameMaster/mapEditor/MapEditor.vue
@@ -1,6 +1,6 @@
 <template>
   <MapTiles @tileMap:create="tileMap = $event" />
-  <!--  <MapObjects v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />-->
+  <PlacedMapObjects v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />
   <MapEventTiles v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />
 
   <Toolbar @save="save" @clear="clear" />
@@ -17,22 +17,20 @@
 import { type Map } from '@/application/types'
 import MapEventTiles from '@/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue'
 import MapTiles from '@/components/gameMaster/mapEditor/mapPartials/MapTiles.vue'
-import MapObjects from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue'
+import PlacedMapObjects from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue'
 import MapList from '@/components/gameMaster/mapEditor/partials/MapList.vue'
 import ObjectList from '@/components/gameMaster/mapEditor/partials/MapObjectList.vue'
 import MapSettings from '@/components/gameMaster/mapEditor/partials/MapSettings.vue'
 import TeleportModal from '@/components/gameMaster/mapEditor/partials/TeleportModal.vue'
 import TileList from '@/components/gameMaster/mapEditor/partials/TileList.vue'
 import Toolbar from '@/components/gameMaster/mapEditor/partials/Toolbar.vue'
-import { loadAllTilesIntoScene } from '@/composables/mapComposable'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { useScene } from 'phavuer'
-import { onBeforeMount, onUnmounted, shallowRef } from 'vue'
+import { onUnmounted, shallowRef } from 'vue'
 
 const gameStore = useGameStore()
 const mapEditorStore = useMapEditorStore()
-const scene = useScene()
 
 const tileMap = shallowRef<Phaser.Tilemaps.Tilemap>()
 
diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
index a672bff..688c546 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
@@ -1,5 +1,5 @@
 <template>
-  <Image v-if="gameStore.getLoadedAsset(props.placedMapObject.mapObject.id)" v-bind="imageProps" />
+  <Image v-if="gameStore.isTextureLoaded(props.placedMapObject.mapObject.id)" v-bind="imageProps" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
index e339409..f08b1ea 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
@@ -4,7 +4,7 @@
 </template>
 
 <script setup lang="ts">
-import type { MapObject, PlacedMapObject as PlacedMapObjectT } from '@/application/types'
+import type { PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
 import PlacedMapObject from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue'
 import SelectedPlacedMapObjectComponent from '@/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue'
diff --git a/src/components/screens/MapEditor.vue b/src/components/screens/MapEditor.vue
index ab1a456..5b7e06c 100644
--- a/src/components/screens/MapEditor.vue
+++ b/src/components/screens/MapEditor.vue
@@ -12,7 +12,6 @@
 import config from '@/application/config'
 import 'phaser'
 import MapEditor from '@/components/gameMaster/mapEditor/MapEditor.vue'
-import { loadAllTilesIntoScene } from '@/composables/mapComposable'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { Game, Scene } from 'phavuer'
diff --git a/src/stores/gameStore.ts b/src/stores/gameStore.ts
index ff7edca..842dadb 100644
--- a/src/stores/gameStore.ts
+++ b/src/stores/gameStore.ts
@@ -34,10 +34,7 @@ export const useGameStore = defineStore('game', {
     }
   },
   getters: {
-    getLoadedAssets: (state) => {
-      return state.game.loadedTextures
-    },
-    isAssetLoaded: (state) => {
+    isTextureLoaded: (state) => {
       return (key: string) => {
         return state.game.loadedTextures.includes(key)
       }