Adding Blink-side 3d Box and Bounds calculations to TransformOperations

Source/platform/transforms/RotateTransformOperation.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 12 matching lines @@
 #include "platform/transforms/RotateTransformOperation.h"
 
 #include "platform/animation/AnimationUtilities.h"
 #include "wtf/MathExtras.h"
 #include <algorithm>
 
 using namespace std;
 
 namespace WebCore {
 
+const double kAngleEpsilon = 1e-4;
+
+static bool isZeroAxis(const RotateTransformOperation& from)

[Ian Vollick, 2014/06/16 15:23:37]

Please expose this rather than duplicating in TransformOperations.cpp.
RotateTransformOperation::hasZeroLengthAxis or something.

[awoloszyn, 2014/06/17 14:26:01]

Done.

+{
+    double length = from.x() * from.x() + from.y() * from.y() + from.z() * from.z();

[Ian Vollick, 2014/06/16 15:23:37]

If you add a FloatPoint3D RotationTransformOperations::axis() fn, you can use
FloatPoint3D's lengthSquared here (as well as its 'dot' later).

[awoloszyn, 2014/06/17 14:26:00]

Done.

+    return(length < kAngleEpsilon);
+}
+
+static bool shareSameAxis(const RotateTransformOperation* from, const RotateTransformOperation* to, double& x, double& y, double& z, double& fromAngle, double& toAngle)

[Ian Vollick, 2014/06/16 15:23:37]

Please expose this, too.

[awoloszyn, 2014/06/17 14:26:00]

Done.

+{
+    x = 0;
+    y = 0;
+    z = 1;
+    fromAngle = 0;
+    toAngle = 0;
+
+    if (!from && !to)
+        return true;
+
+    bool fromZero = !from || isZeroAxis(*from);
+    bool toZero = !to || isZeroAxis(*to);
+
+    if (fromZero && toZero)
+        return true;
+
+    if (fromZero) {
+        x = to->x();
+        y = to->y();
+        z = to->z();
+        toAngle = to->angle();
+        return true;
+    }
+
+    if (toZero) {
+        x = from->x();
+        y = from->y();
+        z = from->z();
+        fromAngle = from->angle();
+        return true;
+    }
+
+    double fromSquared = from->x() * from->x() + from->y() * from->y() + from->z() * from->z();
+    double toSquared   = to->x()   * to->x()   + to->y()   * to->y()   + to->z()   * to->z();
+
+    double dot = from->x() * to->x() + from->y() * to->y() + from->z() * to->z();
+    double error = std::abs(1 - (dot * dot) / (fromSquared * toSquared));
+
+    if (error > kAngleEpsilon)
+        return false;
+    x = from->x();
+    y = from->y();
+    z = from->z();
+    fromAngle = from->angle();
+    toAngle = to->angle();
+    return true;
+}
+
 PassRefPtr<TransformOperation> RotateTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
 {
     if (from && !from->isSameType(*this))
         return this;
 
     if (blendToIdentity)
         return RotateTransformOperation::create(m_x, m_y, m_z, m_angle - m_angle * progress, m_type);
 
     const RotateTransformOperation* fromOp = static_cast<const RotateTransformOperation*>(from);
 
     // Optimize for single axis rotation
     if (!fromOp || (fromOp->m_x == 0 && fromOp->m_y == 0 && fromOp->m_z == 1) ||
                    (fromOp->m_x == 0 && fromOp->m_y == 1 && fromOp->m_z == 0) ||
                    (fromOp->m_x == 1 && fromOp->m_y == 0 && fromOp->m_z == 0)) {
         double fromAngle = fromOp ? fromOp->m_angle : 0;
         return RotateTransformOperation::create(fromOp ? fromOp->m_x : m_x,
                                                 fromOp ? fromOp->m_y : m_y,
                                                 fromOp ? fromOp->m_z : m_z,
                                                 WebCore::blend(fromAngle, m_angle, progress), m_type);
     }
+    double axisX;
+    double axisY;
+    double axisZ;
+    double fromAngle;
+    double toAngle;
+    if (shareSameAxis(fromOp, this, axisX, axisY, axisZ, fromAngle, toAngle)) {
+        return RotateTransformOperation::create(axisX, axisY, axisZ, WebCore::blend(fromAngle, toAngle, progress), m_type);
+    }
 
     const RotateTransformOperation* toOp = this;
 
     // Create the 2 rotation matrices
     TransformationMatrix fromT;
     TransformationMatrix toT;
     fromT.rotate3d((fromOp ? fromOp->m_x : 0),
         (fromOp ? fromOp->m_y : 0),
         (fromOp ? fromOp->m_z : 1),
         (fromOp ? fromOp->m_angle : 0));
@@ skipping 23 matching lines @@
         z /= length;
         angle = rad2deg(acos(decomp.quaternionW) * 2);
     } else {
         x = 0;
         y = 0;
         z = 1;
     }
     return RotateTransformOperation::create(x, y, z, angle, Rotate3D);
 }
 
+bool RotateTransformOperation::isCompatibleType(const TransformOperation& other) const
+{
+    return(other.isSameType(*this));
+}
+
 } // namespace WebCore