BlackMATov/vmath.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/vmath.hpp.git synced 2025-12-13 12:15:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

trs function

Browse Source
This commit is contained in:
BlackMATov
2021-02-27 07:35:53 +07:00
parent 950d1758cf
commit ebdcb4f495
4 changed files with 97 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
README.md
View File

@@ -1799,6 +1799,18 @@ qua<T> imag(qua<T> q, const vec<T, 3>& imag);
### Matrix Transform 3D
```cpp
template < typename T >
mat<T, 4> trs(const vec<T, 3>& t, const mat<T, 3>& r);
template < typename T >
mat<T, 4> trs(const vec<T, 3>& t, const mat<T, 3>& r, const vec<T, 3>& s);
template < typename T >
mat<T, 4> trs(const vec<T, 3>& t, const qua<T>& r);
template < typename T >
mat<T, 4> trs(const vec<T, 3>& t, const qua<T>& r, const vec<T, 3>& s);
template < typename T >
mat<T, 4> translate(const vec<T, 3>& v);
@@ -1893,6 +1905,12 @@ mat<T, 4> look_at_rh(const vec<T, 3>& eye, const vec<T, 3>& at, const vec<T, 3>&
### Matrix Transform 2D
```cpp
template < typename T >
mat<T, 3> trs(const vec<T, 2>& t, const mat<T, 2>& r);
template < typename T >
mat<T, 3> trs(const vec<T, 2>& t, const mat<T, 2>& r, const vec<T, 2>& s);
template < typename T >
mat<T, 3> translate(const vec<T, 2>& v);

48
headers/vmath.hpp/vmath_ext.hpp
View File

@@ -230,6 +230,36 @@ namespace vmath_hpp
namespace vmath_hpp
{
// trs
template < typename T >
[[nodiscard]] constexpr mat<T, 4> trs(const vec<T, 3>& t, const mat<T, 3>& r) {
return {
{ r[0], T{0} },
{ r[1], T{0} },
{ r[2], T{0} },
{ t, T{1} }};
}
template < typename T >
[[nodiscard]] constexpr mat<T, 4> trs(const vec<T, 3>& t, const mat<T, 3>& r, const vec<T, 3>& s) {
return {
{ r[0] * s[0], T{0} },
{ r[1] * s[1], T{0} },
{ r[2] * s[2], T{0} },
{ t, T{1} }};
}
template < typename T >
[[nodiscard]] constexpr mat<T, 4> trs(const vec<T, 3>& t, const qua<T>& r) {
return trs(t, rotate(r));
}
template < typename T >
[[nodiscard]] constexpr mat<T, 4> trs(const vec<T, 3>& t, const qua<T>& r, const vec<T, 3>& s) {
return trs(t, rotate(r), s);
}
// translate
template < typename T >
@@ -555,6 +585,24 @@ namespace vmath_hpp
namespace vmath_hpp
{
// trs
template < typename T >
[[nodiscard]] constexpr mat<T, 3> trs(const vec<T, 2>& t, const mat<T, 2>& r) {
return {
{ r[0], T{0} },
{ r[1], T{0} },
{ t, T{1} }};
}
template < typename T >
[[nodiscard]] constexpr mat<T, 3> trs(const vec<T, 2>& t, const mat<T, 2>& r, const vec<T, 2>& s) {
return {
{ r[0] * s[0], T{0} },
{ r[1] * s[1], T{0} },
{ t, T{1} }};
}
// translate
template < typename T >

23
untests/vmath_ext_tests.cpp
View File

@@ -218,6 +218,29 @@ TEST_CASE("vmath/ext/access") {
}
TEST_CASE("vmath/ext/matrix_transform") {
SUBCASE("trs") {
CHECK(all(approx(
trs(fvec3(1,2,3), rotate(pi, fvec3{1,2,3})),
rotate4(pi, fvec3{1,2,3}) * translate(fvec3(1,2,3)))));
CHECK(all(approx(
trs(fvec3(1,2,3), rotate(pi, fvec3{1,2,3}), fvec3(2,3,4)),
scale4(fvec3(2,3,4)) * rotate4(pi, fvec3(1,2,3)) * translate(fvec3(1,2,3)))));
CHECK(all(approx(
trs(fvec3(1,2,3), qrotate(pi, fvec3{1,2,3})),
rotate4(qrotate(pi, fvec3{1,2,3})) * translate(fvec3(1,2,3)))));
CHECK(all(approx(
trs(fvec3(1,2,3), qrotate(pi, fvec3{1,2,3}), fvec3(2,3,4)),
scale4(fvec3(2,3,4)) * rotate4(qrotate(pi, fvec3{1,2,3})) * translate(fvec3(1,2,3)))));
CHECK(all(approx(
trs(fvec2(1,2), rotate(pi)),
rotate3(pi) * translate(fvec2(1,2)))));
CHECK(all(approx(
trs(fvec2(1,2), rotate(pi), fvec2(2,3)),
scale3(fvec2(2,3)) * rotate3(pi) * translate(fvec2(1,2)))));
}
SUBCASE("translate") {
STATIC_CHECK(fvec3(2.f,3.f,1.f) * translate(fvec2{1.f,2.f}) == uapprox3(3.f,5.f,1.f));
STATIC_CHECK(fvec3(2.f,3.f,1.f) * translate(translate(fvec2{1.f,2.f}), fvec2{1.f,2.f}) == uapprox3(4.f,7.f,1.f));

8
untests/vmath_fix_tests.cpp
View File

@@ -383,6 +383,11 @@ namespace vmath_hpp
namespace vmath_hpp
{
template fix4x4f trs(const fix3f&, const fix3x3f&);
template fix4x4f trs(const fix3f&, const fix3x3f&, const fix3f&);
template fix4x4f trs(const fix3f&, const qfix&);
template fix4x4f trs(const fix3f&, const qfix&, const fix3f&);
template fix4x4f translate(const fix3f&);
template fix4x4f translate(const fix4x4f&, const fix3f&);
@@ -429,6 +434,9 @@ namespace vmath_hpp
namespace vmath_hpp
{
template fix3x3f trs(const fix2f&, const fix2x2f&);
template fix3x3f trs(const fix2f&, const fix2x2f&, const fix2f&);
template fix3x3f translate(const fix2f&);
template fix3x3f translate(const fix3x3f&, const fix2f&);