forked from noxious/client
Finished sprite CRUD in asset manager
This commit is contained in:
parent
9e897728db
commit
0aae34b234
@ -41,6 +41,7 @@
|
||||
<div class="overflow-auto h-full w-4/12 flex flex-col relative">
|
||||
<TileList v-if="selectedCategory === 'tiles'" />
|
||||
<ObjectList v-if="selectedCategory === 'objects'" />
|
||||
<SpriteList v-if="selectedCategory === 'sprites'" />
|
||||
</div>
|
||||
|
||||
<div class="absolute w-px bg-cyan-200 h-full top-0 left-1/2"></div>
|
||||
@ -49,17 +50,20 @@
|
||||
<div class="flex w-1/2 after:hidden flex-col relative overflow-auto">
|
||||
<TileDetails v-if="selectedCategory === 'tiles' && assetManagerStore.selectedTile" />
|
||||
<ObjectDetails v-if="selectedCategory === 'objects' && assetManagerStore.selectedObject" />
|
||||
<SpriteDetails v-if="selectedCategory === 'sprites' && assetManagerStore.selectedSprite" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import { useAssetManagerStore } from '@/stores/assetManager'
|
||||
import TileList from '@/components/utilities/assetManager/partials/TileList.vue'
|
||||
import TileDetails from '@/components/utilities/assetManager/partials/TileDetails.vue'
|
||||
import ObjectList from '@/components/utilities/assetManager/partials/ObjectList.vue'
|
||||
import ObjectDetails from '@/components/utilities/assetManager/partials/ObjectDetails.vue'
|
||||
import { useAssetManagerStore } from '@/stores/assetManager'
|
||||
import SpriteList from '@/components/utilities/assetManager/partials/SpriteList.vue'
|
||||
import SpriteDetails from '@/components/utilities/assetManager/partials/SpriteDetails.vue'
|
||||
|
||||
const assetManagerStore = useAssetManagerStore()
|
||||
const selectedCategory = ref('tiles')
|
||||
|
||||
@ -26,9 +26,9 @@
|
||||
</div>
|
||||
<div class="w-full flex flex-col mb-5">
|
||||
<label class="mb-1.5 font-titles" for="origin-x">Is animated</label>
|
||||
<select :value="objectIsAnimated.toString()" @change="updateObjectIsAnimated" class="input-cyan" name="is-animated">
|
||||
<option value="false">No</option>
|
||||
<option value="true">Yes</option>
|
||||
<select v-model="objectIsAnimated" class="input-cyan" name="is-animated">
|
||||
<option :value="false">No</option>
|
||||
<option :value="true">Yes</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="w-full flex flex-col mb-5">
|
||||
@ -73,11 +73,6 @@ const objectFrameSpeed = ref(0)
|
||||
const objectFrameWidth = ref(0)
|
||||
const objectFrameHeight = ref(0)
|
||||
|
||||
function updateObjectIsAnimated(event: Event) {
|
||||
const target = event.target as HTMLSelectElement
|
||||
objectIsAnimated.value = target.value === 'true'
|
||||
}
|
||||
|
||||
if (!selectedObject.value) {
|
||||
console.error('No object selected')
|
||||
}
|
||||
@ -88,6 +83,9 @@ if (selectedObject.value) {
|
||||
objectOriginX.value = selectedObject.value.origin_x
|
||||
objectOriginY.value = selectedObject.value.origin_y
|
||||
objectIsAnimated.value = selectedObject.value.isAnimated
|
||||
objectFrameSpeed.value = selectedObject.value.frameSpeed
|
||||
objectFrameWidth.value = selectedObject.value.frameWidth
|
||||
objectFrameHeight.value = selectedObject.value.frameHeight
|
||||
}
|
||||
|
||||
function removeObject() {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
<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-72" :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>
|
||||
<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>
|
||||
<div class="m-2.5 p-2.5 block">
|
||||
@ -21,8 +21,23 @@
|
||||
<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="origin-x">Tags</label>
|
||||
<ChipsInput v-model="spriteTags" @update:modelValue="spriteTags = $event" />
|
||||
<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>
|
||||
@ -36,7 +51,6 @@ import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||
import { useAssetManagerStore } from '@/stores/assetManager'
|
||||
import { useGameStore } from '@/stores/game'
|
||||
import config from '@/config'
|
||||
import ChipsInput from '@/components/forms/ChipsInput.vue'
|
||||
|
||||
const gameStore = useGameStore()
|
||||
const assetManagerStore = useAssetManagerStore()
|
||||
@ -44,9 +58,12 @@ const assetManagerStore = useAssetManagerStore()
|
||||
const selectedSprite = computed(() => assetManagerStore.selectedSprite)
|
||||
|
||||
const spriteName = ref('')
|
||||
const spriteTags = ref([] as string[])
|
||||
const spriteOriginX = ref(0)
|
||||
const spriteOriginY = ref(0)
|
||||
const spriteFrameSpeed = ref(0)
|
||||
const spriteFrameWidth = ref(0)
|
||||
const spriteFrameHeight = ref(0)
|
||||
const spriteIsLooping = ref(false)
|
||||
|
||||
if (!selectedSprite.value) {
|
||||
console.error('No sprite selected')
|
||||
@ -56,6 +73,10 @@ 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
|
||||
}
|
||||
|
||||
function removeSprite() {
|
||||
@ -68,10 +89,13 @@ function removeSprite() {
|
||||
})
|
||||
}
|
||||
|
||||
function refreshSpriteList() {
|
||||
function refreshSpriteList(unsetSelectedSprite = true) {
|
||||
gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
|
||||
assetManagerStore.setSpriteList(response)
|
||||
assetManagerStore.setSelectedSprite(null)
|
||||
|
||||
if (unsetSelectedSprite) {
|
||||
assetManagerStore.setSelectedSprite(null)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@ -80,23 +104,25 @@ function saveSprite() {
|
||||
console.error('No sprite selected')
|
||||
return
|
||||
}
|
||||
|
||||
console.log(spriteTags.value)
|
||||
|
||||
gameStore.connection?.emit(
|
||||
'gm:sprite:update',
|
||||
{
|
||||
id: selectedSprite.value.id,
|
||||
name: spriteName.value,
|
||||
tags: spriteTags.value,
|
||||
origin_x: spriteOriginX.value,
|
||||
origin_y: spriteOriginY.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()
|
||||
refreshSpriteList(false)
|
||||
}
|
||||
)
|
||||
}
|
||||
@ -106,6 +132,10 @@ watch(selectedSprite, (sprite: Sprite | null) => {
|
||||
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
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
|
||||
@ -1,151 +1,101 @@
|
||||
<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>
|
||||
<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="origin-x">Is animated</label>
|
||||
<select :value="spriteIsAnimated.toString()" @change="updateSpriteIsAnimated" class="input-cyan" name="is-animated">
|
||||
<option value="false">No</option>
|
||||
<option value="true">Yes</option>
|
||||
</select>
|
||||
</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>
|
||||
<button class="btn-cyan px-4 py-1.5 min-w-24" type="submit">Save</button>
|
||||
</form>
|
||||
<div class="relative p-2.5 cursor-pointer flex gap-y-2.5 gap-x-5 flex-wrap">
|
||||
<label for="upload-asset" class="bg-cyan/50 border border-solid border-white/25 rounded drop-shadow-20 py-1.5 px-4 inline-flex hover:bg-cyan hover:cursor-pointer">
|
||||
<input class="hidden" id="upload-asset" ref="spriteUploadField" type="file" accept="image/png" multiple @change="handleFileUpload" />
|
||||
Upload sprite(s)
|
||||
</label>
|
||||
<input v-model="searchQuery" class="input-cyan w-full" placeholder="Search..." @input="handleSearch" />
|
||||
<div class="absolute left-0 bottom-0 w-full h-px bg-cyan-200"></div>
|
||||
</div>
|
||||
<div v-bind="containerProps" class="overflow-y-auto relative" @scroll="onScroll">
|
||||
<div v-bind="wrapperProps" ref="elementToScroll">
|
||||
<a v-for="{ data: sprite } in list" :key="sprite.id" class="relative p-2.5 cursor-pointer block" :class="{ 'bg-cyan/80': assetManagerStore.selectedSprite?.id === sprite.id }" @click="assetManagerStore.setSelectedSprite(sprite as Sprite)">
|
||||
<div class="flex items-center gap-2.5">
|
||||
<div class="h-7 w-16 max-w-16 flex justify-center">
|
||||
<img class="h-7" :src="`${config.server_endpoint}/assets/sprites/${sprite.id}.png`" alt="Sprite" />
|
||||
</div>
|
||||
<span>{{ sprite.name }}</span>
|
||||
</div>
|
||||
<div class="absolute left-0 bottom-0 w-full h-px bg-cyan-200"></div>
|
||||
</a>
|
||||
</div>
|
||||
<button class="left-[calc(50%_-_60px)] fixed bottom-2.5 min-w-[unset] w-12 h-12 rounded-lg bg-cyan/50 p-0 hover:bg-cyan" v-show="hasScrolled" @click="toTop">
|
||||
<img class="absolute invert w-8 h-8 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 rotate-180" src="/assets/icons/zoneEditor/chevron.svg" alt="" />
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { Sprite } 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 { useGameStore } from '@/stores/game'
|
||||
import { onMounted, ref, computed } from 'vue'
|
||||
import { useAssetManagerStore } from '@/stores/assetManager'
|
||||
import { useAssetStore } from '@/stores/assets'
|
||||
import { useVirtualList } from '@vueuse/core'
|
||||
import type { Sprite } from '@/types'
|
||||
|
||||
const gameStore = useGameStore()
|
||||
const spriteUploadField = ref(null)
|
||||
const assetManagerStore = useAssetManagerStore()
|
||||
const assetStore = useAssetStore()
|
||||
|
||||
const selectedSprite = computed(() => assetManagerStore.selectedSprite)
|
||||
const searchQuery = ref('')
|
||||
|
||||
const spriteName = ref('')
|
||||
const spriteOriginX = ref(0)
|
||||
const spriteOriginY = ref(0)
|
||||
const spriteIsAnimated = ref(false)
|
||||
const spriteFrameSpeed = ref(0)
|
||||
const spriteFrameWidth = ref(0)
|
||||
const spriteFrameHeight = ref(0)
|
||||
const hasScrolled = ref(false)
|
||||
const elementToScroll = ref()
|
||||
|
||||
function updateSpriteIsAnimated(event: Event) {
|
||||
const target = event.target as HTMLSelectElement
|
||||
spriteIsAnimated.value = target.value === 'true'
|
||||
}
|
||||
|
||||
if (!selectedSprite.value) {
|
||||
console.error('No sprite selected')
|
||||
}
|
||||
|
||||
if (selectedSprite.value) {
|
||||
spriteName.value = selectedSprite.value.name
|
||||
spriteOriginX.value = selectedSprite.value.origin_x
|
||||
spriteOriginY.value = selectedSprite.value.origin_y
|
||||
spriteIsAnimated.value = selectedSprite.value.isAnimated
|
||||
}
|
||||
|
||||
function removeSprite() {
|
||||
gameStore.connection?.emit('gm:sprite:remove', { sprite: selectedSprite.value?.id }, (response: boolean) => {
|
||||
const handleFileUpload = (e: Event) => {
|
||||
const files = (e.target as HTMLInputElement).files
|
||||
if (!files) return
|
||||
gameStore.connection?.emit('gm:sprite:upload', files, (response: boolean) => {
|
||||
if (!response) {
|
||||
console.error('Failed to remove sprite')
|
||||
if (config.development) console.error('Failed to upload sprite')
|
||||
return
|
||||
}
|
||||
refreshSpriteList()
|
||||
|
||||
assetStore.fetchAssets()
|
||||
|
||||
gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
|
||||
assetManagerStore.setSpriteList(response)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function refreshSpriteList(unsetSelectedSprite = true) {
|
||||
gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
|
||||
assetManagerStore.setSpriteList(response)
|
||||
|
||||
if (unsetSelectedSprite) {
|
||||
assetManagerStore.setSelectedSprite(null)
|
||||
}
|
||||
})
|
||||
const handleSearch = () => {
|
||||
// Trigger a re-render of the virtual list
|
||||
virtualList.value?.scrollTo(0)
|
||||
}
|
||||
|
||||
function saveSprite() {
|
||||
if (!selectedSprite.value) {
|
||||
console.error('No sprite selected')
|
||||
return
|
||||
const filteredSprites = computed(() => {
|
||||
if (!searchQuery.value) {
|
||||
return assetManagerStore.spriteList
|
||||
}
|
||||
return assetManagerStore.spriteList.filter((sprite) => sprite.name.toLowerCase().includes(searchQuery.value.toLowerCase()))
|
||||
})
|
||||
|
||||
console.log(spriteTags.value)
|
||||
gameStore.connection?.emit(
|
||||
'gm:sprite:update',
|
||||
{
|
||||
id: selectedSprite.value.id,
|
||||
name: spriteName.value,
|
||||
origin_x: spriteOriginX.value,
|
||||
origin_y: spriteOriginY.value,
|
||||
isAnimated: spriteIsAnimated.value,
|
||||
frameSpeed: spriteFrameSpeed.value,
|
||||
frameWidth: spriteFrameWidth.value,
|
||||
frameHeight: spriteFrameHeight.value
|
||||
},
|
||||
(response: boolean) => {
|
||||
if (!response) {
|
||||
console.error('Failed to save sprite')
|
||||
return
|
||||
}
|
||||
refreshSpriteList(false)
|
||||
}
|
||||
)
|
||||
const { list, containerProps, wrapperProps, scrollTo } = useVirtualList(filteredSprites, {
|
||||
itemHeight: 48
|
||||
})
|
||||
|
||||
const virtualList = ref({ scrollTo })
|
||||
|
||||
const onScroll = () => {
|
||||
let scrollTop = elementToScroll.value.style.marginTop.replace('px', '')
|
||||
|
||||
if (scrollTop > 80) {
|
||||
hasScrolled.value = true
|
||||
} else if (scrollTop <= 80) {
|
||||
hasScrolled.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch(selectedSprite, (sprite: Sprite | null) => {
|
||||
if (!sprite) return
|
||||
spriteName.value = sprite.name
|
||||
spriteOriginX.value = sprite.origin_x
|
||||
spriteOriginY.value = sprite.origin_y
|
||||
spriteIsAnimated.value = sprite.isAnimated
|
||||
spriteFrameSpeed.value = sprite.frameSpeed
|
||||
spriteFrameWidth.value = sprite.frameWidth
|
||||
spriteFrameHeight.value = sprite.frameHeight
|
||||
})
|
||||
function toTop() {
|
||||
virtualList.value?.scrollTo(0)
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (!selectedSprite.value) return
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
assetManagerStore.setSelectedSprite(null)
|
||||
gameStore.connection?.emit('gm:sprite:list', {}, (response: Sprite[]) => {
|
||||
assetManagerStore.setSpriteList(response)
|
||||
})
|
||||
})
|
||||
</script>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user