Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Andrew Meadows 2014-06-10 15:25:25 -07:00
commit 5f5ffff23c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/shared/src/RagDoll.cpp
View file

@ -19,7 +19,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// FixedConstraint // FixedConstraint
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
FixedConstraint::FixedConstraint(glm::vec3* point, const glm::vec3& anchor ) : _point(point), _anchor(anchor) { FixedConstraint::FixedConstraint(glm::vec3* point, const glm::vec3& anchor) : _point(point), _anchor(anchor) {
} }
float FixedConstraint::enforce() { float FixedConstraint::enforce() {
@ -80,7 +80,7 @@ void DistanceConstraint::updateProxyShape(Shape* shape, const glm::quat& rotatio
} }
break; break;
case Shape::CAPSULE_SHAPE: { case Shape::CAPSULE_SHAPE: {
// capsule collides from startPoint to endPoint // capsule collides from startPoint to endPoint
CapsuleShape* capsule = static_cast<CapsuleShape*>(shape); CapsuleShape* capsule = static_cast<CapsuleShape*>(shape);
capsule->setEndPoints(translation + rotation * (*_points[0]), translation + rotation * (*_points[1])); capsule->setEndPoints(translation + rotation * (*_points[0]), translation + rotation * (*_points[1]));
} }