Merge remote-tracking branch 'origin/main' into feature/map-refactor

src/application/types.ts

@@ -19,7 +19,6 @@ export type TextureData = {
   updatedAt: Date
   originX?: number
   originY?: number
-  isAnimated?: boolean
   frameRate?: number
   frameWidth?: number
   frameHeight?: number
@@ -40,7 +39,6 @@ export type MapObject = {
   tags: any | null
   originX: number
   originY: number
-  isAnimated: boolean
   frameRate: number
   frameWidth: number
   frameHeight: number
@@ -225,8 +223,6 @@ export type SpriteAction = {
   sprites: string[]
   originX: number
   originY: number
-  isAnimated: boolean
-  isLooping: boolean
   frameWidth: number
   frameHeight: number
   frameRate: number

src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue

@@ -21,13 +21,6 @@
           <label for="tags">Tags</label>
           <ChipsInput v-model="mapObjectTags" @update:modelValue="mapObjectTags = $event" />
         </div>
-        <div class="form-field-full">
-          <label for="is-animated">Is animated</label>
-          <select v-model="mapObjectIsAnimated" class="input-field" name="is-animated">
-            <option :value="false">No</option>
-            <option :value="true">Yes</option>
-          </select>
-        </div>
         <div class="form-field-full">
           <label for="frame-speed">Frame rate</label>
           <input v-model="mapObjectFrameRate" class="input-field" type="number" step="any" name="frame-speed" placeholder="Frame rate" />
@@ -66,7 +59,6 @@ const mapObjectName = ref('')
 const mapObjectTags = ref<string[]>([])
 const mapObjectOriginX = ref(0)
 const mapObjectOriginY = ref(0)
-const mapObjectIsAnimated = ref(false)
 const mapObjectFrameRate = ref(0)
 const mapObjectFrameWidth = ref(0)
 const mapObjectFrameHeight = ref(0)
@@ -80,7 +72,6 @@ if (selectedMapObject.value) {
   mapObjectTags.value = selectedMapObject.value.tags
   mapObjectOriginX.value = selectedMapObject.value.originX
   mapObjectOriginY.value = selectedMapObject.value.originY
-  mapObjectIsAnimated.value = selectedMapObject.value.isAnimated
   mapObjectFrameRate.value = selectedMapObject.value.frameRate
   mapObjectFrameWidth.value = selectedMapObject.value.frameWidth
   mapObjectFrameHeight.value = selectedMapObject.value.frameHeight
@@ -120,7 +111,6 @@ function saveObject() {
       tags: mapObjectTags.value,
       originX: mapObjectOriginX.value,
       originY: mapObjectOriginY.value,
-      isAnimated: mapObjectIsAnimated.value,
       frameRate: mapObjectFrameRate.value,
       frameWidth: mapObjectFrameWidth.value,
       frameHeight: mapObjectFrameHeight.value
@@ -141,7 +131,6 @@ watch(selectedMapObject, (mapObject: MapObject | null) => {
   mapObjectTags.value = mapObject.tags
   mapObjectOriginX.value = mapObject.originX
   mapObjectOriginY.value = mapObject.originY
-  mapObjectIsAnimated.value = mapObject.isAnimated
   mapObjectFrameRate.value = mapObject.frameRate
   mapObjectFrameWidth.value = mapObject.frameWidth
   mapObjectFrameHeight.value = mapObject.frameHeight

src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue

@@ -40,21 +40,7 @@
               <label for="origin-y">Origin Y</label>
               <input v-model.number="action.originY" class="input-field" type="number" step="any" name="origin-y" placeholder="Origin Y" />
             </div>
-            <div class="form-field-half">
-              <label for="is-animated">Is animated</label>
-              <select v-model="action.isAnimated" class="input-field" name="is-animated">
-                <option :value="false">No</option>
-                <option :value="true">Yes</option>
-              </select>
-            </div>
-            <div class="form-field-half" v-if="action.isAnimated">
-              <label for="is-looping">Is looping</label>
-              <select v-model="action.isLooping" class="input-field" name="is-looping">
-                <option :value="false">No</option>
-                <option :value="true">Yes</option>
-              </select>
-            </div>
-            <div class="form-field-full" v-if="action.isAnimated">
+            <div class="form-field-full">
               <label for="frame-speed">Frame rate</label>
               <input v-model.number="action.frameRate" class="input-field" type="number" step="any" name="frame-speed" placeholder="Frame rate" />
             </div>
@@ -140,8 +126,6 @@ function saveSprite() {
           sprites: action.sprites,
           originX: action.originX,
           originY: action.originY,
-          isAnimated: action.isAnimated,
-          isLooping: action.isLooping,
           frameRate: action.frameRate,
           frameWidth: action.frameWidth,
           frameHeight: action.frameHeight
@@ -169,8 +153,6 @@ function addNewImage() {
     sprites: [],
     originX: 0,
     originY: 0,
-    isAnimated: false,
-    isLooping: false,
     frameRate: 0,
     frameWidth: 0,
     frameHeight: 0

src/composables/gameComposable.ts

@@ -73,18 +73,17 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite_id: string)
     await loadTexture(scene, {
       key,
       data: '/textures/sprites/' + sprite.id + '/' + sprite_action.action + '.png',
-      group: sprite_action.isAnimated ? 'sprite_animations' : 'sprites',
+      group: sprite_action.frameCount > 1 ? 'sprite_animations' : 'sprites',
       updatedAt: sprite_action.updatedAt,
       originX: sprite_action.originX,
       originY: sprite_action.originY,
-      isAnimated: sprite_action.isAnimated,
       frameWidth: sprite_action.frameWidth,
       frameHeight: sprite_action.frameHeight,
       frameRate: sprite_action.frameRate
     } as TextureData)
 
-    // If the sprite is not animated, skip
-    if (!sprite_action.isAnimated) continue
+    // If the sprite has no more than one frame, skip
+    if (sprite_action.frameCount <= 1) continue
 
     // Check if animation already exists
     if (scene.anims.get(key)) continue

src/storage/textureStorage.ts

@@ -32,7 +32,6 @@ export class TextureStorage {
         updatedAt: texture.updatedAt,
         originX: texture.originX,
         originY: texture.originY,
-        isAnimated: texture.isAnimated,
         frameRate: texture.frameRate,
         frameWidth: texture.frameWidth,
         frameHeight: texture.frameHeight,