Fix playbackRate breaking syncGroups and loops

fantasycalendar · Jul 24, 2024 · 4af202e · 4af202e
1 parent 3acf55b
commit 4af202e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/canvas-effects/canvas-effect.js b/src/canvas-effects/canvas-effect.js
@@ -3031,7 +3031,7 @@ export default class CanvasEffect extends PIXI.Container {
  setTimeout(() => {
  this._resolve(this.data);
  this.endEffect();
- }, this._totalDuration);
+ }, this._totalDuration / this.mediaPlaybackRate);
  }
 
  _setupTimestampHook(offset) {
@@ -3069,6 +3069,7 @@ export default class CanvasEffect extends PIXI.Container {
  if (!this.hasAnimatedMedia) return;
 
  let creationTimeDifference = this.data.persist ? this.actualCreationTime - this.creationTimestamp : 0;
+ creationTimeDifference *= this.mediaPlaybackRate
 
  // +1 because "loops: 1" means we run the animation one time, not that it restarts once
  // whereas 0 means endless looping.
@@ -3128,7 +3129,7 @@ export default class CanvasEffect extends PIXI.Container {
  if (this.mediaCurrentTime < this._endTime) {
  return;
  }
- if (this.restartLoopHandler) {
+ if (this.restartLoopHandler != null) {
  return;
  }
 
@@ -3158,10 +3159,6 @@ export default class CanvasEffect extends PIXI.Container {
  return;
  }
 
- // restart handler already registerd, just return and let it do its thing
- if (this.restartLoopHandler != null) {
- return
- }
  this._currentLoops++;
  // register restart handler to trigger after loop delay
  this.restartLoopHandler = setTimeout(() => {

diff --git a/src/canvas-effects/sequencer-sprite-manager.js b/src/canvas-effects/sequencer-sprite-manager.js
@@ -241,7 +241,7 @@ class VideoPlaybackControls extends PlaybackControls {
  this.#video.pause();
  }
  get duration() {
- return this.#video.duration / this.playbackRate;
+ return this.#video.duration;
  }
  get isPlaying() {
  return !this.#video.paused;
@@ -289,7 +289,7 @@ class SpritePlaybackControls extends PlaybackControls {
  this.#sprite.stop();
  }
  get duration() {
- return this.#framecount / this.#framerate / this.playbackRate;
+ return this.#framecount / this.#framerate;
  }
  get isPlaying() {
  return this.#sprite.playing;
@@ -600,7 +600,7 @@ export class SequencerSpriteManager extends PIXI.Container {
  return this.#managedSprites[this.#activePath];
  }
  async #preloadVariants() {
- if (this.#activePath === "TEXT") {
+ if (this.#activePath === "TEXT" /* SpecialSpriteKeys.Text */) {
  return;
  }
  if (!this.#file || this.#file.isFlipbook) {

diff --git a/src/modules/sequencer-file-cache.js b/src/modules/sequencer-file-cache.js
@@ -82,7 +82,6 @@ const SequencerFileCache = {
  },
 
  registerSpritesheet(inSrc, inSpriteSheet) {
- console.log('register', inSrc)
  const existingSheetRef = this._spritesheets.get(inSrc)
  if (existingSheetRef ) {
  existingSheetRef[1] += 1
@@ -97,7 +96,6 @@ const SequencerFileCache = {
  console.error('trying to unlaod spritesheet that was not loaded:', inSrc)
  }
  existingSheetRef[1] -= 1
- console.log('deregister', inSrc, 'new refscount', existingSheetRef[1])
  if (existingSheetRef[1] > 0) {
  return
  }
@@ -110,7 +108,6 @@ const SequencerFileCache = {
  // clean up related sheets starting with the last (leaf)
 
  const cacheKeys = [get_sheet_image_url(inSrc, sheet), foundry.utils.getRoute(inSrc)]
- console.log('unloading', cacheKeys)
  PIXI.Assets.unload(cacheKeys.filter(src => !!src))
  }
 };