flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed overshoot in cLineBlockTracer.

Browse Source 
Fixes #2161.
This commit is contained in:
Mattes D 2015-06-05 11:29:54 +02:00
parent 5267285529
commit 1ec9665118
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/LineBlockTracer.cpp
View File

@ -154,38 +154,45 @@ bool cLineBlockTracer::MoveToNextBlock(void)
{ {
// Find out which of the current block's walls gets hit by the path: // Find out which of the current block's walls gets hit by the path:
static const double EPS = 0.00001; static const double EPS = 0.00001;
double Coeff = 1; enum
enum eDirection
{ {
dirNONE, dirNONE,
dirX, dirX,
dirY, dirY,
dirZ, dirZ,
} Direction = dirNONE; } Direction = dirNONE;
// Calculate the next YZ wall hit:
double Coeff = 1;
if (std::abs(m_DiffX) > EPS) if (std::abs(m_DiffX) > EPS)
{ {
double DestX = (m_DirX > 0) ? (m_CurrentX + 1) : m_CurrentX; double DestX = (m_DirX > 0) ? (m_CurrentX + 1) : m_CurrentX;
Coeff = (DestX - m_StartX) / m_DiffX; double CoeffX = (DestX - m_StartX) / m_DiffX;
if (Coeff <= 1) if (CoeffX <= 1) // We need to include equality for the last block in the trace
{ {
Coeff = CoeffX;
Direction = dirX; Direction = dirX;
} }
} }
// If the next XZ wall hit is closer, use it instead:
if (std::abs(m_DiffY) > EPS) if (std::abs(m_DiffY) > EPS)
{ {
double DestY = (m_DirY > 0) ? (m_CurrentY + 1) : m_CurrentY; double DestY = (m_DirY > 0) ? (m_CurrentY + 1) : m_CurrentY;
double CoeffY = (DestY - m_StartY) / m_DiffY; double CoeffY = (DestY - m_StartY) / m_DiffY;
if (CoeffY < Coeff) if (CoeffY <= Coeff) // We need to include equality for the last block in the trace
{ {
Coeff = CoeffY; Coeff = CoeffY;
Direction = dirY; Direction = dirY;
} }
} }
// If the next XY wall hit is closer, use it instead:
if (std::abs(m_DiffZ) > EPS) if (std::abs(m_DiffZ) > EPS)
{ {
double DestZ = (m_DirZ > 0) ? (m_CurrentZ + 1) : m_CurrentZ; double DestZ = (m_DirZ > 0) ? (m_CurrentZ + 1) : m_CurrentZ;
double CoeffZ = (DestZ - m_StartZ) / m_DiffZ; double CoeffZ = (DestZ - m_StartZ) / m_DiffZ;
if (CoeffZ < Coeff) if (CoeffZ <= Coeff) // We need to include equality for the last block in the trace
{ {
Direction = dirZ; Direction = dirZ;
} }