BlackMATov/vmath.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/vmath.hpp.git synced 2026-01-04 17:21:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

more matrix ctors

Browse Source
This commit is contained in:
BlackMATov
2020-11-21 23:14:47 +07:00
parent 4edfa973d2
commit 09062d3988
3 changed files with 91 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
headers/vmath.hpp/vmath_mat.hpp
View File

@@ -26,6 +26,11 @@ namespace vmath_hpp::detail
constexpr explicit mat_base(uninit_t) {}
constexpr explicit mat_base(T v)
: rows{
{v, 0},
{0, v}} {}
constexpr mat_base(
T m11, T m12,
T m21, T m22)
@@ -37,6 +42,18 @@ namespace vmath_hpp::detail
const vec<T, 2>& row0,
const vec<T, 2>& row1)
: rows{row0, row1} {}
constexpr explicit mat_base(
const mat_base<T, 3>& other)
: rows{
vec<T, 2>{other.rows[0]},
vec<T, 2>{other.rows[1]}} {}
constexpr explicit mat_base(
const mat_base<T, 4>& other)
: rows{
vec<T, 2>{other.rows[0]},
vec<T, 2>{other.rows[1]}} {}
};
template < typename T >
@@ -52,6 +69,12 @@ namespace vmath_hpp::detail
constexpr explicit mat_base(uninit_t) {}
constexpr explicit mat_base(T v)
: rows{
{v, 0, 0},
{0, v, 0},
{0, 0, v}} {}
constexpr mat_base(
T m11, T m12, T m13,
T m21, T m22, T m23,
@@ -66,6 +89,20 @@ namespace vmath_hpp::detail
const vec<T, 3>& row1,
const vec<T, 3>& row2)
: rows{row0, row1, row2} {}
constexpr explicit mat_base(
const mat_base<T, 2>& other)
: rows{
{other.rows[0], 0},
{other.rows[1], 0},
{0, 0, 1}} {}
constexpr explicit mat_base(
const mat_base<T, 4>& other)
: rows{
vec<T, 3>{other.rows[0]},
vec<T, 3>{other.rows[1]},
vec<T, 3>{other.rows[2]}} {}
};
template < typename T >
@@ -82,6 +119,13 @@ namespace vmath_hpp::detail
constexpr explicit mat_base(uninit_t) {}
constexpr explicit mat_base(T v)
: rows{
{v, 0, 0, 0},
{0, v, 0, 0},
{0, 0, v, 0},
{0, 0, 0, v}} {}
constexpr mat_base(
T m11, T m12, T m13, T m14,
T m21, T m22, T m23, T m24,
@@ -99,6 +143,22 @@ namespace vmath_hpp::detail
const vec<T, 4>& row2,
const vec<T, 4>& row3)
: rows{row0, row1, row2, row3} {}
constexpr explicit mat_base(
const mat_base<T, 2>& other)
: rows{
{other.rows[0], 0, 0},
{other.rows[1], 0, 0},
{0, 0, 1, 0},
{0, 0, 0, 1}} {}
constexpr explicit mat_base(
const mat_base<T, 3>& other)
: rows{
{other.rows[0], 0},
{other.rows[1], 0},
{other.rows[2], 0},
{0, 0, 0, 1}} {}
};
}
@@ -109,6 +169,7 @@ namespace vmath_hpp
public:
using self_type = mat;
using base_type = detail::mat_base<T, Size>;
public:
using value_type = vec<T, Size>;
using pointer = value_type*;
@@ -162,22 +223,22 @@ namespace vmath_hpp
constexpr size_type max_size() const noexcept { return Size; }
constexpr bool empty() const noexcept { return !Size; }
constexpr value_type& operator[](size_type index) noexcept {
constexpr reference operator[](size_type index) noexcept {
return rows[index];
}
constexpr const value_type& operator[](size_type index) const noexcept {
constexpr const_reference operator[](size_type index) const noexcept {
return rows[index];
}
constexpr value_type& at(size_type index) {
constexpr reference at(size_type index) {
if ( index >= Size ) {
throw std::out_of_range("mat::at");
}
return rows[index];
}
constexpr const value_type& at(size_type index) const {
constexpr const_reference at(size_type index) const {
if ( index >= Size ) {
throw std::out_of_range("mat::at");
}

1
headers/vmath.hpp/vmath_vec.hpp
View File

@@ -126,6 +126,7 @@ namespace vmath_hpp
public:
using self_type = vec;
using base_type = detail::vec_base<T, Size>;
public:
using value_type = T;
using pointer = value_type*;

25
untests/vmath_mat_tests.cpp
View File

@@ -43,6 +43,31 @@ TEST_CASE("vmath/mat") {
constexpr mat2i v2 = std::move(v);
STATIC_REQUIRE(v2 == mat2i(1,2,3,4));
}
{
STATIC_REQUIRE(mat2i() == mat2i(1,0,0,1));
STATIC_REQUIRE(mat2i(2) == mat2i(2,0,0,2));
STATIC_REQUIRE(mat2i(1,2,3,4) == mat2i(1,2,3,4));
STATIC_REQUIRE(mat2i({1,2},{3,4}) == mat2i(1,2,3,4));
STATIC_REQUIRE(mat2i(mat2i({1,2},{3,4})) == mat2i(1,2,3,4));
STATIC_REQUIRE(mat2i(mat3i({1,2,3},{4,5,6},{7,8,9})) == mat2i(1,2,4,5));
STATIC_REQUIRE(mat2i(mat4i({1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16})) == mat2i(1,2,5,6));
STATIC_REQUIRE(mat3i() == mat3i(1,0,0,0,1,0,0,0,1));
STATIC_REQUIRE(mat3i(2) == mat3i(2,0,0,0,2,0,0,0,2));
STATIC_REQUIRE(mat3i(1,2,3,4,5,6,7,8,9) == mat3i(1,2,3,4,5,6,7,8,9));
STATIC_REQUIRE(mat3i({1,2,3},{4,5,6},{7,8,9}) == mat3i(1,2,3,4,5,6,7,8,9));
STATIC_REQUIRE(mat3i(mat3i({1,2,3},{4,5,6},{7,8,9})) == mat3i(1,2,3,4,5,6,7,8,9));
STATIC_REQUIRE(mat3i(mat2i({1,2},{3,4})) == mat3i(1,2,0,3,4,0,0,0,1));
STATIC_REQUIRE(mat3i(mat4i({1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16})) == mat3i(1,2,3,5,6,7,9,10,11));
STATIC_REQUIRE(mat4i() == mat4i(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1));
STATIC_REQUIRE(mat4i(2) == mat4i(2,0,0,0,0,2,0,0,0,0,2,0,0,0,0,2));
STATIC_REQUIRE(mat4i(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16) == mat4i(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16));
STATIC_REQUIRE(mat4i({1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16}) == mat4i(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16));
STATIC_REQUIRE(mat4i(mat4i({1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16})) == mat4i(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16));
STATIC_REQUIRE(mat4i(mat2i({1,2},{3,4})) == mat4i(1,2,0,0,3,4,0,0,0,0,1,0,0,0,0,1));
STATIC_REQUIRE(mat4i(mat3i({1,2,3},{4,5,6},{7,8,9})) == mat4i(1,2,3,0,4,5,6,0,7,8,9,0,0,0,0,1));
}
}
SECTION("operator=") {