2 files changed, 63 insertions, 2 deletions
diff --git a/public/js/mp/dye.js b/public/js/mp/dye.js
index 7cf8da5..e7af938 100644
--- a/public/js/mp/dye.js
+++ b/public/js/mp/dye.js
@@ -5,7 +5,12 @@ var mp = function(mp) {
         parseDyeString: parseDyeString,
         dyeImage: dyeImage
     };
+    
     var channel = [null, "R", "G", "Y", "B", "M", "C", "W"];
+    
+    /*
+     * Return the channel and intensity for the given RGB(A) array.
+     */
     function getChannel(color) {
         var r = color[0], g = color[1], b = color[2],
             max = Math.max(r, g, b);
@@ -28,12 +33,35 @@ var mp = function(mp) {
 
         return { channel: channel[idx], intensity: max };
     }
+    
     /*
      * Return a dye specification from a dye string.
      */
     function parseDyeString(dyeString) {
-        /* TODO */
+        var channelStrings = dyeString.split("|");
+        var dyeData = {};
+        
+        for (var i = 0; i < channelStrings.length; i++) {
+            var channelStr = channelStrings[i];
+            if (channelStr[1] != ":" || channelStr[2] != "#") {
+                // TODO error
+            }
+            
+            var channel = channelStr[0];
+            var parts = channelStr.substring(3).split(",");
+            
+            var list = [];
+            
+            for (var j = 0; j < parts.length; j++) {
+                list.push(mp.resource.parseColor(parts[j]));
+            }
+            
+            dyeData[channel] = list;
+        }
+        
+        return dyeData;
     }
+    
     /*
      * Dye the internal image data based on the specification provided by dyeData.
      * The specification can be generated from a dyeString by parseDyeString.
diff --git a/public/js/mp/resource.js b/public/js/mp/resource.js
index f348a89..406222a 100644
--- a/public/js/mp/resource.js
+++ b/public/js/mp/resource.js
@@ -1,7 +1,9 @@
 "use strict";
 var mp = function(mp) {
     mp.resource = {
-        loadImage: loadImage
+        loadImage: loadImage,
+        copyImageData: copyImageData,
+        parseColor: parseColor
     };
 
     /*
@@ -32,5 +34,36 @@ var mp = function(mp) {
         };
         image.src = url;
     }
+    
+    function copyImageData(ctx, src) {
+        var dst = ctx.createImageData(src.width, src.height);
+        dst.data.set(src.data);
+        return dst;
+    }
+    
+    /*
+     * Parses the given color string into an array of parts
+     */
+    function parseColor(colorString) {
+        if (colorString[0] == "#") {
+            colorString = colorString.substring(1);
+        }
+        
+        if (colorString.length == 3) {
+            var r = colorString[0] + colorString[0];
+            var g = colorString[1] + colorString[1];
+            var b = colorString[2] + colorString[2];
+            return [parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)]
+        }
+        
+        if (colorString.length == 6) {
+            return [parseInt(colorString.substring(0,2), 16), parseInt(colorString.substring(2,4), 16), parseInt(colorString.substring(4,6), 16)]
+        }
+        
+        // TODO others?
+        
+        return null;
+    }
+    
     return mp;
 }(mp || {});