Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 20:16:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16298 from luiscuenca/addisSeatedAPImethod

Browse source 
DEV-2011: Add MyAvatar::isSeated API method
This commit is contained in:
Shannon Romano 2019-10-04 15:06:46 -07:00 committed by GitHub
commit f797f714bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,11 +272,12 @@ class MyAvatar : public Avatar {
* the value.</p> * the value.</p>
* @property {number} analogPlusSprintSpeed - The sprint (run) speed of your avatar for the "AnalogPlus" control scheme. * @property {number} analogPlusSprintSpeed - The sprint (run) speed of your avatar for the "AnalogPlus" control scheme.
* @property {MyAvatar.SitStandModelType} userRecenterModel - Controls avatar leaning and recentering behavior. * @property {MyAvatar.SitStandModelType} userRecenterModel - Controls avatar leaning and recentering behavior.
* @property {number} isInSittingState - <code>true</code> if your avatar is sitting (avatar leaning is disabled, * @property {number} isInSittingState - <code>true</code> if the user wearing the HMD is determined to be sitting
* recenntering is enabled), <code>false</code> if it is standing (avatar leaning is enabled, and avatar recenters if it * (avatar leaning is disabled, recenntering is enabled), <code>false</code> if the user wearing the HMD is
* leans too far). If <code>userRecenterModel == 2</code> (i.e., auto) the property value automatically updates as the * determined to be standing (avatar leaning is enabled, and avatar recenters if it leans too far).
* user sits or stands, unless <code>isSitStandStateLocked == true</code>. Setting the property value overrides the * If <code>userRecenterModel == 2</code> (i.e., auto) the property value automatically updates as the user sits
* current siting / standing state, which is updated when the user next sits or stands unless * or stands, unless <code>isSitStandStateLocked == true</code>. Setting the property value overrides the current
* siting / standing state, which is updated when the user next sits or stands unless
* <code>isSitStandStateLocked == true</code>. * <code>isSitStandStateLocked == true</code>.
* @property {boolean} isSitStandStateLocked - <code>true</code> to lock the avatar sitting/standing state, i.e., use this * @property {boolean} isSitStandStateLocked - <code>true</code> to lock the avatar sitting/standing state, i.e., use this
* to disable automatically changing state. * to disable automatically changing state.
@ -1890,6 +1891,14 @@ public:
*/ */
Q_INVOKABLE void endSit(const glm::vec3& position, const glm::quat& rotation); Q_INVOKABLE void endSit(const glm::vec3& position, const glm::quat& rotation);
/**jsdoc
* Gets whether the avatar is in a seated pose. The seated pose is set by calling the
* MyAvatar::beginSit method.
* @function MyAvatar.isSeated
* @returns {boolean} <code>true</code> if the avatar is in a seated pose.
*/
Q_INVOKABLE bool isSeated() { return _characterController.getSeated(); }
int getOverrideJointCount() const; int getOverrideJointCount() const;
bool getFlowActive() const; bool getFlowActive() const;
bool getNetworkGraphActive() const; bool getNetworkGraphActive() const;