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

Format and fixes

Browse source
This commit is contained in:
luiscuenca 2018-07-17 16:34:30 -07:00
parent 82a3b73de8
commit fcb7614f7e
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,11 +272,11 @@ void MyAvatar::requestEnableHandTouch() {
emit shouldDisableHandTouchChanged(_disableHandTouchCount > 0); emit shouldDisableHandTouchChanged(_disableHandTouchCount > 0);
} }
void MyAvatar::disableHandTouchForID(const QString& entityID) { void MyAvatar::disableHandTouchForID(const QUuid& entityID) {
emit disableHandTouchForIDChanged(entityID, true); emit disableHandTouchForIDChanged(entityID, true);
} }
void MyAvatar::enableHandTouchForID(const QString& entityID) { void MyAvatar::enableHandTouchForID(const QUuid& entityID) {
emit disableHandTouchForIDChanged(entityID, false); emit disableHandTouchForIDChanged(entityID, false);
} }

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

@ -506,23 +506,27 @@ public:
*/ */
Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; } Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; }
/**jsdoc /**jsdoc
* @function MyAvatar.requestEnableHandTouch * Request to enable hand touch effect globally
*/ * @function MyAvatar.requestEnableHandTouch
*/
Q_INVOKABLE void requestEnableHandTouch(); Q_INVOKABLE void requestEnableHandTouch();
/**jsdoc /**jsdoc
* @function MyAvatar.requestDisableHandTouch * Request to disable hand touch effect globally
*/ * @function MyAvatar.requestDisableHandTouch
*/
Q_INVOKABLE void requestDisableHandTouch(); Q_INVOKABLE void requestDisableHandTouch();
/**jsdoc /**jsdoc
* @function MyAvatar.disableHandTouchForID * Disables hand touch effect on a specific entity
* @param {string} entityId * @function MyAvatar.disableHandTouchForID
*/ * @param {Uuid} entityID - ID of the entity that will disable hand touch effect
Q_INVOKABLE void disableHandTouchForID(const QString& entityId); */
Q_INVOKABLE void disableHandTouchForID(const QUuid& entityID);
/**jsdoc /**jsdoc
* @function MyAvatar.enableHandTouchForID * Enables hand touch effect on a specific entity
* @param {string} entityId * @function MyAvatar.enableHandTouchForID
*/ * @param {Uuid} entityID - ID of the entity that will enable hand touch effect
Q_INVOKABLE void enableHandTouchForID(const QString& entityId); */
Q_INVOKABLE void enableHandTouchForID(const QUuid& entityID);
bool useAdvancedMovementControls() const { return _useAdvancedMovementControls.get(); } bool useAdvancedMovementControls() const { return _useAdvancedMovementControls.get(); }
void setUseAdvancedMovementControls(bool useAdvancedMovementControls) void setUseAdvancedMovementControls(bool useAdvancedMovementControls)
@ -1410,6 +1414,7 @@ signals:
void scaleChanged(); void scaleChanged();
/**jsdoc /**jsdoc
* Triggered when hand touch is globally enable or disable
* @function MyAvatar.shouldDisableHandTouchChanged * @function MyAvatar.shouldDisableHandTouchChanged
* @param {boolean} shouldDisable * @param {boolean} shouldDisable
* @returns {Signal} * @returns {Signal}
@ -1417,12 +1422,13 @@ signals:
void shouldDisableHandTouchChanged(bool shouldDisable); void shouldDisableHandTouchChanged(bool shouldDisable);
/**jsdoc /**jsdoc
* @function MyAvatar.handTouchForIDChanged * Triggered when hand touch is enable or disable for an specific entity
* @param {string} entityID * @function MyAvatar.disableHandTouchForIDChanged
* @param {boolean} disable * @param {Uuid} entityID
* @returns {Signal} * @param {boolean} disable
*/ * @returns {Signal}
void disableHandTouchForIDChanged(const QString& entityID, bool disable); */
void disableHandTouchForIDChanged(const QUuid& entityID, bool disable);
private slots: private slots:
void leaveDomain(); void leaveDomain();
@ -1700,7 +1706,7 @@ private:
bool _shouldLoadScripts { false }; bool _shouldLoadScripts { false };
bool _haveReceivedHeightLimitsFromDomain { false }; bool _haveReceivedHeightLimitsFromDomain { false };
int _disableHandTouchCount { 0 }; std::atomic<int> _disableHandTouchCount { 0 };
}; };
QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode); QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);