From 519ebadf219ef3b6b75dd84842ef5b56589c4c3b Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 1 Jun 2024 14:02:42 +0100
Subject: Remove conflicting glm::vec operators

% and %= already exist and abusing them for simplifying perspective
multiplication was always a bad idea. Here they just become named
functions.
---
 lib/maths.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/maths.h b/lib/maths.h
index 63b752a..018ef0e 100644
--- a/lib/maths.h
+++ b/lib/maths.h
@@ -176,7 +176,7 @@ operator||(const glm::vec<L, T, Q> v1, const T v2)
 
 template<glm::length_t L, typename T, glm::qualifier Q>
 inline constexpr glm::vec<L, T, Q>
-operator%(const glm::vec<L, T, Q> & p, const glm::mat<L + 1, L + 1, T, Q> & mutation)
+perspectiveMultiply(const glm::vec<L, T, Q> & p, const glm::mat<L + 1, L + 1, T, Q> & mutation)
 {
 	const auto p2 = mutation * (p || T(1));
 	return p2 / p2.w;
@@ -184,9 +184,9 @@ operator%(const glm::vec<L, T, Q> & p, const glm::mat<L + 1, L + 1, T, Q> & muta
 
 template<glm::length_t L, typename T, glm::qualifier Q>
 inline constexpr glm::vec<L, T, Q>
-operator%=(glm::vec<L, T, Q> & p, const glm::mat<L + 1, L + 1, T, Q> & mutation)
+perspectiveApply(glm::vec<L, T, Q> & p, const glm::mat<L + 1, L + 1, T, Q> & mutation)
 {
-	return p = p % mutation;
+	return p = perspectiveMultiply(p, mutation);
 }
 
 float normalize(float ang);
-- 
cgit v1.2.3