mirror of https://github.com/OpenRCT2/OpenRCT2.git
Refactor uses of PaintAddImageAsParent in VirtualFloor.cpp
This commit is contained in:
parent
4d62a7396c
commit
5818a0a4f3
|
@ -366,13 +366,14 @@ void virtual_floor_paint(paint_session* session)
|
||||||
uint8_t dullEdges = 0xF & ~occupiedEdges & ~litEdges;
|
uint8_t dullEdges = 0xF & ~occupiedEdges & ~litEdges;
|
||||||
uint8_t paintEdges = ((weAreOccupied || weAreLit) && weAreOwned) ? ~dullEdges : 0xF;
|
uint8_t paintEdges = ((weAreOccupied || weAreLit) && weAreOwned) ? ~dullEdges : 0xF;
|
||||||
|
|
||||||
|
const auto virtualFloorOffset = CoordsXYZ{ 0, 0, _virtualFloorHeight };
|
||||||
if (paintEdges & EDGE_NE)
|
if (paintEdges & EDGE_NE)
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(
|
PaintAddImageAsParent(
|
||||||
session,
|
session,
|
||||||
SPR_G2_SELECTION_EDGE_NE
|
SPR_G2_SELECTION_EDGE_NE
|
||||||
| (!(occupiedEdges & EDGE_NE) ? ((litEdges & EDGE_NE) ? remap_lit : remap_base) : remap_edge),
|
| (!(occupiedEdges & EDGE_NE) ? ((litEdges & EDGE_NE) ? remap_lit : remap_base) : remap_edge),
|
||||||
0, 0, 0, 0, 1, _virtualFloorHeight, 5, 5, _virtualFloorHeight + ((dullEdges & EDGE_NE) ? -2 : 0));
|
virtualFloorOffset, { 0, 0, 1 }, { 5, 5, _virtualFloorHeight + ((dullEdges & EDGE_NE) ? -2 : 0) });
|
||||||
}
|
}
|
||||||
if (paintEdges & EDGE_SE)
|
if (paintEdges & EDGE_SE)
|
||||||
{
|
{
|
||||||
|
@ -380,7 +381,7 @@ void virtual_floor_paint(paint_session* session)
|
||||||
session,
|
session,
|
||||||
SPR_G2_SELECTION_EDGE_SE
|
SPR_G2_SELECTION_EDGE_SE
|
||||||
| (!(occupiedEdges & EDGE_SE) ? ((litEdges & EDGE_SE) ? remap_lit : remap_base) : remap_edge),
|
| (!(occupiedEdges & EDGE_SE) ? ((litEdges & EDGE_SE) ? remap_lit : remap_base) : remap_edge),
|
||||||
0, 0, 1, 1, 1, _virtualFloorHeight, 16, 27, _virtualFloorHeight + ((dullEdges & EDGE_SE) ? -2 : 0));
|
virtualFloorOffset, { 1, 1, 1 }, { 16, 27, _virtualFloorHeight + ((dullEdges & EDGE_SE) ? -2 : 0) });
|
||||||
}
|
}
|
||||||
if (paintEdges & EDGE_SW)
|
if (paintEdges & EDGE_SW)
|
||||||
{
|
{
|
||||||
|
@ -388,7 +389,7 @@ void virtual_floor_paint(paint_session* session)
|
||||||
session,
|
session,
|
||||||
SPR_G2_SELECTION_EDGE_SW
|
SPR_G2_SELECTION_EDGE_SW
|
||||||
| (!(occupiedEdges & EDGE_SW) ? ((litEdges & EDGE_SW) ? remap_lit : remap_base) : remap_edge),
|
| (!(occupiedEdges & EDGE_SW) ? ((litEdges & EDGE_SW) ? remap_lit : remap_base) : remap_edge),
|
||||||
0, 0, 1, 1, 1, _virtualFloorHeight, 27, 16, _virtualFloorHeight + ((dullEdges & EDGE_SW) ? -2 : 0));
|
virtualFloorOffset, { 1, 1, 1 }, { 27, 16, _virtualFloorHeight + ((dullEdges & EDGE_SW) ? -2 : 0) });
|
||||||
}
|
}
|
||||||
if (paintEdges & EDGE_NW)
|
if (paintEdges & EDGE_NW)
|
||||||
{
|
{
|
||||||
|
@ -396,7 +397,7 @@ void virtual_floor_paint(paint_session* session)
|
||||||
session,
|
session,
|
||||||
SPR_G2_SELECTION_EDGE_NW
|
SPR_G2_SELECTION_EDGE_NW
|
||||||
| (!(occupiedEdges & EDGE_NW) ? ((litEdges & EDGE_NW) ? remap_lit : remap_base) : remap_edge),
|
| (!(occupiedEdges & EDGE_NW) ? ((litEdges & EDGE_NW) ? remap_lit : remap_base) : remap_edge),
|
||||||
0, 0, 0, 0, 1, _virtualFloorHeight, 5, 5, _virtualFloorHeight + ((dullEdges & EDGE_NW) ? -2 : 0));
|
virtualFloorOffset, { 0, 0, 1 }, { 5, 5, _virtualFloorHeight + ((dullEdges & EDGE_NW) ? -2 : 0) });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Glassy)
|
if (gConfigGeneral.virtual_floor_style != VirtualFloorStyles::Glassy)
|
||||||
|
@ -406,7 +407,7 @@ void virtual_floor_paint(paint_session* session)
|
||||||
{
|
{
|
||||||
int32_t imageColourFlats = SPR_G2_SURFACE_GLASSY_RECOLOURABLE | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT
|
int32_t imageColourFlats = SPR_G2_SURFACE_GLASSY_RECOLOURABLE | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT
|
||||||
| EnumValue(FilterPaletteID::PaletteWater) << 19;
|
| EnumValue(FilterPaletteID::PaletteWater) << 19;
|
||||||
PaintAddImageAsParent(session, imageColourFlats, 0, 0, 30, 30, 0, _virtualFloorHeight, 2, 2, _virtualFloorHeight - 3);
|
PaintAddImageAsParent(session, imageColourFlats, virtualFloorOffset, { 30, 30, 0 }, { 2, 2, _virtualFloorHeight - 3 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue