From 543bf5224c118c74a571f26b7123d7c138efdac4 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 18 Aug 2014 12:54:26 -0700 Subject: [PATCH] add VerletPoint::shift() --- libraries/shared/src/VerletPoint.cpp | 5 +++++ libraries/shared/src/VerletPoint.h | 1 + 2 files changed, 6 insertions(+) diff --git a/libraries/shared/src/VerletPoint.cpp b/libraries/shared/src/VerletPoint.cpp index d2dd985587..cf9aeca149 100644 --- a/libraries/shared/src/VerletPoint.cpp +++ b/libraries/shared/src/VerletPoint.cpp @@ -39,6 +39,11 @@ void VerletPoint::move(const glm::vec3& deltaPosition, const glm::quat& deltaRot _lastPosition += deltaPosition + (deltaRotation * arm - arm); } +void VerletPoint::shift(const glm::vec3& deltaPosition) { + _position += deltaPosition; + _lastPosition += deltaPosition; +} + void VerletPoint::setMass(float mass) { const float MIN_MASS = 1.0e-6f; const float MAX_MASS = 1.0e18f; diff --git a/libraries/shared/src/VerletPoint.h b/libraries/shared/src/VerletPoint.h index 6f94656966..3c73e5eb01 100644 --- a/libraries/shared/src/VerletPoint.h +++ b/libraries/shared/src/VerletPoint.h @@ -25,6 +25,7 @@ public: void accumulateDelta(const glm::vec3& delta); void applyAccumulatedDelta(); void move(const glm::vec3& deltaPosition, const glm::quat& deltaRotation, const glm::vec3& oldPivot); + void shift(const glm::vec3& deltaPosition); void setMass(float mass); float getMass() const { return _mass; }