From 9a7ff47690ca163c588aa2dcd1f69bc1539489cd Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 5 Dec 2021 16:22:02 +0000 Subject: [PATCH] Refactor paint enterprise to use ImageId --- src/openrct2/ride/thrill/Enterprise.cpp | 120 ++++++++++++------------ 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 2e3c8d5a9e..9da6f8c7e7 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -18,29 +18,51 @@ #include "../TrackPaint.h" #include "../Vehicle.h" -/** rct2: 0x008A2ABC */ -static void paint_enterprise_structure( - paint_session* session, const Ride* ride, int8_t xOffset, int8_t yOffset, uint16_t height, const TrackElement& trackElement) +static void PaintEnterpriseRiders( + paint_session* session, const rct_ride_entry& rideEntry, Vehicle& vehicle, uint32_t imageOffset, const CoordsXYZ& offset, + const CoordsXYZ& bbLength, const CoordsXYZ& bbOffset) { - height += 7; - - const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); - rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); - Vehicle* vehicle = nullptr; - - if (rideEntry == nullptr) - { + if (session->DPI.zoom_level > ZoomLevel{ 0 }) + return; + if (imageOffset >= 12) return; - } - uint32_t baseImageId = rideEntry->vehicles[0].base_image_id; - - if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL) + auto baseImageIndex = rideEntry.vehicles[0].base_image_id; + for (int32_t i = 0; i < 15; i++) { - session->InteractionType = ViewportInteractionItem::Entity; - vehicle = GetEntity(ride->vehicles[0]); - session->CurrentlyDrawnItem = vehicle; + if (vehicle.num_peeps <= i) + break; + + auto frameOffset1 = ((imageOffset % 4) * 4 + (i * 4) % 15) & 0x0F; + auto frameOffset2 = floor2(imageOffset, 4) * 4; + auto imageTemplate = ImageId(0, vehicle.peep_tshirt_colours[i]); + auto imageId = imageTemplate.WithIndex(baseImageIndex + 196 + frameOffset1 + frameOffset2); + PaintAddImageAsChild(session, imageId, offset, bbLength, bbOffset); } +} + +static void PaintEnterpriseStructure( + paint_session* session, const Ride& ride, int8_t xOffset, int8_t yOffset, uint16_t height, const TrackElement& trackElement) +{ + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const auto* rideEntry = get_ride_entry(ride.subtype); + if (rideEntry == nullptr) + return; + + Vehicle* vehicle = nullptr; + if (ride.lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) + { + vehicle = GetEntity(ride.vehicles[0]); + if (vehicle != nullptr) + { + session->InteractionType = ViewportInteractionItem::Entity; + session->CurrentlyDrawnItem = vehicle; + } + } + + CoordsXYZ offset(xOffset, yOffset, height + 7); + CoordsXYZ bbLength(24, 24, 48); + CoordsXYZ bbOffset(0, 0, height + 7); uint32_t imageOffset = trackElement.GetDirectionWithOffset(session->CurrentRotation); if (vehicle != nullptr) @@ -48,40 +70,25 @@ static void paint_enterprise_structure( imageOffset = (vehicle->Pitch << 2) + (((vehicle->sprite_direction >> 3) + session->CurrentRotation) % 4); } - uint32_t imageColourFlags = session->TrackColours[SCHEME_MISC]; - if (imageColourFlags == IMAGE_TYPE_REMAP) + auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim); + auto imageFlags = session->TrackColours[SCHEME_MISC]; + if (imageFlags != IMAGE_TYPE_REMAP) { - imageColourFlags = SPRITE_ID_PALETTE_COLOUR_2(ride->vehicle_colours[0].Body, ride->vehicle_colours[0].Trim); + imageTemplate = ImageId::FromUInt32(imageFlags); } + auto imageId = imageTemplate.WithIndex(rideEntry->vehicles[0].base_image_id + imageOffset); + PaintAddImageAsParent(session, imageId, offset, bbLength, bbOffset); - uint32_t imageId = (baseImageId + imageOffset) | imageColourFlags; - PaintAddImageAsParent(session, imageId, { xOffset, yOffset, height }, { 24, 24, 48 }, { 0, 0, height }); - - rct_drawpixelinfo* dpi = &session->DPI; - - if (dpi->zoom_level <= ZoomLevel{ 0 } && imageOffset < 12 && ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK - && vehicle != nullptr) + if (vehicle != nullptr) { - for (int32_t i = 0; i < 15; i++) - { - if (vehicle->num_peeps <= i) - { - break; - } - - uint32_t peepFrameOffset = ((imageOffset % 4) * 4 + (i * 4) % 15) & 0x0F; - uint32_t ax = (imageOffset & 0xFFFFFFFC) << 2; - imageId = (baseImageId + 196 + peepFrameOffset + ax) | SPRITE_ID_PALETTE_COLOUR_1(vehicle->peep_tshirt_colours[i]); - PaintAddImageAsChild(session, imageId, xOffset, yOffset, 24, 24, 48, height, 0, 0, height); - } + PaintEnterpriseRiders(session, *rideEntry, *vehicle, imageOffset, offset, bbLength, bbOffset); } session->CurrentlyDrawnItem = savedTileElement; session->InteractionType = ViewportInteractionItem::Ride; } -/** rct2: 0x008A1584 */ -static void paint_enterprise( +static void PaintEnterprise( paint_session* session, const Ride* ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { @@ -104,42 +111,42 @@ static void paint_enterprise( switch (trackSequence) { case 5: - paint_enterprise_structure(session, ride, 16, 16, height, trackElement); + PaintEnterpriseStructure(session, *ride, 16, 16, height, trackElement); break; case 6: - paint_enterprise_structure(session, ride, 16, -16, height, trackElement); + PaintEnterpriseStructure(session, *ride, 16, -16, height, trackElement); break; case 10: - paint_enterprise_structure(session, ride, -16, -16, height, trackElement); + PaintEnterpriseStructure(session, *ride, -16, -16, height, trackElement); break; case 9: - paint_enterprise_structure(session, ride, -16, 16, height, trackElement); + PaintEnterpriseStructure(session, *ride, -16, 16, height, trackElement); break; case 0: - paint_enterprise_structure(session, ride, 48, 48, height, trackElement); + PaintEnterpriseStructure(session, *ride, 48, 48, height, trackElement); break; case 3: - paint_enterprise_structure(session, ride, 48, -48, height, trackElement); + PaintEnterpriseStructure(session, *ride, 48, -48, height, trackElement); break; case 15: - paint_enterprise_structure(session, ride, -48, -48, height, trackElement); + PaintEnterpriseStructure(session, *ride, -48, -48, height, trackElement); break; case 12: - paint_enterprise_structure(session, ride, -48, 48, height, trackElement); + PaintEnterpriseStructure(session, *ride, -48, 48, height, trackElement); break; case 7: - paint_enterprise_structure(session, ride, 16, -48, height, trackElement); + PaintEnterpriseStructure(session, *ride, 16, -48, height, trackElement); break; case 11: - paint_enterprise_structure(session, ride, -16, -48, height, trackElement); + PaintEnterpriseStructure(session, *ride, -16, -48, height, trackElement); break; case 14: - paint_enterprise_structure(session, ride, -48, -16, height, trackElement); + PaintEnterpriseStructure(session, *ride, -48, -16, height, trackElement); break; case 13: - paint_enterprise_structure(session, ride, -48, 16, height, trackElement); + PaintEnterpriseStructure(session, *ride, -48, 16, height, trackElement); break; } @@ -164,9 +171,6 @@ static void paint_enterprise( paint_util_set_general_support_height(session, height + 160, 0x20); } -/** - * rct2: 0x008A13B4 - */ TRACK_PAINT_FUNCTION get_track_paint_function_enterprise(int32_t trackType) { if (trackType != TrackElemType::FlatTrack4x4) @@ -174,5 +178,5 @@ TRACK_PAINT_FUNCTION get_track_paint_function_enterprise(int32_t trackType) return nullptr; } - return paint_enterprise; + return PaintEnterprise; }