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

Move painting to Litter entity

Browse Source
This commit is contained in:
ζeh Matt
2021-11-27 15:55:24 +02:00
parent 846a270cb3
commit a1ea1dc4fb
3 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/openrct2/entity/Litter.cpp
View File

@@ -4,6 +4,8 @@
#include "../Game.h"
#include "../core/DataSerialiser.h"
#include "../localisation/StringIds.h"
#include "../paint/Paint.h"
#include "../sprites.h"
#include "../world/Map.h"
#include "EntityList.h"
#include "EntityRegistry.h"
@@ -145,6 +147,43 @@ void Litter::Serialise(DataSerialiser& stream)
stream << creationTick;
}
void Litter::Paint() const
struct LitterSprite
{
uint16_t base_id;
uint8_t direction_mask;
};
/** rct2: 0x0097EF6C */
static constexpr const LitterSprite _litterSprites[] = {
{ SPR_LITTER_SICK, 0x1 },
{ SPR_LITTER_SICK_ALT, 0x1 },
{ SPR_LITTER_EMPTY_CAN, 0x1 },
{ SPR_LITTER_RUBBISH, 0x1 },
{ SPR_LITTER_EMPTY_BURGER_BOX, 0x1 },
{ SPR_LITTER_EMPTY_CUP, 0x1 },
{ SPR_LITTER_EMPTY_BOX, 0x1 },
{ SPR_LITTER_EMPTY_BOTTLE, 0x1 },
{ SPR_LITTER_EMPTY_BOWL_RED, 0x3 },
{ SPR_LITTER_EMPTY_DRINK_CART, 0x3 },
{ SPR_LITTER_EMPTY_JUICE_CUP, 0x3 },
{ SPR_LITTER_EMPTY_BOWL_BLUE, 0x3 },
};
void Litter::Paint(paint_session* session, int32_t imageDirection) const
{
rct_drawpixelinfo& dpi = session->DPI;
if (dpi.zoom_level > 0)
return; // If zoomed at all no litter drawn
// litter has no sprite direction so remove that
imageDirection >>= 3;
// Some litter types have only 1 direction so remove
// anything that isn't required.
imageDirection &= _litterSprites[EnumValue(SubType)].direction_mask;
uint32_t image_id = imageDirection + _litterSprites[EnumValue(SubType)].base_id;
// In the following call to PaintAddImageAsParent, we add 4 (instead of 2) to the
// bound_box_offset_z to make sure litter is drawn on top of railways
PaintAddImageAsParent(session, image_id, { 0, 0, z }, { 4, 4, -1 }, { -4, -4, z + 4 });
}

3
src/openrct2/entity/Litter.h
View File

@@ -14,6 +14,7 @@
class DataSerialiser;
struct CoordsXYZ;
struct CoordsXYZD;
struct paint_session;
struct Litter : EntityBase
{
@@ -41,5 +42,5 @@ struct Litter : EntityBase
void Serialise(DataSerialiser& stream);
rct_string_id GetName() const;
uint32_t GetAge() const;
void Paint() const;
void Paint(paint_session* session, int32_t imageDirection) const;
};

47
src/openrct2/paint/sprite/Paint.Litter.cpp
View File

@@ -12,50 +12,3 @@
#include "../Paint.h"
#include "../sprites.h"
#include "Paint.Sprite.h"
struct litter_sprite
{
uint16_t base_id;
uint8_t direction_mask;
};
/** rct2: 0x0097EF6C */
static constexpr const litter_sprite litter_sprites[] = {
{ SPR_LITTER_SICK, 0x1 },
{ SPR_LITTER_SICK_ALT, 0x1 },
{ SPR_LITTER_EMPTY_CAN, 0x1 },
{ SPR_LITTER_RUBBISH, 0x1 },
{ SPR_LITTER_EMPTY_BURGER_BOX, 0x1 },
{ SPR_LITTER_EMPTY_CUP, 0x1 },
{ SPR_LITTER_EMPTY_BOX, 0x1 },
{ SPR_LITTER_EMPTY_BOTTLE, 0x1 },
{ SPR_LITTER_EMPTY_BOWL_RED, 0x3 },
{ SPR_LITTER_EMPTY_DRINK_CART, 0x3 },
{ SPR_LITTER_EMPTY_JUICE_CUP, 0x3 },
{ SPR_LITTER_EMPTY_BOWL_BLUE, 0x3 },
};
/**
* Litter Paint Setup
* rct2: 0x006736FC
*/
template<> void PaintEntity(paint_session* session, const Litter* litter, int32_t imageDirection)
{
rct_drawpixelinfo* dpi;
dpi = &session->DPI;
if (dpi->zoom_level > 0)
return; // If zoomed at all no litter drawn
// litter has no sprite direction so remove that
imageDirection >>= 3;
// Some litter types have only 1 direction so remove
// anything that isn't required.
imageDirection &= litter_sprites[EnumValue(litter->SubType)].direction_mask;
uint32_t image_id = imageDirection + litter_sprites[EnumValue(litter->SubType)].base_id;
// In the following call to PaintAddImageAsParent, we add 4 (instead of 2) to the
// bound_box_offset_z to make sure litter is drawn on top of railways
PaintAddImageAsParent(session, image_id, { 0, 0, litter->z }, { 4, 4, -1 }, { -4, -4, litter->z + 4 });
}