summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorWeiyi Wang <wwylele@gmail.com>2017-08-09 17:54:29 +0200
committerGitHub <noreply@github.com>2017-08-09 17:54:29 +0200
commit792dee47a7b520cb2a8d7cf43cc184c17394708f (patch)
tree35b14f184d95834bed51d3fda5c9662355e8b7f7 /src/common
parentMerge pull request #2856 from wwylele/shader-share (diff)
parentSwRasterizer/Lighting: shorten file name (diff)
downloadyuzu-792dee47a7b520cb2a8d7cf43cc184c17394708f.tar
yuzu-792dee47a7b520cb2a8d7cf43cc184c17394708f.tar.gz
yuzu-792dee47a7b520cb2a8d7cf43cc184c17394708f.tar.bz2
yuzu-792dee47a7b520cb2a8d7cf43cc184c17394708f.tar.lz
yuzu-792dee47a7b520cb2a8d7cf43cc184c17394708f.tar.xz
yuzu-792dee47a7b520cb2a8d7cf43cc184c17394708f.tar.zst
yuzu-792dee47a7b520cb2a8d7cf43cc184c17394708f.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/quaternion.h5
-rw-r--r--src/common/vector_math.h7
2 files changed, 8 insertions, 4 deletions
diff --git a/src/common/quaternion.h b/src/common/quaternion.h
index 84ac82ed3..77f626bcb 100644
--- a/src/common/quaternion.h
+++ b/src/common/quaternion.h
@@ -30,6 +30,11 @@ public:
return {xyz * other.w + other.xyz * w + Cross(xyz, other.xyz),
w * other.w - Dot(xyz, other.xyz)};
}
+
+ Quaternion<T> Normalized() const {
+ T length = std::sqrt(xyz.Length2() + w * w);
+ return {xyz / length, w / length};
+ }
};
template <typename T>
diff --git a/src/common/vector_math.h b/src/common/vector_math.h
index c7a461a1e..6e2a5ad60 100644
--- a/src/common/vector_math.h
+++ b/src/common/vector_math.h
@@ -31,7 +31,6 @@
#pragma once
#include <cmath>
-#include <type_traits>
namespace Math {
@@ -90,7 +89,7 @@ public:
x -= other.x;
y -= other.y;
}
- template <typename Q = T, class = typename std::enable_if<std::is_signed<Q>::value>::type>
+
Vec2<decltype(-T{})> operator-() const {
return MakeVec(-x, -y);
}
@@ -247,7 +246,7 @@ public:
y -= other.y;
z -= other.z;
}
- template <typename Q = T, class = typename std::enable_if<std::is_signed<Q>::value>::type>
+
Vec3<decltype(-T{})> operator-() const {
return MakeVec(-x, -y, -z);
}
@@ -462,7 +461,7 @@ public:
z -= other.z;
w -= other.w;
}
- template <typename Q = T, class = typename std::enable_if<std::is_signed<Q>::value>::type>
+
Vec4<decltype(-T{})> operator-() const {
return MakeVec(-x, -y, -z, -w);
}