AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-15 02:25:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix overly bright env colors

Browse Source
This commit is contained in:
Goodlyay 2024-05-15 22:12:44 -07:00
parent fd7988e492
commit d18a8fe988
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ModernLighting.c
View File

@ -100,11 +100,9 @@ static void ModernLighting_InitPalette(PackedCol* palette, float shaded, PackedC
lavaColor = PackedCol_Lerp(0, Env.LavaLightCol, 1 - blockLerp); lavaColor = PackedCol_Lerp(0, Env.LavaLightCol, 1 - blockLerp);
lampColor = PackedCol_ScreenBlend(lampColor, ambientColor); /* Blend the two light colors together, then blend that with the ambient color, then shade that by the face darkness */
lavaColor = PackedCol_ScreenBlend(lavaColor, ambientColor);
palette[Modern_MakePaletteIndex(lampLevel, lavaLevel)] = palette[Modern_MakePaletteIndex(lampLevel, lavaLevel)] =
PackedCol_Scale(PackedCol_ScreenBlend(lampColor, lavaColor), shaded); PackedCol_Scale(PackedCol_ScreenBlend(PackedCol_ScreenBlend(lampColor, lavaColor), ambientColor), shaded);
} }
} }
} }
@ -146,13 +144,14 @@ static void ModernLighting_AllocState(void) {
} }
static void ModernLighting_FreeState(void) { static void ModernLighting_FreeState(void) {
ClassicLighting_FreeState();
ModernLighting_FreePalettes();
int i; int i;
ClassicLighting_FreeState();
/* This function can be called multiple times without calling ModernLighting_AllocState, so... */ /* This function can be called multiple times without calling ModernLighting_AllocState, so... */
if (!chunkLightingDataFlags) return; if (!chunkLightingDataFlags) return;
ModernLighting_FreePalettes();
for (i = 0; i < chunksCount; i++) { for (i = 0; i < chunksCount; i++) {
Mem_Free(chunkLightingData[i]); Mem_Free(chunkLightingData[i]);
} }
@ -548,7 +547,7 @@ static PackedCol ModernLighting_Color_Core(int x, int y, int z, int paletteFace,
////palette test ////palette test
//cc_uint8 thing = y % MODERN_LIGHTING_LEVELS; //cc_uint8 thing = y % MODERN_LIGHTING_LEVELS;
//cc_uint8 thing2 = z % MODERN_LIGHTING_LEVELS; //cc_uint8 thing2 = z % MODERN_LIGHTING_LEVELS;
//return palettes[0][thing | (thing2 << 4)]; //return palettes[paletteFace][thing | (thing2 << 4)];
return palettes[paletteFace][lightData]; return palettes[paletteFace][lightData];
} }