Browse Source

Merge branch 'kamilbielawski-feature/62-output-diff-portion-from-inputs'

pull/112/head
james.cryer 7 years ago
parent
commit
74ee866e3b
  1. 3
      README.md
  2. 7
      demoassets/main.js
  3. 1
      index.html
  4. 20
      resemble.js

3
README.md

@ -72,7 +72,8 @@ resemble.outputSettings({
errorType: 'movement', errorType: 'movement',
transparency: 0.3, transparency: 0.3,
largeImageThreshold: 1200, largeImageThreshold: 1200,
useCrossOrigin: false useCrossOrigin: false,
outputDiff: true
}); });
// resembleControl.repaint(); // resembleControl.repaint();
``` ```

7
demoassets/main.js

@ -179,6 +179,13 @@ $(function(){
resembleControl.repaint(); resembleControl.repaint();
} }
else else
if($this.is('#outputDiff')){
resemble.outputSettings({
outputDiff: true
});
resembleControl.repaint();
}
else
if($this.is('#opaque')){ if($this.is('#opaque')){
resemble.outputSettings({ resemble.outputSettings({
transparency: 1 transparency: 1

1
index.html

@ -119,6 +119,7 @@
<button class="btn" id="movement">Movement</button> <button class="btn" id="movement">Movement</button>
<button class="btn" id="flatDifferenceIntensity">Flat with diff intensity</button> <button class="btn" id="flatDifferenceIntensity">Flat with diff intensity</button>
<button class="btn" id="movementDifferenceIntensity">Movement with diff intensity</button> <button class="btn" id="movementDifferenceIntensity">Movement with diff intensity</button>
<button class="btn" id="outputDiff">Diff portion from the input</button>
</div> </div>
<br/> <br/>
<br/> <br/>

20
resemble.js

@ -66,6 +66,12 @@ URL: https://github.com/Huddle/Resemble.js
px[offset + 1] = ((1 - ratio) * (d2.g * (errorPixelColor.green / 255)) + ratio * errorPixelColor.green); px[offset + 1] = ((1 - ratio) * (d2.g * (errorPixelColor.green / 255)) + ratio * errorPixelColor.green);
px[offset + 2] = ((1 - ratio) * (d2.b * (errorPixelColor.blue / 255)) + ratio * errorPixelColor.blue); px[offset + 2] = ((1 - ratio) * (d2.b * (errorPixelColor.blue / 255)) + ratio * errorPixelColor.blue);
px[offset + 3] = d2.a; px[offset + 3] = d2.a;
},
copySecondImage: function (px, offset, d1, d2) {
px[offset] = d2.r;
px[offset + 1] = d2.g;
px[offset + 2] = d2.b;
px[offset + 3] = d2.a;
} }
}; };
@ -73,6 +79,7 @@ URL: https://github.com/Huddle/Resemble.js
var boundingBox; var boundingBox;
var largeImageThreshold = 1200; var largeImageThreshold = 1200;
var useCrossOrigin = true; var useCrossOrigin = true;
var outputDiff = false;
var document = typeof window != "undefined" ? window.document : { var document = typeof window != "undefined" ? window.document : {
createElement: function() { createElement: function() {
// This will work as long as only createElement is used on window.document // This will work as long as only createElement is used on window.document
@ -367,6 +374,10 @@ URL: https://github.com/Huddle/Resemble.js
} }
function copyPixel(px, offset, data){ function copyPixel(px, offset, data){
if (outputDiff) {
return;
}
px[offset] = data.r; //r px[offset] = data.r; //r
px[offset + 1] = data.g; //g px[offset + 1] = data.g; //g
px[offset + 2] = data.b; //b px[offset + 2] = data.b; //b
@ -374,6 +385,10 @@ URL: https://github.com/Huddle/Resemble.js
} }
function copyGrayScalePixel(px, offset, data){ function copyGrayScalePixel(px, offset, data){
if (outputDiff) {
return;
}
px[offset] = data.brightness; //r px[offset] = data.brightness; //r
px[offset + 1] = data.brightness; //g px[offset + 1] = data.brightness; //g
px[offset + 2] = data.brightness; //b px[offset + 2] = data.brightness; //b
@ -744,6 +759,11 @@ URL: https://github.com/Huddle/Resemble.js
boundingBox = options.boundingBox; boundingBox = options.boundingBox;
} }
if (options.outputDiff) {
outputDiff = options.outputDiff;
errorPixel = errorPixelTransform.copySecondImage;
}
return this; return this;
}; };

Loading…
Cancel
Save