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

Fix #23471: Traverse the paint nodes in correct order

Browse Source
This commit is contained in:
ζeh Matt
2024-12-24 18:24:16 +02:00
parent 51bf885cda
commit e9f11bf45a
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -633,6 +633,25 @@ void PaintSessionArrange(PaintSessionCore& session)
return _paintArrangeFuncsLegacy[session.CurrentRotation](session);
}
static inline void PaintAttachedPS(DrawPixelInfo& dpi, PaintStruct* ps, uint32_t viewFlags)
{
AttachedPaintStruct* attached_ps = ps->Attached;
for (; attached_ps != nullptr; attached_ps = attached_ps->NextEntry)
{
const auto screenCoords = ps->ScreenPos + attached_ps->RelativePos;
auto imageId = PaintPSColourifyImage(ps, attached_ps->image_id, viewFlags);
if (attached_ps->IsMasked)
{
GfxDrawSpriteRawMasked(dpi, screenCoords, imageId, attached_ps->ColourImageId);
}
else
{
GfxDrawSprite(dpi, imageId, screenCoords);
}
}
}
static inline void PaintDrawStruct(PaintSession& session, PaintStruct* ps)
{
auto screenPos = ps->ScreenPos;
@@ -649,7 +668,6 @@ static inline void PaintDrawStruct(PaintSession& session, PaintStruct* ps)
}
}
}
auto imageId = PaintPSColourifyImage(ps, ps->image_id, session.ViewFlags);
if (gPaintBoundingBoxes)
{
@@ -659,6 +677,15 @@ static inline void PaintDrawStruct(PaintSession& session, PaintStruct* ps)
{
GfxDrawSprite(session.DPI, imageId, screenPos);
}
if (ps->Children != nullptr)
{
PaintDrawStruct(session, ps->Children);
}
else
{
PaintAttachedPS(session.DPI, ps, session.ViewFlags);
}
}
/**
@@ -671,30 +698,7 @@ void PaintDrawStructs(PaintSession& session)
for (PaintStruct* ps = session.PaintHead; ps != nullptr; ps = ps->NextQuadrantEntry)
{
// Paint parent node.
PaintDrawStruct(session, ps);
// Paint children.
for (auto* psChild = ps->Children; psChild != nullptr; psChild = psChild->NextQuadrantEntry)
{
PaintDrawStruct(session, psChild);
}
// Paint attached.
for (auto* psAttached = ps->Attached; psAttached != nullptr; psAttached = psAttached->NextEntry)
{
const auto screenCoords = ps->ScreenPos + psAttached->RelativePos;
auto imageId = PaintPSColourifyImage(ps, psAttached->image_id, session.ViewFlags);
if (psAttached->IsMasked)
{
GfxDrawSpriteRawMasked(session.DPI, screenCoords, imageId, psAttached->ColourImageId);
}
else
{
GfxDrawSprite(session.DPI, imageId, screenCoords);
}
}
}
}