diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b2c469f614..1adcfbd345 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1983,7 +1983,7 @@ void MyAvatar::updateOrientation(float deltaTime) { rollAngle = fabsf(rollAngle); rollAngle = rollAngle > _hmdRollControlDeadZone ? rollSign * (rollAngle - _hmdRollControlDeadZone) : 0.0f; - totalBodyYaw += speedFactor * direction * rollAngle * deltaTime * _hmdRollControlSpeed; + totalBodyYaw += speedFactor * direction * rollAngle * deltaTime * _hmdRollControlRate; } } diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 8039674605..f61f24fb11 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -134,7 +134,7 @@ class MyAvatar : public Avatar { Q_PROPERTY(bool hmdRollControlEnabled READ getHMDRollControlEnabled WRITE setHMDRollControlEnabled) Q_PROPERTY(float hmdRollControlDeadZone READ getHMDRollControlDeadZone WRITE setHMDRollControlDeadZone) - Q_PROPERTY(float hmdRollControlSpeed READ getHMDRollControlSpeed WRITE setHMDRollControlSpeed) + Q_PROPERTY(float hmdRollControlRate READ getHMDRollControlRate WRITE setHMDRollControlRate) public: enum DriveKeys { @@ -345,8 +345,8 @@ public: bool getHMDRollControlEnabled() const { return _hmdRollControlEnabled; } void setHMDRollControlDeadZone(float value) { _hmdRollControlDeadZone = value; } float getHMDRollControlDeadZone() const { return _hmdRollControlDeadZone; } - void setHMDRollControlSpeed(float value) { _hmdRollControlSpeed = value; } - float getHMDRollControlSpeed() const { return _hmdRollControlSpeed; } + void setHMDRollControlRate(float value) { _hmdRollControlRate = value; } + float getHMDRollControlRate() const { return _hmdRollControlRate; } // get/set avatar data void saveData(); @@ -699,10 +699,10 @@ private: bool _clearOverlayWhenMoving { true }; const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // deg - const float ROLL_CONTROL_SPEED_DEFAULT = 2.5f; // deg/sec/deg + const float ROLL_CONTROL_RATE_DEFAULT = 2.5f; // deg/sec/deg bool _hmdRollControlEnabled { true }; float _hmdRollControlDeadZone { ROLL_CONTROL_DEAD_ZONE_DEFAULT }; - float _hmdRollControlSpeed { ROLL_CONTROL_SPEED_DEFAULT }; + float _hmdRollControlRate { ROLL_CONTROL_RATE_DEFAULT }; float _lastDrivenSpeed { 0.0f }; // working copies -- see AvatarData for thread-safe _sensorToWorldMatrixCache, used for outward facing access diff --git a/scripts/developer/hmdRollControlEnable.js b/scripts/developer/hmdRollControlEnable.js index 8af6cca6a5..81318b7ddd 100644 --- a/scripts/developer/hmdRollControlEnable.js +++ b/scripts/developer/hmdRollControlEnable.js @@ -10,12 +10,12 @@ var hmdRollControlEnabled = true; var hmdRollControlDeadZone = 8.0; // deg -var hmdRollControlSpeed = 2.5; // deg/sec/deg +var hmdRollControlRate = 2.5; // deg/sec/deg -//print("HMD roll control: " + hmdRollControlEnabled + ", " + hmdRollControlDeadZone + ", " + hmdRollControlSpeed); +//print("HMD roll control: " + hmdRollControlEnabled + ", " + hmdRollControlDeadZone + ", " + hmdRollControlRate); MyAvatar.hmdRollControlEnabled = hmdRollControlEnabled; MyAvatar.hmdRollControlDeadZone = hmdRollControlDeadZone; -MyAvatar.hmdRollControlSpeed = hmdRollControlSpeed; +MyAvatar.hmdRollControlRate = hmdRollControlRate; Script.stop();