tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

constexpr on vector functions

v1
Brett 2024-05-14 21:31:59 -04:00
parent 9bd19ed372
commit a3e187bd01
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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.17.8) set(BLT_VERSION 0.17.9)
set(BLT_TEST_VERSION 0.0.1) set(BLT_TEST_VERSION 0.0.1)
set(BLT_TARGET BLT) set(BLT_TARGET BLT)

10
include/blt/math/vectors.h
View File

@ -433,19 +433,19 @@ namespace blt
using color4 = vec4; using color4 = vec4;
using color3 = vec3; using color3 = vec3;
inline color4 interpolate(const color4& in, const color4& desired, float factor) inline constexpr color4 interpolate(const color4& in, const color4& desired, float factor)
{ {
auto diff = desired - in; auto diff = desired - in;
return in + (diff * factor); return in + (diff * factor);
} }
inline color4 make_color(float r, float g, float b) inline constexpr color4 make_color(float r, float g, float b)
{ {
return color4{r, g, b, 1.0f}; return color4{r, g, b, 1.0f};
} }
template<typename ValueType, u32 size> template<typename ValueType, u32 size>
inline blt::vec<ValueType, 2> make_vec2(const blt::vec<ValueType, size>& t, size_t fill = 0) inline constexpr blt::vec<ValueType, 2> make_vec2(const blt::vec<ValueType, size>& t, size_t fill = 0)
{ {
if constexpr (size >= 2) if constexpr (size >= 2)
{ {
@ -457,7 +457,7 @@ namespace blt
} }
template<typename ValueType, u32 size> template<typename ValueType, u32 size>
inline blt::vec<ValueType, 3> make_vec3(const blt::vec<ValueType, size>& t, size_t fill = 0) inline constexpr blt::vec<ValueType, 3> make_vec3(const blt::vec<ValueType, size>& t, size_t fill = 0)
{ {
if constexpr (size >= 3) if constexpr (size >= 3)
{ {
@ -474,7 +474,7 @@ namespace blt
} }
template<typename ValueType, u32 size> template<typename ValueType, u32 size>
inline blt::vec<ValueType, 4> make_vec4(const blt::vec<ValueType, size>& t, size_t fill = 0) inline constexpr blt::vec<ValueType, 4> make_vec4(const blt::vec<ValueType, size>& t, size_t fill = 0)
{ {
if constexpr (size >= 4) if constexpr (size >= 4)
{ {