From 253a0b73f0975d8f14c3a3f2a06675b53c736071 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 3 Mar 2021 01:25:15 +0000 Subject: Simplify a lot of code with sincosf --- lib/maths.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lib/maths.h') 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 +inline glm::vec2 sincosf(float a) { - std::pair sc; - sincosf(a, &sc.first, &sc.second); + glm::vec2 sc; + sincosf(a, sc.x, sc.y); return sc; } @@ -61,10 +61,16 @@ operator!(const glm::vec3 & v) return {v.x, v.z}; } +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 -- cgit v1.2.3