mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Code style: Remove struct snakes from Paint (#18341)

Browse Source
This commit is contained in:
Rik Smeets
2022-10-14 20:26:36 +02:00
committed by GitHub
parent d415a5bd10
commit c80bd455e9
124 changed files with 3776 additions and 3779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/openrct2/ride/TrackPaint.cpp
View File

@@ -262,7 +262,7 @@ bool track_paint_util_has_fence(
}
void track_paint_util_paint_floor(
paint_session& session, uint8_t edges, ImageId colourFlags, uint16_t height, const uint32_t floorSprites[4],
PaintSession& session, uint8_t edges, ImageId colourFlags, uint16_t height, const uint32_t floorSprites[4],
const StationObject* stationStyle)
{
if (stationStyle != nullptr && stationStyle->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
@@ -291,7 +291,7 @@ void track_paint_util_paint_floor(
}
void track_paint_util_paint_fences(
paint_session& session, uint8_t edges, const CoordsXY& position, const TrackElement& trackElement, const Ride& ride,
PaintSession& session, uint8_t edges, const CoordsXY& position, const TrackElement& trackElement, const Ride& ride,
const ImageId& colourFlags, uint16_t height, const uint32_t fenceSprites[4], uint8_t rotation)
{
if (edges & EDGE_NW && track_paint_util_has_fence(EDGE_NW, position, trackElement, ride, rotation))
@@ -329,31 +329,31 @@ bool track_paint_util_should_paint_supports(const CoordsXY& position)
}
static void track_paint_util_draw_station_impl(
paint_session& session, const Ride& ride, Direction direction, uint16_t height, uint16_t coverHeight,
PaintSession& session, const Ride& ride, Direction direction, uint16_t height, uint16_t coverHeight,
const TrackElement& trackElement, int32_t fenceOffsetA, int32_t fenceOffsetB);
void track_paint_util_draw_station(
paint_session& session, const Ride& ride, Direction direction, uint16_t height, const TrackElement& trackElement)
PaintSession& session, const Ride& ride, Direction direction, uint16_t height, const TrackElement& trackElement)
{
track_paint_util_draw_station_impl(session, ride, direction, height, height, trackElement, 5, 7);
}
void track_paint_util_draw_station_2(
paint_session& session, const Ride& ride, Direction direction, uint16_t height, const TrackElement& trackElement,
PaintSession& session, const Ride& ride, Direction direction, uint16_t height, const TrackElement& trackElement,
int32_t fenceOffsetA, int32_t fenceOffsetB)
{
track_paint_util_draw_station_impl(session, ride, direction, height, height, trackElement, fenceOffsetA, fenceOffsetB);
}
void track_paint_util_draw_station_3(
paint_session& session, const Ride& ride, Direction direction, uint16_t height, uint16_t coverHeight,
PaintSession& session, const Ride& ride, Direction direction, uint16_t height, uint16_t coverHeight,
const TrackElement& trackElement)
{
track_paint_util_draw_station_impl(session, ride, direction, height, coverHeight, trackElement, 5, 7);
}
static void track_paint_util_draw_station_impl(
paint_session& session, const Ride& ride, Direction direction, uint16_t height, uint16_t coverHeight,
PaintSession& session, const Ride& ride, Direction direction, uint16_t height, uint16_t coverHeight,
const TrackElement& trackElement, int32_t fenceOffsetA, int32_t fenceOffsetB)
{
CoordsXY position = session.MapPosition;
@@ -556,7 +556,7 @@ static void track_paint_util_draw_station_impl(
}
void track_paint_util_draw_station_inverted(
paint_session& session, const Ride& ride, Direction direction, int32_t height, const TrackElement& trackElement,
PaintSession& session, const Ride& ride, Direction direction, int32_t height, const TrackElement& trackElement,
uint8_t stationVariant)
{
CoordsXY position = session.MapPosition;
@@ -759,13 +759,13 @@ void track_paint_util_draw_station_inverted(
}
bool track_paint_util_draw_station_covers(
paint_session& session, enum edge_t edge, bool hasFence, const StationObject* stationObject, uint16_t height)
PaintSession& session, enum edge_t edge, bool hasFence, const StationObject* stationObject, uint16_t height)
{
return track_paint_util_draw_station_covers_2(session, edge, hasFence, stationObject, height, STATION_VARIANT_BASIC);
}
bool track_paint_util_draw_station_covers_2(
paint_session& session, enum edge_t edge, bool hasFence, const StationObject* stationObject, uint16_t height,
PaintSession& session, enum edge_t edge, bool hasFence, const StationObject* stationObject, uint16_t height,
uint8_t stationVariant)
{
if (stationObject == nullptr)
@@ -831,7 +831,7 @@ bool track_paint_util_draw_station_covers_2(
}
void track_paint_util_draw_narrow_station_platform(
paint_session& session, const Ride& ride, Direction direction, int32_t height, int32_t zOffset,
PaintSession& session, const Ride& ride, Direction direction, int32_t height, int32_t zOffset,
const TrackElement& trackElement)
{
CoordsXY position = session.MapPosition;
@@ -880,7 +880,7 @@ void track_paint_util_draw_narrow_station_platform(
}
void track_paint_util_draw_pier(
paint_session& session, const Ride& ride, const StationObject* stationObj, const CoordsXY& position, Direction direction,
PaintSession& session, const Ride& ride, const StationObject* stationObj, const CoordsXY& position, Direction direction,
int32_t height, const TrackElement& trackElement, uint8_t rotation)
{
if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS)
@@ -929,13 +929,13 @@ void track_paint_util_draw_pier(
}
}
void track_paint_util_draw_station_metal_supports(paint_session& session, Direction direction, uint16_t height, ImageId colour)
void track_paint_util_draw_station_metal_supports(PaintSession& session, Direction direction, uint16_t height, ImageId colour)
{
track_paint_util_draw_station_metal_supports_2(session, direction, height, colour, 3);
}
void track_paint_util_draw_station_metal_supports_2(
paint_session& session, Direction direction, uint16_t height, ImageId colour, uint8_t type)
PaintSession& session, Direction direction, uint16_t height, ImageId colour, uint8_t type)
{
if (direction & 1)
{
@@ -1003,7 +1003,7 @@ static constexpr const int8_t right_helix_up_small_quarter_tiles_sprite_map[] =
};
void track_paint_util_right_helix_up_small_quarter_tiles_paint(
paint_session& session, const int8_t thickness[2], int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, const int8_t thickness[2], int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][3][2], const CoordsXY offsets[4][3][2],
const CoordsXY boundsLengths[4][3][2], const CoordsXYZ boundsOffsets[4][3][2])
{
@@ -1103,7 +1103,7 @@ static constexpr const int8_t right_helix_up_large_quarter_sprite_map[] = {
0, -1, 1, 2, -1, 3, 4,
};
void track_paint_util_right_helix_up_large_quarter_tiles_paint(
paint_session& session, const int8_t thickness[2], int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, const int8_t thickness[2], int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][5][2], const CoordsXY offsets[4][5][2],
const CoordsXY boundsLengths[4][5][2], const CoordsXYZ boundsOffsets[4][5][2])
{
@@ -1280,7 +1280,7 @@ static constexpr const int8_t eighth_to_diag_sprite_map[] = {
0, 1, 2, -1, 3,
};
void track_paint_util_eighth_to_diag_tiles_paint(
paint_session& session, const int8_t thickness[4][4], int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, const int8_t thickness[4][4], int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][4], const CoordsXY offsets[4][4], const CoordsXY boundsLengths[4][4],
const CoordsXYZ boundsOffsets[4][4])
{
@@ -1322,7 +1322,7 @@ static constexpr const int8_t diag_sprite_map[4][4] = {
};
void track_paint_util_diag_tiles_paint(
paint_session& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4], const CoordsXY offsets[4], const CoordsXY boundsLengths[4],
const CoordsXYZ boundsOffsets[4])
{
@@ -1444,7 +1444,7 @@ static constexpr const int8_t right_quarter_turn_5_tiles_sprite_map[] = {
};
void track_paint_util_right_quarter_turn_5_tiles_paint(
paint_session& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][5], const CoordsXY offsets[4][5], const CoordsXY boundsLengths[4][5],
const CoordsXYZ boundsOffsets[4][5])
{
@@ -1465,8 +1465,8 @@ void track_paint_util_right_quarter_turn_5_tiles_paint(
}
void track_paint_util_right_quarter_turn_5_tiles_paint_2(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const sprite_bb sprites[][5])
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const SpriteBb sprites[][5])
{
int8_t sprite = right_quarter_turn_5_tiles_sprite_map[trackSequence];
if (sprite < 0)
@@ -1474,7 +1474,7 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_2(
return;
}
const sprite_bb* spriteBB = &sprites[direction][sprite];
const SpriteBb* spriteBB = &sprites[direction][sprite];
const auto imageId = colourFlags.WithIndex(spriteBB->sprite_id);
const auto& offset = spriteBB->offset;
const auto& bbOffset = spriteBB->bb_offset;
@@ -1484,8 +1484,8 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_2(
}
void track_paint_util_right_quarter_turn_5_tiles_paint_3(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const sprite_bb sprites[][5])
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const SpriteBb sprites[][5])
{
int8_t sprite = right_quarter_turn_5_tiles_sprite_map[trackSequence];
if (sprite < 0)
@@ -1493,14 +1493,14 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_3(
return;
}
const sprite_bb* spriteBB = &sprites[direction][sprite];
const SpriteBb* spriteBB = &sprites[direction][sprite];
const auto imageId = colourFlags.WithIndex(spriteBB->sprite_id);
const auto& offset = spriteBB->offset;
PaintAddImageAsParent(session, imageId, { offset.x, offset.y, height + offset.z }, spriteBB->bb_size);
}
void track_paint_util_right_quarter_turn_5_tiles_tunnel(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType)
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType)
{
if (direction == 0 && trackSequence == 0)
{
@@ -1521,7 +1521,7 @@ void track_paint_util_right_quarter_turn_5_tiles_tunnel(
}
void track_paint_util_right_quarter_turn_5_tiles_wooden_supports(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence)
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence)
{
if (trackSequence != 1 && trackSequence != 4)
{
@@ -1620,7 +1620,7 @@ static constexpr const int8_t right_quarter_turn_3_tiles_sprite_map[] = {
};
void track_paint_util_right_quarter_turn_3_tiles_paint(
paint_session& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][3], const CoordsXY offsets[4][3], const CoordsXY boundsLengths[4][3],
const CoordsXYZ boundsOffsets[4][3])
{
@@ -1641,7 +1641,7 @@ void track_paint_util_right_quarter_turn_3_tiles_paint(
}
void track_paint_util_right_quarter_turn_3_tiles_paint_2(
paint_session& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][3])
{
track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(
@@ -1649,7 +1649,7 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_2(
}
void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(
paint_session& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][3], int32_t heightOffset)
{
int8_t sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence];
@@ -1737,15 +1737,15 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(
}
void track_paint_util_right_quarter_turn_3_tiles_paint_3(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const sprite_bb sprites[4][3])
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const SpriteBb sprites[4][3])
{
int8_t sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence];
if (sprite < 0)
{
return;
}
const sprite_bb* spriteBB = &sprites[direction][sprite];
const SpriteBb* spriteBB = &sprites[direction][sprite];
const auto& offset = spriteBB->offset;
const auto& bbOffset = spriteBB->bb_offset;
PaintAddImageAsParent(
@@ -1754,8 +1754,8 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_3(
}
void track_paint_util_right_quarter_turn_3_tiles_paint_4(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const sprite_bb sprites[4][3])
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId& colourFlags,
const SpriteBb sprites[4][3])
{
int8_t sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence];
if (sprite < 0)
@@ -1763,14 +1763,14 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_4(
return;
}
const sprite_bb* spriteBB = &sprites[direction][sprite];
const SpriteBb* spriteBB = &sprites[direction][sprite];
const auto imageId = colourFlags.WithIndex(spriteBB->sprite_id);
const auto& offset = spriteBB->offset;
PaintAddImageAsParent(session, imageId, { offset.x, offset.y, height + offset.z }, spriteBB->bb_size);
}
void track_paint_util_right_quarter_turn_3_tiles_tunnel(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType)
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType)
{
if (direction == 0 && trackSequence == 0)
{
@@ -1794,8 +1794,7 @@ void track_paint_util_right_quarter_turn_3_tiles_tunnel(
}
void track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType0,
uint8_t tunnelType3)
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType0, uint8_t tunnelType3)
{
if (direction == 0 && trackSequence == 0)
{
@@ -1816,8 +1815,7 @@ void track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(
}
void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(
paint_session& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType0,
uint8_t tunnelType3)
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, uint8_t tunnelType0, uint8_t tunnelType3)
{
if (direction == 0 && trackSequence == 0)
{
@@ -1845,7 +1843,7 @@ static constexpr const int8_t left_quarter_turn_3_tiles_sprite_map[] = {
};
void track_paint_util_left_quarter_turn_3_tiles_paint(
paint_session& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][3])
{
track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(
@@ -1853,7 +1851,7 @@ void track_paint_util_left_quarter_turn_3_tiles_paint(
}
void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(
paint_session& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
PaintSession& session, int8_t thickness, int16_t height, Direction direction, uint8_t trackSequence,
const ImageId& colourFlags, const uint32_t sprites[4][3], int32_t heightOffset)
{
int8_t sprite = left_quarter_turn_3_tiles_sprite_map[trackSequence];
@@ -1941,7 +1939,7 @@ void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(
}
void track_paint_util_left_quarter_turn_3_tiles_tunnel(
paint_session& session, int16_t height, uint8_t tunnelType, Direction direction, uint8_t trackSequence)
PaintSession& session, int16_t height, uint8_t tunnelType, Direction direction, uint8_t trackSequence)
{
if (direction == 0 && trackSequence == 0)
{
@@ -1965,7 +1963,7 @@ void track_paint_util_left_quarter_turn_3_tiles_tunnel(
}
void track_paint_util_left_quarter_turn_1_tile_paint(
paint_session& session, int8_t thickness, int16_t height, int16_t boundBoxZOffset, Direction direction,
PaintSession& session, int8_t thickness, int16_t height, int16_t boundBoxZOffset, Direction direction,
const ImageId& colourFlags, const uint32_t* sprites)
{
auto imageId = colourFlags.WithIndex(sprites[direction]);
@@ -1992,7 +1990,7 @@ void track_paint_util_left_quarter_turn_1_tile_paint(
}
void track_paint_util_right_quarter_turn_1_tile_tunnel(
paint_session& session, Direction direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
PaintSession& session, Direction direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
uint8_t endTunnel)
{
track_paint_util_left_quarter_turn_1_tile_tunnel(
@@ -2000,7 +1998,7 @@ void track_paint_util_right_quarter_turn_1_tile_tunnel(
}
void track_paint_util_left_quarter_turn_1_tile_tunnel(
paint_session& session, Direction direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
PaintSession& session, Direction direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
uint8_t endTunnel)
{
switch (direction)
@@ -2018,7 +2016,7 @@ void track_paint_util_left_quarter_turn_1_tile_tunnel(
}
}
void track_paint_util_spinning_tunnel_paint(paint_session& session, int8_t thickness, int16_t height, Direction direction)
void track_paint_util_spinning_tunnel_paint(PaintSession& session, int8_t thickness, int16_t height, Direction direction)
{
int32_t frame = gCurrentTicks >> 2 & 3;
auto colourFlags = session.TrackColours[SCHEME_SUPPORTS];
@@ -2051,7 +2049,7 @@ void track_paint_util_spinning_tunnel_paint(paint_session& session, int8_t thick
}
void track_paint_util_onride_photo_small_paint(
paint_session& session, Direction direction, int32_t height, const TrackElement& trackElement)
PaintSession& session, Direction direction, int32_t height, const TrackElement& trackElement)
{
static constexpr const uint32_t imageIds[4][3] = {
{ SPR_ON_RIDE_PHOTO_SIGN_SMALL_SW_NE, SPR_ON_RIDE_PHOTO_CAMERA_SMALL_S, SPR_ON_RIDE_PHOTO_CAMERA_FLASH_SMALL_S },
@@ -2089,7 +2087,7 @@ void track_paint_util_onride_photo_small_paint(
}
void track_paint_util_onride_photo_paint(
paint_session& session, Direction direction, int32_t height, const TrackElement& trackElement)
PaintSession& session, Direction direction, int32_t height, const TrackElement& trackElement)
{
static constexpr const uint32_t imageIds[4][3] = {
{ SPR_ON_RIDE_PHOTO_SIGN_SW_NE, SPR_ON_RIDE_PHOTO_CAMERA_S, SPR_ON_RIDE_PHOTO_CAMERA_FLASH_S },
@@ -2139,7 +2137,7 @@ static constexpr const uint16_t RightVerticalLoopSegments[] = {
SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0,
};
void track_paint_util_right_vertical_loop_segments(paint_session& session, Direction direction, uint8_t trackSequence)
void track_paint_util_right_vertical_loop_segments(PaintSession& session, Direction direction, uint8_t trackSequence)
{
if (trackSequence > 9)
{
@@ -2151,7 +2149,7 @@ void track_paint_util_right_vertical_loop_segments(paint_session& session, Direc
session, PaintUtilRotateSegments(RightVerticalLoopSegments[trackSequence], direction), 0xFFFF, 0);
}
void track_paint_util_left_corkscrew_up_supports(paint_session& session, Direction direction, uint16_t height)
void track_paint_util_left_corkscrew_up_supports(PaintSession& session, Direction direction, uint16_t height)
{
// TODO: Figure out which of these looks best, and use one to keep a consistent world
if (direction == 2)
@@ -2173,7 +2171,7 @@ void track_paint_util_left_corkscrew_up_supports(paint_session& session, Directi
*
* rct2: 0x006C4794
*/
void PaintTrack(paint_session& session, Direction direction, int32_t height, const TrackElement& trackElement)
void PaintTrack(PaintSession& session, Direction direction, int32_t height, const TrackElement& trackElement)
{
RideId rideIndex = trackElement.GetRideIndex();
auto ride = get_ride(rideIndex);