zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved the ShadeDiv array into the lookup table and took the numshades-2 divisor out of the stored value.

Browse source 
The value was changed to allow easier reuse in scenarios where the size of the shade table does not matter anymore.
This commit is contained in:
Christoph Oelckers 2020-06-05 23:18:21 +02:00
parent 0bd460d9e3
commit f159496f6e
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/build/include/palette.h
View file

@ -53,6 +53,7 @@ struct LookupTable
{ {
FString Shades; FString Shades;
PalEntry FadeColor = 0; PalEntry FadeColor = 0;
float ShadeFactor = 1.f;
float Visibility = 0; float Visibility = 0;
bool hasBrightmap = false; bool hasBrightmap = false;
bool noFloorPal = false; bool noFloorPal = false;

3
source/build/src/palette.cpp
View file

@ -139,10 +139,11 @@ void LookupTableInfo::postLoadTables(void)
bool isbright = false; bool isbright = false;
if (divider > 0.9) if (divider > 0.9)
{ {
shadediv[j] = 1 / 10000.f; // this translation is fullbright. tables[j].ShadeFactor = 1 / 10000.f; // this translation is fullbright.
} }
else else
{ {
if (tables[j].ShadeFactor == 0) tables[j].ShadeFactor = 1.f;
// Fullbright lookups do not need brightmaps. // Fullbright lookups do not need brightmaps.
auto fog = tables[j].FadeColor; auto fog = tables[j].FadeColor;
if (GPalette.HasGlobalBrightmap && fog.r == 0 && fog.g == 0 && fog.b == 0) if (GPalette.HasGlobalBrightmap && fog.r == 0 && fog.g == 0 && fog.b == 0)

6
source/exhumed/src/light.cpp
View file

@ -100,9 +100,9 @@ int LoadPaletteLookups()
#ifdef USE_OPENGL #ifdef USE_OPENGL
// These 3 tables do not have normal gradients. The others work without adjustment. // These 3 tables do not have normal gradients. The others work without adjustment.
// Other changes than altering the fog gradient are not necessary. // Other changes than altering the fog gradient are not necessary.
shadediv[kPalTorch] = shadediv[kPalTorch2] = 1 / 20.f; lookups.tables[kPalTorch].ShadeFactor = lookups.tables[kPalTorch2].ShadeFactor = (numshades - 2) / 20.f;
shadediv[kPalNoTorch] = shadediv[kPalNoTorch2] = 0.25f; lookups.tables[kPalNoTorch].ShadeFactor = lookups.tables[kPalNoTorch2].ShadeFactor = (numshades - 2) / 4.f;
shadediv[kPalBrite] = shadediv[kPalBrite] = 1 / 128.f; lookups.tables[kPalBrite].ShadeFactor = lookups.tables[kPalBrite].ShadeFactor = (numshades - 2) / 128.f;
#endif #endif
} }

6
source/glbackend/glbackend.cpp
View file

@ -60,8 +60,6 @@
F2DDrawer twodpsp; F2DDrawer twodpsp;
static int BufferLock = 0; static int BufferLock = 0;
float shadediv[MAXPALOOKUPS];
static int blendstyles[] = { GL_ZERO, GL_ONE, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA }; static int blendstyles[] = { GL_ZERO, GL_ONE, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA };
static int renderops[] = { GL_FUNC_ADD, GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT }; static int renderops[] = { GL_FUNC_ADD, GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT };
int depthf[] = { GL_ALWAYS, GL_LESS, GL_EQUAL, GL_LEQUAL }; int depthf[] = { GL_ALWAYS, GL_LESS, GL_EQUAL, GL_LEQUAL };
@ -303,7 +301,7 @@ void GLInstance::SetPalette(int index)
void GLInstance::SetPalswap(int index) void GLInstance::SetPalswap(int index)
{ {
palmanager.BindPalswap(index); palmanager.BindPalswap(index);
renderState.ShadeDiv = shadediv[index] == 0 ? 1.f / (numshades - 2) : shadediv[index]; renderState.ShadeDiv = lookups.tables[index].ShadeFactor;
} }
void GLInstance::DrawImGui(ImDrawData* data) void GLInstance::DrawImGui(ImDrawData* data)
@ -522,7 +520,7 @@ void PolymostRenderState::Apply(PolymostShader* shader, GLState &oldState)
if (!(Flags & RF_FogDisabled) && !FogColor.isBlack()) Flags &= ~RF_Brightmapping; if (!(Flags & RF_FogDisabled) && !FogColor.isBlack()) Flags &= ~RF_Brightmapping;
shader->Flags.Set(Flags); shader->Flags.Set(Flags);
shader->Shade.Set(Shade); shader->Shade.Set(Shade);
shader->ShadeDiv.Set(ShadeDiv); shader->ShadeDiv.Set(ShadeDiv / (numshades - 2));
shader->VisFactor.Set(VisFactor); shader->VisFactor.Set(VisFactor);
shader->Flags.Set(Flags); shader->Flags.Set(Flags);
shader->NPOTEmulationFactor.Set(NPOTEmulationFactor); shader->NPOTEmulationFactor.Set(NPOTEmulationFactor);

1
source/glbackend/glbackend.h
View file

@ -89,7 +89,6 @@ enum EWinding
struct ImDrawData; struct ImDrawData;
struct palette_t; struct palette_t;
extern float shadediv[256];
enum enum
{ {