mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-02 10:53:44 +00:00
feat: switch trigger physics volumes on and off at runtime
The ActivatePhysics trigger command was a TODO. The client activates or deactivates the object's physics component (LWOPhysicsSystemComponent::msgActivatePhysics, 1.10.64 0x00ccf970); the server now does the same to phantom physics: switching it off takes the volume out of the physics world (dpWorld::DetachEntity, without deleting it) and makes whatever was inside leave, switching it on adds it back and whatever is inside enters on the next step. This lets trigger driven volumes like the monument lasers turn on and off. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -87,9 +87,31 @@ PhantomPhysicsComponent::PhantomPhysicsComponent(Entity* parent, const int32_t c
|
||||
}
|
||||
}
|
||||
|
||||
void ApplyCollisionEffect(const LWOOBJID& target, const ePhysicsEffectType effectType, const float effectScale);
|
||||
|
||||
PhantomPhysicsComponent::~PhantomPhysicsComponent() {
|
||||
if (m_dpEntity) {
|
||||
dpWorld::RemoveEntity(m_dpEntity);
|
||||
if (!m_dpEntity) return;
|
||||
|
||||
if (m_PhysicsActive) dpWorld::RemoveEntity(m_dpEntity);
|
||||
else delete m_dpEntity;
|
||||
}
|
||||
|
||||
void PhantomPhysicsComponent::SetPhysicsActive(const bool active) {
|
||||
if (!m_dpEntity || m_PhysicsActive == active) return;
|
||||
m_PhysicsActive = active;
|
||||
|
||||
if (active) {
|
||||
// Anything already inside enters on the next physics step
|
||||
dpWorld::AddEntity(m_dpEntity);
|
||||
return;
|
||||
}
|
||||
|
||||
dpWorld::DetachEntity(m_dpEntity);
|
||||
const std::vector<LWOOBJID> inside(m_dpEntity->GetCurrentlyCollidingObjects().begin(), m_dpEntity->GetCurrentlyCollidingObjects().end());
|
||||
m_dpEntity->ClearCollisions();
|
||||
for (const auto id : inside) {
|
||||
ApplyCollisionEffect(id, m_EffectType, 1.0f);
|
||||
m_Parent->OnCollisionLeavePhantom(id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,7 +173,7 @@ void ApplyCollisionEffect(const LWOOBJID& target, const ePhysicsEffectType effec
|
||||
}
|
||||
|
||||
void PhantomPhysicsComponent::Update(float deltaTime) {
|
||||
if (!m_dpEntity) return;
|
||||
if (!m_dpEntity || !m_PhysicsActive) return;
|
||||
|
||||
//Process enter events
|
||||
for (const auto id : m_dpEntity->GetNewObjects()) {
|
||||
|
||||
Reference in New Issue
Block a user