WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 23:00:42 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix some problematic ellipse plotter cases (like 4x36)"

Browse Source 
This reverts commit 1d7a75c8a9.
This commit is contained in:
elasota
2020-01-20 23:59:45 -05:00
parent c112738f2e
commit f5b0ef3698
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PortabilityLayer/EllipsePlotter.cpp
View File

@@ -73,9 +73,9 @@ namespace PortabilityLayer
const int32_t xStepCost = -m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor; const int32_t xStepCost = -m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor;
const int32_t yStepCost = m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor; const int32_t yStepCost = m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor;
const int32_t tangentCalc = (-m_xChangeCostDynamicFactor) + m_yChangeCostDynamicFactor; const int32_t diagonalCostDelta = xStepCost + yStepCost;
if (tangentCalc < 0) if (diagonalCostDelta < 0)
{ {
// Diagonal movement will move closer to the edge (first octant) // Diagonal movement will move closer to the edge (first octant)
IncrementY(); IncrementY();
@@ -115,9 +115,9 @@ namespace PortabilityLayer
const int32_t xStepCost = -m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor; const int32_t xStepCost = -m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor;
const int32_t yStepCost = -m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor; const int32_t yStepCost = -m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor;
const int32_t tangentCalc = (-m_xChangeCostDynamicFactor) + (-m_yChangeCostDynamicFactor); const int32_t diagonalCostDelta = xStepCost + yStepCost;
if (tangentCalc < 0) if (diagonalCostDelta < 0)
{ {
// Diagonal movement will move closer to the edge (first octant) // Diagonal movement will move closer to the edge (first octant)
DecrementX(); DecrementX();
@@ -157,9 +157,9 @@ namespace PortabilityLayer
const int32_t xStepCost = m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor; const int32_t xStepCost = m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor;
const int32_t yStepCost = -m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor; const int32_t yStepCost = -m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor;
const int32_t tangentCalc = (m_xChangeCostDynamicFactor) + (-m_yChangeCostDynamicFactor); const int32_t diagonalCostDelta = xStepCost + yStepCost;
if (tangentCalc < 0) if (diagonalCostDelta < 0)
{ {
// Diagonal movement will move closer to the edge (first octant) // Diagonal movement will move closer to the edge (first octant)
DecrementY(); DecrementY();
@@ -199,9 +199,9 @@ namespace PortabilityLayer
const int32_t xStepCost = m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor; const int32_t xStepCost = m_xChangeCostDynamicFactor + m_xChangeCostStaticFactor;
const int32_t yStepCost = m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor; const int32_t yStepCost = m_yChangeCostDynamicFactor + m_yChangeCostStaticFactor;
const int32_t tangentCalc = m_xChangeCostDynamicFactor + m_yChangeCostDynamicFactor; const int32_t diagonalCostDelta = xStepCost + yStepCost;
if (tangentCalc < 0) if (diagonalCostDelta < 0)
{ {
// Diagonal movement will move closer to the edge (first octant) // Diagonal movement will move closer to the edge (first octant)
IncrementX(); IncrementX();

8
PortabilityLayer/PLQDraw.cpp
View File

@@ -1014,15 +1014,9 @@ void DrawSurface::SetSystemFont(int size, int variationFlags)
void DrawSurface::FillEllipse(const Rect &rect) void DrawSurface::FillEllipse(const Rect &rect)
{ {
if (!rect.IsValid() || rect.Width() < 1 || rect.Height() < 1) if (!rect.IsValid())
return; return;
if (rect.Width() <= 2 || rect.Height() <= 2)
{
FillRect(rect);
return;
}
PortabilityLayer::ScanlineMask *mask = PortabilityLayer::ScanlineMaskConverter::CompileEllipse(PortabilityLayer::Rect2i(rect.top, rect.left, rect.bottom, rect.right)); PortabilityLayer::ScanlineMask *mask = PortabilityLayer::ScanlineMaskConverter::CompileEllipse(PortabilityLayer::Rect2i(rect.top, rect.left, rect.bottom, rect.right));
if (mask) if (mask)
{ {