Extending support for 3d in gfx::InterpolatedScale and gfx::InterpolatedTranslation

ui/gfx/interpolated_transform.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/interpolated_transform.h"
 
 #include <cmath>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ skipping 212 matching lines @@
       start_scale_(start_scale),
       end_scale_(end_scale) {
 }
 
 InterpolatedScale::~InterpolatedScale() {}
 
 gfx::Transform InterpolatedScale::InterpolateButDoNotCompose(float t) const {
   gfx::Transform result;
   float scale_x = ValueBetween(t, start_scale_.x(), end_scale_.x());
   float scale_y = ValueBetween(t, start_scale_.y(), end_scale_.y());
-  // TODO(vollick) 3d xforms.
-  result.Scale(scale_x, scale_y);
+  float scale_z = ValueBetween(t, start_scale_.z(), end_scale_.z());
+  result.Scale3d(scale_x, scale_y, scale_z);
   return result;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // InterpolatedTranslation
 //
 
 InterpolatedTranslation::InterpolatedTranslation(const gfx::Point& start_pos,
                                                  const gfx::Point& end_pos)
     : InterpolatedTransform(),
       start_pos_(start_pos),
       end_pos_(end_pos) {
 }
 
 InterpolatedTranslation::InterpolatedTranslation(const gfx::Point& start_pos,
                                                  const gfx::Point& end_pos,
                                                  float start_time,
                                                  float end_time)
     : InterpolatedTransform(start_time, end_time),
       start_pos_(start_pos),
       end_pos_(end_pos) {
 }
 
+InterpolatedTranslation::InterpolatedTranslation(const gfx::Point3F& start_pos,
+                                                 const gfx::Point3F& end_pos)
+    : InterpolatedTransform(), start_pos_(start_pos), end_pos_(end_pos) {
+}
+
+InterpolatedTranslation::InterpolatedTranslation(const gfx::Point3F& start_pos,
+                                                 const gfx::Point3F& end_pos,
+                                                 float start_time,
+                                                 float end_time)
+    : InterpolatedTransform(start_time, end_time),
+      start_pos_(start_pos),
+      end_pos_(end_pos) {
+}
+
 InterpolatedTranslation::~InterpolatedTranslation() {}
 
 gfx::Transform
 InterpolatedTranslation::InterpolateButDoNotCompose(float t) const {
   gfx::Transform result;
-  // TODO(vollick) 3d xforms.
-  result.Translate(ValueBetween(t, start_pos_.x(), end_pos_.x()),
-                      ValueBetween(t, start_pos_.y(), end_pos_.y()));
+  result.Translate3d(ValueBetween(t, start_pos_.x(), end_pos_.x()),
+                     ValueBetween(t, start_pos_.y(), end_pos_.y()),
+                     ValueBetween(t, start_pos_.z(), end_pos_.z()));
   return result;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // InterpolatedConstantTransform
 //
 
 InterpolatedConstantTransform::InterpolatedConstantTransform(
   const gfx::Transform& transform)
     : InterpolatedTransform(),
@@ skipping 85 matching lines @@
 
 void InterpolatedMatrixTransform::Init(const gfx::Transform& start_transform,
                                        const gfx::Transform& end_transform) {
   bool success = gfx::DecomposeTransform(&start_decomp_, start_transform);
   DCHECK(success);
   success = gfx::DecomposeTransform(&end_decomp_, end_transform);
   DCHECK(success);
 }
 
 } // namespace ui