diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-03-03 01:25:15 +0000 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-03-03 01:25:15 +0000 |
commit | 253a0b73f0975d8f14c3a3f2a06675b53c736071 (patch) | |
tree | 71cd0bf5604f7dfb07ed7022c1358a8e2aa91f6a /lib/maths.h | |
parent | Create and use a shader program for things with absolute position (diff) | |
download | ilt-253a0b73f0975d8f14c3a3f2a06675b53c736071.tar.bz2 ilt-253a0b73f0975d8f14c3a3f2a06675b53c736071.tar.xz ilt-253a0b73f0975d8f14c3a3f2a06675b53c736071.zip |
Simplify a lot of code with sincosf
Diffstat (limited to 'lib/maths.h')
-rw-r--r-- | lib/maths.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/maths.h b/lib/maths.h index d304b65..a3a391d 100644 --- a/lib/maths.h +++ b/lib/maths.h @@ -37,11 +37,11 @@ sincosf(float a, float & s, float & c) return sincosf(a, &s, &c); } -inline std::pair<float, float> +inline glm::vec2 sincosf(float a) { - std::pair<float, float> sc; - sincosf(a, &sc.first, &sc.second); + glm::vec2 sc; + sincosf(a, sc.x, sc.y); return sc; } @@ -62,9 +62,15 @@ operator!(const glm::vec3 & v) } constexpr inline glm::vec3 +operator^(const glm::vec2 & v, float y) +{ + return {v.x, y, v.y}; +} + +constexpr inline glm::vec3 operator!(const glm::vec2 & v) { - return {v.x, 0, v.y}; + return v ^ 0.F; } constexpr inline float |