remove last of *InDomainUnits code

libraries/entities/src/EntityItem.cpp

@@ -82,7 +82,7 @@ EntityItem::EntityItem(const EntityItemID& entityItemID, const EntityItemPropert
 }
 
 EntityItem::~EntityItem() {
-    // these pointers MUST be NULL at delete, else we probably have a dangling backpointer 
+    // these pointers MUST be correct at delete, else we probably have a dangling backpointer 
     // to this EntityItem in the corresponding data structure.
     assert(!_simulated);
     assert(!_element);
@@ -517,12 +517,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     EntityPropertyFlags propertyFlags = encodedPropertyFlags;
     dataAt += propertyFlags.getEncodedLength();
     bytesRead += propertyFlags.getEncodedLength();
-    bool useMeters = (args.bitstreamVersion >= VERSION_ENTITIES_USE_METERS_AND_RADIANS);
+    READ_ENTITY_PROPERTY(PROP_POSITION, glm::vec3, updatePosition);
-    if (useMeters) {
-        READ_ENTITY_PROPERTY(PROP_POSITION, glm::vec3, updatePosition);
-    } else {
-        READ_ENTITY_PROPERTY(PROP_POSITION, glm::vec3, updatePositionInDomainUnits);
-    }
 
     // Old bitstreams had PROP_RADIUS, new bitstreams have PROP_DIMENSIONS
     if (args.bitstreamVersion < VERSION_ENTITIES_SUPPORT_DIMENSIONS) {
@@ -536,22 +531,13 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
             }
         }
     } else {
-        if (useMeters) {
+        READ_ENTITY_PROPERTY(PROP_DIMENSIONS, glm::vec3, updateDimensions);
-            READ_ENTITY_PROPERTY(PROP_DIMENSIONS, glm::vec3, updateDimensions);
-        } else {
-            READ_ENTITY_PROPERTY(PROP_DIMENSIONS, glm::vec3, updateDimensionsInDomainUnits);
-        }
     }
 
     READ_ENTITY_PROPERTY(PROP_ROTATION, glm::quat, updateRotation);
     READ_ENTITY_PROPERTY(PROP_DENSITY, float, updateDensity);
-    if (useMeters) {
+    READ_ENTITY_PROPERTY(PROP_VELOCITY, glm::vec3, updateVelocity);
-        READ_ENTITY_PROPERTY(PROP_VELOCITY, glm::vec3, updateVelocity);
+    READ_ENTITY_PROPERTY(PROP_GRAVITY, glm::vec3, updateGravity);
-        READ_ENTITY_PROPERTY(PROP_GRAVITY, glm::vec3, updateGravity);
-    } else {
-        READ_ENTITY_PROPERTY(PROP_VELOCITY, glm::vec3, updateVelocityInDomainUnits);
-        READ_ENTITY_PROPERTY(PROP_GRAVITY, glm::vec3, updateGravityInDomainUnits);
-    }
     if (args.bitstreamVersion >= VERSION_ENTITIES_HAVE_ACCELERATION) {
         READ_ENTITY_PROPERTY(PROP_ACCELERATION, glm::vec3, setAcceleration);
     }
@@ -562,11 +548,8 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     READ_ENTITY_PROPERTY(PROP_LIFETIME, float, updateLifetime);
     READ_ENTITY_PROPERTY(PROP_SCRIPT, QString, setScript);
     READ_ENTITY_PROPERTY(PROP_REGISTRATION_POINT, glm::vec3, setRegistrationPoint);
-    if (useMeters) {
+    READ_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, glm::vec3, updateAngularVelocity);
-        READ_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, glm::vec3, updateAngularVelocity);
+    //READ_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, glm::vec3, updateAngularVelocityInDegrees);
-    } else {
-        READ_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, glm::vec3, updateAngularVelocityInDegrees);
-    }
     READ_ENTITY_PROPERTY(PROP_ANGULAR_DAMPING, float, updateAngularDamping);
     READ_ENTITY_PROPERTY(PROP_VISIBLE, bool, setVisible);
     READ_ENTITY_PROPERTY(PROP_IGNORE_FOR_COLLISIONS, bool, updateIgnoreForCollisions);
@@ -1127,11 +1110,6 @@ void EntityItem::computeShapeInfo(ShapeInfo& info) {
     info.setParams(getShapeType(), 0.5f * getDimensions());
 }
 
-void EntityItem::updatePositionInDomainUnits(const glm::vec3& value) { 
-    glm::vec3 position = value * (float)TREE_SCALE;
-    updatePosition(position);
-}
-
 void EntityItem::updatePosition(const glm::vec3& value) { 
     auto delta = glm::distance(_position, value);
     if (delta > IGNORE_POSITION_DELTA) {
@@ -1143,11 +1121,6 @@ void EntityItem::updatePosition(const glm::vec3& value) {
     }
 }
 
-void EntityItem::updateDimensionsInDomainUnits(const glm::vec3& value) { 
-    glm::vec3 dimensions = value * (float)TREE_SCALE;
-    updateDimensions(dimensions);
-}
-
 void EntityItem::updateDimensions(const glm::vec3& value) { 
     auto delta = glm::distance(_dimensions, value);
     if (delta > IGNORE_DIMENSIONS_DELTA) {
@@ -1199,11 +1172,6 @@ void EntityItem::updateMass(float mass) {
     }
 }
 
-void EntityItem::updateVelocityInDomainUnits(const glm::vec3& value) {
-    glm::vec3 velocity = value * (float)TREE_SCALE;
-    updateVelocity(velocity);
-}
-
 void EntityItem::updateVelocity(const glm::vec3& value) { 
     auto delta = glm::distance(_velocity, value);
     if (delta > IGNORE_LINEAR_VELOCITY_DELTA) {
@@ -1229,11 +1197,6 @@ void EntityItem::updateDamping(float value) {
     }
 }
 
-void EntityItem::updateGravityInDomainUnits(const glm::vec3& value) { 
-    glm::vec3 gravity = value * (float) TREE_SCALE;
-    updateGravity(gravity);
-}
-
 void EntityItem::updateGravity(const glm::vec3& value) { 
     auto delta = glm::distance(_gravity, value);
     if (delta > IGNORE_GRAVITY_DELTA) {

libraries/entities/src/EntityItem.h

@@ -308,22 +308,17 @@ public:
     virtual ShapeType getShapeType() const { return SHAPE_TYPE_NONE; }
 
     // updateFoo() methods to be used when changes need to be accumulated in the _dirtyFlags
-    void updatePositionInDomainUnits(const glm::vec3& value);
     void updatePosition(const glm::vec3& value);
-    void updateDimensionsInDomainUnits(const glm::vec3& value);
     void updateDimensions(const glm::vec3& value);
     void updateRotation(const glm::quat& rotation);
     void updateDensity(float value);
     void updateMass(float value);
-    void updateVelocityInDomainUnits(const glm::vec3& value);
     void updateVelocity(const glm::vec3& value);
     void updateDamping(float value);
     void updateRestitution(float value);
     void updateFriction(float value);
-    void updateGravityInDomainUnits(const glm::vec3& value);
     void updateGravity(const glm::vec3& value);
     void updateAngularVelocity(const glm::vec3& value);
-    void updateAngularVelocityInDegrees(const glm::vec3& value) { updateAngularVelocity(glm::radians(value)); }
     void updateAngularDamping(float value);
     void updateIgnoreForCollisions(bool value);
     void updateCollisionsWillMove(bool value);