From c26b03f48086c495007c06d13dac95561ea7969b Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 11 Jun 2018 10:40:13 -0700 Subject: [PATCH] Cleanup --- interface/src/ui/OverlayConductor.cpp | 4 +--- interface/src/ui/OverlayConductor.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp index 924a5d6179..d131bb3467 100644 --- a/interface/src/ui/OverlayConductor.cpp +++ b/interface/src/ui/OverlayConductor.cpp @@ -89,9 +89,7 @@ void OverlayConductor::update(float dt) { } bool isAtRest = updateAvatarIsAtRest(); - bool prevMoving = _currentMoving; bool isMoving = !isAtRest; - bool movingChanged = prevMoving != isMoving; bool shouldRecenter = false; @@ -101,7 +99,7 @@ void OverlayConductor::update(float dt) { shouldRecenter = true; } } else { - if (myAvatar->getClearOverlayWhenMoving() && movingChanged && isMoving) { + if (myAvatar->getClearOverlayWhenMoving() && isMoving) { _flags |= SuppressedByMove; } } diff --git a/interface/src/ui/OverlayConductor.h b/interface/src/ui/OverlayConductor.h index 509292b775..ef7ce216d2 100644 --- a/interface/src/ui/OverlayConductor.h +++ b/interface/src/ui/OverlayConductor.h @@ -34,8 +34,6 @@ private: uint8_t _flags { SuppressedByMove }; bool _hmdMode { false }; - - bool _currentMoving { false }; // used by updateAvatarIsAtRest uint64_t _desiredAtRestTimer { 0 };