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

Merge pull request #15695 from PrestonB1123/logspam

Browse source 
BUGZ-346: QML Logspam
This commit is contained in:
PrestonB1123 2019-06-07 13:37:38 -07:00 committed by GitHub
commit 73ce5ef619
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 68 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4947,35 +4947,55 @@ void MyAvatar::setWalkSpeed(float value) {
}
void MyAvatar::setWalkBackwardSpeed(float value) {
bool changed = true;
float prevVal;
switch (_controlSchemeIndex) {
case LocomotionControlsMode::CONTROLS_DEFAULT:
prevVal = _defaultWalkBackwardSpeed.get();
_defaultWalkBackwardSpeed.set(value);
break;
case LocomotionControlsMode::CONTROLS_ANALOG:
prevVal = _analogWalkBackwardSpeed.get();
_analogWalkBackwardSpeed.set(value);
break;
case LocomotionControlsMode::CONTROLS_ANALOG_PLUS:
prevVal = _analogPlusWalkBackwardSpeed.get();
_analogPlusWalkBackwardSpeed.set(value);
break;
default:
changed = false;
break;
}
if (changed && prevVal != value) {
emit walkBackwardSpeedChanged(value);
}
}
void MyAvatar::setSprintSpeed(float value) {
bool changed = true;
float prevVal;
switch (_controlSchemeIndex) {
case LocomotionControlsMode::CONTROLS_DEFAULT:
prevVal = _defaultSprintSpeed.get();
_defaultSprintSpeed.set(value);
break;
case LocomotionControlsMode::CONTROLS_ANALOG:
prevVal = _analogSprintSpeed.get();
_analogSprintSpeed.set(value);
break;
case LocomotionControlsMode::CONTROLS_ANALOG_PLUS:
prevVal = _analogPlusSprintSpeed.get();
_analogPlusSprintSpeed.set(value);
break;
default:
changed = false;
break;
}
if (changed && prevVal != value) {
emit analogPlusSprintSpeedChanged(value);
}
}
float MyAvatar::getSprintSpeed() const {
@ -5013,9 +5033,12 @@ float MyAvatar::getAnalogSprintSpeed() const {
}
void MyAvatar::setAnalogPlusWalkSpeed(float value) {
_analogPlusWalkSpeed.set(value);
// Sprint speed for Analog Plus should be double walk speed.
_analogPlusSprintSpeed.set(value * 2.0f);
if (_analogPlusWalkSpeed.get() != value) {
_analogPlusWalkSpeed.set(value);
emit analogPlusWalkSpeedChanged(value);
// Sprint speed for Analog Plus should be double walk speed.
_analogPlusSprintSpeed.set(value * 2.0f);
}
}
float MyAvatar::getAnalogPlusWalkSpeed() const {
@ -5023,7 +5046,10 @@ float MyAvatar::getAnalogPlusWalkSpeed() const {
}
void MyAvatar::setAnalogPlusSprintSpeed(float value) {
_analogPlusSprintSpeed.set(value);
if (_analogPlusSprintSpeed.get() != value) {
_analogPlusSprintSpeed.set(value);
emit analogPlusSprintSpeedChanged(value);
}
}
float MyAvatar::getAnalogPlusSprintSpeed() const {

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

@ -370,10 +370,10 @@ class MyAvatar : public Avatar {
Q_PROPERTY(QUuid SELF_ID READ getSelfID CONSTANT)
Q_PROPERTY(float walkSpeed READ getWalkSpeed WRITE setWalkSpeed);
Q_PROPERTY(float analogPlusWalkSpeed READ getAnalogPlusWalkSpeed WRITE setAnalogPlusWalkSpeed);
Q_PROPERTY(float analogPlusSprintSpeed READ getAnalogPlusSprintSpeed WRITE setAnalogPlusSprintSpeed);
Q_PROPERTY(float walkBackwardSpeed READ getWalkBackwardSpeed WRITE setWalkBackwardSpeed);
Q_PROPERTY(float sprintSpeed READ getSprintSpeed WRITE setSprintSpeed);
Q_PROPERTY(float analogPlusWalkSpeed READ getAnalogPlusWalkSpeed WRITE setAnalogPlusWalkSpeed NOTIFY analogPlusWalkSpeedChanged);
Q_PROPERTY(float analogPlusSprintSpeed READ getAnalogPlusSprintSpeed WRITE setAnalogPlusSprintSpeed NOTIFY analogPlusSprintSpeedChanged);
Q_PROPERTY(float walkBackwardSpeed READ getWalkBackwardSpeed WRITE setWalkBackwardSpeed NOTIFY walkBackwardSpeedChanged);
Q_PROPERTY(float sprintSpeed READ getSprintSpeed WRITE setSprintSpeed NOTIFY sprintSpeedChanged);
Q_PROPERTY(bool isInSittingState READ getIsInSittingState WRITE setIsInSittingState);
Q_PROPERTY(MyAvatar::SitStandModelType userRecenterModel READ getUserRecenterModel WRITE setUserRecenterModel);
Q_PROPERTY(bool isSitStandStateLocked READ getIsSitStandStateLocked WRITE setIsSitStandStateLocked);
@ -2161,6 +2161,38 @@ signals:
*/
void audioListenerModeChanged();
/**jsdoc
* Notifies when the analogPlusWalkSpeed value is changed.
* @function MyAvatar.analogPlusWalkSpeedChanged
* @param {float} value - the new avatar walk speed
* @returns {Signal}
*/
void analogPlusWalkSpeedChanged(float value);
/**jsdoc
* Notifies when the analogPlusSprintSpeed value is changed.
* @function MyAvatar.analogPlusSprintSpeedChanged
* @param {float} value - the new avatar sprint speed
* @returns {Signal}
*/
void analogPlusSprintSpeedChanged(float value);
/**jsdoc
* Notifies when the sprintSpeed value is changed.
* @function MyAvatar.sprintSpeedChanged
* @param {float} value - the new avatar sprint speed
* @returns {Signal}
*/
void sprintSpeedChanged(float value);
/**jsdoc
* Notifies when the walkBackwardSpeed value is changed.
* @function MyAvatar.walkBackwardSpeedChanged
* @param {float} value - the new avatar walk backward speed
* @returns {Signal}
*/
void walkBackwardSpeedChanged(float value);
/**jsdoc
* @function MyAvatar.transformChanged
* @returns {Signal}

2
interface/src/scripting/AudioDevices.h
View file

@ -80,7 +80,7 @@ public:
class AudioInputDeviceList : public AudioDeviceList {
Q_OBJECT
Q_PROPERTY(bool peakValuesAvailable READ peakValuesAvailable)
Q_PROPERTY(bool peakValuesAvailable READ peakValuesAvailable CONSTANT)
Q_PROPERTY(bool peakValuesEnabled READ peakValuesEnabled WRITE setPeakValuesEnabled NOTIFY peakValuesEnabledChanged)
public:

2
libraries/shared/src/shared/Camera.h
View file

@ -38,7 +38,7 @@ class Camera : public QObject {
Q_PROPERTY(glm::vec3 position READ getPosition WRITE setPosition)
Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation)
Q_PROPERTY(QString mode READ getModeString WRITE setModeString)
Q_PROPERTY(QString mode READ getModeString WRITE setModeString NOTIFY modeUpdated)
Q_PROPERTY(QVariantMap frustum READ getViewFrustum CONSTANT)
public: