mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Use wooden support table in APVC

Browse Source
This commit is contained in:
Gymnasiast
2024-09-12 21:49:06 +02:00
parent 30244594ac
commit 599ae4006d
3 changed files with 17 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2/paint/track/coaster/AirPoweredVerticalCoaster.cpp
View File

@@ -261,7 +261,8 @@ static void AirPoweredVerticalRCTrackRightQuarterTurn5(
};
TrackPaintUtilRightQuarterTurn5TilesPaint3(session, height, direction, trackSequence, session.TrackColours, imageIds);
TrackPaintUtilRightQuarterTurn5TilesWoodenSupports(session, height, direction, trackSequence);
DrawSupportForSequenceA<TrackElemType::RightQuarterTurn5Tiles>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours);
TrackPaintUtilRightQuarterTurn5TilesTunnel(session, kTunnelGroup, TunnelSubType::Flat, height, direction, trackSequence);
switch (trackSequence)
@@ -456,7 +457,8 @@ static void AirPoweredVerticalRCTrackBankedRightQuarterTurn5(
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { 27, 0, height }, { 1, 32, 26 } });
}
TrackPaintUtilRightQuarterTurn5TilesWoodenSupports(session, height, direction, trackSequence);
DrawSupportForSequenceA<TrackElemType::BankedRightQuarterTurn5Tiles>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours);
TrackPaintUtilRightQuarterTurn5TilesTunnel(session, kTunnelGroup, TunnelSubType::Flat, height, direction, trackSequence);
switch (trackSequence)
@@ -699,12 +701,10 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
PaintAddImageAsChildRotated(
session, direction, trackImageId, { 0, 0, height }, { { 0, 6, height }, { 20, 32, bbHeight } });
WoodenASupportsPaintSetup(session, supportType.wooden, WoodenSupportSubType::NeSw, height, session.SupportColours);
DrawSupportForSequenceA<TrackElemType::ReverseFreefallSlope>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours);
PaintUtilPushTunnelRotated(session, direction, height, kTunnelGroup, TunnelSubType::Flat);
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence]);
break;
case 1:
case 2:
@@ -727,16 +727,13 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
session, direction, trackImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
}
WoodenASupportsPaintSetupRotated(
session, supportType.wooden, WoodenSupportSubType::NeSw, direction, height, session.SupportColours);
DrawSupportForSequenceA<TrackElemType::ReverseFreefallSlope>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours);
if (trackSequence == 0)
{
PaintUtilPushTunnelRotated(session, direction, height, kTunnelGroup, TunnelSubType::Flat);
}
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence]);
break;
case 4:
if (isDirection03)
@@ -756,14 +753,12 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
session, direction, supportsImageId, { 0, 0, height }, { { 0, 6, height }, { 32, 20, bbHeight } });
}
WoodenASupportsPaintSetupRotated(
session, supportType.wooden, WoodenSupportSubType::NeSw, direction, height, session.SupportColours);
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence]);
DrawSupportForSequenceA<TrackElemType::ReverseFreefallSlope>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours);
break;
case 5:
if (WoodenASupportsPaintSetupRotated(
session, supportType.wooden, WoodenSupportSubType::NeSw, direction, height, session.SupportColours))
if (DrawSupportForSequenceA<TrackElemType::ReverseFreefallSlope>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours))
{
ImageId floorImageId;
if (direction & 1)
@@ -783,8 +778,6 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
PaintAddImageAsParentRotated(
session, direction, supportsImageId, { 0, 0, height }, { { 3, 3, height }, { 26, 26, 126 } });
}
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence]);
break;
case 6:
if (isDirection03)
@@ -801,15 +794,16 @@ static void AirPoweredVerticalRCTrackVerticalSlopeUp(
PaintAddImageAsChildRotated(
session, direction, supportsImageId, { 0, 0, height }, { { 27, 6, height }, { 1, 20, 126 } });
}
WoodenASupportsPaintSetupRotated(
session, supportType.wooden, WoodenSupportSubType::NeSw, direction, height, session.SupportColours);
DrawSupportForSequenceA<TrackElemType::ReverseFreefallSlope>(
session, supportType.wooden, trackSequence, direction, height, session.SupportColours);
PaintUtilSetVerticalTunnel(session, height + 240);
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence]);
break;
}
PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0);
PaintUtilSetGeneralSupportHeight(session, height + supportHeights[trackSequence]);
}
static void AirPoweredVerticalRCTrackVerticalUp(

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

@@ -1367,27 +1367,6 @@ void TrackPaintUtilRightQuarterTurn5TilesPaint3(
PaintAddImageAsParent(session, imageId, { offset.x, offset.y, height + offset.z }, spriteBB->bb_size);
}
void TrackPaintUtilRightQuarterTurn5TilesWoodenSupports(
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence)
{
static constexpr WoodenSupportSubType supportTypes[kNumOrthogonalDirections][7] = {
{ WoodenSupportSubType::NeSw, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0,
WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::NwSe },
{ WoodenSupportSubType::NwSe, WoodenSupportSubType::Null, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1,
WoodenSupportSubType::Null, WoodenSupportSubType::Corner3, WoodenSupportSubType::NeSw },
{ WoodenSupportSubType::NeSw, WoodenSupportSubType::Null, WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner2,
WoodenSupportSubType::Null, WoodenSupportSubType::Corner0, WoodenSupportSubType::NwSe },
{ WoodenSupportSubType::NwSe, WoodenSupportSubType::Null, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3,
WoodenSupportSubType::Null, WoodenSupportSubType::Corner1, WoodenSupportSubType::NeSw },
};
const auto supportType = supportTypes[direction][trackSequence];
if (supportType != WoodenSupportSubType::Null)
{
WoodenASupportsPaintSetup(session, WoodenSupportType::Truss, supportType, height, session.SupportColours);
}
}
const uint8_t kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[] = {
3,
1,

2
src/openrct2/ride/TrackPaint.h
View File

@@ -455,8 +455,6 @@ void TrackPaintUtilRightQuarterTurn5TilesPaint3(
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence, const ImageId colourFlags,
const SpriteBb sprites[][5]);
void TrackPaintUtilRightQuarterTurn5TilesWoodenSupports(
PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence);
void TrackPaintUtilRightQuarterTurn3TilesPaint(
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],