mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Some cleanup

Browse Source
This commit is contained in:
Trevor Finney
2023-02-20 14:37:22 -05:00
parent 8bc7965fc2
commit 5f324ef9f2
4 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
View File

@@ -212,7 +212,7 @@ void TextureCache::GeneratePaletteTexture()
dpi.bits[i] = i;
}
for (int i = 0; i < PALETTE_TO_G1_OFFSET_COUNT; ++i)
for (int i = 0; i < PALETTE_TOTAL_OFFSETS; ++i)
{
GLint y = PaletteToY(static_cast<FilterPaletteID>(i));
@@ -223,18 +223,6 @@ void TextureCache::GeneratePaletteTexture()
GfxDrawSpriteSoftware(&dpi, ImageId(g1Index.value()), { -element->x_offset, y - element->y_offset });
}
}
// G2 Palette textures
for (int i = PALETTE_TO_G1_OFFSET_COUNT; i < PALETTE_TOTAL_OFFSETS; ++i)
{
GLint y = PaletteToY(static_cast<FilterPaletteID>(i));
auto g2Index = GetPaletteG2Index(i);
if (g2Index.has_value())
{
auto element = GfxGetG1Element(g2Index.value());
GfxDrawSpriteSoftware(&dpi, ImageId(g2Index.value()), { -element->x_offset, y - element->y_offset });
}
}
glBindTexture(GL_TEXTURE_2D, _paletteTexture);
glTexImage2D(GL_TEXTURE_2D, 0, GL_R8UI, width, height, 0, GL_RED_INTEGER, GL_UNSIGNED_BYTE, dpi.bits);

9
src/openrct2/drawing/Drawing.cpp
View File

@@ -906,15 +906,6 @@ void GfxDrawPickedUpPeep(DrawPixelInfo* dpi)
}
std::optional<uint32_t> GetPaletteG1Index(colour_t paletteId)
{
if (paletteId < PALETTE_TO_G1_OFFSET_COUNT)
{
return palette_to_g1_offset[paletteId];
}
return std::nullopt;
}
std::optional<uint32_t> GetPaletteG2Index(colour_t paletteId)
{
if (paletteId < PALETTE_TOTAL_OFFSETS)
{

3
src/openrct2/drawing/Drawing.h
View File

@@ -470,7 +470,7 @@ void FASTCALL BlitPixels(const uint8_t* src, uint8_t* dst, const PaletteMap& pal
}
#define PALETTE_TO_G1_OFFSET_COUNT 144
#define PALETTE_TOTAL_OFFSETS 192
constexpr uint8_t PALETTE_TOTAL_OFFSETS = 192;
#define INSET_RECT_F_30 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_NONE)
#define INSET_RECT_F_60 (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_DONT_LIGHTEN)
@@ -595,7 +595,6 @@ extern void (*MaskFn)(
int32_t maskWrap, int32_t colourWrap, int32_t dstWrap);
std::optional<uint32_t> GetPaletteG1Index(colour_t paletteId);
std::optional<uint32_t> GetPaletteG2Index(colour_t paletteId);
std::optional<PaletteMap> GetPaletteMapForColour(colour_t paletteId);
void UpdatePalette(const uint8_t* colours, int32_t start_index, int32_t num_colours);

26
src/openrct2/interface/Colour.cpp
View File

@@ -37,29 +37,11 @@ enum
void ColoursInitMaps()
{
// Get colour maps from g1
for (int32_t i = 0; i < COLOUR_NUM_ORIGINAL; i++)
for (int32_t i = 0; i < COLOUR_COUNT; i++)
{
const G1Element* g1 = GfxGetG1Element(SPR_PALETTE_2_START + i);
if (g1 != nullptr)
{
ColourMapA[i].colour_0 = g1->offset[INDEX_COLOUR_0];
ColourMapA[i].colour_1 = g1->offset[INDEX_COLOUR_1];
ColourMapA[i].darkest = g1->offset[INDEX_DARKEST];
ColourMapA[i].darker = g1->offset[INDEX_DARKER];
ColourMapA[i].dark = g1->offset[INDEX_DARK];
ColourMapA[i].mid_dark = g1->offset[INDEX_MID_DARK];
ColourMapA[i].mid_light = g1->offset[INDEX_MID_LIGHT];
ColourMapA[i].light = g1->offset[INDEX_LIGHT];
ColourMapA[i].lighter = g1->offset[INDEX_LIGHTER];
ColourMapA[i].lightest = g1->offset[INDEX_LIGHTEST];
ColourMapA[i].colour_10 = g1->offset[INDEX_COLOUR_10];
ColourMapA[i].colour_11 = g1->offset[INDEX_COLOUR_11];
}
}
// G2 Palette Init
for (int32_t i = COLOUR_NUM_ORIGINAL; i < COLOUR_COUNT; i++)
{
const G1Element* g1 = GfxGetG1Element(SPR_G2_PALETTE_BEGIN + i - (COLOUR_NUM_ORIGINAL - 1));
// Get palette index in g1 / g2
auto paletteIndex = (i < COLOUR_NUM_ORIGINAL) ? SPR_PALETTE_2_START : SPR_G2_PALETTE_BEGIN - (COLOUR_NUM_ORIGINAL - 1);
const G1Element* g1 = GfxGetG1Element(paletteIndex + i);
if (g1 != nullptr)
{
ColourMapA[i].colour_0 = g1->offset[INDEX_COLOUR_0];