mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Code Issues Releases Wiki Activity

Consistently render various height marks when zoomed in (#12853)

Browse Source
This commit is contained in:
Nils Caspar
2020-09-06 00:56:41 -07:00
committed by GitHub
parent a377c127ca
commit 4e6935f689
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/paint/tile_element/Paint.Entrance.cpp
View File

@@ -340,9 +340,7 @@ void entrance_paint(paint_session* session, uint8_t direction, int32_t height, c
{
session->InteractionType = VIEWPORT_INTERACTION_ITEM_LABEL;
rct_drawpixelinfo* dpi = &session->DPI;
if (session->ViewFlags & VIEWPORT_FLAG_PATH_HEIGHTS && dpi->zoom_level <= 0)
if (PaintShouldShowHeightMarkers(session, VIEWPORT_FLAG_PATH_HEIGHTS))
{
if (entrance_get_directions(tile_element) & 0xF)
{

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

@@ -930,7 +930,7 @@ void path_paint(paint_session* session, uint16_t height, const TileElement* tile
}
}
if (session->ViewFlags & VIEWPORT_FLAG_PATH_HEIGHTS)
if (PaintShouldShowHeightMarkers(session, VIEWPORT_FLAG_PATH_HEIGHTS))
{
uint16_t heightMarkerBaseZ = tile_element->GetBaseZ() + 3;
if (tile_element->AsPath()->IsSloped())

2
src/openrct2/paint/tile_element/Paint.Surface.cpp
View File

@@ -1015,7 +1015,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
descriptor.corner_heights.left = baseHeight + ch.left;
}
if ((session->ViewFlags & VIEWPORT_FLAG_LAND_HEIGHTS) && (zoomLevel == 0))
if (PaintShouldShowHeightMarkers(session, VIEWPORT_FLAG_LAND_HEIGHTS))
{
const int16_t x = session->MapPosition.x;
const int16_t y = session->MapPosition.y;

6
src/openrct2/paint/tile_element/Paint.TileElement.cpp
View File

@@ -453,3 +453,9 @@ uint16_t paint_util_rotate_segments(uint16_t segments, uint8_t rotation)
return (segments & 0xFF00) | temp;
}
bool PaintShouldShowHeightMarkers(const paint_session* session, const uint32_t viewportFlag)
{
auto dpi = &session->DPI;
return (session->ViewFlags & viewportFlag) && (dpi->zoom_level <= 0);
}

2
src/openrct2/paint/tile_element/Paint.TileElement.h
View File

@@ -111,4 +111,6 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement);
void track_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement);
bool PaintShouldShowHeightMarkers(const paint_session* session, const uint32_t viewportFlag);
#endif

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

@@ -2143,8 +2143,6 @@ void track_paint(paint_session* session, uint8_t direction, int32_t height, cons
return;
}
rct_drawpixelinfo* dpi = &session->DPI;
if ((!gTrackDesignSaveMode || rideIndex == gTrackDesignSaveRideIndex)
&& !(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
{
@@ -2152,7 +2150,7 @@ void track_paint(paint_session* session, uint8_t direction, int32_t height, cons
int32_t trackSequence = tileElement->AsTrack()->GetSequenceIndex();
int32_t trackColourScheme = tileElement->AsTrack()->GetColourScheme();
if ((session->ViewFlags & VIEWPORT_FLAG_TRACK_HEIGHTS) && dpi->zoom_level <= 0)
if (PaintShouldShowHeightMarkers(session, VIEWPORT_FLAG_TRACK_HEIGHTS))
{
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
if (TrackHeightMarkerPositions[trackType] & (1 << trackSequence))