From ed32ddc747d81bfd55cb1b14a87d05479652e1fe Mon Sep 17 00:00:00 2001
From: grosbouddha <grosbouddha@gmail.com>
Date: Mon, 14 Sep 2015 21:41:10 +0200
Subject: [PATCH] Introduce basic dithering tool

---
 src/css/tools.css                       |   9 ++++++-
 src/img/tools/dithering.png             | Bin 0 -> 642 bytes
 src/js/app.js                           |   3 +++
 src/js/controller/PaletteController.js  |   1 +
 src/js/controller/ToolController.js     |   1 +
 src/js/service/SelectedColorsService.js |  28 ++++++++++++++++++++++
 src/js/tools/drawing/DitheringTool.js   |  30 ++++++++++++++++++++++++
 src/piskel-script-list.js               |   2 ++
 8 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 src/img/tools/dithering.png
 create mode 100644 src/js/service/SelectedColorsService.js
 create mode 100644 src/js/tools/drawing/DitheringTool.js

diff --git a/src/css/tools.css b/src/css/tools.css
index c2a7be7c..de0936ac 100644
--- a/src/css/tools.css
+++ b/src/css/tools.css
@@ -114,6 +114,12 @@
   background-size: 30px;
 }
 
+.tool-icon.tool-dithering {
+  background-image: url(../img/tools/dithering.png);
+  background-position: 8px 9px;
+  background-size: 30px;
+}
+
 /*
  * Tool cursors:
  */
@@ -128,7 +134,8 @@
 }
 
 .tool-pen .drawing-canvas-container:hover,
