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

Rename fields for consistency

Browse source
This commit is contained in:
Lwmte 2024-12-18 13:14:08 +01:00
parent 79a8db0655
commit 1f002745f3
7 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TombEngine/Renderer/Renderer.h
View file

@ -582,7 +582,7 @@ namespace TEN::Renderer
inline bool IgnoreReflectionPassForRoom(int room)
{
return (_currentMirror != nullptr && room != _currentMirror->RealRoom);
return (_currentMirror != nullptr && room != _currentMirror->RoomNumber);
}
inline void ReflectVectorOptionally(Vector3& vector)

2
TombEngine/Renderer/RendererDraw.cpp
View file

@ -1652,7 +1652,7 @@ namespace TEN::Renderer
// Check if light is spawned in a mirrored room, and create reflection.
for (auto& mirror : g_Level.Mirrors)
{
if (Camera.pos.RoomNumber == mirror.RealRoom && IsPointInRoom(light.Position, mirror.RealRoom))
if (Camera.pos.RoomNumber == mirror.RoomNumber && IsPointInRoom(light.Position, mirror.RoomNumber))
{
RendererLight reflectedLight = light;
reflectedLight.Position = Vector3::Transform(light.Position, mirror.ReflectionMatrix);

4
TombEngine/Renderer/RendererFrame.cpp
View file

@ -362,7 +362,7 @@ namespace TEN::Renderer
// Collect mirrors first, because they are needed while collecting items
for (auto& mirror : g_Level.Mirrors)
{
if (mirror.RealRoom != Camera.pos.RoomNumber && mirror.RealRoom != LaraItem->RoomNumber)
if (mirror.RoomNumber != Camera.pos.RoomNumber && mirror.RoomNumber != LaraItem->RoomNumber)
continue;
if (!mirror.Enabled)
@ -370,7 +370,7 @@ namespace TEN::Renderer
auto& rendererMirror = renderView.Mirrors.emplace_back();
rendererMirror.RealRoom = mirror.RealRoom;
rendererMirror.RoomNumber = mirror.RoomNumber;
rendererMirror.ReflectionMatrix = mirror.ReflectionMatrix;
rendererMirror.ReflectLara = mirror.ReflectLara;
rendererMirror.ReflectMoveables = mirror.ReflectMoveables;

2
TombEngine/Renderer/RendererHelper.cpp
View file

@ -604,7 +604,7 @@ namespace TEN::Renderer
{
for (auto& mirror : renderView.Mirrors)
{
if (roomNumber == mirror.RealRoom && (Camera.pos.RoomNumber == mirror.RealRoom || LaraItem->RoomNumber == mirror.RealRoom))
if (roomNumber == mirror.RoomNumber && (Camera.pos.RoomNumber == mirror.RoomNumber || LaraItem->RoomNumber == mirror.RoomNumber))
return true;
}

2
TombEngine/Renderer/Structures/RendererMirror.h
View file

@ -8,7 +8,7 @@ namespace TEN::Renderer::Structures
struct RendererMirror
{
short RealRoom;
short RoomNumber;
Plane Plane;
Matrix ReflectionMatrix;
bool ReflectLara;

2
TombEngine/Specific/level.cpp
View file

@ -1529,7 +1529,7 @@ void LoadMirrors()
{
auto& mirror = g_Level.Mirrors.emplace_back();
mirror.RealRoom = ReadInt16();
mirror.RoomNumber = ReadInt16();
mirror.MirrorPlane.x = ReadFloat();
mirror.MirrorPlane.y = ReadFloat();
mirror.MirrorPlane.z = ReadFloat();

2
TombEngine/Specific/level.h
View file

@ -87,7 +87,7 @@ struct MESH
struct MirrorInfo
{
short RealRoom;
short RoomNumber;
Vector4 MirrorPlane;
Matrix ReflectionMatrix;
bool ReflectLara;