1
0
forked from noxious/client

GM panel UI improvements, added accordion component, worked on sprite logics, updated types, npm update

This commit is contained in:
2024-07-24 03:26:08 +02:00
parent a788cdef99
commit 026165cff3
8 changed files with 280 additions and 203 deletions

View File

@ -1,56 +1,64 @@
<template>
<div class="h-full overflow-auto">
<div class="relative p-2.5 flex flex-col items-center justify-between h-72">
<div class="filler"></div>
<img class="max-h-56" :src="`${config.server_endpoint}/assets/sprites/${selectedSprite?.id}.png`" :alt="'Sprite ' + selectedSprite?.id" />
<button class="btn-bordeaux px-4 py-1.5 min-w-24" type="button" @click.prevent="removeSprite">Remove</button>
<div class="absolute left-0 bottom-0 w-full h-px bg-cyan-200"></div>
<div class="relative p-2.5 flex flex-col items-center justify-between">
<div class="w-full flex flex-col sm:flex-row items-center gap-9 mb-5">
<div class="w-full sm:flex-grow">
<input v-model="spriteName" class="input-cyan w-full" type="text" name="name" placeholder="New sprite" />
</div>
<div class="flex gap-2 w-full sm:w-auto">
<button class="btn-cyan px-4 py-1.5 flex-1 sm:flex-none sm:min-w-24" type="button" @click.prevent="saveSprite">Save</button>
<button class="btn-bordeaux px-4 py-1.5 flex-1 sm:flex-none sm:min-w-24" type="button" @click.prevent="removeSprite">Remove</button>
</div>
</div>
<div class="w-full h-px bg-cyan-200"></div>
</div>
<div class="m-2.5 p-2.5 block">
<form class="flex gap-2.5 flex-wrap" @submit.prevent="saveSprite">
<div class="w-full flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="name">Name</label>
<input v-model="spriteName" class="input-cyan" type="text" name="name" placeholder="Wall #1" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="origin-x">Origin X</label>
<input v-model="spriteOriginX" class="input-cyan" type="number" step="any" name="origin-x" placeholder="Origin X" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="origin-y">Origin Y</label>
<input v-model="spriteOriginY" class="input-cyan" type="number" step="any" name="origin-y" placeholder="Origin Y" />
</div>
<div class="w-full flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="frame-speed">Frame speed</label>
<input v-model="spriteFrameSpeed" class="input-cyan" type="number" step="any" name="frame-speed" placeholder="Frame speed" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="frame-width">Frame width</label>
<input v-model="spriteFrameWidth" class="input-cyan" type="number" step="any" name="frame-width" placeholder="Frame width" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="frame-height">Frame height</label>
<input v-model="spriteFrameHeight" class="input-cyan" type="number" step="any" name="frame-height" placeholder="Frame height" />
</div>
<div class="w-full flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="is-looping">Is looping</label>
<select v-model="spriteIsLooping" class="input-cyan" name="is-looping">
<option :value="false">No</option>
<option :value="true">Yes</option>
</select>
</div>
<button class="btn-cyan px-4 py-1.5 min-w-24" type="submit">Save</button>
</form>
<div class="m-2.5 px-2.5 block">
<button class="btn-cyan px-4 py-1.5 flex-1 sm:flex-none sm:min-w-24 mb-5" type="button" @click.prevent="addNewImage">New IMG</button>
<Accordion v-for="image in spriteImages" :key="image.id" :title="image.name">
<form class="flex gap-2.5 flex-wrap" @submit.prevent="saveSprite">
<div class="w-full flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="name">Name</label>
<input v-model="image.name" class="input-cyan" type="text" name="name" placeholder="Wall #1" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="origin-x">Origin X</label>
<input v-model.number="image.origin_x" class="input-cyan" type="number" step="any" name="origin-x" placeholder="Origin X" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="origin-y">Origin Y</label>
<input v-model.number="image.origin_y" class="input-cyan" type="number" step="any" name="origin-y" placeholder="Origin Y" />
</div>
<div class="w-full flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="frame-speed">Frame speed</label>
<input v-model.number="image.frameSpeed" class="input-cyan" type="number" step="any" name="frame-speed" placeholder="Frame speed" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="frame-width">Frame width</label>
<input v-model.number="image.frameWidth" class="input-cyan" type="number" step="any" name="frame-width" placeholder="Frame width" />
</div>
<div class="w-[calc(50%_-_5px)] flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="frame-height">Frame height</label>
<input v-model.number="image.frameHeight" class="input-cyan" type="number" step="any" name="frame-height" placeholder="Frame height" />
</div>
<div class="w-full flex flex-col mb-5">
<label class="mb-1.5 font-titles" for="is-looping">Is looping</label>
<select v-model="image.isLooping" class="input-cyan" name="is-looping">
<option :value="false">No</option>
<option :value="true">Yes</option>
</select>
</div>
</form>
</Accordion>
</div>
</div>
</template>
<script setup lang="ts">
import type { Sprite } from '@/types'
import type { Sprite, SpriteImage } from '@/types'
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { useAssetManagerStore } from '@/stores/assetManager'
import { useGameStore } from '@/stores/game'
import config from '@/config'
import Accordion from '@/components/utilities/Accordion.vue'
const gameStore = useGameStore()
const assetManagerStore = useAssetManagerStore()
@ -58,12 +66,7 @@ const assetManagerStore = useAssetManagerStore()
const selectedSprite = computed(() => assetManagerStore.selectedSprite)
const spriteName = ref('')
const spriteOriginX = ref(0)
const spriteOriginY = ref(0)
const spriteFrameSpeed = ref(0)
const spriteFrameWidth = ref(0)
const spriteFrameHeight = ref(0)
const spriteIsLooping = ref(false)
const spriteImages = ref<SpriteImage[]>([])
if (!selectedSprite.value) {
console.error('No sprite selected')
@ -71,12 +74,7 @@ if (!selectedSprite.value) {
if (selectedSprite.value) {
spriteName.value = selectedSprite.value.name
spriteOriginX.value = selectedSprite.value.origin_x
spriteOriginY.value = selectedSprite.value.origin_y
spriteFrameSpeed.value = selectedSprite.value.frameSpeed
spriteFrameWidth.value = selectedSprite.value.frameWidth
spriteFrameHeight.value = selectedSprite.value.frameHeight
spriteIsLooping.value = selectedSprite.value.isLooping
spriteImages.value = selectedSprite.value.spriteImages
}
function removeSprite() {
@ -105,37 +103,51 @@ function saveSprite() {
return
}
gameStore.connection?.emit(
'gm:sprite:update',
{
id: selectedSprite.value.id,
name: spriteName.value,
origin_x: spriteOriginX.value,
origin_y: spriteOriginY.value,
frameSpeed: spriteFrameSpeed.value,
frameWidth: spriteFrameWidth.value,
frameHeight: spriteFrameHeight.value,
isLooping: spriteIsLooping.value
},
(response: boolean) => {
if (!response) {
console.error('Failed to save sprite')
return
}
refreshSpriteList(false)
const updatedSprite = {
id: selectedSprite.value.id,
name: spriteName.value,
spriteImages: selectedSprite.value.spriteImages
}
gameStore.connection?.emit('gm:sprite:update', updatedSprite, (response: boolean) => {
if (!response) {
console.error('Failed to save sprite')
return
}
)
refreshSpriteList(false)
})
}
function addNewImage() {
if (!selectedSprite.value) return
const newImage: SpriteImage = {
id: Date.now().toString(), // Temporary ID, should be replaced by server-generated ID
name: 'New image',
origin_x: 0,
origin_y: 0,
frameSpeed: 0,
frameWidth: 0,
frameHeight: 0,
isAnimated: false,
spriteId: selectedSprite.value.id,
sprite: selectedSprite.value,
action: '',
isLooping: false
}
// spriteimages value can be undefined
if (!spriteImages.value) {
spriteImages.value = []
}
spriteImages.value.push(newImage)
}
watch(selectedSprite, (sprite: Sprite | null) => {
if (!sprite) return
spriteName.value = sprite.name
spriteOriginX.value = sprite.origin_x
spriteOriginY.value = sprite.origin_y
spriteFrameSpeed.value = sprite.frameSpeed
spriteFrameWidth.value = sprite.frameWidth
spriteFrameHeight.value = sprite.frameHeight
spriteIsLooping.value = sprite.isLooping
spriteImages.value = sprite.spriteImages
})
onMounted(() => {