mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only paint valid corners 

Modified PathPaintGetRotatedEdgesAndCorners to check which corners can be painted based on the adjacent edges.
This commit is contained in:
Liz 2024-05-02 23:42:13 -05:00
parent a088f7615b
commit 81b0acb95f
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2/paint/tile_element/Paint.Path.cpp
View File

@ -846,11 +846,33 @@ static std::pair<uint8_t, uint8_t> PathPaintGetRotatedEdgesAndCorners(
const PaintSession& session, const PathElement& pathElement)
{
// Rol edges around rotation
uint8_t edges = ((pathElement.GetEdges() << session.CurrentRotation) & 0xF)
| (((pathElement.GetEdges()) << session.CurrentRotation) >> 4);
uint8_t rawEdges = pathElement.GetEdges();
uint8_t edges = ((rawEdges << session.CurrentRotation) & 0xF)
| ((rawEdges << session.CurrentRotation) >> 4);
uint8_t rawCorners = pathElement.GetCorners();
uint8_t validCorners = 0x0;
uint8_t corners = (((pathElement.GetCorners()) << session.CurrentRotation) & 0xF)
| (((pathElement.GetCorners()) << session.CurrentRotation) >> 4);
// Only paint corners that exist between two edges
if ((rawEdges & EDGE_SE) && (rawEdges & EDGE_SW))
{
validCorners |= (rawCorners & FOOTPATH_CORNER_1);
}
if ((rawEdges & EDGE_NE) && (rawEdges & EDGE_NW))
{
validCorners |= (rawCorners & FOOTPATH_CORNER_3);
}
if ((rawEdges & EDGE_SW) && (rawEdges & EDGE_NW))
{
validCorners |= (rawCorners & FOOTPATH_CORNER_2);
}
if ((rawEdges & EDGE_NE) && (rawEdges & EDGE_SE))
{
validCorners |= (rawCorners & FOOTPATH_CORNER_0);
}
// Roll corners around rotation
uint8_t corners = ((validCorners << session.CurrentRotation) & 0xF)
| ((validCorners << session.CurrentRotation) >> 4);
return std::make_pair(edges, corners);
}