zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 23:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix broken voxel palette colors when using the game palette

Browse source
This commit is contained in:
Magnus Norddahl 2017-03-15 04:33:01 +01:00
parent 225ce82a5a
commit fea2361815
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/r_data/voxels.cpp
View file

@ -401,10 +401,6 @@ FVoxel::~FVoxel()
void FVoxel::CreateBgraSlabData() void FVoxel::CreateBgraSlabData()
{ {
uint8_t *palette = Palette;
if (palette == nullptr)
palette = (uint8_t *)GPalette.BaseColors;
for (int i = 0; i < NumMips; ++i) for (int i = 0; i < NumMips; ++i)
{ {
int size = Mips[i].OffsetX[Mips[i].SizeX]; int size = Mips[i].OffsetX[Mips[i].SizeX];
@ -426,9 +422,19 @@ void FVoxel::CreateBgraSlabData()
{ {
int colorIndex = src->col[j]; int colorIndex = src->col[j];
uint32_t red = (palette[colorIndex * 3 + 0] << 2) | (palette[colorIndex * 3 + 0] >> 4); uint32_t red, green, blue;
uint32_t green = (palette[colorIndex * 3 + 1] << 2) | (palette[colorIndex * 3 + 1] >> 4); if (Palette)
uint32_t blue = (palette[colorIndex * 3 + 2] << 2) | (palette[colorIndex * 3 + 2] >> 4); {
red = (Palette[colorIndex * 3 + 0] << 2) | (Palette[colorIndex * 3 + 0] >> 4);
green = (Palette[colorIndex * 3 + 1] << 2) | (Palette[colorIndex * 3 + 1] >> 4);
blue = (Palette[colorIndex * 3 + 2] << 2) | (Palette[colorIndex * 3 + 2] >> 4);
}
else
{
red = GPalette.BaseColors[colorIndex].r;
green = GPalette.BaseColors[colorIndex].g;
blue = GPalette.BaseColors[colorIndex].b;
}
dest->col[j] = 0xff000000 | (red << 16) | (green << 8) | blue; dest->col[j] = 0xff000000 | (red << 16) | (green << 8) | blue;
} }