From ff9dcb91b096c2f012d8575cbbbc07afdd44ca1a Mon Sep 17 00:00:00 2001
From: Andrei <amborn02@gmail.com>
Date: Mon, 3 Feb 2025 14:53:46 -0600
Subject: [PATCH] Map object position as tile coordinates, map objects
 correctly snap to each tile now when moving, and fixed bug of placing objects
 over eachother on the same tile

---
 .../mapEditor/mapPartials/MapTiles.vue        |  5 ++---
 .../mapPartials/PlacedMapObjects.vue          | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue b/src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue
index 3408bde..cd3cbfb 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue
@@ -3,13 +3,12 @@
 </template>
 
 <script setup lang="ts">
-import config from '@/application/config'
 import Controls from '@/components/utilities/Controls.vue'
-import { createTileMap, createTileLayer, createTileArray, getTile, placeTile, setLayerTiles } from '@/composables/mapComposable'
+import { createTileArray, getTile, placeTile, setLayerTiles } from '@/composables/mapComposable'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { TileStorage } from '@/storage/storages'
 import { useScene } from 'phavuer'
-import { onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
 const emit = defineEmits(['tileMap:create'])
 const scene = useScene()
diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
index dd0e2e9..a56b2d9 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
@@ -10,8 +10,8 @@ import PlacedMapObject from '@/components/game/map/partials/PlacedMapObject.vue'
 import SelectedPlacedMapObjectComponent from '@/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue'
 import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
 import { useScene } from 'phavuer'
-import { ref, watch } from 'vue'
-import { getTile, tileToWorldX, tileToWorldY } from '@/composables/mapComposable'
+import { watch } from 'vue'
+import { getTile } from '@/composables/mapComposable'
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 
@@ -28,10 +28,11 @@ const props = defineProps<{
 function pencil(pointer: Phaser.Input.Pointer, map: MapT) {
   const tile = getTile(props.tileMap, pointer.worldX, pointer.worldY)
   if (!tile) return
-
+  
   // Check if object already exists on position
-  const existingPlacedMapObject = findInMap(pointer, map)
+  const existingPlacedMapObject = findObjectByPointer(pointer, map)
   if (existingPlacedMapObject) return
+
   if (!mapEditor.selectedMapObject.value) return
 
   const newPlacedMapObject: PlacedMapObjectT = {
@@ -52,20 +53,23 @@ function pencil(pointer: Phaser.Input.Pointer, map: MapT) {
 
 function eraser(pointer: Phaser.Input.Pointer, map: MapT) {
   // Check if object already exists on position
-  const existingPlacedMapObject = findInMap(pointer, map)
+  const existingPlacedMapObject = findObjectByPointer(pointer, map)
   if (!existingPlacedMapObject) return
 
   // Remove existing object
   map.placedMapObjects = map.placedMapObjects.filter((placedMapObject) => placedMapObject.id !== existingPlacedMapObject.id)
 }
 
-function findInMap(pointer: Phaser.Input.Pointer, map: MapT) {
-  return map.placedMapObjects.find((placedMapObject) => placedMapObject.positionX === pointer.worldX && placedMapObject.positionY === pointer.worldY)
+function findObjectByPointer(pointer: Phaser.Input.Pointer, map: MapT) : PlacedMapObjectT | undefined {
+  const tile = getTile(props.tileMap, pointer.worldX, pointer.worldY)
+  if (!tile) return undefined
+
+  return map.placedMapObjects.find((placedMapObject) => placedMapObject.positionX === tile.x && placedMapObject.positionY === tile.y)!
 }
 
 function objectPicker(pointer: Phaser.Input.Pointer, map: MapT) {
   // Check if object already exists on position
-  const existingPlacedMapObject = findInMap(pointer, map)
+  const existingPlacedMapObject = findObjectByPointer(pointer, map)
   if (!existingPlacedMapObject) return
 
   // Select the object