dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use custom sprite sorting rules for vehicles diagonally under bridges

Browse Source 
Extend bb sprite south for comparisons, but only for vehicles underneath
This is to avoid creating sprite sorting problems for vehicles
on top of the bridge

Adjust ParentSpriteToDraw struct
This commit is contained in:
Jonathan G Rennison
2024-02-08 20:44:15 +00:00
parent ea8aa47832
commit a484a5eb77
6 changed files with 152 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/viewport_sprite_sorter.h
View File

@@ -34,7 +34,14 @@ struct __attribute__ ((aligned (16))) ParentSpriteToDraw {
SpriteID image; ///< sprite to draw
PaletteID pal; ///< palette to use
const SubSprite *sub; ///< only draw a rectangular part of the sprite
#ifdef POINTER_IS_64BIT
int32_t sub_idx; ///< only draw a rectangular part of the sprite (store the actual pointer elsewhere to save space in this struct)
#else
const SubSprite *sub_ptr; ///< only draw a rectangular part of the sprite
#endif
uint8_t special_flags; ///< special flags
/* 3 bytes spare! */
int32_t left; ///< minimal screen X coordinate of sprite (= x + sprite->x_offs), reference point for child sprites
int32_t top; ///< minimal screen Y coordinate of sprite (= y + sprite->y_offs), reference point for child sprites
@@ -51,11 +58,45 @@ static_assert(sizeof(ParentSpriteToDraw) <= 64);
typedef std::vector<ParentSpriteToDraw*> ParentSpriteToSortVector;
#ifdef POINTER_IS_64BIT
struct ParentSpriteToDrawSubSpriteHolder {
std::vector<const SubSprite *> subsprites;
const SubSprite *Get(const ParentSpriteToDraw *ps) const
{
return ps->sub_idx >= 0 ? this->subsprites[ps->sub_idx] : nullptr;
}
void Set(ParentSpriteToDraw *ps, const SubSprite *sub)
{
if (sub == nullptr) {
ps->sub_idx = -1;
} else {
ps->sub_idx = (int32_t)this->subsprites.size();
this->subsprites.push_back(sub);
}
}
void Clear()
{
this->subsprites.clear();
}
};
#else
struct ParentSpriteToDrawSubSpriteHolder {
const SubSprite *Get(const ParentSpriteToDraw *ps) const { return ps->sub_ptr; }
void Set(ParentSpriteToDraw *ps, const SubSprite *sub) { ps->sub_ptr = sub; }
void Clear() {}
};
#endif
/** Type for method for checking whether a viewport sprite sorter exists. */
typedef bool (*VpSorterChecker)();
/** Type for the actual viewport sprite sorter. */
typedef void (*VpSpriteSorter)(ParentSpriteToSortVector *psd);
bool ViewportSortParentSpritesSpecial(ParentSpriteToDraw *ps, ParentSpriteToDraw *ps2, ParentSpriteToDraw **psd, ParentSpriteToDraw **psd2);
#ifdef WITH_SSE
bool ViewportSortParentSpritesSSE41Checker();
void ViewportSortParentSpritesSSE41(ParentSpriteToSortVector *psdv);