From cc10a572af01ed18f66cc0bbb94070e69c1ada3e Mon Sep 17 00:00:00 2001 From: Lubosz Sarnecki Date: Sat, 3 Aug 2024 14:33:57 +0200 Subject: [PATCH] GLMHelpers: Don't redefine lerp. Fixes GCC build error on C++20. --- libraries/shared/src/GLMHelpers.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h index cfb4bb6398..da81568e58 100644 --- a/libraries/shared/src/GLMHelpers.h +++ b/libraries/shared/src/GLMHelpers.h @@ -211,11 +211,6 @@ T toNormalizedDeviceScale(const T& value, const T& size) { #define PITCH(euler) euler.x #define ROLL(euler) euler.z -// float - linear interpolate -inline float lerp(float x, float y, float a) { - return x * (1.0f - a) + (y * a); -} - // vec2 lerp - linear interpolate template glm::tvec2 lerp(const glm::tvec2& x, const glm::tvec2& y, T a) {