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

JSDoc updates for PR16399

Browse source
This commit is contained in:
ingerjm0 2019-11-12 20:45:20 -08:00
parent dda69bf91a
commit 417856fec4
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/avatars/src/AvatarData.h
View file

@ -532,19 +532,22 @@ class AvatarData : public QObject, public SpatiallyNestable {
* size in the virtual world. <em>Read-only.</em> * size in the virtual world. <em>Read-only.</em>
* @property {boolean} hasPriority - <code>true</code> if the avatar is in a "hero" zone, <code>false</code> if it isn't. * @property {boolean} hasPriority - <code>true</code> if the avatar is in a "hero" zone, <code>false</code> if it isn't.
* <em>Read-only.</em> * <em>Read-only.</em>
* @property {boolean} hasScriptedBlendshapes=false - Set this to true before using the {@link MyAvatar.setBlendshape} method, * @property {boolean} hasScriptedBlendshapes=false - <code>true</code> if blendshapes are controlled by scripted actions,
* after you no longer want scripted control over the blendshapes set to back to false.<br /> NOTE: this property will * otherwise <code>false</code>. Set this to true before using the {@link MyAvatar.setBlendshape} method, and set back
* automatically become true if the Controller system has valid facial blendshape actions. * to false after you no longer want scripted control over the blendshapes.
* @property {boolean} hasProceduralBlinkFaceMovement=true - By default avatars will blink automatically by animating facial * <p>NOTE: This property will automatically be set to true if the Controller system has valid facial blendshape
* blendshapes. Set this property to <code>false</code> to disable this automatic blinking. This can be useful if you * actions.</p>
* wish to fully control the blink facial blendshapes via the {@link MyAvatar.setBlendshape} method. * @property {boolean} hasProceduralBlinkFaceMovement=true - <code>true</code> if avatars blink automatically by animating
* @property {boolean} hasProceduralEyeFaceMovement=true - By default the avatar eye facial blendshapes will be adjusted * facial blendshapes, <code>false</code> if automatic blinking is disabled. Set this property to false if you wish to
* automatically as the eyes move. This will prevent the iris is never obscured by the upper or lower lids. Set this * fully control the blink facial blendshapes via the {@link MyAvatar.setBlendshape} method.
* property to <code>false</code> to disable this automatic movement. This can be useful if you wish to fully control * @property {boolean} hasProceduralEyeFaceMovement=true - <code>true</code> if the facial blendshapes for an avatar's eyes
* the eye blendshapes via the {@link MyAvatar.setBlendshape} method. * adjust automatically as the eyes move, <code>false</code> if this automatic movement is disabled. Set this property
* @property {boolean} hasAudioEnabledFaceMovement=true - By default the avatar mouth blendshapes will animate based on * to true to prevent the iris from being obscured by the upper or lower lids. Set this property to <code>false</code>
* the microphone audio. Set this property to <code>false</code> to disable that animaiton. This can be useful if you * if you wish to fully control the eye blendshapes via the {@link MyAvatar.setBlendshape} method.
* wish to fully control the blink facial blendshapes via the {@link MyAvatar.setBlendshape} method. * @property {boolean} hasAudioEnabledFaceMovement=true - <code>true</code> if the avatar's mouth blendshapes animate
* automatically based on detected microphone input, <code>false</code> if this automatic movement is disabled. Set
* this property to false if you wish to fully control the mouth facial blendshapes via the
* {@link MyAvatar.setBlendshape} method.
*/ */
Q_PROPERTY(glm::vec3 position READ getWorldPosition WRITE setPositionViaScript) Q_PROPERTY(glm::vec3 position READ getWorldPosition WRITE setPositionViaScript)
Q_PROPERTY(float scale READ getDomainLimitedScale WRITE setTargetScale) Q_PROPERTY(float scale READ getDomainLimitedScale WRITE setTargetScale)
@ -1130,9 +1133,9 @@ public:
/**jsdoc /**jsdoc
* Sets the value of a blendshape to animate your avatar's face. To enable other users to see the resulting animation of * Sets the value of a blendshape to animate your avatar's face. In order for other users to see the resulting animations
* your avatar's face, set {@link Avatar.hasScriptedBlendshapes} to true while using this API and back to false when your * on your avatar's face, set {@link Avatar.hasScriptedBlendshapes} to true. When you are done using this API, set
* animation is complete. * {@link Avatar.hasScriptedBlendshapes} back to false when the animation is complete.
* @function Avatar.setBlendshape * @function Avatar.setBlendshape
* @param {string} name - The name of the blendshape, per the * @param {string} name - The name of the blendshape, per the
* {@link https://docs.highfidelity.com/create/avatars/avatar-standards.html#blendshapes Avatar Standards}. * {@link https://docs.highfidelity.com/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.