fix(phaserx): allow for multiple tweens on same objects by passing in… (

#122) * fix(phaserx): allow for multiple tweens on same objects by passing in control flags * fix(phaserx): fix breaking change on embodiedEntity.removeComponent * fix: make stop flag optional in types Co-authored-by: alvarius <89248902+alvrs@users.noreply.github.com>
latticexyz · Aug 5, 2022 · d129836 · d129836
1 parent 4eac3c6
commit d129836
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/packages/phaserx/src/createEmbodiedEntity.ts b/packages/phaserx/src/createEmbodiedEntity.ts
@@ -63,13 +63,13 @@ export function createEmbodiedEntity<Type extends keyof GameObjectTypes>(
     if (activeGameObject && once) once(activeGameObject);
   }
 
-  function removeComponent(id: string) {
+  function removeComponent(id: string, stop?: boolean) {
     onOnce.delete(id);
     onUpdate.delete(id);
 
     // Reset the entity and reapply all onOnce components
     if (activeGameObject) {
-      reset(activeGameObject, false);
+      reset(activeGameObject, stop);
       executeGameObjectFunctions(activeGameObject, onOnce.values());
     }
   }
@@ -84,6 +84,7 @@ export function createEmbodiedEntity<Type extends keyof GameObjectTypes>(
     gameObject.resetPipeline(true, true);
     gameObject.setScale(1, 1);
     gameObject.setOrigin(0, 0);
+    gameObject.setAlpha(1);
     if (isSprite(gameObject, type)) {
       gameObject.clearTint();
       gameObject.setTexture("");

diff --git a/packages/phaserx/src/types.ts b/packages/phaserx/src/types.ts
@@ -64,7 +64,7 @@ export type Input = ReturnType<typeof createInput>;
 
 export type EmbodiedEntity<Type extends keyof GameObjectTypes> = {
   setComponent: (component: GameObjectComponent<Type>) => void;
-  removeComponent: (id: string) => void;
+  removeComponent: (id: string, stop?: boolean) => void;
   spawn: () => void;
   despawn: () => void;
   position: Coord;

diff --git a/packages/phaserx/src/utils/tween.ts b/packages/phaserx/src/utils/tween.ts
@@ -9,13 +9,15 @@ type TweenBuilderConfig = { targets: Phaser.GameObjects.Sprite } & Omit<
  * Add a tween to the provided game object.
  * @returns Promise that resolves when the tween is done.
  */
-export async function tween(config: TweenBuilderConfig) {
+export async function tween(config: TweenBuilderConfig, options?: { keepExistingTweens?: boolean }) {
   const [resolve, , promise] = deferred<void>();
   const { targets } = config;
   if (!targets.scene || !targets.scene.tweens) return;
 
   // Kill old tweens
-  removeAllTweens(targets);
+  if (!options?.keepExistingTweens) {
+    removeAllTweens(targets);
+  }
 
   // Add new tween
   targets.scene.tweens.add({