Browse Source

Renamed difference intensity properties

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

8
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();
}

10
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>

10
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),

Loading…
Cancel
Save