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

Add overloads to take CoordsXYZ (#15253)

Browse Source
This commit is contained in:
Duncan
2021-08-24 16:26:52 +01:00
committed by GitHub
parent e48dd2d32b
commit 201a94f7e6
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,6 +295,15 @@ paint_struct* PaintAddImageAsChildRotated(
paint_session* session, uint8_t direction, uint32_t image_id, int32_t x_offset, int32_t y_offset,
int32_t bound_box_length_x, int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset,
int32_t bound_box_offset_x, int32_t bound_box_offset_y, int32_t bound_box_offset_z);
paint_struct* PaintAddImageAsChildRotated(
paint_session* session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset);
paint_struct* PaintAddImageAsParentRotated(
paint_session* session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize);
paint_struct* PaintAddImageAsParentRotated(
paint_session* session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset);
void paint_util_push_tunnel_rotated(paint_session* session, uint8_t direction, uint16_t height, uint8_t type);

47
src/openrct2/paint/PaintHelpers.cpp
View File

@@ -48,6 +48,37 @@ paint_struct* PaintAddImageAsParentRotated(
}
}
paint_struct* PaintAddImageAsParentRotated(
paint_session* session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset)
{
if (direction & 1)
{
return PaintAddImageAsParent(
session, image_id, { offset.y, offset.x, offset.z }, { boundBoxSize.y, boundBoxSize.x, boundBoxSize.z },
{ boundBoxOffset.y, boundBoxOffset.x, boundBoxOffset.z });
}
else
{
return PaintAddImageAsParent(session, image_id, offset, boundBoxSize, boundBoxOffset);
}
}
paint_struct* PaintAddImageAsParentRotated(
paint_session* session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize)
{
if (direction & 1)
{
return PaintAddImageAsParent(
session, image_id, { offset.y, offset.x, offset.z }, { boundBoxSize.y, boundBoxSize.x, boundBoxSize.z });
}
else
{
return PaintAddImageAsParent(session, image_id, offset, boundBoxSize);
}
}
paint_struct* PaintAddImageAsChildRotated(
paint_session* session, uint8_t direction, uint32_t image_id, int32_t x_offset, int32_t y_offset,
int32_t bound_box_length_x, int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset,
@@ -67,6 +98,22 @@ paint_struct* PaintAddImageAsChildRotated(
}
}
paint_struct* PaintAddImageAsChildRotated(
paint_session* session, const uint8_t direction, const uint32_t image_id, const CoordsXYZ& offset,
const CoordsXYZ& boundBoxSize, const CoordsXYZ& boundBoxOffset)
{
if (direction & 1)
{
return PaintAddImageAsChild(
session, image_id, { offset.y, offset.x, offset.z }, { boundBoxSize.y, boundBoxSize.x, boundBoxSize.z },
{ boundBoxOffset.y, boundBoxOffset.x, boundBoxOffset.z });
}
else
{
return PaintAddImageAsChild(session, image_id, offset, boundBoxSize, boundBoxOffset);
}
}
void paint_util_push_tunnel_rotated(paint_session* session, uint8_t direction, uint16_t height, uint8_t type)
{
if (direction & 1)