From f7b7db5ab40af85246e0f63595e5de9cc7a0f0df Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 10 Jan 2019 09:14:37 -0800 Subject: [PATCH] fix warning on OSX, use correct format for float literals --- interface/src/avatar/OtherAvatar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/OtherAvatar.cpp b/interface/src/avatar/OtherAvatar.cpp index 569f92ac4d..854f078c03 100644 --- a/interface/src/avatar/OtherAvatar.cpp +++ b/interface/src/avatar/OtherAvatar.cpp @@ -209,9 +209,9 @@ void OtherAvatar::simulate(float deltaTime, bool inView) { _displayNameAlpha *= coef; } else { // Fading in - _displayNameAlpha = 1 - (1 - _displayNameAlpha) * coef; + _displayNameAlpha = 1.0f - (1.0f - _displayNameAlpha) * coef; } - _displayNameAlpha = abs(_displayNameAlpha - _displayNameTargetAlpha) < 0.01f ? _displayNameTargetAlpha : _displayNameAlpha; + _displayNameAlpha = absf(_displayNameAlpha - _displayNameTargetAlpha) < 0.01f ? _displayNameTargetAlpha : _displayNameAlpha; } {