From be06078df11c9362a0c2699318dd671ea0be0050 Mon Sep 17 00:00:00 2001
From: Tim Mickel <tim.mickel@gmail.com>
Date: Wed, 31 Aug 2016 11:21:32 -0400
Subject: [PATCH] Update sprite and clones to have basic costume support

---
 src/sprites/clone.js  | 58 +++++++++++++++++++++++++++++++++++++------
 src/sprites/sprite.js |  6 +++--
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/sprites/clone.js b/src/sprites/clone.js
index 8370ac73e..9c7537d27 100644
--- a/src/sprites/clone.js
+++ b/src/sprites/clone.js
@@ -4,11 +4,16 @@ var Target = require('../engine/target');
 
 /**
  * Clone (instance) of a sprite.
- * @param {!Blocks} spriteBlocks Reference to the sprite's blocks.
+ * @param {!Sprite} sprite Reference to the sprite.
  * @constructor
  */
-function Clone(spriteBlocks) {
-    Target.call(this, spriteBlocks);
+function Clone(sprite) {
+    Target.call(this, sprite.blocks);
+    /**
+     * Reference to the sprite that this is a clone of.
+     * @type {!Sprite}
+     */
+    this.sprite = sprite;
     /**
      * Reference to the global renderer for this VM, if one exists.
      * @type {?RenderWebGLWorker}
@@ -38,6 +43,8 @@ Clone.prototype.initDrawable = function () {
         var instance = this;
         createPromise.then(function (id) {
             instance.drawableID = id;
+            // Once the drawable is created, send our current set of properties.
+            instance.updateAllDrawableProperties();
         });
     }
 };
@@ -45,34 +52,40 @@ Clone.prototype.initDrawable = function () {
 // Clone-level properties.
 /**
  * Scratch X coordinate. Currently should range from -240 to 240.
- * @type {!number}
+ * @type {Number}
  */
 Clone.prototype.x = 0;
 
 /**
  * Scratch Y coordinate. Currently should range from -180 to 180.
- * @type {!number}
+ * @type {number}
  */
 Clone.prototype.y = 0;
 
 /**
  * Scratch direction. Currently should range from -179 to 180.
- * @type {!number}
+ * @type {number}
  */
 Clone.prototype.direction = 90;
 
 /**
  * Whether the clone is currently visible.
- * @type {!boolean}
+ * @type {boolean}
  */
 Clone.prototype.visible = true;
 
 /**
  * Size of clone as a percent of costume size. Ranges from 5% to 535%.
- * @type {!number}
+ * @type {number}
  */
 Clone.prototype.size = 100;
 
+/**
+ * Currently selected costume index.
+ * @type {number}
+ */
+Clone.prototype.currentCostume = 0;
+
 /**
  * Map of current graphic effect values.
  * @type {!Object.<string, number>}
@@ -184,4 +197,33 @@ Clone.prototype.clearEffects = function () {
     }
 };
 
+/**
+ * Set the current costume of this clone.
+ * @param {number} index New index of costume.
+ */
+Clone.prototype.setCostume = function (index) {
+    this.currentCostume = index;
+    if (this.renderer) {
+        this.renderer.updateDrawableProperties(this.drawableID, {
+            skin: this.sprite.costumes[this.currentCostume].baseLayerMD5
+        });
+    }
+};
+
+/**
+ * Update all drawable properties for this clone.
+ * Use when a batch has changed, e.g., when the drawable is first created.
+ */
+Clone.prototype.updateAllDrawableProperties = function () {
+    if (this.renderer) {
+        this.renderer.updateDrawableProperties(this.drawableID, {
+            position: [this.x, this.y],
+            direction: this.direction,
+            scale: [this.size, this.size],
+            visible: this.visible,
+            skin: this.sprite.costumes[this.currentCostume].baseLayerMD5
+        });
+    }
+};
+
 module.exports = Clone;
diff --git a/src/sprites/sprite.js b/src/sprites/sprite.js
index b4abdbbb5..9add2c719 100644
--- a/src/sprites/sprite.js
+++ b/src/sprites/sprite.js
@@ -7,12 +7,14 @@ var Blocks = require('../engine/blocks');
  * @param {?Blocks} blocks Shared blocks object for all clones of sprite.
  * @constructor
  */
-function Sprite (blocks) {
+function Sprite (blocks, name) {
     if (!blocks) {
         // Shared set of blocks for all clones.
         blocks = new Blocks();
     }
     this.blocks = blocks;
+    this.name = name;
+    this.costumes = [];
     this.clones = [];
 }
 
@@ -21,7 +23,7 @@ function Sprite (blocks) {
  * @returns {!Clone} Newly created clone.
  */
 Sprite.prototype.createClone = function () {
-    var newClone = new Clone(this.blocks);
+    var newClone = new Clone(this);
     this.clones.push(newClone);
     return newClone;
 };