diff --git a/package-lock.json b/package-lock.json index 0ce52cf..c4a2885 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1998,9 +1998,9 @@ } }, "node_modules/@types/node": { - "version": "20.17.24", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.24.tgz", - "integrity": "sha512-d7fGCyB96w9BnWQrOsJtpyiSaBcAYYr75bnK6ZRjDbql2cGLj/3GsL5OYmLPNq76l7Gf2q4Rv9J2o6h5CrD9sA==", + "version": "20.17.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.25.tgz", + "integrity": "sha512-bT+r2haIlplJUYtlZrEanFHdPIZTeiMeh/fSOEbOOfWf9uTn+lg8g0KU6Q3iMgjd9FLuuMAgfCNSkjUbxL6E3Q==", "devOptional": true, "license": "MIT", "dependencies": { diff --git a/src/components/game/map/partials/ImageGroup.vue b/src/components/game/map/partials/ImageGroup.vue index fb0c728..46bfff8 100644 --- a/src/components/game/map/partials/ImageGroup.vue +++ b/src/components/game/map/partials/ImageGroup.vue @@ -56,23 +56,21 @@ onPreUpdate(() => { orderedImages.forEach((child, index) => { const image = child as Phaser.GameObjects.Image if (image && props.obj) { - image.flipX = props.obj.isRotated; + image.flipX = props.obj.isRotated if (props.obj.isRotated) { var offsetNum = props.mapObj!.depthOffsets.length //Could break in case of images with odd partion number //Shifts image over so that it becomes aligned again after flipping - if (index < offsetNum/2) { - image.x = props.x! - (props.mapObj!.frameWidth/offsetNum) - } - else { - image.x = props.x! + (props.mapObj!.frameWidth/offsetNum) + if (index < offsetNum / 2) { + image.x = props.x! - props.mapObj!.frameWidth / offsetNum + } else { + image.x = props.x! + props.mapObj!.frameWidth / offsetNum } image.setDepth(baseDepth - props.mapObj!.depthOffsets[index]) - } - else { + } else { image.x = props.x! image.setDepth(baseDepth + props.mapObj!.depthOffsets[index]) } @@ -80,7 +78,6 @@ onPreUpdate(() => { }) }) - // Initial setup if (props.mapObj && props.x && props.y) { baseDepth = calculateIsometricDepth(props.obj!.positionX, props.obj!.positionY) @@ -88,13 +85,13 @@ if (props.mapObj && props.x && props.y) { group.setXY(props.x, props.y) group.setOrigin(props.mapObj.originX, props.mapObj.originY) - let sliceCount = props.mapObj.depthOffsets.length; + let sliceCount = props.mapObj.depthOffsets.length for (let j = 1; j <= sliceCount; j++) { - partitionPoints.push(j * (props.mapObj.frameWidth/sliceCount)) + partitionPoints.push(j * (props.mapObj.frameWidth / sliceCount)) } for (let i = 0; i < partitionPoints.length - 1; i++) { - createImagePartition(partitionPoints[i], partitionPoints[i+1], props.mapObj.depthOffsets[i]) + createImagePartition(partitionPoints[i], partitionPoints[i + 1], props.mapObj.depthOffsets[i]) } } diff --git a/src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue b/src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue index fb2838f..708f393 100644 --- a/src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue +++ b/src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue @@ -3,26 +3,22 @@
- -
- + +
+
- - + +

Depth Offset

- +
@@ -77,15 +73,15 @@ import ChipsInput from '@/components/forms/ChipsInput.vue' import { socketManager } from '@/managers/SocketManager' import { MapObjectStorage } from '@/storage/storages' import { useAssetManagerStore } from '@/stores/assetManagerStore' -import { computed, onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from 'vue' -import { Rectangle } from 'phavuer' import { useElementSize } from '@vueuse/core' +import { Rectangle } from 'phavuer' +import { computed, onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from 'vue' const assetManagerStore = useAssetManagerStore() const selectedMapObject = computed(() => assetManagerStore.selectedMapObject) const svg = useTemplateRef('svg') -const {width, height} = useElementSize(svg) +const { width, height } = useElementSize(svg) const mapObjectName = ref('') const mapObjectTags = ref([]) @@ -96,8 +92,8 @@ const mapObjectFrameRate = ref(0) const mapObjectFrameWidth = ref(0) const mapObjectFrameHeight = ref(0) const imageRef = ref(null) -const showOrigin = ref(true); -const showPartitionOverlay = ref(true); +const showOrigin = ref(true) +const showPartitionOverlay = ref(true) if (!selectedMapObject.value) { console.error('No map mapObject selected') @@ -114,7 +110,7 @@ if (selectedMapObject.value) { mapObjectFrameHeight.value = selectedMapObject.value.frameHeight } -const setPartitionDepth = (event: any, idx: number) => mapObjectDepthOffsets.value[idx] = Number.parseInt(event.target.value) +const setPartitionDepth = (event: any, idx: number) => (mapObjectDepthOffsets.value[idx] = Number.parseInt(event.target.value)) async function removeObject() { if (!selectedMapObject.value) return diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue index 1378107..c64626b 100644 --- a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue +++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue @@ -24,16 +24,16 @@
{{ imageDimensions[index].width }}x{{ imageDimensions[index].height }}
-
-
- -
+
+
+
+
{ mapEditor.reset() }) -setInterval( () => { +setInterval(() => { scene.children.queueDepthSort() }, 0.2) diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue index 1eedbc7..75f1c80 100644 --- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue +++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue @@ -1,20 +1,13 @@