From b637847a1eb541e406cb3c857ce69917d0750c5a Mon Sep 17 00:00:00 2001 From: MontyTRC89 Date: Fri, 26 Jun 2020 20:51:59 +0200 Subject: [PATCH] New level format: ambient light now is Vector3 --- TR5Main/Game/room.h | 2 +- TR5Main/Renderer/Renderer11Compatibility.cpp | 2 +- TR5Main/Specific/level.cpp | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/TR5Main/Game/room.h b/TR5Main/Game/room.h index 426ef8a34..c42d82c5e 100644 --- a/TR5Main/Game/room.h +++ b/TR5Main/Game/room.h @@ -189,7 +189,7 @@ typedef struct ROOM_INFO short xSize; short ySize; std::vector floor; - CVECTOR ambient; + Vector3 ambient; std::vector lights; std::vector mesh; short flippedRoom; diff --git a/TR5Main/Renderer/Renderer11Compatibility.cpp b/TR5Main/Renderer/Renderer11Compatibility.cpp index 9cef4770b..af2ef8fc3 100644 --- a/TR5Main/Renderer/Renderer11Compatibility.cpp +++ b/TR5Main/Renderer/Renderer11Compatibility.cpp @@ -162,7 +162,7 @@ bool Renderer11::PrepareDataForTheRenderer() RendererRoom& r = m_rooms[i]; r.RoomNumber = i; r.Room = room; - r.AmbientLight = Vector4(room->ambient.b / 255.0f, room->ambient.g / 255.0f, room->ambient.r / 255.0f, 1.0f); + r.AmbientLight = Vector4(room->ambient.x, room->ambient.y, room->ambient.z, 1.0f); r.LightsToDraw = vector(MAX_LIGHTS); r.Statics.resize(room->mesh.size()); diff --git a/TR5Main/Specific/level.cpp b/TR5Main/Specific/level.cpp index 88dc5c7d0..44f1b29b7 100644 --- a/TR5Main/Specific/level.cpp +++ b/TR5Main/Specific/level.cpp @@ -518,10 +518,9 @@ void ReadRooms() room.floor.push_back(floor); } - room.ambient.r = ReadInt8(); - room.ambient.g = ReadInt8(); - room.ambient.b = ReadInt8(); - ReadInt8(); + room.ambient.x = ReadFloat(); + room.ambient.y = ReadFloat(); + room.ambient.z = ReadFloat(); short numLights = ReadInt16(); room.lights.reserve(numLights);