Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Npcs and mobs climb in stairs too

Browse Source
feature/colissions-stairs
Nuno 3 years ago
parent 8ea4ff53cb
commit f0b74071ad
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
nel/src/pacs/move_container.cpp
Unescape Escape View File

@ -1676,7 +1676,7 @@ void CMoveContainer::reaction (const CCollisionOTInfo& first)
CVectorD first_pos = dynInfo->getFirstPrimitive()->getFinalPosition(dynInfo->getFirstWorldImage()); CVectorD first_pos = dynInfo->getFirstPrimitive()->getFinalPosition(dynInfo->getFirstWorldImage());
CVectorD second_pos = dynInfo->getSecondPrimitive()->getFinalPosition(dynInfo->getSecondWorldImage()); CVectorD second_pos = dynInfo->getSecondPrimitive()->getFinalPosition(dynInfo->getSecondWorldImage());
nlinfo("P = %f, C = %f, H = %f, D = %f", first_pos.z, second_pos.z, dynInfo->getSecondPrimitive()->getHeight(), second_pos.z-first_pos.z); nlinfo("P = %f, C = %f, H = %f, D = %f", first_pos.z, second_pos.z, dynInfo->getSecondPrimitive()->getHeight(), second_pos.z-first_pos.z);
dynInfo->getFirstPrimitive()->setZOffset(second_pos.z+dynInfo->getSecondPrimitive()->getHeight()-1.0f); dynInfo->getFirstPrimitive()->setZOffset(second_pos.z+dynInfo->getSecondPrimitive()->getHeight()-10.0f);
} }
} }
if (dynInfo->isExit()) if (dynInfo->isExit())

16
ryzom/client/src/character_cl.cpp
Unescape Escape View File

