[Bf-blender-cvs] [bb4b0cc9544] functions: move float3 to separate file

[Jacques Lucke]

Commit: bb4b0cc9544f3acd2831ad6fc73638a24a9e47c8
Author: Jacques Lucke
Date:   Thu Feb 13 17:45:26 2020 +0100
Branches: functions
https://developer.blender.org/rBbb4b0cc9544f3acd2831ad6fc73638a24a9e47c8

move float3 to separate file

===================================================================

A	source/blender/blenlib/BLI_float3.h
M	source/blender/blenlib/BLI_math_cxx.h
M	source/blender/blenlib/CMakeLists.txt

===================================================================

diff --git a/source/blender/blenlib/BLI_float3.h b/source/blender/blenlib/BLI_float3.h
new file mode 100644
index 00000000000..db87e81c1e1
--- /dev/null
+++ b/source/blender/blenlib/BLI_float3.h
@@ -0,0 +1,208 @@
+#ifndef __BLI_FLOAT3_H__
+#define __BLI_FLOAT3_H__
+
+namespace BLI {
+struct float3 {
+  float x, y, z;
+
+  float3() = default;
+
+  float3(const float *ptr) : x{ptr[0]}, y{ptr[1]}, z{ptr[2]}
+  {
+  }
+
+  explicit float3(float value) : x(value), y(value), z(value)
+  {
+  }
+
+  explicit float3(int value) : x(value), y(value), z(value)
+  {
+  }
+
+  float3(float x, float y, float z) : x{x}, y{y}, z{z}
+  {
+  }
+
+  operator const float *() const
+  {
+    return (const float *)this;
+  }
+
+  operator float *()
+  {
+    return (float *)this;
+  }
+
+  operator std::array<float, 3>()
+  {
+    return {x, y, z};
+  }
+
+  float normalize_and_get_length()
+  {
+    return normalize_v3(*this);
+  }
+
+  float3 normalized() const
+  {
+    float3 result;
+    normalize_v3_v3(result, *this);
+    return result;
+  }
+
+  float length() const
+  {
+    return len_v3(*this);
+  }
+
+  float length_squared() const
+  {
+    return len_squared_v3(*this);
+  }
+
+  void reflect(float3 normal)
+  {
+    *this = this->reflected(normal);
+  }
+
+  float3 reflected(float3 normal) const
+  {
+    float3 result;
+    reflect_v3_v3v3(result, *this, normal);
+    return result;
+  }
+
+  static float3 safe_divide(const float3 a, const float3 b)
+  {
+    float3 result;
+    result.x = (b.x == 0.0f) ? 0.0f : a.x / b.x;
+    result.y = (b.y == 0.0f) ? 0.0f : a.y / b.y;
+    result.z = (b.z == 0.0f) ? 0.0f : a.z / b.z;
+    return result;
+  }
+
+  void invert()
+  {
+    x = -x;
+    y = -y;
+    z = -z;
+  }
+
+  bool is_zero() const
+  {
+    return x != 0.0f && y != 0.0f && z != 0.0f;
+  }
+
+  friend float3 operator+(float3 a, float3 b)
+  {
+    return {a.x + b.x, a.y + b.y, a.z + b.z};
+  }
+
+  void operator+=(float3 b)
+  {
+    this->x += b.x;
+    this->y += b.y;
+    this->z += b.z;
+  }
+
+  friend float3 operator-(float3 a, float3 b)
+  {
+    return {a.x - b.x, a.y - b.y, a.z - b.z};
+  }
+
+  friend float3 operator-(float3 a)
+  {
+    return {-a.x, -a.y, -a.z};
+  }
+
+  void operator-=(float3 b)
+  {
+    this->x -= b.x;
+    this->y -= b.y;
+    this->z -= b.z;
+  }
+
+  void operator*=(float scalar)
+  {
+    this->x *= scalar;
+    this->y *= scalar;
+    this->z *= scalar;
+  }
+
+  void operator*=(float3 other)
+  {
+    this->x *= other.x;
+    this->y *= other.y;
+    this->z *= other.z;
+  }
+
+  friend float3 operator*(float3 a, float3 b)
+  {
+    return {a.x * b.x, a.y * b.y, a.z * b.z};
+  }
+
+  friend float3 operator*(float3 a, float b)
+  {
+    return {a.x * b, a.y * b, a.z * b};
+  }
+
+  friend float3 operator*(float a, float3 b)
+  {
+    return b * a;
+  }
+
+  friend float3 operator/(float3 a, float3 b)
+  {
+    BLI_assert(!b.is_zero());
+    return {a.x / b.x, a.y / b.y, a.z / b.z};
+  }
+
+  friend float3 operator/(float3 a, float b)
+  {
+    BLI_assert(b != 0);
+    return {a.x / b, a.y / b, a.z / b};
+  }
+
+  friend std::ostream &operator<<(std::ostream &stream, float3 v)
+  {
+    stream << "(" << v.x << ", " << v.y << ", " << v.z << ")";
+    return stream;
+  }
+
+  static float dot(float3 a, float3 b)
+  {
+    return a.x * b.x + a.y * b.y + a.z * b.z;
+  }
+
+  static float3 cross_high_precision(float3 a, float3 b)
+  {
+    float3 result;
+    cross_v3_v3v3_hi_prec(result, a, b);
+    return result;
+  }
+
+  static float3 project(float3 a, float3 b)
+  {
+    float3 result;
+    project_v3_v3v3(result, a, b);
+    return result;
+  }
+
+  static float distance(float3 a, float3 b)
+  {
+    return (a - b).length();
+  }
+
+  static float distance_squared(float3 a, float3 b)
+  {
+    return float3::dot(a, b);
+  }
+
+  static float3 interpolate(float3 a, float3 b, float t)
+  {
+    return a * (1 - t) + b * t;
+  }
+};
+}  // namespace BLI
+
+#endif /* __BLI_FLOAT3_H__ */
diff --git a/source/blender/blenlib/BLI_math_cxx.h b/source/blender/blenlib/BLI_math_cxx.h
index f5fdae2d0be..177a2a885cb 100644
--- a/source/blender/blenlib/BLI_math_cxx.h
+++ b/source/blender/blenlib/BLI_math_cxx.h
@@ -28,11 +28,11 @@
 #include "BLI_array_ref.h"
 #include "BLI_math_vector.h"
 #include "BLI_math_matrix.h"
+#include "BLI_float3.h"
 
 namespace BLI {
 
 struct float2;
-struct float3;
 struct rgba_f;
 struct rgba_b;
 
@@ -98,208 +98,6 @@ struct float2 {
   }
 };
 
-struct float3 {
-  float x, y, z;
-
-  float3() = default;
-
-  float3(const float *ptr) : x{ptr[0]}, y{ptr[1]}, z{ptr[2]}
-  {
-  }
-
-  explicit float3(float value) : x(value), y(value), z(value)
-  {
-  }
-
-  explicit float3(int value) : x(value), y(value), z(value)
-  {
-  }
-
-  float3(float x, float y, float z) : x{x}, y{y}, z{z}
-  {
-  }
-
-  operator const float *() const
-  {
-    return (const float *)this;
-  }
-
-  operator float *()
-  {
-    return (float *)this;
-  }
-
-  operator std::array<float, 3>()
-  {
-    return {x, y, z};
-  }
-
-  float normalize_and_get_length()
-  {
-    return normalize_v3(*this);
-  }
-
-  float3 normalized() const
-  {
-    float3 result;
-    normalize_v3_v3(result, *this);
-    return result;
-  }
-
-  float length() const
-  {
-    return len_v3(*this);
-  }
-
-  float length_squared() const
-  {
-    return len_squared_v3(*this);
-  }
-
-  void reflect(float3 normal)
-  {
-    *this = this->reflected(normal);
-  }
-
-  float3 reflected(float3 normal) const
-  {
-    float3 result;
-    reflect_v3_v3v3(result, *this, normal);
-    return result;
-  }
-
-  static float3 safe_divide(const float3 a, const float3 b)
-  {
-    float3 result;
-    result.x = (b.x == 0.0f) ? 0.0f : a.x / b.x;
-    result.y = (b.y == 0.0f) ? 0.0f : a.y / b.y;
-    result.z = (b.z == 0.0f) ? 0.0f : a.z / b.z;
-    return result;
-  }
-
-  void invert()
-  {
-    x = -x;
-    y = -y;
-    z = -z;
-  }
-
-  bool is_zero() const
-  {
-    return is_zero_v3(*this);
-  }
-
-  friend float3 operator+(float3 a, float3 b)
-  {
-    return {a.x + b.x, a.y + b.y, a.z + b.z};
-  }
-
-  void operator+=(float3 b)
-  {
-    this->x += b.x;
-    this->y += b.y;
-    this->z += b.z;
-  }
-
-  friend float3 operator-(float3 a, float3 b)
-  {
-    return {a.x - b.x, a.y - b.y, a.z - b.z};
-  }
-
-  friend float3 operator-(float3 a)
-  {
-    return {-a.x, -a.y, -a.z};
-  }
-
-  void operator-=(float3 b)
-  {
-    this->x -= b.x;
-    this->y -= b.y;
-    this->z -= b.z;
-  }
-
-  void operator*=(float scalar)
-  {
-    this->x *= scalar;
-    this->y *= scalar;
-    this->z *= scalar;
-  }
-
-  void operator*=(float3 other)
-  {
-    this->x *= other.x;
-    this->y *= other.y;
-    this->z *= other.z;
-  }
-
-  friend float3 operator*(float3 a, float3 b)
-  {
-    return {a.x * b.x, a.y * b.y, a.z * b.z};
-  }
-
-  friend float3 operator*(float3 a, float b)
-  {
-    return {a.x * b, a.y * b, a.z * b};
-  }
-
-  friend float3 operator*(float a, float3 b)
-  {
-    return b * a;
-  }
-
-  friend float3 operator/(float3 a, float3 b)
-  {
-    BLI_assert(!b.is_zero());
-    return {a.x / b.x, a.y / b.y, a.z / b.z};
-  }
-
-  friend float3 operator/(float3 a, float b)
-  {
-    BLI_assert(b != 0);
-    return {a.x / b, a.y / b, a.z / b};
-  }
-
-  friend std::ostream &operator<<(std::ostream &stream, float3 v)
-  {
-    stream << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-    return stream;
-  }
-
-  static float dot(float3 a, float3 b)
-  {
-    return a.x * b.x + a.y * b.y + a.z * b.z;
-  }
-
-  static float3 cross_high_precision(float3 a, float3 b)
-  {
-    float3 result;
-    cross_v3_v3v3_hi_prec(result, a, b);
-    return result;
-  }
-
-  static float3 project(float3 a, float3 b)
-  {
-    float3 result;
-    project_v3_v3v3(result, a, b);
-    return result;
-  }
-
-  static float distance(float3 a, float3 b)
-  {
-    return (a - b).length();
-  }
-
-  static float distance_squared(float3 a, float3 b)
-  {
-    return float3::dot(a, b);
-  }
-
-  static float3 interpolate(float3 a, float3 b, float t)
-  {
-    return a * (1 - t) + b * t;
-  }
-};
-
 struct float4x4 {
   float values[4][4];
 
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index bdfbafb9170..2660528745f 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -272,6 +272,7 @@ set(SRC
   BLI_index_to_ref_map.h
   BLI_rand_cxx.h
   BLI_buffer_cache.h
+  BLI_float3.h
 )
 
 set(LIB