Merge pull request #343 from Codas/spritesheet-fixes

Some spritesheet fixes
fantasycalendar · Oct 22, 2024 · 43a3081 · 43a3081
2 parents 0d15bad + 1809d6b
commit 43a3081
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/canvas-effects/sequencer-sprite-manager.js b/src/canvas-effects/sequencer-sprite-manager.js
@@ -679,9 +679,9 @@ export class SequencerSpriteManager extends PIXI.Container {
 			const prev = this.managedSprite;
 			view.tint = prev.tint;
 			view.anchor.copyFrom(prev.anchor);
+			view.scale.copyFrom(prev.scale);
 			view.width = prev.width;
 			view.height = prev.height;
-			view.scale.copyFrom(prev.scale);
 			view.tileScale.copyFrom(prev.tileScale);
 			view.tilePosition.copyFrom(prev.tilePosition);
 			view.pivot.copyFrom(prev.pivot);

diff --git a/src/lib/meshes/AnimatedSpriteMesh.js b/src/lib/meshes/AnimatedSpriteMesh.js
@@ -128,11 +128,12 @@ export default class AnimatedSpriteMesh extends TilingSpriteMesh {
 			return;
 		}
 		this._previousFrame = currentFrame;
-		this.texture = this._textures[currentFrame];
+		this._texture = this._textures[currentFrame];
 		this._textureID = -1;
 		this._textureTrimmedID = -1;
 		this._cachedTint = [1, 1, 1, 1];
-		this.updateUvs();
+		this.uvs.set(this._texture._uvs.uvsFloat32);
+
 		if (this.updateAnchor) {
 			this._anchor.copyFrom(this._texture.defaultAnchor);
 		}

diff --git a/src/lib/spritesheets/FramePacker.js b/src/lib/spritesheets/FramePacker.js
@@ -125,7 +125,7 @@ export class FramePacker {
 		 * @param {number} scaleFactor
 		 * @return {Promise<{buffer: Uint8Array, size: Size}>}
 		 */
-		async function getScaledImageBuffer(buffer, sourceSize, scaleFactor) {
+		const getScaledImageBuffer = async (buffer, sourceSize, scaleFactor) => {
 			if (scaleFactor === 1) {
 				return { buffer, size: sourceSize };
 			}

diff --git a/src/modules/sequencer-file-cache.js b/src/modules/sequencer-file-cache.js
@@ -163,7 +163,7 @@ const SequencerFileCache = {
       )
       return undefined
     }
-    return result.spritesheet
+    return result?.spritesheet
   },
 
   registerSpritesheet(inSrc, inSpriteSheet) {
@@ -182,7 +182,6 @@ const SequencerFileCache = {
    */
   async unloadSpritesheet(inSrc) {
     const existingSheetRef = this._spritesheets.get(inSrc)
-    this._generateSpritesheetJobs.delete(inSrc)
     if (!existingSheetRef) {
       console.error("trying to unlaod spritesheet that was not loaded:", inSrc)
       return
@@ -191,6 +190,7 @@ const SequencerFileCache = {
     if (existingSheetRef[1] > 0) {
       return
     }
+    this._generateSpritesheetJobs.delete(inSrc)
     this._spritesheets.delete(inSrc)
     /** @type {PIXI.Spritesheet} */
     const sheet = existingSheetRef[0]