From f5364f752fb01c761288d0517bbca411b2c6b4c1 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 26 Jul 2018 18:01:24 -0700 Subject: [PATCH] fix scaling --- interface/src/raypick/ParabolaPick.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/raypick/ParabolaPick.cpp b/interface/src/raypick/ParabolaPick.cpp index c11d9cba95..b3e3f16345 100644 --- a/interface/src/raypick/ParabolaPick.cpp +++ b/interface/src/raypick/ParabolaPick.cpp @@ -58,13 +58,13 @@ PickResultPointer ParabolaPick::getHUDIntersection(const PickParabola& pick) { } float ParabolaPick::getSpeed() const { - return _scaleWithAvatar ? DependencyManager::get()->getMyAvatar()->getSensorToWorldScale() * _speed : _speed; + return (_scaleWithAvatar ? DependencyManager::get()->getMyAvatar()->getSensorToWorldScale() * _speed : _speed); } glm::vec3 ParabolaPick::getAcceleration() const { - float scale = _scaleWithAvatar ? DependencyManager::get()->getMyAvatar()->getSensorToWorldScale() : 1.0f; + float scale = (_scaleWithAvatar ? DependencyManager::get()->getMyAvatar()->getSensorToWorldScale() : 1.0f); if (_rotateAccelerationWithAvatar) { - return scale * DependencyManager::get()->getMyAvatar()->getWorldOrientation() * _accelerationAxis; + return scale * (DependencyManager::get()->getMyAvatar()->getWorldOrientation() * _accelerationAxis); } return scale * _accelerationAxis; } \ No newline at end of file