mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-15 01:24:35 +02:00
Code Issues Releases Wiki Activity

fix lighting

Browse Source
This commit is contained in:
XProger
2018-06-21 05:40:18 +03:00
parent a6fe279bea
commit 62b21b47d9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controller.h
View File

@@ -161,6 +161,7 @@ struct Controller {
timer = 0.0f; timer = 0.0f;
ambient[0] = ambient[1] = ambient[2] = ambient[3] = ambient[4] = ambient[5] = vec4(intensityf(getRoom().ambient)); ambient[0] = ambient[1] = ambient[2] = ambient[3] = ambient[4] = ambient[5] = vec4(intensityf(getRoom().ambient));
targetLight = NULL; targetLight = NULL;
mainLightFlip = false;
updateLights(false); updateLights(false);
visibleMask = 0xFFFFFFFF; visibleMask = 0xFFFFFFFF;
@@ -1163,8 +1164,7 @@ struct Controller {
vec4 tcolor = vec4(vec3(targetLight->color.r, targetLight->color.g, targetLight->color.b) * (1.0f / 255.0f), float(targetLight->radius)); vec4 tcolor = vec4(vec3(targetLight->color.r, targetLight->color.g, targetLight->color.b) * (1.0f / 255.0f), float(targetLight->radius));
if (mainLightFlip != level->state.flags.flipped) { if (mainLightFlip != level->state.flags.flipped) {
if (room.alternateRoom > -1) lerp = false;
lerp = false;
mainLightFlip = level->state.flags.flipped; mainLightFlip = level->state.flags.flipped;
} }

2
src/format.h
View File

@@ -3466,7 +3466,7 @@ namespace TR {
stream.seek(4); // radius2 stream.seek(4); // radius2
if ((version & VER_VERSION) < VER_TR3) { if ((version & VER_VERSION) < VER_TR3) {
int value = 255 - clamp((intensity > 0x1FFF) ? 0 : (intensity >> 5), 0, 255); int value = clamp((intensity > 0x1FFF) ? 0 : (intensity >> 5), 0, 255);
light.color.r = light.color.g = light.color.b = value; light.color.r = light.color.g = light.color.b = value;
light.color.a = 0; light.color.a = 0;
} }