diff --git a/src/components/game/gui/Minimap.vue b/src/components/game/gui/Minimap.vue index d3cefb4..35c8ecd 100644 --- a/src/components/game/gui/Minimap.vue +++ b/src/components/game/gui/Minimap.vue @@ -5,12 +5,12 @@
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue index 705af93..bffd251 100644 --- a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue +++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue @@ -48,23 +48,20 @@
- +
- @@ -199,9 +196,9 @@ function updateFrameRate(value: number) { } } -const tempOffsetData = ref<{ index: number | undefined; offset: { x: number; y: number } | undefined }>({ - index: undefined, - offset: undefined +const tempOffsetData = ref<{ index: number | undefined; offset: { x: number; y: number } | undefined }>({ + index: undefined, + offset: undefined }) function handleTempOffsetChange(action: SpriteAction, index: number, offset: { x: number; y: number }) { diff --git a/src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue b/src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue index 96b6061..00d047c 100644 --- a/src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue +++ b/src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue @@ -2,9 +2,7 @@
Uploaded image -
- {{ image.dimensions.width }}x{{ image.dimensions.height }} -
+
{{ image.dimensions.width }}x{{ image.dimensions.height }}
- +
@@ -69,7 +61,7 @@ const props = defineProps<{ frameRate: number isModalOpen?: boolean tempOffsetIndex?: number - tempOffset?: { x: number, y: number } + tempOffset?: { x: number; y: number } }>() const emit = defineEmits<{ diff --git a/src/composables/controls/useBaseControlsComposable.ts b/src/composables/controls/useBaseControlsComposable.ts index 5651152..dce4312 100644 --- a/src/composables/controls/useBaseControlsComposable.ts +++ b/src/composables/controls/useBaseControlsComposable.ts @@ -32,8 +32,8 @@ export function useBaseControlsComposable(scene: Phaser.Scene, layer: Phaser.Til if (Math.abs(deltaX) <= dragThreshold && Math.abs(deltaY) <= dragThreshold) return - const scrollX = camera.scrollX - (deltaX / camera.zoom) - const scrollY = camera.scrollY - (deltaY / camera.zoom) + const scrollX = camera.scrollX - deltaX / camera.zoom + const scrollY = camera.scrollY - deltaY / camera.zoom camera.setScroll(scrollX, scrollY) pointerStartPosition.value = { x: pointer.x, y: pointer.y } @@ -66,4 +66,4 @@ export function useBaseControlsComposable(scene: Phaser.Scene, layer: Phaser.Til handleZoom, pointerStartPosition } -} \ No newline at end of file +} diff --git a/src/composables/controls/useGameControlsComposable.ts b/src/composables/controls/useGameControlsComposable.ts index 79e26d3..a79297d 100644 --- a/src/composables/controls/useGameControlsComposable.ts +++ b/src/composables/controls/useGameControlsComposable.ts @@ -1,7 +1,7 @@ import { getTile } from '@/composables/mapComposable' import { useGameStore } from '@/stores/gameStore' -import { useBaseControlsComposable } from './useBaseControlsComposable' import type { Ref } from 'vue' +import { useBaseControlsComposable } from './useBaseControlsComposable' export function useGameControlsComposable(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) { const gameStore = useGameStore() diff --git a/src/composables/controls/useMapEditorControlsComposable.ts b/src/composables/controls/useMapEditorControlsComposable.ts index 8c3afa4..c0db832 100644 --- a/src/composables/controls/useMapEditorControlsComposable.ts +++ b/src/composables/controls/useMapEditorControlsComposable.ts @@ -1,6 +1,6 @@ import { useMapEditorComposable } from '@/composables/useMapEditorComposable' -import { useBaseControlsComposable } from './useBaseControlsComposable' import { computed, type Ref } from 'vue' +import { useBaseControlsComposable } from './useBaseControlsComposable' export function useMapEditorControlsComposable(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) { const mapEditor = useMapEditorComposable() diff --git a/src/composables/useControlsComposable.ts b/src/composables/useControlsComposable.ts index 92cab72..2ce48fb 100644 --- a/src/composables/useControlsComposable.ts +++ b/src/composables/useControlsComposable.ts @@ -1,15 +1,14 @@ -import { useMapEditorComposable } from '@/composables/useMapEditorComposable' -import { computed, watch, type Ref } from 'vue' import { useGameControlsComposable } from '@/composables/controls/useGameControlsComposable' import { useMapEditorControlsComposable } from '@/composables/controls/useMapEditorControlsComposable' -import { useGameStore } from '@/stores/gameStore' +import { useMapEditorComposable } from '@/composables/useMapEditorComposable' +import { computed, type Ref } from 'vue' export function useControlsComposable(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>) { const camera = scene.cameras.main - const mapEditor = useMapEditorComposable() const gameHandlers = useGameControlsComposable(scene, layer, waypoint, camera) const mapEditorHandlers = useMapEditorControlsComposable(scene, layer, waypoint, camera) + const mapEditor = useMapEditorComposable() const currentHandlers = computed(() => (mapEditor.active.value ? mapEditorHandlers : gameHandlers)) const setupControls = () => currentHandlers.value.setupControls()