From dd1430aff573aec61c5a6b4779ec9708d569eefb Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Thu, 4 Jul 2024 15:44:35 +0200
Subject: [PATCH] small clean up

---
 .../utilities/zoneEditor/ZoneEditor.vue       | 29 -------------------
 src/screens/Game.vue                          | 26 +++++++++++++++--
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/components/utilities/zoneEditor/ZoneEditor.vue b/src/components/utilities/zoneEditor/ZoneEditor.vue
index 0747459..a92fb9f 100644
--- a/src/components/utilities/zoneEditor/ZoneEditor.vue
+++ b/src/components/utilities/zoneEditor/ZoneEditor.vue
@@ -69,13 +69,6 @@ tilesetImages.push(zone.addTilesetImage('blank_tile', 'blank_tile', config.tile_
 const tiles = zone.createBlankLayer('tiles', tilesetImages, 0, config.tile_size.y) as TilemapLayer
 const exampleTilesArray = Array.from({ length: zoneEditorStore.width }, () => Array.from({ length: zoneEditorStore.height }, () => 'blank_tile'))
 
-placeTile(zone, tiles, 0, 0, 'blank_tile')
-
-const pos = tileToWorldXY(tiles, 1, 1)
-const pos2 = tileToWorldXY(tiles, 1, 2)
-const pos3 = tileToWorldXY(tiles, 2, 1)
-console.log(pos)
-
 // Watch for changes in the zoneStore and update the layer
 // watch(
 //   () => zoneEditorStore.object,
@@ -144,28 +137,6 @@ function save() {
   })
 }
 
-watch(
-  () => assetStore.assets,
-  () => {
-    console.log('re-loading assets', assetStore.assets)
-    toRaw(assetStore.assets).forEach((asset) => {
-      if (asset.type === 'link') {
-        scene.load.image(asset.key, config.server_endpoint + '/assets' + asset.value + '.png')
-      }
-      if (asset.type === 'base64') {
-        scene.textures.addBase64(asset.key, asset.value)
-      }
-    })
-
-    scene.load.start()
-
-    scene.load.once('complete', () => {
-      console.log('assets re-loaded')
-    })
-  },
-  { deep: true }
-)
-
 onBeforeMount(() => {
   exampleTilesArray.forEach((row, y) => row.forEach((tile, x) => placeTile(zone, tiles, x, y, 'blank_tile')))
   socket.connection.emit('gm:zone_editor:zone:request', { zoneId: socket.character.zoneId })
diff --git a/src/screens/Game.vue b/src/screens/Game.vue
index f5f3307..bd88bb8 100644
--- a/src/screens/Game.vue
+++ b/src/screens/Game.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="game-container">
-    <GmPanel />
     <GmTools />
+    <GmPanel />
 
     <Game class="game" :config="gameConfig" @create="createGame" v-if="!zoneEditorStore.active">
       <Scene name="main" @preload="preloadScene" @create="createScene">
@@ -28,7 +28,7 @@
 <script setup lang="ts">
 import config from '@/config'
 import 'phaser'
-import { onUnmounted, toRaw } from 'vue'
+import { onUnmounted, toRaw, watch } from 'vue'
 import { Game, Scene } from 'phavuer'
 import { useSocketStore } from '@/stores/socket'
 import { useZoneEditorStore } from '@/stores/zoneEditor'
@@ -102,6 +102,28 @@ const createScene = (scene: Phaser.Scene) => {
     repeat: -1
   })
 
+  watch(
+    () => assetStore.assets,
+    () => {
+      console.log('re-loading assets', assetStore.assets)
+      toRaw(assetStore.assets).forEach((asset) => {
+        if (asset.type === 'link') {
+          scene.load.image(asset.key, config.server_endpoint + '/assets' + asset.value + '.png')
+        }
+        if (asset.type === 'base64') {
+          scene.textures.addBase64(asset.key, asset.value)
+        }
+      })
+
+      scene.load.start()
+
+      scene.load.once('complete', () => {
+        console.log('assets re-loaded')
+      })
+    },
+    { deep: true }
+  )
+
   // const grid = scene.add.grid(0, 0, window.innerWidth, window.innerHeight, 64, 32, 0, 0, 0xff0000, 0.5).setOrigin(0, 0);
   //
   // window.addEventListener('resize', () => {