allow any type that can be static_cast to type of vector in operators like +, -, *. /
parent
37da0bd76d
commit
3f0ea887cd
|
@ -1,7 +1,7 @@
|
||||||
cmake_minimum_required(VERSION 3.20)
|
cmake_minimum_required(VERSION 3.20)
|
||||||
include(cmake/color.cmake)
|
include(cmake/color.cmake)
|
||||||
|
|
||||||
set(BLT_VERSION 0.16.19)
|
set(BLT_VERSION 0.16.20)
|
||||||
set(BLT_TEST_VERSION 0.0.1)
|
set(BLT_TEST_VERSION 0.0.1)
|
||||||
|
|
||||||
set(BLT_TARGET BLT)
|
set(BLT_TARGET BLT)
|
||||||
|
|
|
@ -291,39 +291,39 @@ namespace blt
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator+(const vec<T, size>& left, T right)
|
inline constexpr vec<T, size> operator+(const vec<T, size>& left, G right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = left[i] + right;
|
initializer[i] = left[i] + static_cast<T>(right);
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator-(const vec<T, size>& left, T right)
|
inline constexpr vec<T, size> operator-(const vec<T, size>& left, G right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = left[i] + right;
|
initializer[i] = left[i] + static_cast<T>(right);
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator+(T f, const vec<T, size>& right)
|
inline constexpr vec<T, size> operator+(G left, const vec<T, size>& right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = f + right[i];
|
initializer[i] = static_cast<T>(left) + right[i];
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator-(T f, const vec<T, size>& right)
|
inline constexpr vec<T, size> operator-(G left, const vec<T, size>& right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = f - right[i];
|
initializer[i] = static_cast<T>(left) - right[i];
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -336,39 +336,39 @@ namespace blt
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator*(const vec<T, size>& left, T right)
|
inline constexpr vec<T, size> operator*(const vec<T, size>& left, G right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = left[i] * right;
|
initializer[i] = left[i] * static_cast<T>(right);
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator*(T f, const vec<T, size>& right)
|
inline constexpr vec<T, size> operator*(G left, const vec<T, size>& right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = f * right[i];
|
initializer[i] = static_cast<T>(left) * right[i];
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator/(const vec<T, size>& left, T right)
|
inline constexpr vec<T, size> operator/(const vec<T, size>& left, G right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = left[i] / right;
|
initializer[i] = left[i] / static_cast<T>(right);
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, blt::u32 size>
|
template<typename T, typename G, blt::u32 size>
|
||||||
inline constexpr vec<T, size> operator/(T left, const vec<T, size>& right)
|
inline constexpr vec<T, size> operator/(G left, const vec<T, size>& right)
|
||||||
{
|
{
|
||||||
vec<T, size> initializer{};
|
vec<T, size> initializer{};
|
||||||
for (blt::u32 i = 0; i < size; i++)
|
for (blt::u32 i = 0; i < size; i++)
|
||||||
initializer[i] = left / right[i];
|
initializer[i] = static_cast<T>(left) / right[i];
|
||||||
return initializer;
|
return initializer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue