Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-01 09:18:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'DiagonalCollisions' into NoShifts

Browse source
This commit is contained in:
asasas9500 2020-06-26 19:58:16 -03:00
commit c9724c46c4
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Game/room.h
View file

@ -189,7 +189,7 @@ typedef struct ROOM_INFO
short xSize; short xSize;
short ySize; short ySize;
std::vector<FLOOR_INFO> floor; std::vector<FLOOR_INFO> floor;
CVECTOR ambient; Vector3 ambient;
std::vector<ROOM_LIGHT> lights; std::vector<ROOM_LIGHT> lights;
std::vector<MESH_INFO> mesh; std::vector<MESH_INFO> mesh;
short flippedRoom; short flippedRoom;

2
TR5Main/Renderer/Renderer11Compatibility.cpp
View file

@ -162,7 +162,7 @@ bool Renderer11::PrepareDataForTheRenderer()
RendererRoom& r = m_rooms[i]; RendererRoom& r = m_rooms[i];
r.RoomNumber = i; r.RoomNumber = i;
r.Room = room; 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<RendererLight*>(MAX_LIGHTS); r.LightsToDraw = vector<RendererLight*>(MAX_LIGHTS);
r.Statics.resize(room->mesh.size()); r.Statics.resize(room->mesh.size());

7
TR5Main/Specific/level.cpp
View file

@ -518,10 +518,9 @@ void ReadRooms()
room.floor.push_back(floor); room.floor.push_back(floor);
} }
room.ambient.r = ReadInt8(); room.ambient.x = ReadFloat();
room.ambient.g = ReadInt8(); room.ambient.y = ReadFloat();
room.ambient.b = ReadInt8(); room.ambient.z = ReadFloat();
ReadInt8();
short numLights = ReadInt16(); short numLights = ReadInt16();
room.lights.reserve(numLights); room.lights.reserve(numLights);