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

Fixed weather particles performance

Browse source
This commit is contained in:
Lwmte 2024-11-07 23:44:31 +01:00
parent 43c8f8658b
commit 222e67e493
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -7,7 +7,9 @@ TombEngine releases are located in this repository (alongside with Tomb Editor):
### Bug fixes ### Bug fixes
* Fixed bad engine performance around multiple stacked bridges. * Fixed engine performance around multiple stacked bridges.
* Fixed engine performance if weather effects are active.
* Fixed snow particles not always melting on the ground.
* Fixed enemy pickups dropping on death sectors. * Fixed enemy pickups dropping on death sectors.
### Features/Amendments ### Features/Amendments

1
TombEngine/Game/collision/Point.h
View file

@ -36,6 +36,7 @@ namespace TEN::Collision::Point
public: public:
// Constructors // Constructors
PointCollisionData() = default;
PointCollisionData(const Vector3i& pos, int roomNumber); PointCollisionData(const Vector3i& pos, int roomNumber);
// Getters // Getters

12
TombEngine/Game/effects/weather.cpp
View file

@ -361,8 +361,9 @@ namespace TEN::Effects::Environment
if (part.Type == WeatherType::None) if (part.Type == WeatherType::None)
continue; continue;
auto pointColl = GetPointCollision(part.Position, part.RoomNumber); PointCollisionData pointColl;
bool collisionCalculated = false; bool collisionCalculated = false;
bool landed = false;
if (part.CollisionCheckDelay <= 0) if (part.CollisionCheckDelay <= 0)
{ {
@ -393,9 +394,8 @@ namespace TEN::Effects::Environment
if (pointColl.GetRoomNumber() == part.RoomNumber) if (pointColl.GetRoomNumber() == part.RoomNumber)
{ {
// Not landed on door, so out of room bounds - delete. // Not landed on door, so out of room bounds - land.
part.Enabled = false; landed = true;
continue;
} }
else else
{ {
@ -409,7 +409,7 @@ namespace TEN::Effects::Environment
// If particle is inside water or swamp, count it as "inSubstance". // If particle is inside water or swamp, count it as "inSubstance".
// If particle got below floor or above ceiling, count it as "landed". // If particle got below floor or above ceiling, count it as "landed".
bool inSubstance = g_Level.Rooms[pointColl.GetRoomNumber()].flags & (ENV_FLAG_WATER | ENV_FLAG_SWAMP); bool inSubstance = g_Level.Rooms[pointColl.GetRoomNumber()].flags & (ENV_FLAG_WATER | ENV_FLAG_SWAMP);
bool landed = (pointColl.GetFloorHeight() <= part.Position.y) || (pointColl.GetCeilingHeight() >= part.Position.y); landed = landed || (pointColl.GetFloorHeight() <= part.Position.y) || (pointColl.GetCeilingHeight() >= part.Position.y);
if (inSubstance || landed) if (inSubstance || landed)
{ {
@ -427,6 +427,8 @@ namespace TEN::Effects::Environment
part.Enabled = false; part.Enabled = false;
AddWaterSparks(prevPos.x, prevPos.y, prevPos.z, 6); AddWaterSparks(prevPos.x, prevPos.y, prevPos.z, 6);
} }
continue;
} }
} }