Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix scaling

Browse source
This commit is contained in:
SamGondelman 2018-07-26 18:01:24 -07:00
parent 74b3143bc3
commit f5364f752f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/raypick/ParabolaPick.cpp
View file

@ -58,13 +58,13 @@ PickResultPointer ParabolaPick::getHUDIntersection(const PickParabola& pick) {
} }
float ParabolaPick::getSpeed() const { float ParabolaPick::getSpeed() const {
return _scaleWithAvatar ? DependencyManager::get<AvatarManager>()->getMyAvatar()->getSensorToWorldScale() * _speed : _speed; return (_scaleWithAvatar ? DependencyManager::get<AvatarManager>()->getMyAvatar()->getSensorToWorldScale() * _speed : _speed);
} }
glm::vec3 ParabolaPick::getAcceleration() const { glm::vec3 ParabolaPick::getAcceleration() const {
float scale = _scaleWithAvatar ? DependencyManager::get<AvatarManager>()->getMyAvatar()->getSensorToWorldScale() : 1.0f; float scale = (_scaleWithAvatar ? DependencyManager::get<AvatarManager>()->getMyAvatar()->getSensorToWorldScale() : 1.0f);
if (_rotateAccelerationWithAvatar) { if (_rotateAccelerationWithAvatar) {
return scale * DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldOrientation() * _accelerationAxis; return scale * (DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldOrientation() * _accelerationAxis);
} }
return scale * _accelerationAxis; return scale * _accelerationAxis;
} }