Merge pull request #63 from BoldBigflank/clone-animations

animations clone on set
straker · Feb 23, 2019 · fbb0f2a · fbb0f2a
2 parents b803cd5 + 3ec465c
commit fbb0f2a
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 35 deletions.
diff --git a/dist/sprite.js b/dist/sprite.js
diff --git a/docs/js/kontra.js b/docs/js/kontra.js
diff --git a/kontra.js b/kontra.js
@@ -1317,22 +1317,6 @@ kontra = {
         this.width = (properties.width !== undefined) ? properties.width : temp.width;
         this.height = (properties.height !== undefined) ? properties.height : temp.height;
       }
-      // animation sprite
-      else if (temp = properties.animations) {
-        this.animations = {}; // don't copy memory reference of animation object
-
-        // clone each animation so no sprite shares an animation
-        for (prop in temp) {
-          this.animations[prop] = temp[prop].clone();
-
-          // default the current animation to the first one in the list
-          firstAnimation = firstAnimation || this.animations[prop];
-        }
-
-        this.currentAnimation = firstAnimation;
-        this.width = this.width || firstAnimation.width;
-        this.height = this.height || firstAnimation.height;
-      }
 
       return this;
     }
@@ -1400,6 +1384,10 @@ kontra = {
       return this.acceleration.y;
     }
 
+    get animations() {
+      return this.anims
+    }
+
     set x(value) {
       this.position.x = value;
     }
@@ -1419,6 +1407,23 @@ kontra = {
       this.acceleration.y = value;
     }
 
+    set animations(value) {
+      let prop, firstAnimation
+      this.anims = {}
+
+      // clone each animation so no sprite shares an animation
+      for (prop in value) {
+        this.anims[prop] = value[prop].clone()
+
+        // default the current animation to the first one in the list
+        firstAnimation = firstAnimation || this.anims[prop]
+      }
+
+      this.currentAnimation = firstAnimation
+      this.width = this.width || firstAnimation.width
+      this.height = this.height || firstAnimation.height
+    }
+
     /**
      * Determine if the sprite is alive.
      * @memberof kontra.sprite

diff --git a/kontra.min.js b/kontra.min.js
diff --git a/src/sprite.js b/src/sprite.js
@@ -148,22 +148,6 @@
         this.width = (properties.width !== undefined) ? properties.width : temp.width;
         this.height = (properties.height !== undefined) ? properties.height : temp.height;
       }
-      // animation sprite
-      else if (temp = properties.animations) {
-        this.animations = {}; // don't copy memory reference of animation object
-
-        // clone each animation so no sprite shares an animation
-        for (prop in temp) {
-          this.animations[prop] = temp[prop].clone();
-
-          // default the current animation to the first one in the list
-          firstAnimation = firstAnimation || this.animations[prop];
-        }
-
-        this.currentAnimation = firstAnimation;
-        this.width = this.width || firstAnimation.width;
-        this.height = this.height || firstAnimation.height;
-      }
 
       return this;
     }
@@ -231,6 +215,10 @@
       return this.acceleration.y;
     }
 
+    get animations() {
+      return this.anims
+    }
+
     set x(value) {
       this.position.x = value;
     }
@@ -250,6 +238,23 @@
       this.acceleration.y = value;
     }
 
+    set animations(value) {
+      let prop, firstAnimation
+      this.anims = {}
+
+      // clone each animation so no sprite shares an animation
+      for (prop in value) {
+        this.anims[prop] = value[prop].clone()
+
+        // default the current animation to the first one in the list
+        firstAnimation = firstAnimation || this.anims[prop]
+      }
+
+      this.currentAnimation = firstAnimation
+      this.width = this.width || firstAnimation.width
+      this.height = this.height || firstAnimation.height
+    }
+
     /**
      * Determine if the sprite is alive.
      * @memberof kontra.sprite