kraken_engine/hydra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added min(vector, vector) and max(vector,vector) functions

Browse Source
This commit is contained in:
Kearwood Kip Gilbert
2018-03-28 12:59:33 -07:00
parent 7fc321ebb8
commit 20d341227d
8 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vector2.cpp
View File

@@ -30,6 +30,7 @@
//
#include "../include/kraken-math.h"
#include "krhelpers.h"
namespace kraken {
@@ -259,4 +260,12 @@ float Vector2::Dot(const Vector2 &v1, const Vector2 &v2) {
return v1.x * v2.x + v1.y * v2.y;
}
Vector2 Vector2::Min(const Vector2 &v1, const Vector2 &v2) {
return Vector2::Create(KRMIN(v1.x, v2.x), KRMIN(v1.y, v2.y));
}
Vector2 Vector2::Max(const Vector2 &v1, const Vector2 &v2) {
return Vector2::Create(KRMAX(v1.x, v2.x), KRMAX(v1.y, v2.y));
}
} // namepsace kraken

9
src/vector2i.cpp
View File

@@ -30,6 +30,7 @@
//
#include "../include/kraken-math.h"
#include "krhelpers.h"
namespace kraken {
@@ -253,4 +254,12 @@ int Vector2i::Dot(const Vector2i &v1, const Vector2i &v2) {
return v1.x * v2.x + v1.y * v2.y;
}
Vector2i Vector2i::Min(const Vector2i &v1, const Vector2i &v2) {
return Vector2i::Create(KRMIN(v1.x, v2.x), KRMIN(v1.y, v2.y));
}
Vector2i Vector2i::Max(const Vector2i &v1, const Vector2i &v2) {
return Vector2i::Create(KRMAX(v1.x, v2.x), KRMAX(v1.y, v2.y));
}
} // namepsace kraken

9
src/vector3.cpp
View File

@@ -30,6 +30,7 @@
//
#include "../include/kraken-math.h"
#include "krhelpers.h"
namespace kraken {
@@ -416,6 +417,14 @@ float Vector3::Dot(const Vector3 &v1, const Vector3 &v2) {
return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z;
}
Vector3 Vector3::Min(const Vector3 &v1, const Vector3 &v2) {
return Vector3::Create(KRMIN(v1.x, v2.x), KRMIN(v1.y, v2.y), KRMIN(v1.z, v2.z));
}
Vector3 Vector3::Max(const Vector3 &v1, const Vector3 &v2) {
return Vector3::Create(KRMAX(v1.x, v2.x), KRMAX(v1.y, v2.y), KRMAX(v1.z, v2.z));
}
bool Vector3::operator >(const Vector3& b) const
{
// Comparison operators are implemented to allow insertion into sorted containers such as std::set

9
src/vector4.cpp
View File

@@ -30,6 +30,7 @@
//
#include "../include/kraken-math.h"
#include "krhelpers.h"
namespace kraken {
@@ -312,6 +313,14 @@ float Vector4::Dot(const Vector4 &v1, const Vector4 &v2) {
return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z + v1.w * v2.w;
}
Vector4 Vector4::Min(const Vector4 &v1, const Vector4 &v2) {
return Vector4::Create(KRMIN(v1.x, v2.x), KRMIN(v1.y, v2.y), KRMIN(v1.z, v2.z), KRMIN(v1.w, v2.w));
}
Vector4 Vector4::Max(const Vector4 &v1, const Vector4 &v2) {
return Vector4::Create(KRMAX(v1.x, v2.x), KRMAX(v1.y, v2.y), KRMAX(v1.z, v2.z), KRMAX(v1.w, v2.w));
}
bool Vector4::operator >(const Vector4& b) const
{
// Comparison operators are implemented to allow insertion into sorted containers such as std::set