| 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_VECTOR3D_F_H_ | 10 #ifndef UI_GFX_GEOMETRY_VECTOR3D_F_H_ |
| 11 #define UI_GFX_VECTOR3D_F_H_ | 11 #define UI_GFX_GEOMETRY_VECTOR3D_F_H_ |
| 12 | 12 |
| 13 #include <string> | 13 #include <string> |
| 14 | 14 |
| 15 #include "ui/gfx/geometry/vector2d_f.h" |
| 15 #include "ui/gfx/gfx_export.h" | 16 #include "ui/gfx/gfx_export.h" |
| 16 #include "ui/gfx/vector2d_f.h" | |
| 17 | 17 |
| 18 namespace gfx { | 18 namespace gfx { |
| 19 | 19 |
| 20 class GFX_EXPORT Vector3dF { | 20 class GFX_EXPORT Vector3dF { |
| 21 public: | 21 public: |
| 22 Vector3dF(); | 22 Vector3dF(); |
| 23 Vector3dF(float x, float y, float z); | 23 Vector3dF(float x, float y, float z); |
| 24 | 24 |
| 25 explicit Vector3dF(const Vector2dF& other); | 25 explicit Vector3dF(const Vector2dF& other); |
| 26 | 26 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 float y_scale, | 114 float y_scale, |
| 115 float z_scale); | 115 float z_scale); |
| 116 | 116 |
| 117 // Return a vector that is |v| scaled by the given scale factor. | 117 // Return a vector that is |v| scaled by the given scale factor. |
| 118 inline Vector3dF ScaleVector3d(const Vector3dF& v, float scale) { | 118 inline Vector3dF ScaleVector3d(const Vector3dF& v, float scale) { |
| 119 return ScaleVector3d(v, scale, scale, scale); | 119 return ScaleVector3d(v, scale, scale, scale); |
| 120 } | 120 } |
| 121 | 121 |
| 122 } // namespace gfx | 122 } // namespace gfx |
| 123 | 123 |
| 124 #endif // UI_GFX_VECTOR3D_F_H_ | 124 #endif // UI_GFX_GEOMETRY_VECTOR3D_F_H_ |
| OLD | NEW |