| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Defines a simple float vector class. This class is used to indicate a | 5 // Defines a simple float vector class. This class is used to indicate a |
| 6 // distance in two dimensions between two points. Subtracting two points should | 6 // distance in two dimensions between two points. Subtracting two points should |
| 7 // produce a vector, and adding a vector to a point produces the point at the | 7 // produce a vector, and adding a vector to a point produces the point at the |
| 8 // vector's distance from the original point. | 8 // vector's distance from the original point. |
| 9 | 9 |
| 10 #ifndef UI_GFX_VECTOR2D_F_H_ | 10 #ifndef UI_GFX_VECTOR2D_F_H_ |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 bool IsZero() const; | 31 bool IsZero() const; |
| 32 | 32 |
| 33 // Add the components of the |other| vector to the current vector. | 33 // Add the components of the |other| vector to the current vector. |
| 34 void Add(const Vector2dF& other); | 34 void Add(const Vector2dF& other); |
| 35 // Subtract the components of the |other| vector from the current vector. | 35 // Subtract the components of the |other| vector from the current vector. |
| 36 void Subtract(const Vector2dF& other); | 36 void Subtract(const Vector2dF& other); |
| 37 | 37 |
| 38 void operator+=(const Vector2dF& other) { Add(other); } | 38 void operator+=(const Vector2dF& other) { Add(other); } |
| 39 void operator-=(const Vector2dF& other) { Subtract(other); } | 39 void operator-=(const Vector2dF& other) { Subtract(other); } |
| 40 | 40 |
| 41 void ClampToMax(const Vector2dF& max) { | 41 void ClampToUpperBound(const Vector2dF& max) { |
| 42 x_ = x_ <= max.x_ ? x_ : max.x_; | 42 x_ = x_ <= max.x_ ? x_ : max.x_; |
| 43 y_ = y_ <= max.y_ ? y_ : max.y_; | 43 y_ = y_ <= max.y_ ? y_ : max.y_; |
| 44 } | 44 } |
| 45 | 45 |
| 46 void ClampToMin(const Vector2dF& min) { | 46 void ClampToLowerBound(const Vector2dF& min) { |
| 47 x_ = x_ >= min.x_ ? x_ : min.x_; | 47 x_ = x_ >= min.x_ ? x_ : min.x_; |
| 48 y_ = y_ >= min.y_ ? y_ : min.y_; | 48 y_ = y_ >= min.y_ ? y_ : min.y_; |
| 49 } | 49 } |
| 50 | 50 |
| 51 // Gives the square of the diagonal length of the vector. | 51 // Gives the square of the diagonal length of the vector. |
| 52 double LengthSquared() const; | 52 double LengthSquared() const; |
| 53 // Gives the diagonal length of the vector. | 53 // Gives the diagonal length of the vector. |
| 54 float Length() const; | 54 float Length() const; |
| 55 | 55 |
| 56 // Scale the x and y components of the vector by |scale|. | 56 // Scale the x and y components of the vector by |scale|. |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 float y_scale); | 99 float y_scale); |
| 100 | 100 |
| 101 // Return a vector that is |v| scaled by the given scale factor. | 101 // Return a vector that is |v| scaled by the given scale factor. |
| 102 inline Vector2dF ScaleVector2d(const Vector2dF& v, float scale) { | 102 inline Vector2dF ScaleVector2d(const Vector2dF& v, float scale) { |
| 103 return ScaleVector2d(v, scale, scale); | 103 return ScaleVector2d(v, scale, scale); |
| 104 } | 104 } |
| 105 | 105 |
| 106 } // namespace gfx | 106 } // namespace gfx |
| 107 | 107 |
| 108 #endif // UI_GFX_VECTOR2D_F_H_ | 108 #endif // UI_GFX_VECTOR2D_F_H_ |
| OLD | NEW |