From c4c12179b83c9c4429ad957970fa290af89f4797 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Wed, 10 Jul 2024 00:43:52 +0200
Subject: [PATCH] Added depth logics for objects

---
 src/components/utilities/zoneEditor/Objects.vue    | 13 ++++++++++---
 src/components/utilities/zoneEditor/ZoneEditor.vue |  3 ++-
 src/stores/zoneEditor.ts                           |  5 +++++
 src/types.ts                                       |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/utilities/zoneEditor/Objects.vue b/src/components/utilities/zoneEditor/Objects.vue
index 6288ffd..167078d 100644
--- a/src/components/utilities/zoneEditor/Objects.vue
+++ b/src/components/utilities/zoneEditor/Objects.vue
@@ -17,8 +17,8 @@
               />
             </div>
             <div>
-              <label class="mb-1.5 font-titles hidden" for="z-index">Z-index</label>
-              <input @mousedown.stop class="input-cyan" type="number" name="z-index" placeholder="Z-index" />
+              <label class="mb-1.5 font-titles hidden" for="depth">Depth</label>
+              <input v-model="objectDepth" @mousedown.stop class="input-cyan" type="number" name="depth" placeholder="Depth" />
             </div>
           </div>
         </div>
@@ -48,7 +48,7 @@
 
 <script setup lang="ts">
 import config from '@/config'
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 import { useZoneEditorStore } from '@/stores/zoneEditor'
 import { useSocketStore } from '@/stores/socket'
 import Modal from '@/components/utilities/Modal.vue'
@@ -58,6 +58,11 @@ const socket = useSocketStore()
 const isModalOpen = ref(false)
 const zoneEditorStore = useZoneEditorStore()
 const searchQuery = ref('')
+const objectDepth = ref(0)
+
+watch(objectDepth, (depth) => {
+  zoneEditorStore.setObjectDepth(depth)
+})
 
 const filteredObjects = computed(() => {
   if (!searchQuery.value) {
@@ -69,6 +74,8 @@ const filteredObjects = computed(() => {
 })
 
 onMounted(async () => {
+  zoneEditorStore.setObjectDepth(0)
+
   isModalOpen.value = true
   socket.connection.emit('gm:object:list', {}, (response: Object[]) => {
     zoneEditorStore.setObjectList(response)
diff --git a/src/components/utilities/zoneEditor/ZoneEditor.vue b/src/components/utilities/zoneEditor/ZoneEditor.vue
index d60e36f..ade770f 100644
--- a/src/components/utilities/zoneEditor/ZoneEditor.vue
+++ b/src/components/utilities/zoneEditor/ZoneEditor.vue
@@ -3,7 +3,7 @@
   <Controls :layer="tiles" />
 
   <Container :depth="2">
-    <Image v-for="object in zoneObjects" :key="object.object.id" :x="tileToWorldX(zoneTilemap, object.position_x, object.position_y)" :y="tileToWorldY(zoneTilemap, object.position_x, object.position_y)" :texture="object.object.id" :originY="Number(object.object.origin_x)" :originX="Number(object.object.origin_y)" />
+    <Image v-for="object in zoneObjects" :depth="object.depth" :key="object.object.id" :x="tileToWorldX(zoneTilemap, object.position_x, object.position_y)" :y="tileToWorldY(zoneTilemap, object.position_x, object.position_y)" :texture="object.object.id" :originY="Number(object.object.origin_x)" :originX="Number(object.object.origin_y)" />
   </Container>
 
   <Container :depth="3">
@@ -122,6 +122,7 @@ function pencil(tile: Phaser.Tilemaps.Tile) {
       zone: zoneEditorStore.zone,
       objectId: zoneEditorStore.selectedObject.id,
       object: zoneEditorStore.selectedObject,
+      depth: zoneEditorStore.objectDepth,
       position_x: tile.x,
       position_y: tile.y
     })
diff --git a/src/stores/zoneEditor.ts b/src/stores/zoneEditor.ts
index 33cdd4d..f2402ff 100644
--- a/src/stores/zoneEditor.ts
+++ b/src/stores/zoneEditor.ts
@@ -11,6 +11,7 @@ export const useZoneEditorStore = defineStore('zoneEditor', {
     objectList: [] as Object[],
     selectedTile: '',
     selectedObject: null as Object | null,
+    objectDepth: 0,
     isZoneListModalShown: false,
     isCreateZoneModalShown: false,
     isSettingsModalShown: false
@@ -40,6 +41,9 @@ export const useZoneEditorStore = defineStore('zoneEditor', {
     setSelectedObject(object: any) {
       this.selectedObject = object
     },
+    setObjectDepth(depth: number) {
+      this.objectDepth = depth
+    },
     toggleSettingsModal() {
       this.isSettingsModalShown = !this.isSettingsModalShown
     },
@@ -57,6 +61,7 @@ export const useZoneEditorStore = defineStore('zoneEditor', {
       this.drawMode = 'tile'
       this.selectedTile = ''
       this.selectedObject = null
+      this.objectDepth = 0
       this.isSettingsModalShown = false
       this.isZoneListModalShown = false
       this.isCreateZoneModalShown = false
diff --git a/src/types.ts b/src/types.ts
index 2d564fc..98c7fd5 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -90,6 +90,7 @@ export type ZoneObject = {
   zone: Zone
   objectId: string
   object: Object
+  depth: number
   position_x: number
   position_y: number
 }