tschwery/reprapfirmware-dc42
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Grid leveling bugfixes (#82)

Browse source 
* calculate recipSpacing while loading heightmap.csv

* HeightMap::Interpolate2 was the wrong way around

* Grid interpolation bounds checks
This commit is contained in:
Christoph Pech 2017-03-06 19:40:34 +01:00 • committed by dc42
parent 28f708087c
commit ed9b895275
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Movement/Grid.cpp
View file

@ -74,6 +74,7 @@ bool GridDefinition::ReadParameters(const StringRef& s)
if (ok) if (ok)
{ {
CheckValidity(); CheckValidity();
recipSpacing = 1.0 / spacing;
} }
else else
{ {
@ -340,29 +341,29 @@ float HeightMap::GetInterpolatedHeightError(float x, float y) const
// We are off the bottom left corner of the grid // We are off the bottom left corner of the grid
return GetHeightError(0, 0); return GetHeightError(0, 0);
} }
else if (yIndex >= (int)def.numY) else if (yIndex >= (int)def.numY - 1)
{ {
return GetHeightError(0, def.numY); return GetHeightError(0, def.numY - 1);
} }
else else
{ {
return InterpolateY(0, yIndex, yf - yFloor); return InterpolateY(0, yIndex, yf - yFloor);
} }
} }
else if (xIndex >= (int)def.numX) else if (xIndex >= (int)def.numX - 1)
{ {
if (yIndex < 0) if (yIndex < 0)
{ {
// We are off the bottom left corner of the grid // We are off the bottom left corner of the grid
return GetHeightError(def.numX, 0); return GetHeightError(def.numX - 1, 0);
} }
else if (yIndex >= (int)def.numY) else if (yIndex >= (int)def.numY - 1)
{ {
return GetHeightError(def.numX, def.numY); return GetHeightError(def.numX - 1, def.numY - 1);
} }
else else
{ {
return InterpolateY(def.numX, yIndex, yf - yFloor); return InterpolateY(def.numX - 1, yIndex, yf - yFloor);
} }
} }
else else
@ -372,9 +373,9 @@ float HeightMap::GetInterpolatedHeightError(float x, float y) const
// We are off the bottom left corner of the grid // We are off the bottom left corner of the grid
return InterpolateX(xIndex, 0, xf - xFloor); return InterpolateX(xIndex, 0, xf - xFloor);
} }
else if (yIndex >= (int)def.numY) else if (yIndex >= (int)def.numY - 1)
{ {
return InterpolateX(xIndex, def.numY, xf - xFloor); return InterpolateX(xIndex, def.numY - 1, xf - xFloor);
} }
else else
{ {
@ -405,7 +406,7 @@ float HeightMap::Interpolate2(uint32_t index1, uint32_t index2, float frac) cons
{ {
const bool b1 = IsHeightSet(index1); const bool b1 = IsHeightSet(index1);
const bool b2 = IsHeightSet(index2); const bool b2 = IsHeightSet(index2);
return (b1 && b2) ? (frac * gridHeights[index1]) + ((1.0 - frac) * gridHeights[index2]) return (b1 && b2) ? ((1.0 - frac) * gridHeights[index1]) + (frac * gridHeights[index2])
: (b1) ? gridHeights[index1] : (b1) ? gridHeights[index1]
: (b2) ? gridHeights[index2] : (b2) ? gridHeights[index2]
: 0.0; : 0.0;