From efc34c9437a38e674682a28b338f1f392ddcd0ae Mon Sep 17 00:00:00 2001 From: Joey de Vries Date: Sat, 1 Oct 2022 09:50:17 +0200 Subject: [PATCH] Fix lerp name ambiguity (need to look into getting rid of using namespace std in header files, for later). --- src/5.advanced_lighting/9.ssao/ssao.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/5.advanced_lighting/9.ssao/ssao.cpp b/src/5.advanced_lighting/9.ssao/ssao.cpp index 08ac98e..0095afe 100644 --- a/src/5.advanced_lighting/9.ssao/ssao.cpp +++ b/src/5.advanced_lighting/9.ssao/ssao.cpp @@ -35,7 +35,7 @@ bool firstMouse = true; float deltaTime = 0.0f; float lastFrame = 0.0f; -float lerp(float a, float b, float f) +float ourLerp(float a, float b, float f) { return a + f * (b - a); } @@ -176,7 +176,7 @@ int main() float scale = float(i) / 64.0f; // scale samples s.t. they're more aligned to center of kernel - scale = lerp(0.1f, 1.0f, scale * scale); + scale = ourLerp(0.1f, 1.0f, scale * scale); sample *= scale; ssaoKernel.push_back(sample); }