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

Fixed plane selection for split ceilings

Browse source
This commit is contained in:
wolfcheese 2021-06-03 23:19:38 -04:00
parent 1fa0a8a1c9
commit 952b27f932
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TR5Main/Game/floordata.cpp
View file

@ -17,6 +17,16 @@ int FLOOR_INFO::SectorPlane(int x, int z) const
return vector.x < 0 ? 0 : 1; return vector.x < 0 ? 0 : 1;
} }
int FLOOR_INFO::SectorPlaneCeiling(int x, int z) const
{
const auto point = GetSectorPoint(x, z);
auto vector = Vector2(point.x, point.y);
const auto matrix = Matrix::CreateRotationZ(CeilingCollision.SplitAngle);
Vector2::Transform(vector, matrix, vector);
return vector.x < 0 ? 0 : 1;
}
std::optional<int> FLOOR_INFO::RoomBelow(int plane) const std::optional<int> FLOOR_INFO::RoomBelow(int plane) const
{ {
const auto room = FloorCollision.Portals[plane]; const auto room = FloorCollision.Portals[plane];
@ -116,7 +126,7 @@ int FLOOR_INFO::BridgeFloorHeight(int x, int z, int y) const
int FLOOR_INFO::CeilingHeight(int x, int z) const int FLOOR_INFO::CeilingHeight(int x, int z) const
{ {
const auto plane = SectorPlane(x, z); const auto plane = SectorPlaneCeiling(x, z);
const auto vector = GetSectorPoint(x, z); const auto vector = GetSectorPoint(x, z);
return CeilingCollision.Planes[plane].x * vector.x + CeilingCollision.Planes[plane].y * vector.y + CeilingCollision.Planes[plane].z; return CeilingCollision.Planes[plane].x * vector.x + CeilingCollision.Planes[plane].y * vector.y + CeilingCollision.Planes[plane].z;

1
TR5Main/Game/floordata.h
View file

@ -27,6 +27,7 @@ public:
int Room; int Room;
int SectorPlane(int x, int z) const; int SectorPlane(int x, int z) const;
int SectorPlaneCeiling(int x, int z) const;
std::optional<int> RoomBelow(int plane) const; std::optional<int> RoomBelow(int plane) const;
std::optional<int> RoomBelow(int x, int z) const; std::optional<int> RoomBelow(int x, int z) const;
std::optional<int> RoomBelow(int x, int z, int y) const; std::optional<int> RoomBelow(int x, int z, int y) const;