noxious/client
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better func. naming

Browse Source
This commit is contained in:
Dennis Postma 2024-10-18 19:53:02 +02:00
parent 13cb46658f
commit 3c9b92ccbd
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/gameMaster/zoneEditor/EventTiles.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<Image v-for="tile in zoneEditorStore.zone?.zoneEventTiles" v-bind="getEventTileImageProps(tile)" /> <Image v-for="tile in zoneEditorStore.zone?.zoneEventTiles" v-bind="getImageProps(tile)" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -17,11 +17,12 @@ const props = defineProps<{
tilemap: Phaser.Tilemaps.Tilemap tilemap: Phaser.Tilemaps.Tilemap
}>() }>()
function getEventTileImageProps(tile: ZoneEventTile) { function getImageProps(tile: ZoneEventTile) {
return { return {
x: tileToWorldX(props.tilemap, tile.positionX, tile.positionY), x: tileToWorldX(props.tilemap, tile.positionX, tile.positionY),
y: tileToWorldY(props.tilemap, tile.positionX, tile.positionY), y: tileToWorldY(props.tilemap, tile.positionX, tile.positionY),
texture: tile.type texture: tile.type,
depth: 999
} }
} }

22
src/components/gameMaster/zoneEditor/Objects.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<SelectedZoneObject v-if="selectedZoneObject" :zoneObject="selectedZoneObject" @move="moveZoneObject" @rotate="rotateZoneObject" @delete="deleteZoneObject" /> <SelectedZoneObject v-if="selectedZoneObject" :zoneObject="selectedZoneObject" @move="moveZoneObject" @rotate="rotateZoneObject" @delete="deleteZoneObject" />
<Image v-for="object in zoneEditorStore.zone?.zoneObjects" v-bind="getObjectImageProps(object)" @pointerup="() => (selectedZoneObject = object)" /> <Image v-for="object in zoneEditorStore.zone?.zoneObjects" v-bind="getImageProps(object)" @pointerup="() => (selectedZoneObject = object)" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -21,17 +21,17 @@ const props = defineProps<{
tilemap: Phaser.Tilemaps.Tilemap tilemap: Phaser.Tilemaps.Tilemap
}>() }>()
function getObjectImageProps(object: ZoneObject) { function getImageProps(zoneObject: ZoneObject) {
return { return {
alpha: object.id === movingZoneObject.value?.id ? 0.5 : 1, alpha: zoneObject.id === movingZoneObject.value?.id ? 0.5 : 1,
depth: calculateIsometricDepth(object.positionX, object.positionY, object.object.frameWidth, object.object.frameHeight), depth: calculateIsometricDepth(zoneObject.positionX, zoneObject.positionY, zoneObject.object.frameWidth, zoneObject.object.frameHeight),
tint: selectedZoneObject.value?.id === object.id ? 0x00ff00 : 0xffffff, tint: selectedZoneObject.value?.id === zoneObject.id ? 0x00ff00 : 0xffffff,
x: tileToWorldX(props.tilemap, object.positionX, object.positionY), x: tileToWorldX(props.tilemap, zoneObject.positionX, zoneObject.positionY),
y: tileToWorldY(props.tilemap, object.positionX, object.positionY), y: tileToWorldY(props.tilemap, zoneObject.positionX, zoneObject.positionY),
flipX: object.isRotated, flipX: zoneObject.isRotated,
texture: object.object.id, texture: zoneObject.object.id,
originY: Number(object.object.originX), originY: Number(zoneObject.object.originX),
originX: Number(object.object.originY) originX: Number(zoneObject.object.originY)
} }
} }

4
src/components/zone/Objects.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<Image v-for="object in zoneStore.zone?.zoneObjects" v-bind="getObjectImageProps(object)" /> <Image v-for="object in zoneStore.zone?.zoneObjects" v-bind="getImageProps(object)" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -14,7 +14,7 @@ const props = defineProps<{
tilemap: Phaser.Tilemaps.Tilemap tilemap: Phaser.Tilemaps.Tilemap
}>() }>()
const getObjectImageProps = (object: ZoneObject) => { const getImageProps = (object: ZoneObject) => {
return { return {
depth: calculateIsometricDepth(object.positionX, object.positionY, object.object.frameWidth, object.object.frameHeight), depth: calculateIsometricDepth(object.positionX, object.positionY, object.object.frameWidth, object.object.frameHeight),
x: tileToWorldX(props.tilemap as any, object.positionX, object.positionY), x: tileToWorldX(props.tilemap as any, object.positionX, object.positionY),