Core/Objects: further improvements for MovePositionToFirstCollision (#24523)
* Core/Objects: further improvements for MovePositionToFirstCollision * the PathGenerator will now normalize incomplete destinations as well * normalize destination positions before launching detour raycasts to get better direction data * exclude unwanted pathfinding results from further use to avoid unintended behaivior * Core/PathFinding: Split PATHFIND_FARFROMPOLY into PATHFIND_FARFROMPOLY_START and PATHFIND_FARFROMPOLY_END for start and end position Handle PATHFIND_FARFROMPOLY_END as valid in MovePositionToFirstCollision Co-authored-by: jackpoz <giacomopoz@gmail.com> # Conflicts: # src/server/game/Entities/Object/Object.cpp # src/server/game/Movement/PathGenerator.h
This commit is contained in:
1 parent
1472bc9a7d
commit
1a85f82edd
3 files changed
+67
-17
No files matched your search
@@ -2553,16 +2553,38 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float
|
||||
// Use a detour raycast to get our first collision point
|
||||
PathGenerator path(this);
|
||||
path.CalculatePath(destx, desty, destz, false, true);
|
||||
|
||||
// We have a invalid path result. Skip further processing.
|
||||
if (path.GetPathType() & ~(PATHFIND_NORMAL | PATHFIND_SHORTCUT | PATHFIND_INCOMPLETE | PATHFIND_FARFROMPOLY_END))
|
||||
return;
|
||||
|
||||
G3D::Vector3 result = path.GetPath().back();
|
||||
destx = result.x;
|
||||
desty = result.y;
|
||||
destz = result.z;
|
||||
|
||||
UpdateAllowedPositionZ(destx, desty, destz);
|
||||
// Object is using a shortcut. Check static LOS
|
||||
float halfHeight = GetCollisionHeight() * 0.5f;
|
||||
if (path.GetPathType() & PATHFIND_SHORTCUT)
|
||||
{
|
||||
uint32 terrainMapId = PhasingHandler::GetTerrainMapId(GetPhaseShift(), GetMap(), pos.m_positionX, pos.m_positionY);
|
||||
bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(terrainMapId,
|
||||
pos.m_positionX, pos.m_positionY, pos.m_positionZ + halfHeight,
|
||||
destx, desty, destz + halfHeight,
|
||||
destx, desty, destz, -0.5f);
|
||||
|
||||
destz -= halfHeight;
|
||||
|
||||
// Collided with static LOS object, move back to collision point
|
||||
if (col)
|
||||
{
|
||||
destx -= CONTACT_DISTANCE * std::cos(angle);
|
||||
desty -= CONTACT_DISTANCE * std::sin(angle);
|
||||
dist = std::sqrt((pos.m_positionX - destx) * (pos.m_positionX - destx) + (pos.m_positionY - desty) * (pos.m_positionY - desty));
|
||||
}
|
||||
}
|
||||
|
||||
// check dynamic collision
|
||||
float halfHeight = GetCollisionHeight() * 0.5f;
|
||||
bool col = GetMap()->getObjectHitPos(GetPhaseShift(),
|
||||
pos.m_positionX, pos.m_positionY, pos.m_positionZ + halfHeight,
|
||||
destx, desty, destz + halfHeight,
|
||||
|
||||
Reference in new issue
Block a user