From f7682f6b13817363e1d68362f82cec7b856eb633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Sun, 18 Feb 2024 21:12:46 +0200 Subject: [PATCH] Apply clang-format --- src/openrct2/interface/Viewport.cpp | 3 +-- src/openrct2/paint/Paint.Entity.cpp | 6 ++---- src/openrct2/paint/Paint.cpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 90b78fbf1c..0a516f9f25 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -267,8 +267,7 @@ void ViewportsInvalidate(const CoordsXYZ& pos, int32_t width, int32_t minHeight, { auto screenCoords = Translate3DTo2DWithZ(vp.rotation, pos); auto screenPos = ScreenRect( - screenCoords - ScreenCoordsXY{ width, minHeight }, - screenCoords + ScreenCoordsXY{ width, maxHeight }); + screenCoords - ScreenCoordsXY{ width, minHeight }, screenCoords + ScreenCoordsXY{ width, maxHeight }); ViewportInvalidate(&vp, screenPos); } diff --git a/src/openrct2/paint/Paint.Entity.cpp b/src/openrct2/paint/Paint.Entity.cpp index a1b351119c..3e1e074dc6 100644 --- a/src/openrct2/paint/Paint.Entity.cpp +++ b/src/openrct2/paint/Paint.Entity.cpp @@ -99,10 +99,8 @@ void EntityPaintSetup(PaintSession& session, const CoordsXY& pos) screenCoords - ScreenCoordsXY{ spr->SpriteData.Width, spr->SpriteData.HeightMin }, screenCoords + ScreenCoordsXY{ spr->SpriteData.Width, spr->SpriteData.HeightMax }); - if (session.DPI.y + session.DPI.height <= spriteRect.GetTop() - || spriteRect.GetBottom() <= session.DPI.y - || session.DPI.x + session.DPI.width <= spriteRect.GetLeft() - || spriteRect.GetRight() <= session.DPI.x) + if (session.DPI.y + session.DPI.height <= spriteRect.GetTop() || spriteRect.GetBottom() <= session.DPI.y + || session.DPI.x + session.DPI.width <= spriteRect.GetLeft() || spriteRect.GetRight() <= session.DPI.x) { continue; } diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index e556870997..3a99d2117f 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -590,7 +590,7 @@ static void PaintAttachedPS(DrawPixelInfo& dpi, PaintStruct* ps, uint32_t viewFl static void PaintPSImageWithBoundingBoxes(PaintSession& session, PaintStruct* ps, ImageId imageId, int32_t x, int32_t y) { auto& dpi = session.DPI; - + const uint8_t colour = BoundBoxDebugColours[EnumValue(ps->InteractionItem)]; const uint8_t rotation = session.CurrentRotation;