Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-setaylor

gameplay/src/AnimationTarget.cpp

@@ -56,18 +56,6 @@ int AnimationTarget::getPropertyId(TargetType type, const char* propertyIdStr)
         {
             return Transform::ANIMATE_SCALE_Z;
         }
-        else if (strcmp(propertyIdStr, "ANIMATE_SCALE_XY") == 0)
-        {
-            return Transform::ANIMATE_SCALE_XY;
-        }
-        else if (strcmp(propertyIdStr, "ANIMATE_SCALE_XZ") == 0)
-        {
-            return Transform::ANIMATE_SCALE_XZ;
-        }
-        else if (strcmp(propertyIdStr, "ANIMATE_SCALE_YZ") == 0)
-        {
-            return Transform::ANIMATE_SCALE_YZ;
-        }
         else if (strcmp(propertyIdStr, "ANIMATE_ROTATE") == 0)
         {
             return Transform::ANIMATE_ROTATE;
@@ -88,18 +76,6 @@ int AnimationTarget::getPropertyId(TargetType type, const char* propertyIdStr)
         {
             return Transform::ANIMATE_TRANSLATE_Z;
         }
-        else if (strcmp(propertyIdStr, "ANIMATE_TRANSLATE_XY") == 0)
-        {
-            return Transform::ANIMATE_TRANSLATE_XY;
-        }
-        else if (strcmp(propertyIdStr, "ANIMATE_TRANSLATE_XZ") == 0)
-        {
-            return Transform::ANIMATE_TRANSLATE_XZ;
-        }
-        else if (strcmp(propertyIdStr, "ANIMATE_TRANSLATE_YZ") == 0)
-        {
-            return Transform::ANIMATE_TRANSLATE_YZ;
-        }
         else if (strcmp(propertyIdStr, "ANIMATE_ROTATE_TRANSLATE") == 0)
         {
             return Transform::ANIMATE_ROTATE_TRANSLATE;

gameplay/src/Transform.cpp

@@ -558,13 +558,6 @@ unsigned int Transform::getAnimationPropertyComponentCount(int propertyId) const
         case ANIMATE_TRANSLATE_Y:
         case ANIMATE_TRANSLATE_Z:
             return 1;
-        case ANIMATE_SCALE_XY:
-        case ANIMATE_SCALE_XZ:
-        case ANIMATE_SCALE_YZ:
-        case ANIMATE_TRANSLATE_XY:
-        case ANIMATE_TRANSLATE_XZ:
-        case ANIMATE_TRANSLATE_YZ:
-            return 2;
         case ANIMATE_SCALE:
         case ANIMATE_TRANSLATE:
             return 3;
@@ -597,18 +590,6 @@ void Transform::getAnimationPropertyValue(int propertyId, AnimationValue* value)
         case ANIMATE_SCALE_Z:
             value->setFloat(0, _scale.z);
             break;
-        case ANIMATE_SCALE_XY:
-            value->setFloat(0, _scale.x);
-            value->setFloat(1, _scale.y);
-            break;
-        case ANIMATE_SCALE_XZ:
-            value->setFloat(0, _scale.x);
-            value->setFloat(1, _scale.z);
-            break;
-        case ANIMATE_SCALE_YZ:
-            value->setFloat(0, _scale.y);
-            value->setFloat(1, _scale.z);
-            break;
         case ANIMATE_ROTATE:
             value->setFloat(0, _rotation.x);
             value->setFloat(1, _rotation.y);
@@ -629,18 +610,6 @@ void Transform::getAnimationPropertyValue(int propertyId, AnimationValue* value)
         case ANIMATE_TRANSLATE_Z:
             value->setFloat(0, _translation.z);
             break;
-        case ANIMATE_TRANSLATE_XY:
-            value->setFloat(0, _translation.x);
-            value->setFloat(1, _translation.y);
-            break;
-        case ANIMATE_TRANSLATE_XZ:
-            value->setFloat(0, _translation.x);
-            value->setFloat(1, _translation.z);
-            break;
-        case ANIMATE_TRANSLATE_YZ:
-            value->setFloat(0, _translation.y);
-            value->setFloat(1, _translation.z);
-            break;
         case ANIMATE_ROTATE_TRANSLATE:
             value->setFloat(0, _rotation.x);
             value->setFloat(1, _rotation.y);
@@ -683,18 +652,6 @@ void Transform::setAnimationPropertyValue(int propertyId, AnimationValue* value)
         case ANIMATE_SCALE_Z:
             setScaleZ(value->getFloat(0));
             break;
-        case ANIMATE_SCALE_XY:
-            setScaleX(value->getFloat(0));
-            setScaleY(value->getFloat(1));
-            break;
-        case ANIMATE_SCALE_XZ:
-            setScaleX(value->getFloat(0));
-            setScaleZ(value->getFloat(1));
-            break;
-        case ANIMATE_SCALE_YZ:
-            setScaleY(value->getFloat(0));
-            setScaleZ(value->getFloat(1));
-            break;
         case ANIMATE_ROTATE:
             setRotation(value->getFloat(0), value->getFloat(1), value->getFloat(2), value->getFloat(3));
             break;
@@ -710,18 +667,6 @@ void Transform::setAnimationPropertyValue(int propertyId, AnimationValue* value)
         case ANIMATE_TRANSLATE_Z:
             setTranslationZ(value->getFloat(0));
             break;
-        case ANIMATE_TRANSLATE_XY:
-            setTranslationX(value->getFloat(0));
-            setTranslationY(value->getFloat(1));
-            break;
-        case ANIMATE_TRANSLATE_XZ:
-            setTranslationX(value->getFloat(0));
-            setTranslationZ(value->getFloat(1));
-            break;
-        case ANIMATE_TRANSLATE_YZ:
-            setTranslationY(value->getFloat(0));
-            setTranslationZ(value->getFloat(1));
-            break;
         case ANIMATE_ROTATE_TRANSLATE:
             setRotation(value->getFloat(0), value->getFloat(1), value->getFloat(2), value->getFloat(3));
             setTranslation(value->getFloat(4), value->getFloat(5), value->getFloat(6));

gameplay/src/Transform.h

@@ -50,21 +50,6 @@ public:
      */
     static const int ANIMATE_SCALE_Z = 4;
 
-    /**
-     * Scale xy animation property. Data=sx,sy
-     */
-    static const int ANIMATE_SCALE_XY = 5;
-
-    /**
-     * Scale xz animation property. Data=sx,sz
-     */
-    static const int ANIMATE_SCALE_XZ = 6;
-
-    /**
-     * Scale yz animation property. Data=sy,sz
-     */
-    static const int ANIMATE_SCALE_YZ = 7;
-
     /**
      * Rotation animation property. Data=qx,qy,qz,qw (as quaternion).
      */
@@ -90,21 +75,6 @@ public:
      */
     static const int ANIMATE_TRANSLATE_Z = 12;
 
-    /**
-     * Translate xy animation property. Data=tx,ty
-     */
-    static const int ANIMATE_TRANSLATE_XY = 13;
-
-    /**
-     * Translate xz animation property. Data=tx,tz
-     */
-    static const int ANIMATE_TRANSLATE_XZ = 14;
-
-    /**
-     * Translate yz animation property. Data=ty,tz
-     */
-    static const int ANIMATE_TRANSLATE_YZ = 15;
-
     /**
      * Rotation + Translation animation property (Rigid Body). Data=qx,qy,qz,qw,tx,ty,tz
      */