Browse Source

Renamed difference intensity properties

pull/34/head
James Cryer 11 years ago
parent
commit
cf3661ab05
  1. 8
      demoassets/main.js
  2. 8
      index.html
  3. 4
      resemble.js

8
demoassets/main.js

@ -151,16 +151,16 @@ $(function(){
resembleControl.repaint(); resembleControl.repaint();
} }
else else
if($this.is('#flatWithDistanceBasedIntensity')){ if($this.is('#flatDifferenceIntensity')){
resemble.outputSettings({ resemble.outputSettings({
errorType: 'flatWithDistanceBasedIntensity' errorType: 'flatDifferenceIntensity'
}); });
resembleControl.repaint(); resembleControl.repaint();
} }
else else
if($this.is('#movementWithDistanceBasedIntensity')){ if($this.is('#movementDifferenceIntensity')){
resemble.outputSettings({ resemble.outputSettings({
errorType: 'movementWithDistanceBasedIntensity' errorType: 'movementDifferenceIntensity'
}); });
resembleControl.repaint(); resembleControl.repaint();
} }

8
index.html

@ -98,13 +98,17 @@
<button class="btn active" id="pink">Pink</button> <button class="btn active" id="pink">Pink</button>
<button class="btn" id="yellow">Yellow</button> <button class="btn" id="yellow">Yellow</button>
</div> </div>
<br/>
<br/>
<div class="btn-group buttons" style="display:none"> <div class="btn-group buttons" style="display:none">
<button class="btn active" id="flat">Flat</button> <button class="btn active" id="flat">Flat</button>
<button class="btn" id="movement">Movement</button> <button class="btn" id="movement">Movement</button>
<button class="btn" id="flatWithDistanceBasedIntensity">Flat with distance-based intensity</button> <button class="btn" id="flatDifferenceIntensity">Flat with diff intensity</button>
<button class="btn" id="movementWithDistanceBasedIntensity">Movement with distance-based intensity</button> <button class="btn" id="movementDifferenceIntensity">Movement with diff intensity</button>
</div> </div>
<br/>
<br/>
<div class="btn-group buttons" style="display:none"> <div class="btn-group buttons" style="display:none">
<button class="btn active" id="opaque">Opaque</button> <button class="btn active" id="opaque">Opaque</button>

4
resemble.js

@ -36,7 +36,7 @@ URL: https://github.com/Huddle/Resemble.js
a: d2.a a: d2.a
} }
}, },
flatWithDistanceBasedIntensity: function (d1, d2){ flatDifferenceIntensity: function (d1, d2){
return { return {
r: errorPixelColor.red, r: errorPixelColor.red,
g: errorPixelColor.green, g: errorPixelColor.green,
@ -44,7 +44,7 @@ URL: https://github.com/Huddle/Resemble.js
a: colorsDistance(d1, d2) a: colorsDistance(d1, d2)
} }
}, },
movementWithDistanceBasedIntensity: function (d1, d2){ movementDifferenceIntensity: function (d1, d2){
var ratio = colorsDistance(d1, d2)/255 * 0.8; var ratio = colorsDistance(d1, d2)/255 * 0.8;
return { return {
r: ((1-ratio)*(d2.r*(errorPixelColor.red/255)) + ratio*errorPixelColor.red), r: ((1-ratio)*(d2.r*(errorPixelColor.red/255)) + ratio*errorPixelColor.red),

Loading…
Cancel
Save