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

more vector ctors

Browse Source
This commit is contained in:
BlackMATov
2020-11-21 22:14:28 +07:00
parent c256523102
commit 4edfa973d2
4 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
headers/vmath.hpp/vmath_fwd.hpp
View File

@@ -34,6 +34,14 @@ namespace vmath_hpp
using vec2f = vec<float, 2>;
using vec3f = vec<float, 3>;
using vec4f = vec<float, 4>;
using vec2d = vec<double, 2>;
using vec3d = vec<double, 3>;
using vec4d = vec<double, 4>;
using vec2u = vec<unsigned, 2>;
using vec3u = vec<unsigned, 3>;
using vec4u = vec<unsigned, 4>;
}
namespace vmath_hpp
@@ -52,4 +60,12 @@ namespace vmath_hpp
using mat2f = mat<float, 2>;
using mat3f = mat<float, 3>;
using mat4f = mat<float, 4>;
using mat2d = mat<double, 2>;
using mat3d = mat<double, 3>;
using mat4d = mat<double, 4>;
using mat2u = mat<unsigned, 2>;
using mat3u = mat<unsigned, 3>;
using mat4u = mat<unsigned, 4>;
}

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

@@ -171,17 +171,17 @@ namespace vmath_hpp
}
constexpr value_type& at(size_type index) {
if ( index < Size ) {
return rows[index];
if ( index >= Size ) {
throw std::out_of_range("mat::at");
}
throw std::out_of_range("mat::at");
return rows[index];
}
constexpr const value_type& at(size_type index) const {
if ( index < Size ) {
return rows[index];
if ( index >= Size ) {
throw std::out_of_range("mat::at");
}
throw std::out_of_range("mat::at");
return rows[index];
}
};

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

@@ -28,10 +28,10 @@ namespace vmath_hpp::detail
: data{x, y} {}
constexpr explicit vec_base(const vec_base<T, 3>& xy)
: data{xy.x(), xy.y()} {}
: data{xy.data[0], xy.data[1]} {}
constexpr explicit vec_base(const vec_base<T, 4>& xy)
: data{xy.x(), xy.y()} {}
: data{xy.data[0], xy.data[1]} {}
constexpr T& x() noexcept { return data[0]; }
constexpr const T& x() const noexcept { return data[0]; }
@@ -54,11 +54,14 @@ namespace vmath_hpp::detail
constexpr vec_base(T x, T y, T z)
: data{x, y, z} {}
constexpr explicit vec_base(const vec_base<T, 2>& xy, T z)
: data{xy.x(), xy.y(), z} {}
constexpr vec_base(const vec_base<T, 2>& xy, T z)
: data{xy.data[0], xy.data[1], z} {}
constexpr vec_base(T x, const vec_base<T, 2>& yz)
: data{x, yz.data[0], yz.data[1]} {}
constexpr explicit vec_base(const vec_base<T, 4>& xyz)
: data{xyz.x(), xyz.y(), xyz.z()} {}
: data{xyz.data[0], xyz.data[1], xyz.data[2]} {}
constexpr T& x() noexcept { return data[0]; }
constexpr const T& x() const noexcept { return data[0]; }
@@ -84,11 +87,23 @@ namespace vmath_hpp::detail
constexpr vec_base(T x, T y, T z, T w)
: data{x, y, z, w} {}
constexpr explicit vec_base(const vec_base<T, 2>& xy, T z, T w)
: data{xy.x(), xy.y(), z, w} {}
constexpr vec_base(const vec_base<T, 2>& xy, T z, T w)
: data{xy.data[0], xy.data[1], z, w} {}
constexpr explicit vec_base(const vec_base<T, 3>& xyz, T w)
: data{xyz.x(), xyz.y(), xyz.z(), w} {}
constexpr vec_base(T x, const vec_base<T, 2>& yz, T w)
: data{x, yz.data[0], yz.data[1], w} {}
constexpr vec_base(T x, T y, const vec_base<T, 2>& zw)
: data{x, y, zw.data[0], zw.data[1]} {}
constexpr vec_base(const vec_base<T, 2>& xy, const vec_base<T, 2>& zw)
: data{xy.data[0], xy.data[1], zw.data[0], zw.data[1]} {}
constexpr vec_base(const vec_base<T, 3>& xyz, T w)
: data{xyz.data[0], xyz.data[1], xyz.data[2], w} {}
constexpr vec_base(T x, const vec_base<T, 3>& yzw)
: data{x, yzw.data[0], yzw.data[1], yzw.data[2]} {}
constexpr T& x() noexcept { return data[0]; }
constexpr const T& x() const noexcept { return data[0]; }
@@ -173,17 +188,17 @@ namespace vmath_hpp
}
constexpr reference at(size_type index) {
if ( index < Size ) {
return data[index];
if ( index >= Size ) {
throw std::out_of_range("vec::at");
}
throw std::out_of_range("vec::at");
return data[index];
}
constexpr const_reference at(size_type index) const {
if ( index < Size ) {
return data[index];
if ( index >= Size ) {
throw std::out_of_range("vec::at");
}
throw std::out_of_range("vec::at");
return data[index];
}
};

13
untests/vmath_vec_tests.cpp
View File

@@ -44,14 +44,27 @@ TEST_CASE("vmath/vec") {
STATIC_REQUIRE(v2 == vec2i(1,2));
}
{
STATIC_REQUIRE(vec2i(1) == vec2i(1,1));
STATIC_REQUIRE(vec2i(1,2) == vec2i(1,2));
STATIC_REQUIRE(vec2i(vec2i(1,2)) == vec2i(1,2));
STATIC_REQUIRE(vec2i(vec3i(1,2,3)) == vec2i(1,2));
STATIC_REQUIRE(vec2i(vec4i(1,2,3,4)) == vec2i(1,2));
STATIC_REQUIRE(vec3i(1) == vec3i(1,1,1));
STATIC_REQUIRE(vec3i(1,2,3) == vec3i(1,2,3));
STATIC_REQUIRE(vec3i(vec2i(1,2),3) == vec3i(1,2,3));
STATIC_REQUIRE(vec3i(1,vec2i(2,3)) == vec3i(1,2,3));
STATIC_REQUIRE(vec3i(vec3i(1,2,3)) == vec3i(1,2,3));
STATIC_REQUIRE(vec3i(vec4i(1,2,3,4)) == vec3i(1,2,3));
STATIC_REQUIRE(vec4i(1) == vec4i(1,1,1,1));
STATIC_REQUIRE(vec4i(1,2,3,4) == vec4i(1,2,3,4));
STATIC_REQUIRE(vec4i(vec2i(1,2),3,4) == vec4i(1,2,3,4));
STATIC_REQUIRE(vec4i(1,vec2i(2,3),4) == vec4i(1,2,3,4));
STATIC_REQUIRE(vec4i(1,2,vec2i(3,4)) == vec4i(1,2,3,4));
STATIC_REQUIRE(vec4i(vec2i(1,2),vec2i(3,4)) == vec4i(1,2,3,4));
STATIC_REQUIRE(vec4i(vec3i(1,2,3),4) == vec4i(1,2,3,4));
STATIC_REQUIRE(vec4i(1,vec3i(2,3,4)) == vec4i(1,2,3,4));
}
}