mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8367 from ZehMatt/paint-refactor2 

Paint refactor
This commit is contained in:
Michał Janiszewski 2018-12-05 23:46:21 +01:00 committed by GitHub
parent cec86469f0 468d94a6ca
commit eca13b99ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 91 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -2333,12 +2333,9 @@ static void sub_6CBCE2(
{
Ride* ride;
const rct_preview_track* trackBlock;
int32_t preserve_current_viewport_flags;
int32_t offsetX, offsetY;
paint_session* session = paint_session_alloc(dpi);
preserve_current_viewport_flags = gCurrentViewportFlags;
gCurrentViewportFlags = 0;
paint_session* session = paint_session_alloc(dpi, 0);
trackDirection &= 3;
ride = get_ride(rideIndex);
@ -2450,10 +2447,8 @@ static void sub_6CBCE2(
gMapSizeMaxXY = preserveMapSizeMaxXY;
paint_session_arrange(session);
paint_draw_structs(session, gCurrentViewportFlags);
paint_draw_structs(session);
paint_session_free(session);
gCurrentViewportFlags = preserve_current_viewport_flags;
}
/**

9
src/openrct2/drawing/Rain.cpp
View File

@ -42,10 +42,15 @@ void DrawRain(rct_drawpixelinfo* dpi, IRainDrawer* rainDrawer)
{
if (gConfigGeneral.render_weather_effects)
{
uint32_t viewFlags = 0;
rct_viewport* viewport = window_get_viewport(window_get_main());
if (viewport != nullptr)
viewFlags = viewport->flags;
// Get rain draw function and draw rain
uint32_t rainType = gClimateCurrent.RainLevel;
if (rainType != RAIN_LEVEL_NONE && !gTrackDesignSaveMode
&& !(gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
if (rainType != RAIN_LEVEL_NONE && !gTrackDesignSaveMode && !(viewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
{
auto drawFunc = DrawRainFunctions[rainType];
auto uiContext = GetContext()->GetUiContext();

9
src/openrct2/interface/Viewport.cpp
View File

@ -50,7 +50,6 @@ uint8_t gSavedViewRotation;
paint_entry* gNextFreePaintStruct;
uint8_t gCurrentRotation;
uint32_t gCurrentViewportFlags = 0;
static uint32_t _currentImageType;
@ -906,8 +905,6 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int16_t left
static void viewport_paint_column(rct_drawpixelinfo* dpi, uint32_t viewFlags)
{
gCurrentViewportFlags = viewFlags;
if (viewFlags
& (VIEWPORT_FLAG_HIDE_VERTICAL | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_CLIP_VIEW))
{
@ -919,10 +916,10 @@ static void viewport_paint_column(rct_drawpixelinfo* dpi, uint32_t viewFlags)
gfx_clear(dpi, colour);
}
paint_session* session = paint_session_alloc(dpi);
paint_session* session = paint_session_alloc(dpi, viewFlags);
paint_session_generate(session);
paint_session_arrange(session);
paint_draw_structs(session, viewFlags);
paint_draw_structs(session);
paint_session_free(session);
if (gConfigGeneral.render_weather_gloom && !gTrackDesignSaveMode && !(viewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES)
@ -1644,7 +1641,7 @@ void get_map_coordinates_from_pos_window(
dpi->x = _viewportDpi1.x;
dpi->width = 1;
paint_session* session = paint_session_alloc(dpi);
paint_session* session = paint_session_alloc(dpi, myviewport->flags);
paint_session_generate(session);
paint_session_arrange(session);
sub_68862C(session);

1
src/openrct2/interface/Viewport.h
View File

@ -115,7 +115,6 @@ extern uint8_t gSavedViewRotation;
extern paint_entry* gNextFreePaintStruct;
extern uint8_t gCurrentRotation;
extern uint32_t gCurrentViewportFlags;
void viewport_init_all();
void centre_2d_coordinates(int32_t x, int32_t y, int32_t z, int32_t* out_x, int32_t* out_y, rct_viewport* viewport);

43
src/openrct2/paint/Paint.cpp
View File

@ -47,20 +47,21 @@ bool gShowDirtyVisuals;
bool gPaintBoundingBoxes;
bool gPaintBlockedTiles;
static void paint_session_init(paint_session* session, rct_drawpixelinfo* dpi);
static void paint_session_init(paint_session* session, rct_drawpixelinfo* dpi, uint32_t viewFlags);
static void paint_attached_ps(rct_drawpixelinfo* dpi, paint_struct* ps, uint32_t viewFlags);
static void paint_ps_image_with_bounding_boxes(
rct_drawpixelinfo* dpi, paint_struct* ps, uint32_t imageId, int16_t x, int16_t y);
static void paint_ps_image(rct_drawpixelinfo* dpi, paint_struct* ps, uint32_t imageId, int16_t x, int16_t y);
static uint32_t paint_ps_colourify_image(uint32_t imageId, uint8_t spriteType, uint32_t viewFlags);
static void paint_session_init(paint_session* session, rct_drawpixelinfo* dpi)
static void paint_session_init(paint_session* session, rct_drawpixelinfo* dpi, uint32_t viewFlags)
{
session->DPI = dpi;
session->EndOfPaintStructArray = &session->PaintStructs[4000 - 1];
session->NextFreePaintStruct = session->PaintStructs;
session->UnkF1AD28 = nullptr;
session->LastRootPS = nullptr;
session->UnkF1AD2C = nullptr;
session->ViewFlags = viewFlags;
for (auto& quadrant : session->Quadrants)
{
quadrant = nullptr;
@ -486,7 +487,7 @@ void paint_session_arrange(paint_session* session)
}
}
static void paint_draw_struct(paint_session* session, paint_struct* ps, uint32_t viewFlags)
static void paint_draw_struct(paint_session* session, paint_struct* ps)
{
rct_drawpixelinfo* dpi = session->DPI;
@ -507,7 +508,7 @@ static void paint_draw_struct(paint_session* session, paint_struct* ps, uint32_t
}
}
uint32_t imageId = paint_ps_colourify_image(ps->image_id, ps->sprite_type, viewFlags);
uint32_t imageId = paint_ps_colourify_image(ps->image_id, ps->sprite_type, session->ViewFlags);
if (gPaintBoundingBoxes && dpi->zoom_level == 0)
{
paint_ps_image_with_bounding_boxes(dpi, ps, imageId, x, y);
@ -519,11 +520,11 @@ static void paint_draw_struct(paint_session* session, paint_struct* ps, uint32_t
if (ps->children != nullptr)
{
paint_draw_struct(session, ps->children, viewFlags);
paint_draw_struct(session, ps->children);
}
else
{
paint_attached_ps(dpi, ps, viewFlags);
paint_attached_ps(dpi, ps, session->ViewFlags);
}
}
@ -531,13 +532,13 @@ static void paint_draw_struct(paint_session* session, paint_struct* ps, uint32_t
*
* rct2: 0x00688485
*/
void paint_draw_structs(paint_session* session, uint32_t viewFlags)
void paint_draw_structs(paint_session* session)
{
paint_struct* ps = &session->PaintHead;
for (ps = ps->next_quadrant_ps; ps;)
{
paint_draw_struct(session, ps, viewFlags);
paint_draw_struct(session, ps);
ps = ps->next_quadrant_ps;
}
@ -729,14 +730,14 @@ static void draw_pixel_info_crop_by_zoom(rct_drawpixelinfo* dpi)
dpi->height >>= zoom;
}
paint_session* paint_session_alloc(rct_drawpixelinfo* dpi)
paint_session* paint_session_alloc(rct_drawpixelinfo* dpi, uint32_t viewFlags)
{
// Currently limited to just one session at a time
assert(!_paintSessionInUse);
_paintSessionInUse = true;
paint_session* session = &gPaintSession;
paint_session_init(session, dpi);
paint_session_init(session, dpi, viewFlags);
return session;
}
@ -764,7 +765,7 @@ paint_struct* sub_98196C(
assert((uint16_t)bound_box_length_x == (int16_t)bound_box_length_x);
assert((uint16_t)bound_box_length_y == (int16_t)bound_box_length_y);
session->UnkF1AD28 = nullptr;
session->LastRootPS = nullptr;
session->UnkF1AD2C = nullptr;
if (session->NextFreePaintStruct >= session->EndOfPaintStructArray)
@ -866,7 +867,7 @@ paint_struct* sub_98196C(
ps->map_y = session->MapPosition.y;
ps->tileElement = (TileElement*)session->CurrentlyDrawnItem;
session->UnkF1AD28 = ps;
session->LastRootPS = ps;
int32_t positionHash = 0;
switch (session->CurrentRotation)
@ -912,7 +913,7 @@ paint_struct* sub_98197C(
int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x,
int16_t bound_box_offset_y, int16_t bound_box_offset_z)
{
session->UnkF1AD28 = nullptr;
session->LastRootPS = nullptr;
session->UnkF1AD2C = nullptr;
LocationXYZ16 offset = { x_offset, y_offset, z_offset };
@ -925,7 +926,7 @@ paint_struct* sub_98197C(
return nullptr;
}
session->UnkF1AD28 = ps;
session->LastRootPS = ps;
LocationXY16 attach = { (int16_t)ps->bounds.x, (int16_t)ps->bounds.y };
@ -974,7 +975,7 @@ paint_struct* sub_98198C(
assert((uint16_t)bound_box_length_x == bound_box_length_x);
assert((uint16_t)bound_box_length_y == bound_box_length_y);
session->UnkF1AD28 = nullptr;
session->LastRootPS = nullptr;
session->UnkF1AD2C = nullptr;
LocationXYZ16 offset = { x_offset, y_offset, z_offset };
@ -987,7 +988,7 @@ paint_struct* sub_98198C(
return nullptr;
}
session->UnkF1AD28 = ps;
session->LastRootPS = ps;
session->NextFreePaintStruct++;
return ps;
}
@ -1016,7 +1017,7 @@ paint_struct* sub_98199C(
assert((uint16_t)bound_box_length_x == (int16_t)bound_box_length_x);
assert((uint16_t)bound_box_length_y == (int16_t)bound_box_length_y);
if (session->UnkF1AD28 == nullptr)
if (session->LastRootPS == nullptr)
{
return sub_98197C(
session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
@ -1033,10 +1034,10 @@ paint_struct* sub_98199C(
return nullptr;
}
paint_struct* old_ps = session->UnkF1AD28;
paint_struct* old_ps = session->LastRootPS;
old_ps->children = ps;
session->UnkF1AD28 = ps;
session->LastRootPS = ps;
session->NextFreePaintStruct++;
return ps;
}
@ -1099,7 +1100,7 @@ bool paint_attach_to_previous_ps(paint_session* session, uint32_t image_id, uint
ps->y = y;
ps->flags = 0;
paint_struct* masterPs = session->UnkF1AD28;
paint_struct* masterPs = session->LastRootPS;
if (masterPs == nullptr)
{
return false;

10
src/openrct2/paint/Paint.h
View File

@ -143,14 +143,14 @@ struct paint_session
paint_entry PaintStructs[4000];
paint_struct* Quadrants[MAX_PAINT_QUADRANTS];
paint_struct PaintHead;
uint32_t ViewFlags;
uint32_t QuadrantBackIndex;
uint32_t QuadrantFrontIndex;
const void* CurrentlyDrawnItem;
paint_entry* EndOfPaintStructArray;
paint_entry* NextFreePaintStruct;
LocationXY16 SpritePosition;
paint_struct UnkF1A4CC;
paint_struct* UnkF1AD28;
paint_struct* LastRootPS;
attached_paint_struct* UnkF1AD2C;
uint8_t InteractionType;
uint8_t CurrentRotation;
@ -224,12 +224,12 @@ void paint_floating_money_effect(
paint_session* session, money32 amount, rct_string_id string_id, int16_t y, int16_t z, int8_t y_offsets[], int16_t offset_x,
uint32_t rotation);
paint_session* paint_session_alloc(rct_drawpixelinfo* dpi);
void paint_session_free(paint_session*);
paint_session* paint_session_alloc(rct_drawpixelinfo* dpi, uint32_t viewFlags);
void paint_session_free(paint_session* session);
void paint_session_generate(paint_session* session);
void paint_session_arrange(paint_session* session);
paint_struct* paint_arrange_structs_helper(paint_struct* ps_next, uint16_t quadrantIndex, uint8_t flag, uint8_t rotation);
void paint_draw_structs(paint_session* session, uint32_t viewFlags);
void paint_draw_structs(paint_session* session);
void paint_draw_money_structs(rct_drawpixelinfo* dpi, paint_string_struct* ps);
// TESTING

12
src/openrct2/paint/Supports.cpp
View File

@ -344,7 +344,7 @@ bool wooden_a_supports_paint_setup(
*underground = false;
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
{
return false;
}
@ -522,7 +522,7 @@ bool wooden_b_supports_paint_setup(
{
bool _9E32B1 = false;
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
{
if (underground != nullptr)
*underground = false; // AND
@ -702,7 +702,7 @@ bool metal_a_supports_paint_setup(
{
support_height* supportSegments = session->SupportSegments;
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
{
return false;
}
@ -907,7 +907,7 @@ bool metal_b_supports_paint_setup(
support_height* supportSegments = session->SupportSegments;
uint8_t originalSegment = segment;
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
{
return false; // AND
}
@ -1090,7 +1090,7 @@ bool path_a_supports_paint_setup(
*underground = false; // AND
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
{
return false;
}
@ -1234,7 +1234,7 @@ bool path_b_supports_paint_setup(
{
support_height* supportSegments = session->SupportSegments;
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SUPPORTS)
{
return false; // AND
}

2
src/openrct2/paint/sprite/Paint.Peep.cpp
View File

@ -62,7 +62,7 @@ void peep_paint(paint_session* session, const rct_peep* peep, int32_t imageDirec
return;
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS)
{
return;
}

6
src/openrct2/paint/sprite/Paint.Sprite.cpp
View File

@ -29,7 +29,7 @@ void sprite_paint_setup(paint_session* session, const uint16_t x, const uint16_t
return;
}
if (gTrackDesignSaveMode || (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES))
if (gTrackDesignSaveMode || (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES))
{
return;
}
@ -46,7 +46,7 @@ void sprite_paint_setup(paint_session* session, const uint16_t x, const uint16_t
return;
}
const bool highlightPathIssues = (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES);
const bool highlightPathIssues = (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES);
for (const rct_sprite* spr = get_sprite(sprite_idx); sprite_idx != SPRITE_INDEX_NULL;
sprite_idx = spr->generic.next_in_quadrant)
@ -73,7 +73,7 @@ void sprite_paint_setup(paint_session* session, const uint16_t x, const uint16_t
// Here converting from land/path/etc height scale to pixel height scale.
// Note: peeps/scenery on slopes will be above the base
// height of the slope element, and consequently clipped.
if ((gCurrentViewportFlags & VIEWPORT_FLAG_CLIP_VIEW))
if ((session->ViewFlags & VIEWPORT_FLAG_CLIP_VIEW))
{
if (spr->generic.z > (gClipHeight * 8))
{

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

@ -38,7 +38,7 @@ void banner_paint(paint_session* session, uint8_t direction, int32_t height, con
session->InteractionType = VIEWPORT_INTERACTION_ITEM_BANNER;
if (dpi->zoom_level > 1 || gTrackDesignSaveMode || (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
if (dpi->zoom_level > 1 || gTrackDesignSaveMode || (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
return;
height -= 16;

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

@ -31,7 +31,7 @@ static void ride_entrance_exit_paint(paint_session* session, uint8_t direction,
{
uint8_t is_exit = tile_element->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_RIDE_EXIT;
if (gTrackDesignSaveMode || (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
if (gTrackDesignSaveMode || (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
{
if (tile_element->AsEntrance()->GetRideIndex() != gTrackDesignSaveRideIndex)
return;
@ -208,7 +208,7 @@ static void ride_entrance_exit_paint(paint_session* session, uint8_t direction,
*/
static void park_entrance_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element)
{
if (gTrackDesignSaveMode || (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
if (gTrackDesignSaveMode || (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
return;
#ifdef __ENABLE_LIGHTFX__
@ -332,7 +332,7 @@ void entrance_paint(paint_session* session, uint8_t direction, int32_t height, c
rct_drawpixelinfo* dpi = session->DPI;
if (gCurrentViewportFlags & VIEWPORT_FLAG_PATH_HEIGHTS && dpi->zoom_level == 0)
if (session->ViewFlags & VIEWPORT_FLAG_PATH_HEIGHTS && dpi->zoom_level == 0)
{
if (entrance_get_directions(tile_element) & 0xF)
{

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

@ -221,7 +221,7 @@ static constexpr const boundbox s98E3C4[] = {
*/
void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement)
{
if (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
if (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
{
return;
}

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

@ -171,7 +171,7 @@ static void path_bit_bins_paint(
imageId += 8;
}
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
sub_98197C(session, imageId, 7, 16, 1, 1, 7, height, 7, 16, height + 2);
}
if (!(edges & EDGE_SE))
@ -192,7 +192,7 @@ static void path_bit_bins_paint(
imageId += 8;
}
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
sub_98197C(session, imageId, 16, 25, 1, 1, 7, height, 16, 25, height + 2);
}
@ -214,7 +214,7 @@ static void path_bit_bins_paint(
imageId += 8;
}
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
sub_98197C(session, imageId, 25, 16, 1, 1, 7, height, 25, 16, height + 2);
}
@ -236,7 +236,7 @@ static void path_bit_bins_paint(
imageId += 8;
}
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
sub_98197C(session, imageId, 16, 7, 1, 1, 7, height, 16, 7, height + 2);
}
}
@ -697,7 +697,7 @@ static void sub_6A3F61(
if (sceneryEntry == nullptr)
return;
if ((gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
if ((session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
&& !(tile_element->flags & TILE_ELEMENT_FLAG_BROKEN)
&& !(sceneryEntry->path_bit.draw_type == PATH_BIT_DRAW_TYPE_BINS))
{
@ -815,7 +815,7 @@ void path_paint(paint_session* session, uint16_t height, const TileElement* tile
}
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
if (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
{
imageFlags = SPRITE_ID_PALETTE_COLOUR_1(PALETTE_46);
}
@ -911,7 +911,7 @@ void path_paint(paint_session* session, uint16_t height, const TileElement* tile
}
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_PATH_HEIGHTS)
if (session->ViewFlags & VIEWPORT_FLAG_PATH_HEIGHTS)
{
uint16_t height2 = 3 + tile_element->base_height * 8;
if (tile_element->AsPath()->IsSloped())

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

@ -32,7 +32,7 @@ static constexpr const LocationXY16 lengths[] = {
*/
void scenery_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement)
{
if (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
if (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
{
return;
}

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

@ -680,7 +680,7 @@ static void viewport_surface_draw_tile_side_bottom(
return;
}
bool neighbourIsClippedAway = (gCurrentViewportFlags & VIEWPORT_FLAG_CLIP_VIEW) && !tile_is_inside_clip_view(neighbour);
bool neighbourIsClippedAway = (session->ViewFlags & VIEWPORT_FLAG_CLIP_VIEW) && !tile_is_inside_clip_view(neighbour);
if (neighbour.tile_element == nullptr || neighbourIsClippedAway)
{
@ -712,7 +712,7 @@ static void viewport_surface_draw_tile_side_bottom(
edgeStyle = TERRAIN_EDGE_ROCK;
uint32_t base_image_id = get_edge_image(edgeStyle, 0);
if (gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
if (session->ViewFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
{
base_image_id = get_edge_image(edgeStyle, 1);
}
@ -921,7 +921,7 @@ static void viewport_surface_draw_tile_side_top(
if (isWater)
{
base_image_id = get_edge_image(terrain, 2); // var_08
if (gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
if (session->ViewFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
{
base_image_id = get_edge_image(terrain, 1); // var_04
}
@ -929,7 +929,7 @@ static void viewport_surface_draw_tile_side_top(
}
else
{
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE))
if (!(session->ViewFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE))
{
const uint8_t incline = (cl - al) + 1;
const uint32_t image_id = get_edge_image(terrain, 3) + (edge == EDGE_TOPLEFT ? 3 : 0) + incline; // var_c;
@ -1076,7 +1076,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
descriptor.corner_heights.left = baseHeight + ch.left;
}
if ((gCurrentViewportFlags & VIEWPORT_FLAG_LAND_HEIGHTS) && (zoomLevel == 0))
if ((session->ViewFlags & VIEWPORT_FLAG_LAND_HEIGHTS) && (zoomLevel == 0))
{
const int16_t x = session->MapPosition.x;
const int16_t y = session->MapPosition.y;
@ -1102,7 +1102,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
}
else
{
const bool showGridlines = (gCurrentViewportFlags & VIEWPORT_FLAG_GRIDLINES);
const bool showGridlines = (session->ViewFlags & VIEWPORT_FLAG_GRIDLINES);
int32_t branch = -1;
if (tileElement->AsSurface()->GetSurfaceStyle() == TERRAIN_GRASS)
@ -1111,7 +1111,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
{
if (zoomLevel == 0)
{
if ((gCurrentViewportFlags & (VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_UNDERGROUND_INSIDE)) == 0)
if ((session->ViewFlags & (VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_UNDERGROUND_INSIDE)) == 0)
{
branch = tileElement->AsSurface()->GetGrassLength() & 0x7;
}
@ -1149,7 +1149,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
image_id = SPR_TERRAIN_TRACK_DESIGNER;
}
if (gCurrentViewportFlags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE))
if (session->ViewFlags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE))
{
image_id &= 0xDC07FFFF; // remove colour
image_id |= 0x41880000;
@ -1216,7 +1216,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
// Draw Peep Spawns
if (((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gCheatsSandboxMode)
&& gCurrentViewportFlags & VIEWPORT_FLAG_LAND_OWNERSHIP)
&& session->ViewFlags & VIEWPORT_FLAG_LAND_OWNERSHIP)
{
const LocationXY16& pos = session->MapPosition;
for (auto& spawn : gPeepSpawns)
@ -1232,7 +1232,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
}
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_LAND_OWNERSHIP)
if (session->ViewFlags & VIEWPORT_FLAG_LAND_OWNERSHIP)
{
// loc_660E9A:
if (tileElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED)
@ -1244,14 +1244,13 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
{
const LocationXY16& pos = session->MapPosition;
const int32_t height2 = (tile_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3;
paint_struct* backup = session->UnkF1AD28;
paint_struct* backup = session->LastRootPS;
sub_98196C(session, SPR_LAND_OWNERSHIP_AVAILABLE, 16, 16, 1, 1, 0, height2);
session->UnkF1AD28 = backup;
session->LastRootPS = backup;
}
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_CONSTRUCTION_RIGHTS
&& !(tileElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED))
if (session->ViewFlags & VIEWPORT_FLAG_CONSTRUCTION_RIGHTS && !(tileElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED))
{
if (tileElement->AsSurface()->GetOwnership() & OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED)
{
@ -1262,9 +1261,9 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
{
const LocationXY16& pos = session->MapPosition;
const int32_t height2 = tile_element_height(pos.x + 16, pos.y + 16) & 0xFFFF;
paint_struct* backup = session->UnkF1AD28;
paint_struct* backup = session->LastRootPS;
sub_98196C(session, SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE, 16, 16, 1, 1, 0, height2 + 3);
session->UnkF1AD28 = backup;
session->LastRootPS = backup;
}
}
@ -1339,9 +1338,9 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
const int32_t image_id = (SPR_TERRAIN_SELECTION_CORNER + byte_97B444[local_surfaceShape]) | 0x21300000;
paint_struct* backup = session->UnkF1AD28;
paint_struct* backup = session->LastRootPS;
sub_98196C(session, image_id, 0, 0, 32, 32, 1, local_height);
session->UnkF1AD28 = backup;
session->LastRootPS = backup;
}
}
}
@ -1369,8 +1368,8 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
}
}
if (zoomLevel == 0 && has_surface && !(gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
&& !(gCurrentViewportFlags & VIEWPORT_FLAG_HIDE_BASE) && gConfigGeneral.landscape_smoothing)
if (zoomLevel == 0 && has_surface && !(session->ViewFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE)
&& !(session->ViewFlags & VIEWPORT_FLAG_HIDE_BASE) && gConfigGeneral.landscape_smoothing)
{
viewport_surface_smoothen_edge(session, EDGE_TOPLEFT, tileDescriptors[0], tileDescriptors[3]);
viewport_surface_smoothen_edge(session, EDGE_TOPRIGHT, tileDescriptors[0], tileDescriptors[4]);
@ -1378,7 +1377,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
viewport_surface_smoothen_edge(session, EDGE_BOTTOMRIGHT, tileDescriptors[0], tileDescriptors[2]);
}
if ((gCurrentViewportFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE) && !(gCurrentViewportFlags & VIEWPORT_FLAG_HIDE_BASE)
if ((session->ViewFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE) && !(session->ViewFlags & VIEWPORT_FLAG_HIDE_BASE)
&& !(gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)))
{
const uint8_t image_offset = byte_97B444[surfaceShape];
@ -1391,7 +1390,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
paint_attach_to_previous_ps(session, image_id, 0, 0);
}
if (!(gCurrentViewportFlags & VIEWPORT_FLAG_HIDE_VERTICAL))
if (!(session->ViewFlags & VIEWPORT_FLAG_HIDE_VERTICAL))
{
const uint32_t edgeStyle = tileElement->AsSurface()->GetEdgeStyle();
if (edgeStyle >= TERRAIN_EDGE_COUNT)

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

@ -138,7 +138,7 @@ static void sub_68B3FB(paint_session* session, int32_t x, int32_t y)
{
rct_drawpixelinfo* dpi = session->DPI;
if ((gCurrentViewportFlags & VIEWPORT_FLAG_CLIP_VIEW))
if ((session->ViewFlags & VIEWPORT_FLAG_CLIP_VIEW))
{
if (x / 32 < gClipSelectionA.x || x / 32 > gClipSelectionB.x)
return;
@ -245,7 +245,7 @@ static void sub_68B3FB(paint_session* session, int32_t x, int32_t y)
do
{
// Only paint tile_elements below the clip height.
if ((gCurrentViewportFlags & VIEWPORT_FLAG_CLIP_VIEW) && (tile_element->base_height > gClipHeight))
if ((session->ViewFlags & VIEWPORT_FLAG_CLIP_VIEW) && (tile_element->base_height > gClipHeight))
continue;
int32_t direction = tile_element->GetDirectionWithOffset(rotation);
@ -366,7 +366,7 @@ static void sub_68B3FB(paint_session* session, int32_t x, int32_t y)
}
// Only draw supports below the clipping height.
if ((gCurrentViewportFlags & VIEWPORT_FLAG_CLIP_VIEW) && (segmentHeight > gClipHeight))
if ((session->ViewFlags & VIEWPORT_FLAG_CLIP_VIEW) && (segmentHeight > gClipHeight))
continue;
int32_t xOffset = sy * 10;

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

@ -190,7 +190,7 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
paint_util_set_general_support_height(session, height, 0x20);
uint32_t dword_141F710 = 0;
if (gTrackDesignSaveMode || (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
if (gTrackDesignSaveMode || (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
{
if (!track_design_save_contains_tile_element(tile_element))
{

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

@ -2160,13 +2160,13 @@ void track_paint(paint_session* session, uint8_t direction, int32_t height, cons
rct_drawpixelinfo* dpi = session->DPI;
if ((!gTrackDesignSaveMode || rideIndex == gTrackDesignSaveRideIndex)
&& !(gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
&& !(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES))
{
int32_t trackType = tileElement->AsTrack()->GetTrackType();
int32_t trackSequence = tileElement->AsTrack()->GetSequenceIndex();
int32_t trackColourScheme = tileElement->AsTrack()->GetColourScheme();
if ((gCurrentViewportFlags & VIEWPORT_FLAG_TRACK_HEIGHTS) && dpi->zoom_level == 0)
if ((session->ViewFlags & VIEWPORT_FLAG_TRACK_HEIGHTS) && dpi->zoom_level == 0)
{
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
if (TrackHeightMarkerPositions[trackType] & (1 << trackSequence))

4
src/openrct2/ride/gentle/MiniGolf.cpp
View File

@ -1199,7 +1199,7 @@ void vehicle_visual_mini_golf_player(
return;
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS)
{
return;
}
@ -1232,7 +1232,7 @@ void vehicle_visual_mini_golf_ball(
return;
}
if (gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS)
if (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_PEEPS)
{
return;
}

1
test/testpaint/Compat.cpp
View File

@ -32,7 +32,6 @@ uint8_t gTrackDesignSaveRideIndex = 255;
uint8_t gClipHeight = 255;
LocationXY8 gClipSelectionA = { 0, 0 };
LocationXY8 gClipSelectionB = { MAXIMUM_MAP_SIZE_TECHNICAL - 1, MAXIMUM_MAP_SIZE_TECHNICAL - 1 };
uint32_t gCurrentViewportFlags;
uint32_t gScenarioTicks;
uint8_t gCurrentRotation;

1
test/testpaint/TestPaint.cpp
View File

@ -64,7 +64,6 @@ namespace TestPaint
g141E9DB = G141E9DB_FLAG_1 | G141E9DB_FLAG_2;
gPaintSession.Unk141E9DB = G141E9DB_FLAG_1 | G141E9DB_FLAG_2;
gCurrentViewportFlags = 0;
RCT2_CurrentViewportFlags = 0;
gScenarioTicks = 0;