pull some common code out of subclasses and into ObjectAction

libraries/entities-renderer/src/EntityTreeRenderer.cpp

@@ -1012,8 +1012,10 @@ void EntityTreeRenderer::deletingEntity(const EntityItemID& entityID) {
 void EntityTreeRenderer::addingEntity(const EntityItemID& entityID) {
     checkAndCallPreload(entityID);
     auto entity = static_cast<EntityTree*>(_tree)->findEntityByID(entityID);
+    if (entity) {
         addEntityToScene(entity);
     }
+}
 
 void EntityTreeRenderer::addEntityToScene(EntityItemPointer entity) {
     // here's where we add the entity payload to the scene

libraries/physics/src/ObjectAction.cpp

@@ -24,7 +24,27 @@ ObjectAction::~ObjectAction() {
 }
 
 void ObjectAction::updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) {
-    qDebug() << "ObjectAction::updateAction called";
+    if (!_active) {
+        return;
+    }
+    if (!_ownerEntity) {
+        qDebug() << "ObjectActionPullToPoint::updateAction no owner entity";
+        return;
+    }
+    if (!tryLockForRead()) {
+        // don't risk hanging the thread running the physics simulation
+        return;
+    }
+    void* physicsInfo = _ownerEntity->getPhysicsInfo();
+
+    if (physicsInfo) {
+        ObjectMotionState* motionState = static_cast<ObjectMotionState*>(physicsInfo);
+        btRigidBody* rigidBody = motionState->getRigidBody();
+        if (rigidBody) {
+            updateActionWorker(collisionWorld, deltaTimeStep, motionState, rigidBody);
+        }
+    }
+    unlock();
 }
 
 void ObjectAction::debugDraw(btIDebugDraw* debugDrawer) {

libraries/physics/src/ObjectAction.h

@@ -13,11 +13,14 @@
 #ifndef hifi_ObjectAction_h
 #define hifi_ObjectAction_h
 
-#include <btBulletDynamicsCommon.h>
-
 #include <QUuid>
 
+#include <btBulletDynamicsCommon.h>
+
 #include <EntityItem.h>
+#include "ObjectMotionState.h"
+#include "BulletUtil.h"
+
 
 class ObjectAction : public btActionInterface, public EntityActionInterface {
 public:
@@ -30,6 +33,10 @@ public:
     virtual void setOwnerEntity(const EntityItemPointer ownerEntity) { _ownerEntity = ownerEntity; }
     virtual bool updateArguments(QVariantMap arguments) { return false; }
 
+    // this is called from updateAction and should be overridden by subclasses
+    virtual void updateActionWorker(btCollisionWorld* collisionWorld, btScalar deltaTimeStep,
+                                    ObjectMotionState* motionState, btRigidBody* rigidBody) {}
+
     // these are from btActionInterface
     virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep);
     virtual void debugDraw(btIDebugDraw* debugDrawer);

libraries/physics/src/ObjectActionPullToPoint.cpp

@@ -9,9 +9,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ObjectMotionState.h"
-#include "BulletUtil.h"
-
 #include "ObjectActionPullToPoint.h"
 
 ObjectActionPullToPoint::ObjectActionPullToPoint(QUuid id, EntityItemPointer ownerEntity) :
@@ -27,21 +24,8 @@ ObjectActionPullToPoint::~ObjectActionPullToPoint() {
     #endif
 }
 
-void ObjectActionPullToPoint::updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) {
-    if (!_ownerEntity) {
-        qDebug() << "ObjectActionPullToPoint::updateAction no owner entity";
-        return;
-    }
-    if (!tryLockForRead()) {
-        // don't risk hanging the thread running the physics simulation
-        return;
-    }
-    void* physicsInfo = _ownerEntity->getPhysicsInfo();
-
-    if (_active && physicsInfo) {
-        ObjectMotionState* motionState = static_cast<ObjectMotionState*>(physicsInfo);
-        btRigidBody* rigidBody = motionState->getRigidBody();
-        if (rigidBody) {
+void ObjectActionPullToPoint::updateActionWorker(btCollisionWorld* collisionWorld, btScalar deltaTimeStep,
+                                                 ObjectMotionState* motionState, btRigidBody* rigidBody) {
     glm::vec3 offset = _target - bulletToGLM(rigidBody->getCenterOfMassPosition());
     float offsetLength = glm::length(offset);
     if (offsetLength > IGNORE_POSITION_DELTA) {
@@ -52,9 +36,6 @@ void ObjectActionPullToPoint::updateAction(btCollisionWorld* collisionWorld, btS
         rigidBody->setLinearVelocity(glmToBullet(glm::vec3()));
     }
 }
-    }
-    unlock();
-}
 
 
 bool ObjectActionPullToPoint::updateArguments(QVariantMap arguments) {

libraries/physics/src/ObjectActionPullToPoint.h

@@ -23,7 +23,8 @@ public:
     virtual ~ObjectActionPullToPoint();
 
     virtual bool updateArguments(QVariantMap arguments);
-    virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep);
+    virtual void updateActionWorker(btCollisionWorld* collisionWorld, btScalar deltaTimeStep,
+                                    ObjectMotionState* motionState, btRigidBody* rigidBody);
 
 private:
 

libraries/physics/src/ObjectActionSpring.cpp

@@ -9,9 +9,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ObjectMotionState.h"
-#include "BulletUtil.h"
-
 #include "ObjectActionSpring.h"
 
 ObjectActionSpring::ObjectActionSpring(QUuid id, EntityItemPointer ownerEntity) :
@@ -27,21 +24,8 @@ ObjectActionSpring::~ObjectActionSpring() {
     #endif
 }
 
-void ObjectActionSpring::updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) {
-    if (!_ownerEntity) {
-        qDebug() << "ObjectActionSpring::updateAction no owner entity";
-        return;
-    }
-    if (!tryLockForRead()) {
-        // don't risk hanging the thread running the physics simulation
-        return;
-    }
-    void* physicsInfo = _ownerEntity->getPhysicsInfo();
-
-    if (_active && physicsInfo) {
-        ObjectMotionState* motionState = static_cast<ObjectMotionState*>(physicsInfo);
-        btRigidBody* rigidBody = motionState->getRigidBody();
-        if (rigidBody) {
+void ObjectActionSpring::updateActionWorker(btCollisionWorld* collisionWorld, btScalar deltaTimeStep,
+                                            ObjectMotionState* motionState, btRigidBody* rigidBody) {
     // handle the linear part
     if (_positionalTargetSet) {
         glm::vec3 offset = _positionalTarget - bulletToGLM(rigidBody->getCenterOfMassPosition());
@@ -51,10 +35,9 @@ void ObjectActionSpring::updateAction(btCollisionWorld* collisionWorld, btScalar
         if (offsetLength > IGNORE_POSITION_DELTA) {
             glm::vec3 newVelocity = glm::normalize(offset) * speed;
             rigidBody->setLinearVelocity(glmToBullet(newVelocity));
-                    // void setAngularVelocity (const btVector3 &ang_vel);
             rigidBody->activate();
         } else {
-                    rigidBody->setLinearVelocity(glmToBullet(glm::vec3()));
+            rigidBody->setLinearVelocity(glmToBullet(glm::vec3(0.0f)));
         }
     }
 
@@ -88,9 +71,6 @@ void ObjectActionSpring::updateAction(btCollisionWorld* collisionWorld, btScalar
         }
     }
 }
-    }
-    unlock();
-}
 
 
 bool ObjectActionSpring::updateArguments(QVariantMap arguments) {

libraries/physics/src/ObjectActionSpring.h

@@ -23,7 +23,8 @@ public:
     virtual ~ObjectActionSpring();
 
     virtual bool updateArguments(QVariantMap arguments);
-    virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep);
+    virtual void updateActionWorker(btCollisionWorld* collisionWorld, btScalar deltaTimeStep,
+                                    ObjectMotionState* motionState, btRigidBody* rigidBody);
 
 private: