mirror of
https://github.com/ZDoom/Raze.git
synced 2025-02-01 04:40:46 +00:00
- Make TVector4<T> available as constexpr.
This commit is contained in:
Mitchell Richters
parent
6afa8dcd2b
commit
873287b9df
1 changed files with 42 additions and 42 deletions
|
|
@ -720,88 +720,88 @@ struct TVector4
|
||||||
|
|
||||||
vec_t X, Y, Z, W;
|
vec_t X, Y, Z, W;
|
||||||
|
|
||||||
TVector4() = default;
|
constexpr TVector4() = default;
|
||||||
|
|
||||||
TVector4(vec_t a, vec_t b, vec_t c, vec_t d)
|
constexpr TVector4(vec_t a, vec_t b, vec_t c, vec_t d)
|
||||||
: X(a), Y(b), Z(c), W(d)
|
: X(a), Y(b), Z(c), W(d)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4(vec_t *o)
|
constexpr TVector4(vec_t *o)
|
||||||
: X(o[0]), Y(o[1]), Z(o[2]), W(o[3])
|
: X(o[0]), Y(o[1]), Z(o[2]), W(o[3])
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4(const TVector4 &other) = default;
|
constexpr TVector4(const TVector4 &other) = default;
|
||||||
|
|
||||||
TVector4(const Vector3 &xyz, vec_t w)
|
constexpr TVector4(const Vector3 &xyz, vec_t w)
|
||||||
: X(xyz.X), Y(xyz.Y), Z(xyz.Z), W(w)
|
: X(xyz.X), Y(xyz.Y), Z(xyz.Z), W(w)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4(const vec_t v[4])
|
constexpr TVector4(const vec_t v[4])
|
||||||
: TVector4(v[0], v[1], v[2], v[3])
|
: TVector4(v[0], v[1], v[2], v[3])
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename U>
|
template<typename U>
|
||||||
explicit operator TVector4<U> () const noexcept {
|
constexpr explicit operator TVector4<U> () const noexcept {
|
||||||
return TVector4<U>(static_cast<U>(X), static_cast<U>(Y), static_cast<U>(Z), static_cast<U>(W));
|
return TVector4<U>(static_cast<U>(X), static_cast<U>(Y), static_cast<U>(Z), static_cast<U>(W));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Zero()
|
constexpr void Zero()
|
||||||
{
|
{
|
||||||
Z = Y = X = W = 0;
|
Z = Y = X = W = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isZero() const
|
constexpr bool isZero() const
|
||||||
{
|
{
|
||||||
return X == 0 && Y == 0 && Z == 0 && W == 0;
|
return X == 0 && Y == 0 && Z == 0 && W == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4 &operator= (const TVector4 &other) = default;
|
constexpr TVector4 &operator= (const TVector4 &other) = default;
|
||||||
|
|
||||||
// Access X and Y and Z as an array
|
// Access X and Y and Z as an array
|
||||||
vec_t &operator[] (int index)
|
constexpr vec_t &operator[] (int index)
|
||||||
{
|
{
|
||||||
return (&X)[index];
|
return (&X)[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
const vec_t &operator[] (int index) const
|
constexpr const vec_t &operator[] (int index) const
|
||||||
{
|
{
|
||||||
return (&X)[index];
|
return (&X)[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test for equality
|
// Test for equality
|
||||||
bool operator== (const TVector4 &other) const
|
constexpr bool operator== (const TVector4 &other) const
|
||||||
{
|
{
|
||||||
return X == other.X && Y == other.Y && Z == other.Z && W == other.W;
|
return X == other.X && Y == other.Y && Z == other.Z && W == other.W;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test for inequality
|
// Test for inequality
|
||||||
bool operator!= (const TVector4 &other) const
|
constexpr bool operator!= (const TVector4 &other) const
|
||||||
{
|
{
|
||||||
return X != other.X || Y != other.Y || Z != other.Z || W != other.W;
|
return X != other.X || Y != other.Y || Z != other.Z || W != other.W;
|
||||||
}
|
}
|
||||||
|
|
||||||
// returns the XY fields as a 2D-vector.
|
// returns the XY fields as a 2D-vector.
|
||||||
const Vector2& XY() const
|
constexpr const Vector2& XY() const
|
||||||
{
|
{
|
||||||
return *reinterpret_cast<const Vector2*>(this);
|
return *reinterpret_cast<const Vector2*>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector2& XY()
|
constexpr Vector2& XY()
|
||||||
{
|
{
|
||||||
return *reinterpret_cast<Vector2*>(this);
|
return *reinterpret_cast<Vector2*>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
// returns the XY fields as a 2D-vector.
|
// returns the XY fields as a 2D-vector.
|
||||||
const Vector3& XYZ() const
|
constexpr const Vector3& XYZ() const
|
||||||
{
|
{
|
||||||
return *reinterpret_cast<const Vector3*>(this);
|
return *reinterpret_cast<const Vector3*>(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector3& XYZ()
|
constexpr Vector3& XYZ()
|
||||||
{
|
{
|
||||||
return *reinterpret_cast<Vector3*>(this);
|
return *reinterpret_cast<Vector3*>(this);
|
||||||
}
|
}
|
||||||
|
|
@ -820,127 +820,127 @@ struct TVector4
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unary negation
|
// Unary negation
|
||||||
TVector4 operator- () const
|
constexpr TVector4 operator- () const
|
||||||
{
|
{
|
||||||
return TVector4(-X, -Y, -Z, -W);
|
return TVector4(-X, -Y, -Z, -W);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scalar addition
|
// Scalar addition
|
||||||
TVector4 &operator+= (vec_t scalar)
|
constexpr TVector4 &operator+= (vec_t scalar)
|
||||||
{
|
{
|
||||||
X += scalar, Y += scalar, Z += scalar; W += scalar;
|
X += scalar, Y += scalar, Z += scalar; W += scalar;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
friend TVector4 operator+ (const TVector4 &v, vec_t scalar)
|
constexpr friend TVector4 operator+ (const TVector4 &v, vec_t scalar)
|
||||||
{
|
{
|
||||||
return TVector4(v.X + scalar, v.Y + scalar, v.Z + scalar, v.W + scalar);
|
return TVector4(v.X + scalar, v.Y + scalar, v.Z + scalar, v.W + scalar);
|
||||||
}
|
}
|
||||||
|
|
||||||
friend TVector4 operator+ (vec_t scalar, const TVector4 &v)
|
constexpr friend TVector4 operator+ (vec_t scalar, const TVector4 &v)
|
||||||
{
|
{
|
||||||
return TVector4(v.X + scalar, v.Y + scalar, v.Z + scalar, v.W + scalar);
|
return TVector4(v.X + scalar, v.Y + scalar, v.Z + scalar, v.W + scalar);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scalar subtraction
|
// Scalar subtraction
|
||||||
TVector4 &operator-= (vec_t scalar)
|
constexpr TVector4 &operator-= (vec_t scalar)
|
||||||
{
|
{
|
||||||
X -= scalar, Y -= scalar, Z -= scalar, W -= scalar;
|
X -= scalar, Y -= scalar, Z -= scalar, W -= scalar;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4 operator- (vec_t scalar) const
|
constexpr TVector4 operator- (vec_t scalar) const
|
||||||
{
|
{
|
||||||
return TVector4(X - scalar, Y - scalar, Z - scalar, W - scalar);
|
return TVector4(X - scalar, Y - scalar, Z - scalar, W - scalar);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scalar multiplication
|
// Scalar multiplication
|
||||||
TVector4 &operator*= (vec_t scalar)
|
constexpr TVector4 &operator*= (vec_t scalar)
|
||||||
{
|
{
|
||||||
X = vec_t(X *scalar), Y = vec_t(Y * scalar), Z = vec_t(Z * scalar), W = vec_t(W * scalar);
|
X = vec_t(X *scalar), Y = vec_t(Y * scalar), Z = vec_t(Z * scalar), W = vec_t(W * scalar);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
friend TVector4 operator* (const TVector4 &v, vec_t scalar)
|
constexpr friend TVector4 operator* (const TVector4 &v, vec_t scalar)
|
||||||
{
|
{
|
||||||
return TVector4(v.X * scalar, v.Y * scalar, v.Z * scalar, v.W * scalar);
|
return TVector4(v.X * scalar, v.Y * scalar, v.Z * scalar, v.W * scalar);
|
||||||
}
|
}
|
||||||
|
|
||||||
friend TVector4 operator* (vec_t scalar, const TVector4 &v)
|
constexpr friend TVector4 operator* (vec_t scalar, const TVector4 &v)
|
||||||
{
|
{
|
||||||
return TVector4(v.X * scalar, v.Y * scalar, v.Z * scalar, v.W * scalar);
|
return TVector4(v.X * scalar, v.Y * scalar, v.Z * scalar, v.W * scalar);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scalar division
|
// Scalar division
|
||||||
TVector4 &operator/= (vec_t scalar)
|
constexpr TVector4 &operator/= (vec_t scalar)
|
||||||
{
|
{
|
||||||
scalar = 1 / scalar, X = vec_t(X * scalar), Y = vec_t(Y * scalar), Z = vec_t(Z * scalar), W = vec_t(W * scalar);
|
scalar = 1 / scalar, X = vec_t(X * scalar), Y = vec_t(Y * scalar), Z = vec_t(Z * scalar), W = vec_t(W * scalar);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4 operator/ (vec_t scalar) const
|
constexpr TVector4 operator/ (vec_t scalar) const
|
||||||
{
|
{
|
||||||
scalar = 1 / scalar;
|
scalar = 1 / scalar;
|
||||||
return TVector4(X * scalar, Y * scalar, Z * scalar, W * scalar);
|
return TVector4(X * scalar, Y * scalar, Z * scalar, W * scalar);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Vector addition
|
// Vector addition
|
||||||
TVector4 &operator+= (const TVector4 &other)
|
constexpr TVector4 &operator+= (const TVector4 &other)
|
||||||
{
|
{
|
||||||
X += other.X, Y += other.Y, Z += other.Z, W += other.W;
|
X += other.X, Y += other.Y, Z += other.Z, W += other.W;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4 operator+ (const TVector4 &other) const
|
constexpr TVector4 operator+ (const TVector4 &other) const
|
||||||
{
|
{
|
||||||
return TVector4(X + other.X, Y + other.Y, Z + other.Z, W + other.W);
|
return TVector4(X + other.X, Y + other.Y, Z + other.Z, W + other.W);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Vector subtraction
|
// Vector subtraction
|
||||||
TVector4 &operator-= (const TVector4 &other)
|
constexpr TVector4 &operator-= (const TVector4 &other)
|
||||||
{
|
{
|
||||||
X -= other.X, Y -= other.Y, Z -= other.Z, W -= other.W;
|
X -= other.X, Y -= other.Y, Z -= other.Z, W -= other.W;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
TVector4 operator- (const TVector4 &other) const
|
constexpr TVector4 operator- (const TVector4 &other) const
|
||||||
{
|
{
|
||||||
return TVector4(X - other.X, Y - other.Y, Z - other.Z, W - other.W);
|
return TVector4(X - other.X, Y - other.Y, Z - other.Z, W - other.W);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add a 3D vector to this 4D vector, leaving W unchanged.
|
// Add a 3D vector to this 4D vector, leaving W unchanged.
|
||||||
TVector4 &operator+= (const Vector3 &other)
|
constexpr TVector4 &operator+= (const Vector3 &other)
|
||||||
{
|
{
|
||||||
X += other.X, Y += other.Y, Z += other.Z;
|
X += other.X, Y += other.Y, Z += other.Z;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Subtract a 3D vector from this 4D vector, leaving W unchanged.
|
// Subtract a 3D vector from this 4D vector, leaving W unchanged.
|
||||||
TVector4 &operator-= (const Vector3 &other)
|
constexpr TVector4 &operator-= (const Vector3 &other)
|
||||||
{
|
{
|
||||||
X -= other.X, Y -= other.Y, Z -= other.Z;
|
X -= other.X, Y -= other.Y, Z -= other.Z;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add a 4D vector and a 3D vector.
|
// Add a 4D vector and a 3D vector.
|
||||||
friend TVector4 operator+ (const TVector4 &v4, const Vector3 &v3)
|
constexpr friend TVector4 operator+ (const TVector4 &v4, const Vector3 &v3)
|
||||||
{
|
{
|
||||||
return TVector4(v4.X + v3.X, v4.Y + v3.Y, v4.Z + v3.Z, v4.W);
|
return TVector4(v4.X + v3.X, v4.Y + v3.Y, v4.Z + v3.Z, v4.W);
|
||||||
}
|
}
|
||||||
|
|
||||||
friend TVector4 operator- (const TVector4 &v4, const Vector3 &v3)
|
constexpr friend TVector4 operator- (const TVector4 &v4, const Vector3 &v3)
|
||||||
{
|
{
|
||||||
return TVector4(v4.X - v3.X, v4.Y - v3.Y, v4.Z - v3.Z, v4.W);
|
return TVector4(v4.X - v3.X, v4.Y - v3.Y, v4.Z - v3.Z, v4.W);
|
||||||
}
|
}
|
||||||
|
|
||||||
friend Vector3 operator+ (const Vector3 &v3, const TVector4 &v4)
|
constexpr friend Vector3 operator+ (const Vector3 &v3, const TVector4 &v4)
|
||||||
{
|
{
|
||||||
return Vector3(v3.X + v4.X, v3.Y + v4.Y, v3.Z + v4.Z);
|
return Vector3(v3.X + v4.X, v3.Y + v4.Y, v3.Z + v4.Z);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Subtract a 4D vector and a 3D vector.
|
// Subtract a 4D vector and a 3D vector.
|
||||||
// Discards the W component of the 4D vector and returns a 3D vector.
|
// Discards the W component of the 4D vector and returns a 3D vector.
|
||||||
friend Vector3 operator- (const TVector3<vec_t> &v3, const TVector4 &v4)
|
constexpr friend Vector3 operator- (const TVector3<vec_t> &v3, const TVector4 &v4)
|
||||||
{
|
{
|
||||||
return Vector3(v3.X - v4.X, v3.Y - v4.Y, v3.Z - v4.Z);
|
return Vector3(v3.X - v4.X, v3.Y - v4.Y, v3.Z - v4.Z);
|
||||||
}
|
}
|
||||||
|
|
@ -951,7 +951,7 @@ struct TVector4
|
||||||
return g_sqrt(LengthSquared());
|
return g_sqrt(LengthSquared());
|
||||||
}
|
}
|
||||||
|
|
||||||
double LengthSquared() const
|
constexpr double LengthSquared() const
|
||||||
{
|
{
|
||||||
return X*X + Y*Y + Z*Z + W*W;
|
return X*X + Y*Y + Z*Z + W*W;
|
||||||
}
|
}
|
||||||
|
|
@ -1008,12 +1008,12 @@ struct TVector4
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dot product
|
// Dot product
|
||||||
vec_t operator | (const TVector4 &other) const
|
constexpr vec_t operator | (const TVector4 &other) const
|
||||||
{
|
{
|
||||||
return X*other.X + Y*other.Y + Z*other.Z + W*other.W;
|
return X*other.X + Y*other.Y + Z*other.Z + W*other.W;
|
||||||
}
|
}
|
||||||
|
|
||||||
vec_t dot(const TVector4 &other) const
|
constexpr vec_t dot(const TVector4 &other) const
|
||||||
{
|
{
|
||||||
return X*other.X + Y*other.Y + Z*other.Z + W*other.W;
|
return X*other.X + Y*other.Y + Z*other.Z + W*other.W;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue