cartodb/torque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adds interpolation for ambiguous cases

Browse Source
This commit is contained in:
Francisco Dans 2015-08-26 17:37:16 +02:00
parent 018f6c71d5
commit 7299fdca9a
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
examples/contour.html
View File

@ -177,13 +177,41 @@
else if (type === 5 || type === 10) { else if (type === 5 || type === 10) {
var diff = [previousPos.x - currentPos.x, previousPos.y - currentPos.y]; var diff = [previousPos.x - currentPos.x, previousPos.y - currentPos.y];
if (diff[0] === -1){ if (diff[0] === -1){
return {x: currentPos.x, y: currentPos.y - 1}; return {
x: currentPos.x,
y: currentPos.y - 1,
interpolation: {
x: lerp(cornerValues[1], cornerValues[0], contourValue),
y: lerp(cornerValues[3], cornerValues[0], contourValue)
}
};
} else if (diff[0] === 1){ } else if (diff[0] === 1){
return {x: currentPos.x, y: currentPos.y + 1}; return {
x: currentPos.x,
y: currentPos.y + 1,
interpolation: {
x: lerp(cornerValues[3], cornerValues[2], contourValue),
y: lerp(cornerValues[1], cornerValues[2], contourValue)
}
};
} else if (diff[1] === -1){ } else if (diff[1] === -1){
return {x: currentPos.x + 1, y: currentPos.y}; return {
x: currentPos.x + 1,
y: currentPos.y,
interpolation: {
x: lerp(cornerValues[1], cornerValues[0], contourValue),
y: lerp(cornerValues[3], cornerValues[0], contourValue)
}
};
} else if (diff[1] === 1){ } else if (diff[1] === 1){
return {x: currentPos.x - 1, y: currentPos.y}; return {
x: currentPos.x - 1,
y: currentPos.y,
interpolation: {
x: lerp(cornerValues[3], cornerValues[2], contourValue),
y: lerp(cornerValues[1], cornerValues[2], contourValue)
}
};
} }
} }