@ -426,7 +426,7 @@ void CCharacterCL::computePrimitive()
// Initialize the primitive. // Initialize the primitive.
if (_Sheet) if (_Sheet)
{ {
initPrimitive(_Sheet->ColRadius*getScale(), _Sheet->ColHeight*getScale(), _Sheet->ColLength, _Sheet->ColWidth, UMovePrimitive::DoNothing, UMovePrimitive::NotATrigger, MaskColNpc, MaskColNone, _Sheet->ClipRadius, _Sheet->ClipHeight); initPrimitive(_Sheet->ColRadius*getScale(), _Sheet->ColHeight*getScale(), _Sheet->ColLength, _Sheet->ColWidth, UMovePrimitive::DoNothing, (UMovePrimitive::TTrigger)(UMovePrimitive::OverlapTrigger | UMovePrimitive::EnterTrigger), MaskColNpc, MaskColDoor, _Sheet->ClipRadius, _Sheet->ClipHeight);
} }
else else
{ {
@ -976,7 +976,7 @@ bool CCharacterCL::build(const CEntitySheet *sheet) // virtual
_CustomScalePos *= getScale(); _CustomScalePos *= getScale();
// Create PACS Primitive. // Create PACS Primitive.
initPrimitive(_Sheet->ColRadius*getScale(), _Sheet->ColHeight*getScale(), _Sheet->ColLength, _Sheet->ColWidth, UMovePrimitive::DoNothing, UMovePrimitive::NotATrigger, MaskColNpc, MaskColNone, _Sheet->ClipRadius, _Sheet->ClipHeight); initPrimitive(_Sheet->ColRadius*getScale(), _Sheet->ColHeight*getScale(), _Sheet->ColLength, _Sheet->ColWidth, UMovePrimitive::DoNothing, (UMovePrimitive::TTrigger)(UMovePrimitive::OverlapTrigger | UMovePrimitive::EnterTrigger), MaskColNpc, MaskColDoor, _Sheet->ClipRadius, _Sheet->ClipHeight);
// Compute the element to be able to snap the entity to the ground. // Compute the element to be able to snap the entity to the ground.
computeCollisionEntity(); computeCollisionEntity();
@ -6678,7 +6678,7 @@ ADD_METHOD(void CCharacterCL::updatePos(const TTime &currentTimeInMs, CEntityCL
updatePosCombatFloat(frameTimeRemaining, target); updatePosCombatFloat(frameTimeRemaining, target);
} }
// Compute the average speed to the destination. // Compute the average speed to the destination.
// double spd = // double spd =
computeSpeed(); computeSpeed();
@ -8232,14 +8232,14 @@ float CCharacterCL::getSheetScale() const // virtual
// getColRadius : // getColRadius :
// Return the entity collision radius. (return 0.5 if there is any problem). // Return the entity collision radius. (return 0.5 if there is any problem).
//--------------------------------------------------- //---------------------------------------------------
float CCharacterCL::getSheetColRadius() const float CCharacterCL::getSheetColRadius() const
{ {
if(!_Sheet) if(!_Sheet)
return 0.5f; return 0.5f;
else else
return _Sheet->ColRadius; return _Sheet->ColRadius;
} }
//--------------------------------------------------- //---------------------------------------------------
// getScale : // getScale :
@ -8358,7 +8358,7 @@ std::string CCharacterCL::shapeFromItem(const CItemSheet &itemSheet) const
sheet = itemSheet.getShape(); sheet = itemSheet.getShape();
return sheet; return sheet;
}// shapeFromItem // }// shapeFromItem //
@ -9146,7 +9146,7 @@ void CCharacterCL::setAuraFX(uint index, const CAnimationFX *sheet)
bi.DelayBeforeStart = 11.5f; bi.DelayBeforeStart = 11.5f;
_AttachedFXListToStart.push_front(bi); _AttachedFXListToStart.push_front(bi);
} }
else else
{ {
CAttachedFX::TSmartPtr fx = new CAttachedFX; CAttachedFX::TSmartPtr fx = new CAttachedFX;
fx->create(*this, bi, CAttachedFX::CTargeterInfo()); fx->create(*this, bi, CAttachedFX::CTargeterInfo());

8
ryzom/client/src/entities.cpp
Unescape Escape View File

@ -945,6 +945,8 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
float height = primitive->getHeight(); float height = primitive->getHeight();
CVector size = CVector(width, depth, height); CVector size = CVector(width, depth, height);
if (primitive->getTriggerType() == UMovePrimitive::OverlapStairsTrigger)
size.z -= 10.0f;
float v; float v;
if (getRelativeFloatFromString(values[i], v)) if (getRelativeFloatFromString(values[i], v))
{ {
@ -954,6 +956,8 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
{ {
updateVector(param, size, v, false); updateVector(param, size, v, false);
} }
if (primitive->getTriggerType() == UMovePrimitive::OverlapStairsTrigger)
size.z += 10.0f;
primitive->setSize(size.x, size.y); primitive->setSize(size.x, size.y);
primitive->setHeight(size.z); primitive->setHeight(size.z);
} }
@ -1028,12 +1032,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
{ {
bool active; bool active;
fromString(values[i], active); fromString(values[i], active);
primitive->setObstacle(active); primitive->setObstacle(!active);
if (active) if (active)
{ {
primitive->setReactionType(UMovePrimitive::DoNothing); primitive->setReactionType(UMovePrimitive::DoNothing);
primitive->setTriggerType(UMovePrimitive::OverlapStairsTrigger); primitive->setTriggerType(UMovePrimitive::OverlapStairsTrigger);
primitive->setGlobalPosition(instance.getPos()+CVector(0, 0, 0.5f), dynamicWI); primitive->setGlobalPosition(instance.getPos(), dynamicWI);
} }
else else
{ {

4
ryzom/client/src/main_loop.cpp
Unescape Escape View File

@ -3080,9 +3080,9 @@ void displayPACSPrimitive()
// Static collision // Static collision
if (prim->getTriggerType() == UMovePrimitive::OverlapStairsTrigger) if (prim->getTriggerType() == UMovePrimitive::OverlapStairsTrigger)
{ {
line.Color0 = CRGBA::Blue; line.Color0 = CRGBA::Green;
isStairs = true; isStairs = true;
position.z -= 1.0f; position.z -= 10.0f;
} }
else if (prim->getReactionType() == UMovePrimitive::DoNothing) else if (prim->getReactionType() == UMovePrimitive::DoNothing)
{ {

Write Preview
Loading…
Cancel
Save