From 09c923dbbaa6e47c569d4717675e0837e74892fe Mon Sep 17 00:00:00 2001
From: Kamil Bielawski <kamil.bielawski1@gmail.com>
Date: Mon, 22 Sep 2014 01:30:55 +0200
Subject: [PATCH 1/2] Added two distance-based types of errorPixelTransform

---
 demoassets/main.js | 14 ++++++++++++++
 index.html         |  4 +++-
 resemble.js        | 21 +++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/demoassets/main.js b/demoassets/main.js
index a3371c9..0c31527 100644
--- a/demoassets/main.js
+++ b/demoassets/main.js
@@ -151,6 +151,20 @@ $(function(){
 			resembleControl.repaint();
 		}
 		else
+		if($this.is('#flatWithDistanceBasedIntensity')){
+			resemble.outputSettings({
+				errorType: 'flatWithDistanceBasedIntensity'
+			});
+			resembleControl.repaint();
+		}
+		else
+		if($this.is('#movementWithDistanceBasedIntensity')){
+			resemble.outputSettings({
+				errorType: 'movementWithDistanceBasedIntensity'
+			});
+			resembleControl.repaint();
+		}
+		else
 		if($this.is('#opaque')){
 			resemble.outputSettings({
 				transparency: 1
diff --git a/index.html b/index.html
index 99408a2..59b10ec 100644
--- a/index.html
+++ b/index.html
@@ -102,6 +102,8 @@
 								<div class="btn-group buttons" style="display:none">
 									<button class="btn active" id="flat">Flat</button>
 									<button class="btn" id="movement">Movement</button>
+									<button class="btn" id="flatWithDistanceBasedIntensity">Flat with distance-based intensity</button>
+									<button class="btn" id="movementWithDistanceBasedIntensity">Movement with distance-based intensity</button>
 								</div>
 								
 								<div class="btn-group buttons" style="display:none">
@@ -188,4 +190,4 @@ resemble(file).compareTo(file2).onComplete(function(){
 		<script src="resemble.js"></script>
 		<script src="demoassets/main.js"></script>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/resemble.js b/resemble.js
index c38553d..6f73d34 100644
--- a/resemble.js
+++ b/resemble.js
@@ -15,6 +15,10 @@ URL: https://github.com/Huddle/Resemble.js
 		alpha: 255
 	};
 
+  function colorsDistance(c1, c2){
+   return (Math.abs(c1.r - c2.r) + Math.abs(c1.g - c2.g) + Math.abs(c1.b - c2.b))/3;
+  }
+
 	var errorPixelTransform = {
 		flat : function (d1, d2){
 			return {
@@ -31,6 +35,23 @@ URL: https://github.com/Huddle/Resemble.js
 				b: ((d2.b*(errorPixelColor.blue/255)) + errorPixelColor.blue)/2,
 				a: d2.a
 			}
+		},
+		flatWithDistanceBasedIntensity: function (d1, d2){
+			return {
+				r: errorPixelColor.red,
+				g: errorPixelColor.green,
+				b: errorPixelColor.blue,
+				a: colorsDistance(d1, d2)
+			}
+		},
+		movementWithDistanceBasedIntensity: function (d1, d2){
+			var ratio = colorsDistance(d1, d2)/255 * 0.8;
+			return {
+				r: ((1-ratio)*(d2.r*(errorPixelColor.red/255)) + ratio*errorPixelColor.red),
+				g: ((1-ratio)*(d2.g*(errorPixelColor.green/255)) + ratio*errorPixelColor.green),
+				b: ((1-ratio)*(d2.b*(errorPixelColor.blue/255)) + ratio*errorPixelColor.blue),
+				a: d2.a
+			}
 		}
 	};
 

From cf3661ab0574b8121ab88b1ae5604efa9d544d2a Mon Sep 17 00:00:00 2001
From: James Cryer <james.cryer@huddle.com>
Date: Wed, 24 Sep 2014 11:11:21 +0100
Subject: [PATCH 2/2] Renamed difference intensity properties

---
 demoassets/main.js |  8 ++++----
 index.html         | 10 +++++++---
 resemble.js        | 10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/demoassets/main.js b/demoassets/main.js
index 0c31527..dfa5b89 100644
--- a/demoassets/main.js
+++ b/demoassets/main.js
@@ -151,16 +151,16 @@ $(function(){
 			resembleControl.repaint();
 		}
 		else
-		if($this.is('#flatWithDistanceBasedIntensity')){
+		if($this.is('#flatDifferenceIntensity')){
 			resemble.outputSettings({
-				errorType: 'flatWithDistanceBasedIntensity'
+				errorType: 'flatDifferenceIntensity'
 			});
 			resembleControl.repaint();
 		}
 		else
-		if($this.is('#movementWithDistanceBasedIntensity')){
+		if($this.is('#movementDifferenceIntensity')){
 			resemble.outputSettings({
-				errorType: 'movementWithDistanceBasedIntensity'
+				errorType: 'movementDifferenceIntensity'
 			});
 			resembleControl.repaint();
 		}
diff --git a/index.html b/index.html
index 59b10ec..e1131fe 100644
--- a/index.html
+++ b/index.html
@@ -98,14 +98,18 @@
 									<button class="btn active" id="pink">Pink</button>
 									<button class="btn" id="yellow">Yellow</button>
 								</div>
+								<br/>
+								<br/>
 
 								<div class="btn-group buttons" style="display:none">
 									<button class="btn active" id="flat">Flat</button>
 									<button class="btn" id="movement">Movement</button>
-									<button class="btn" id="flatWithDistanceBasedIntensity">Flat with distance-based intensity</button>
-									<button class="btn" id="movementWithDistanceBasedIntensity">Movement with distance-based intensity</button>
+									<button class="btn" id="flatDifferenceIntensity">Flat with diff intensity</button>
+									<button class="btn" id="movementDifferenceIntensity">Movement with diff intensity</button>
 								</div>
-								
+								<br/>
+								<br/>
+
 								<div class="btn-group buttons" style="display:none">
 									<button class="btn active" id="opaque">Opaque</button>
 									<button class="btn" id="transparent">Transparent</button>
diff --git a/resemble.js b/resemble.js
index 6f73d34..ce8869f 100644
--- a/resemble.js
+++ b/resemble.js
@@ -15,9 +15,9 @@ URL: https://github.com/Huddle/Resemble.js
 		alpha: 255
 	};
 
-  function colorsDistance(c1, c2){
-   return (Math.abs(c1.r - c2.r) + Math.abs(c1.g - c2.g) + Math.abs(c1.b - c2.b))/3;
-  }
+	function colorsDistance(c1, c2){
+		return (Math.abs(c1.r - c2.r) + Math.abs(c1.g - c2.g) + Math.abs(c1.b - c2.b))/3;
+	}
 
 	var errorPixelTransform = {
 		flat : function (d1, d2){
@@ -36,7 +36,7 @@ URL: https://github.com/Huddle/Resemble.js
 				a: d2.a
 			}
 		},
-		flatWithDistanceBasedIntensity: function (d1, d2){
+		flatDifferenceIntensity: function (d1, d2){
 			return {
 				r: errorPixelColor.red,
 				g: errorPixelColor.green,
@@ -44,7 +44,7 @@ URL: https://github.com/Huddle/Resemble.js
 				a: colorsDistance(d1, d2)
 			}
 		},
-		movementWithDistanceBasedIntensity: function (d1, d2){
+		movementDifferenceIntensity: function (d1, d2){
 			var ratio = colorsDistance(d1, d2)/255 * 0.8;
 			return {
 				r: ((1-ratio)*(d2.r*(errorPixelColor.red/255)) + ratio*errorPixelColor.red),