mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-12 16:14:25 +02:00
Code Issues Releases Wiki Activity

fixed #201

Browse Source
This commit is contained in:
XProger
2019-08-10 23:28:04 +03:00
parent e161791008
commit ee175c8170
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/format.h
View File

@@ -1902,7 +1902,7 @@ namespace TR {
int32 x, y, z; int32 x, y, z;
uint32 radius; uint32 radius;
int32 intensity; int32 intensity;
Color32 color; Color24 color;
float in, out; float in, out;
float length, cutoff; float length, cutoff;
vec3 dir; vec3 dir;
@@ -4189,7 +4189,6 @@ namespace TR {
ASSERTV(intensity == intensity2); ASSERTV(intensity == intensity2);
int value = 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.intensity = intensity; light.intensity = intensity;
light.radius = stream.readBE32() * 2; light.radius = stream.readBE32() * 2;
@@ -5394,10 +5393,13 @@ namespace TR {
if (version & (VER_TR3 | VER_TR4)) { if (version & (VER_TR3 | VER_TR4)) {
stream.read(light.color); stream.read(light.color);
stream.read(light.type);
} }
if (version & VER_TR4) { if (version & VER_TR4) {
stream.read(light.type); uint8 unknown;
stream.read(unknown);
ASSERT(unknown == 0x00 || unknown == 0xFF);
uint8 byteIntensity; uint8 byteIntensity;
intensity = stream.read(byteIntensity); intensity = stream.read(byteIntensity);
stream.read(light.in); stream.read(light.in);
@@ -5429,7 +5431,6 @@ namespace TR {
if ((version & VER_VERSION) < VER_TR3) { if ((version & VER_VERSION) < VER_TR3) {
int value = 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.intensity = intensity; light.intensity = intensity;