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

Rename identifiers

Browse source
This commit is contained in:
David Rowe 2017-06-15 09:20:55 +12:00
parent 55e0082792
commit 16bebdd409
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/MyAvatar.cpp
View file

@ -1983,7 +1983,7 @@ void MyAvatar::updateOrientation(float deltaTime) {
rollAngle = fabsf(rollAngle); rollAngle = fabsf(rollAngle);
rollAngle = rollAngle > _hmdRollControlDeadZone ? rollSign * (rollAngle - _hmdRollControlDeadZone) : 0.0f; rollAngle = rollAngle > _hmdRollControlDeadZone ? rollSign * (rollAngle - _hmdRollControlDeadZone) : 0.0f;
totalBodyYaw += speedFactor * direction * rollAngle * deltaTime * _hmdRollControlSpeed; totalBodyYaw += speedFactor * direction * rollAngle * deltaTime * _hmdRollControlRate;
} }
} }

10
interface/src/avatar/MyAvatar.h
View file

@ -134,7 +134,7 @@ class MyAvatar : public Avatar {
Q_PROPERTY(bool hmdRollControlEnabled READ getHMDRollControlEnabled WRITE setHMDRollControlEnabled) Q_PROPERTY(bool hmdRollControlEnabled READ getHMDRollControlEnabled WRITE setHMDRollControlEnabled)
Q_PROPERTY(float hmdRollControlDeadZone READ getHMDRollControlDeadZone WRITE setHMDRollControlDeadZone) 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: public:
enum DriveKeys { enum DriveKeys {
@ -345,8 +345,8 @@ public:
bool getHMDRollControlEnabled() const { return _hmdRollControlEnabled; } bool getHMDRollControlEnabled() const { return _hmdRollControlEnabled; }
void setHMDRollControlDeadZone(float value) { _hmdRollControlDeadZone = value; } void setHMDRollControlDeadZone(float value) { _hmdRollControlDeadZone = value; }
float getHMDRollControlDeadZone() const { return _hmdRollControlDeadZone; } float getHMDRollControlDeadZone() const { return _hmdRollControlDeadZone; }
void setHMDRollControlSpeed(float value) { _hmdRollControlSpeed = value; } void setHMDRollControlRate(float value) { _hmdRollControlRate = value; }
float getHMDRollControlSpeed() const { return _hmdRollControlSpeed; } float getHMDRollControlRate() const { return _hmdRollControlRate; }
// get/set avatar data // get/set avatar data
void saveData(); void saveData();
@ -699,10 +699,10 @@ private:
bool _clearOverlayWhenMoving { true }; bool _clearOverlayWhenMoving { true };
const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // deg 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 }; bool _hmdRollControlEnabled { true };
float _hmdRollControlDeadZone { ROLL_CONTROL_DEAD_ZONE_DEFAULT }; float _hmdRollControlDeadZone { ROLL_CONTROL_DEAD_ZONE_DEFAULT };
float _hmdRollControlSpeed { ROLL_CONTROL_SPEED_DEFAULT }; float _hmdRollControlRate { ROLL_CONTROL_RATE_DEFAULT };
float _lastDrivenSpeed { 0.0f }; float _lastDrivenSpeed { 0.0f };
// working copies -- see AvatarData for thread-safe _sensorToWorldMatrixCache, used for outward facing access // working copies -- see AvatarData for thread-safe _sensorToWorldMatrixCache, used for outward facing access

6
scripts/developer/hmdRollControlEnable.js
View file

@ -10,12 +10,12 @@
var hmdRollControlEnabled = true; var hmdRollControlEnabled = true;
var hmdRollControlDeadZone = 8.0; // deg 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.hmdRollControlEnabled = hmdRollControlEnabled;
MyAvatar.hmdRollControlDeadZone = hmdRollControlDeadZone; MyAvatar.hmdRollControlDeadZone = hmdRollControlDeadZone;
MyAvatar.hmdRollControlSpeed = hmdRollControlSpeed; MyAvatar.hmdRollControlRate = hmdRollControlRate;
Script.stop(); Script.stop();