Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-07 21:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter physics volumes like the client's collision groups

Browse Source 
Volumes on the server touched far more than in the client:

- An enemy's body in the physics world was a sphere the size of its aggro
  radius, so trigger and damage volumes caught enemies from far away
  (Cavalry Hill enemies taking damage on spawn). It is now the enemy's
  own radius and collision group from its physics component.
- Trigger volumes ignored their collision group and caught everything.
  dpEntity now filters with the client's collision filter
  (PeCollisionFilter, 1.10.64 0x00fb6940, group table from 0x00fcf9a0):
  POI walls ignore enemies, threat clearing walls ignore players, and
  so on. The aggro sensor keeps seeing only players.
- Rotated boxes were tested as the axis aligned box around them, which
  for a turned wall covers a big square (the AG survival boundary).
  Sphere and point tests now use the box's own axes.

Proximity monitors take an optional collision group like live's
SetProximityRadius; the AM shield generators use live's (10 finds
enemies, 1 finds players).

Fixes #1127
Refs #1971

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 23:57:50 -05:00
parent 507ebc7fda
commit 9907d7deb8
20 changed files with 277 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dPhysics/dpShapeBox.cpp
View File

@@ -7,6 +7,7 @@
#include "NiPoint3.h"
#include "NiQuaternion.h"
#include <algorithm>
#include <iostream>
dpShapeBox::dpShapeBox(dpEntity* parentEntity, float width, float height, float depth) :
@@ -78,6 +79,7 @@ void dpShapeBox::SetScale(float scale) {
void dpShapeBox::SetRotation(const NiQuaternion& rotation) {
if (m_HasBeenRotated) return; //Boxes cannot be rotated more than once.
m_HasBeenRotated = true;
m_Orientation = rotation;
m_TopMinLeft = m_TopMinLeft.RotateByQuaternion(rotation);
m_TopMaxLeft = m_TopMaxLeft.RotateByQuaternion(rotation);
@@ -93,19 +95,17 @@ void dpShapeBox::SetRotation(const NiQuaternion& rotation) {
}
bool dpShapeBox::IsVertInBox(const NiPoint3& vert) {
//if we are in the correct height
if (vert.y >= m_MinY && vert.y <= m_MaxY) {
return SquaredDistanceTo(vert) <= 0.0f;
}
//if we're inside the x bounds
if (vert.x >= m_MinX && vert.x <= m_MaxX) {
float dpShapeBox::SquaredDistanceTo(const NiPoint3& point) const {
// Into the box's frame: its origin is the middle of its bottom face
const auto local = (point - m_Origin).RotateByQuaternion(glm::conjugate(m_Orientation));
//if we're inside the z bounds
if (vert.z >= m_MinZ && vert.z <= m_MaxZ)
return true;
}
}
return false;
const float dX = local.x - std::clamp(local.x, -m_Width, m_Width);
const float dY = local.y - std::clamp(local.y, 0.0f, m_Height * 2.0f);
const float dZ = local.z - std::clamp(local.z, -m_Depth, m_Depth);
return dX * dX + dY * dY + dZ * dZ;
}
void dpShapeBox::InitVertices() {
@@ -129,6 +129,7 @@ void dpShapeBox::InitVertices() {
void dpShapeBox::SetPosition(const NiPoint3& position) {
if (isTransformed) return;
isTransformed = true;
m_Origin = position;
for (auto& vert : m_Vertices) {
vert.x += position.x;