Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 14:53:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set time and angle recentering parameters

Browse source
This commit is contained in:
luiscuenca 2019-10-02 11:43:06 -07:00
parent 18af7c5d84
commit 521aa50356
No known key found for this signature in database
GPG key ID: 2387ECD129A6961D
2 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3622,12 +3622,12 @@ void MyAvatar::updateOrientation(float deltaTime) {
const float DEFAULT_REORIENT_ANGLE = 65.0f; const float DEFAULT_REORIENT_ANGLE = 65.0f;
const float FIRST_PERSON_REORIENT_ANGLE = 95.0f; const float FIRST_PERSON_REORIENT_ANGLE = 95.0f;
const float TRIGGER_REORIENT_ANGLE = 45.0f; const float TRIGGER_REORIENT_ANGLE = 45.0f;
// const float FIRST_PERSON_TRIGGER_REORIENT_ANGLE = 45.0f; const float FIRST_PERSON_TRIGGER_REORIENT_ANGLE = 65.0f;
glm::vec3 ajustedYawVector = cameraYawVector; glm::vec3 ajustedYawVector = cameraYawVector;
float limitAngle = 0.0f; float limitAngle = 0.0f;
float triggerAngle = -glm::sin(glm::radians(TRIGGER_REORIENT_ANGLE)); float triggerAngle = -glm::sin(glm::radians(TRIGGER_REORIENT_ANGLE));
if (mode == CAMERA_MODE_FIRST_PERSON) { if (mode == CAMERA_MODE_FIRST_PERSON) {
limitAngle = glm::sin(glm::radians(90.0f - _recenterAngle)); limitAngle = glm::sin(glm::radians(90.0f - FIRST_PERSON_TRIGGER_REORIENT_ANGLE));
triggerAngle = limitAngle; triggerAngle = limitAngle;
} }
float reorientAngle = mode == CAMERA_MODE_FIRST_PERSON ? FIRST_PERSON_REORIENT_ANGLE : DEFAULT_REORIENT_ANGLE; float reorientAngle = mode == CAMERA_MODE_FIRST_PERSON ? FIRST_PERSON_REORIENT_ANGLE : DEFAULT_REORIENT_ANGLE;
@ -3662,10 +3662,10 @@ void MyAvatar::updateOrientation(float deltaTime) {
_lookAtCameraTarget = targetPoint; _lookAtCameraTarget = targetPoint;
} }
_headLookAtActive = true; _headLookAtActive = true;
// const float FIRST_PERSON_RECENTER_SECONDS = 5.0f; const float FIRST_PERSON_RECENTER_SECONDS = 15.0f;
if (mode == CAMERA_MODE_FIRST_PERSON) { if (mode == CAMERA_MODE_FIRST_PERSON) {
if (getDriveKey(YAW) + getDriveKey(STEP_YAW) + getDriveKey(DELTA_YAW) == 0.0f) { if (getDriveKey(YAW) + getDriveKey(STEP_YAW) + getDriveKey(DELTA_YAW) == 0.0f) {
if (_firstPersonSteadyHeadTimer < _recenterSeconds) { if (_firstPersonSteadyHeadTimer < FIRST_PERSON_RECENTER_SECONDS) {
if (_firstPersonSteadyHeadTimer > 0.0f) { if (_firstPersonSteadyHeadTimer > 0.0f) {
_firstPersonSteadyHeadTimer += deltaTime; _firstPersonSteadyHeadTimer += deltaTime;
} }
@ -6774,28 +6774,3 @@ glm::vec3 MyAvatar::getLookAtPivotPoint() {
return yAxisEyePosition; return yAxisEyePosition;
} }
QVariantMap MyAvatar::getLookAtCameraData() {
QVariantMap result;
if (QThread::currentThread() != thread()) {
BLOCKING_INVOKE_METHOD(this, "getLookAtCameraData",
Q_RETURN_ARG(QVariantMap, result));
return result;
}
result.insert("recenterSeconds", _recenterSeconds);
result.insert("recenterAngle", _recenterAngle);
return result;
}
Q_INVOKABLE void MyAvatar::setLookAtCameraData(const QVariantMap& data) {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setLookAtCameraData",
Q_ARG(const QVariantMap&, data));
return;
}
if (data.contains("recenterSeconds")) {
_recenterSeconds = data["recenterSeconds"].toFloat();
}
if (data.contains("recenterAngle")) {
_recenterAngle = data["recenterAngle"].toFloat();
}
}

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

@ -1857,9 +1857,6 @@ public:
*/ */
Q_INVOKABLE QVariantMap getFlowData(); Q_INVOKABLE QVariantMap getFlowData();
Q_INVOKABLE QVariantMap getLookAtCameraData();
Q_INVOKABLE void setLookAtCameraData(const QVariantMap& data);
/**jsdoc /**jsdoc
* Gets the indexes of currently colliding flow joints. * Gets the indexes of currently colliding flow joints.
* @function MyAvatar.getCollidingFlowJoints * @function MyAvatar.getCollidingFlowJoints
@ -2659,9 +2656,6 @@ private:
float _scriptHeadControlTimer { 0.0f }; float _scriptHeadControlTimer { 0.0f };
float _firstPersonSteadyHeadTimer { 0.0f }; float _firstPersonSteadyHeadTimer { 0.0f };
float _recenterSeconds { 5.0f };
float _recenterAngle { 45.0f };
Setting::Handle<float> _realWorldFieldOfView; Setting::Handle<float> _realWorldFieldOfView;
Setting::Handle<bool> _useAdvancedMovementControls; Setting::Handle<bool> _useAdvancedMovementControls;
Setting::Handle<bool> _showPlayArea; Setting::Handle<bool> _showPlayArea;