-.tool-lighten .drawing-canvas-container:hover {
+.tool-lighten .drawing-canvas-container:hover,
+.tool-dithering .drawing-canvas-container:hover {
   cursor: url(../img/icons/pen.png) 0 15, pointer;
 }
 
diff --git a/src/img/tools/dithering.png b/src/img/tools/dithering.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bd0f11b646252e8497d824f8828729901e73b10
GIT binary patch
literal 642
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVDj*EaSW-5dwX+Z(IE$(mc$pq
zAO87!PPChOu$P;o`~5SOL(`-Bp8nms`mo*nKU;$y+*u`kb`C?P8A}7hC7;H$w*?#u
zXGJou@wG#_Cw4Ra+!t4$_U&KkP9NE}cYl}OI=ZN&{=vJyjFYrJEXdo|e7VemWrA<x
zO<|2qLHv5N92^)VLmvElT6RK-efbv##v?)hPwUDYQUs!xZg;Pq{Wo{YHib<t(@qFQ
zX2x}_VfM1!ab)#mN8NONUy#lNyVp!-ne+C+muDY0n*VLjjQ!rR@)iGtw00H;hMOWQ
zx?0{%JOwf<IBxEeF#p#s*B-o|5b|ORpMb-qNKM<4h*#5gEzMiGUnFcRv+^dFu(vGB
z(pFlr7ICx}bS$0s?8-X76j_1X`jc<;YZ@4ef)51MUtb!R`tXXy-QV8xmCHQ7v%kA1
zudtGd|5cj2&?Q1XoBwIs_TQJ@+?#*GOH?3I$vZ{1;Pe~$b(!3LAWr8R6aBJMrPmD^
zzrAIu*;(h<Ha0LAtvK-D^wFE;@9i#z{ylm;&f%DdhqBZJcB|qOHyHlS_CEyl+ia%L
zi4&wYuCnKQD8M)Klb-h0s;F>L&bz;bp~fyRD-E5f1qno@*E^X)CI9Z(9L0WHvCQKw
zOOeNBP8OC4vzgxRmsmFWS7vFd_utDce)GjAgsgNeZO{?2+RLl3GN}6%L!?Scm9#_9
wQn9Oyn>=28F>6@jrMrqbW#WaGxpj<|6B?RlDS2)JCM^a}S3j3^P6<s606^3sg#Z8m

literal 0
HcmV?d00001

diff --git a/src/js/app.js b/src/js/app.js
index b8dbd171..b0a2e6df 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -38,6 +38,9 @@
       this.paletteService = new pskl.service.palette.PaletteService();
       this.paletteService.addDynamicPalette(new pskl.service.palette.CurrentColorsPalette());
 
+      this.selectedColorsService = new pskl.service.SelectedColorsService();
+      this.selectedColorsService.init();
+
       this.paletteController = new pskl.controller.PaletteController();
       this.paletteController.init();
 
diff --git a/src/js/controller/PaletteController.js b/src/js/controller/PaletteController.js
index 30120ac6..f6e0559b 100644
--- a/src/js/controller/PaletteController.js
+++ b/src/js/controller/PaletteController.js
@@ -2,6 +2,7 @@
   var ns = $.namespace('pskl.controller');
 
   ns.PaletteController = function () {
+    // TODO(grosbouddha): Reuse default colors from SelectedColorsService.
     this.primaryColor =  Constants.DEFAULT_PEN_COLOR;
     this.secondaryColor =  Constants.TRANSPARENT_COLOR;
   };
diff --git a/src/js/controller/ToolController.js b/src/js/controller/ToolController.js
index de29d9ce..00f134e9 100644
--- a/src/js/controller/ToolController.js
+++ b/src/js/controller/ToolController.js
@@ -19,6 +19,7 @@
       toDescriptor('rectangleSelect', 'S', new pskl.tools.drawing.RectangleSelect()),
       toDescriptor('shapeSelect', 'Z', new pskl.tools.drawing.ShapeSelect()),
       toDescriptor('lighten', 'U', new pskl.tools.drawing.Lighten()),
+      toDescriptor('dithering', 'T', new pskl.tools.drawing.DitheringTool()),
       toDescriptor('colorPicker', 'O', new pskl.tools.drawing.ColorPicker())
     ];
 
diff --git a/src/js/service/SelectedColorsService.js b/src/js/service/SelectedColorsService.js
new file mode 100644
index 00000000..6d3e3d38
--- /dev/null
+++ b/src/js/service/SelectedColorsService.js
@@ -0,0 +1,28 @@
+(function () {
+  var ns = $.namespace('pskl.service');
+
+  ns.SelectedColorsService = function () {
+    this.primaryColor_ = Constants.DEFAULT_PEN_COLOR;
+    this.secondaryColor_ = Constants.TRANSPARENT_COLOR;
+  };
+
+  ns.SelectedColorsService.prototype.init = function () {
+    $.subscribe(Events.PRIMARY_COLOR_SELECTED, this.onPrimaryColorUpdate_.bind(this));
+    $.subscribe(Events.SECONDARY_COLOR_SELECTED, this.onSecondaryColorUpdate_.bind(this));
+  };
+
+  ns.SelectedColorsService.prototype.getColors = function () {
+    if (this.primaryColor_ == null || this.secondaryColor_ == null) {
+      throw "SelectedColorsService not properly intialized.";
+    }
+    return [this.primaryColor_, this.secondaryColor_];
+  };
+
+  ns.SelectedColorsService.prototype.onPrimaryColorUpdate_ = function (evt, color) {
+    this.primaryColor_ = color;
+  };
+
+  ns.SelectedColorsService.prototype.onSecondaryColorUpdate_ = function (evt, color) {
+    this.secondaryColor_ = color;
+  };
+})();
diff --git a/src/js/tools/drawing/DitheringTool.js b/src/js/tools/drawing/DitheringTool.js
new file mode 100644
index 00000000..95c8c4f2
--- /dev/null
+++ b/src/js/tools/drawing/DitheringTool.js
@@ -0,0 +1,30 @@
+/**
+ * @provide pskl.tools.drawing.DitheringTool
+ *
+ * @require pskl.utils
+ */
+(function() {
+  var ns = $.namespace('pskl.tools.drawing');
+
+  ns.DitheringTool = function() {
+    ns.SimplePen.call(this);
+    this.toolId = 'tool-dithering';
+    this.helpText = 'Dithering tool';
+  };
+  pskl.utils.inherit(ns.DitheringTool, ns.SimplePen);
+
+  /**
+   * @override
+   */
+  ns.DitheringTool.prototype.applyToolAt = function(col, row, color, frame, overlay, event) {
+    var ditheringColor;
+    var currentColors = pskl.app.selectedColorsService.getColors();
+    // XOR on either row or col parity.
+    if (((col % 2 == 0) && !(row % 2 == 0)) || (!(col % 2 == 0) && (row % 2 == 0))) {
+      ditheringColor = currentColors[0];
+    } else {
+      ditheringColor = currentColors[1];
+    }
+    this.superclass.applyToolAt.call(this, col, row, ditheringColor, frame, overlay, event);
+  };
+})();
diff --git a/src/piskel-script-list.js b/src/piskel-script-list.js
index 3583713a..4b664d1c 100644
--- a/src/piskel-script-list.js
+++ b/src/piskel-script-list.js
@@ -160,6 +160,7 @@
   "js/service/ImageUploadService.js",
   "js/service/CurrentColorsService.js",
   "js/service/FileDropperService.js",
+  "js/service/SelectedColorsService.js",
 
   // Tools
   "js/tools/ToolsHelper.js",
@@ -181,6 +182,7 @@
   "js/tools/drawing/selection/ShapeSelect.js",
   "js/tools/drawing/ColorPicker.js",
   "js/tools/drawing/ColorSwap.js",
+  "js/tools/drawing/DitheringTool.js",
   "js/tools/transform/Transform.js",
   "js/tools/transform/Clone.js",
   "js/tools/transform/Flip.js",