Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-09 13:18:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3282 from AndrewMeadows/ragdoll

Browse source 
fix crash for between two ragdolls
This commit is contained in:
Philip Rosedale 2014-08-14 11:45:09 -07:00
commit e18f4e7033
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/SkeletonModel.cpp
View file

@ -432,7 +432,8 @@ bool SkeletonModel::getHeadPosition(glm::vec3& headPosition) const {
} }
bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const { bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const {
if (Menu::getInstance()->isOptionChecked(MenuOption::CollideAsRagdoll)) { if (_owningAvatar->isMyAvatar() &&
Menu::getInstance()->isOptionChecked(MenuOption::CollideAsRagdoll)) {
return isActive() && getVisibleJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition); return isActive() && getVisibleJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition);
} }
return isActive() && getJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition); return isActive() && getJointPositionInWorldFrame(_geometry->getFBXGeometry().neckJointIndex, neckPosition);

3
libraries/shared/src/Ragdoll.cpp
View file

@ -24,6 +24,9 @@ Ragdoll::Ragdoll() : _massScale(1.0f), _ragdollTranslation(0.0f), _translationIn
Ragdoll::~Ragdoll() { Ragdoll::~Ragdoll() {
clearRagdollConstraintsAndPoints(); clearRagdollConstraintsAndPoints();
if (_ragdollSimulation) {
_ragdollSimulation->removeRagdoll(this);
}
} }
void Ragdoll::stepRagdollForward(float deltaTime) { void Ragdoll::stepRagdollForward(float deltaTime) {