GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Vector3::Clamp for easier inline in optimized builds

Browse Source
This commit is contained in:
Wojciech Figat
2022-02-15 12:14:31 +01:00
parent a857e6daa0
commit 5d4c168e1e
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Engine/Core/Math/Vector3.cpp
View File

@@ -148,23 +148,6 @@ Vector3 Vector3::Clamp(const Vector3& value, const Vector3& min, const Vector3&
return Vector3(x, y, z);
}
void Vector3::Clamp(const Vector3& value, const Vector3& min, const Vector3& max, Vector3& result)
{
float x = value.X;
x = x > max.X ? max.X : x;
x = x < min.X ? min.X : x;
float y = value.Y;
y = y > max.Y ? max.Y : y;
y = y < min.Y ? min.Y : y;
float z = value.Z;
z = z > max.Z ? max.Z : z;
z = z < min.Z ? min.Z : z;
result = Vector3(x, y, z);
}
void Vector3::Hermite(const Vector3& value1, const Vector3& tangent1, const Vector3& value2, const Vector3& tangent2, float amount, Vector3& result)
{
const float squared = amount * amount;

5
Source/Engine/Core/Math/Vector3.h
View File

@@ -600,7 +600,10 @@ public:
// @param min The minimum value,
// @param max The maximum value
// @param result When the method completes, contains the clamped value
static void Clamp(const Vector3& value, const Vector3& min, const Vector3& max, Vector3& result);
static void Clamp(const Vector3& value, const Vector3& min, const Vector3& max, Vector3& result)
{
result = Vector3(Math::Clamp(value.X, min.X, max.X), Math::Clamp(value.Y, min.Y, max.Y), Math::Clamp(value.Z, min.Z, max.Z));
}
// Calculates the distance between two vectors
// @param value1 The first vector