if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol

Seth Alves committed 11 years ago

Commit 88fc7431 parent 0a734c93 files · +32 −55Browse files

Showing the changes to libraries/physics/src/ObjectActionSpring.cpp (1 of 3 files). Show all

Unified · Split

 #include "ObjectActionSpring.h"
+const float SPRING_MAX_SPEED = 10.0f;
 const uint16_t ObjectActionSpring::springVersion = 1;
 ObjectActionSpring::ObjectActionSpring(EntityActionType type, QUuid id, EntityItemPointer ownerEntity) :
         float offsetLength = glm::length(offset);
         float speed = offsetLength / _linearTimeScale;
+        // cap speed
+        if (speed > SPRING_MAX_SPEED) {
+            speed = SPRING_MAX_SPEED;
+        }
         if (offsetLength > IGNORE_POSITION_DELTA) {
             glm::vec3 newVelocity = glm::normalize(offset) * speed;
             rigidBody->setLinearVelocity(glmToBullet(newVelocity));

Keyboard shortcuts