From 337446497b7e1dfc4be5878ec8dcd7c5a92d9750 Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Sat, 15 Feb 2025 16:51:58 +0100 Subject: [PATCH] Simple --- src/components/game/map/partials/PlacedMapObject.vue | 2 +- src/composables/useCharacterSpriteComposable.ts | 2 +- src/services/mapService.ts | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/components/game/map/partials/PlacedMapObject.vue b/src/components/game/map/partials/PlacedMapObject.vue index 9e3a4cd..4af77d7 100644 --- a/src/components/game/map/partials/PlacedMapObject.vue +++ b/src/components/game/map/partials/PlacedMapObject.vue @@ -61,7 +61,7 @@ function calculateObjectPlacement(mapObj: PlacedMapObject): { x: number; y: numb const imageProps = computed(() => ({ alpha: mapEditor.movingPlacedObject.value?.id == props.placedMapObject.id || mapEditor.selectedMapObject.value?.id == props.placedMapObject.id ? 0.5 : 1, tint: mapEditor.selectedPlacedObject.value?.id == props.placedMapObject.id ? 0x00ff00 : 0xffffff, - depth: calculateIsometricDepth(props.placedMapObject.positionX, props.placedMapObject.positionY, mapObject.value!.frameWidth, mapObject.value!.frameHeight), + depth: calculateIsometricDepth(props.placedMapObject.positionX, props.placedMapObject.positionY), ...calculateObjectPlacement(props.placedMapObject), flipX: props.placedMapObject.isRotated, texture: mapObject.value!.id, diff --git a/src/composables/useCharacterSpriteComposable.ts b/src/composables/useCharacterSpriteComposable.ts index 5c0449d..4fd6d23 100644 --- a/src/composables/useCharacterSpriteComposable.ts +++ b/src/composables/useCharacterSpriteComposable.ts @@ -18,7 +18,7 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase const tween = ref(null) const updateIsometricDepth = (positionX: number, positionY: number) => { - isometricDepth.value = calculateIsometricDepth(positionX, positionY, 30, 95) + isometricDepth.value = calculateIsometricDepth(positionX, positionY) } const updatePosition = (positionX: number, positionY: number) => { diff --git a/src/services/mapService.ts b/src/services/mapService.ts index 7f3ac0b..9aac582 100644 --- a/src/services/mapService.ts +++ b/src/services/mapService.ts @@ -62,14 +62,8 @@ export function createTileArray(width: number, height: number, tile: string = 'b return Array.from({ length: height }, () => Array.from({ length: width }, () => tile)) } -export const calculateIsometricDepth = (positionX: number, positionY: number, width: number = 0, height: number = 0) => { - const backCornerX = positionX + width - const backCornerY = positionY + height - - const sortingX = (positionX + backCornerX) / 2 - const sortingY = (positionY + backCornerY) / 2 - - return sortingX + sortingY +export const calculateIsometricDepth = (positionX: number, positionY, pivotPoints: { x: number; y: number; }[] = []) => { + return Math.max(positionX + positionY); } async function loadTileTextures(tiles: TileT[], scene: Phaser.Scene) {