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

adding domainLimitedScale property

Browse source
This commit is contained in:
Wayne Chen 2018-08-09 17:29:13 -07:00
parent 19ad9c52da
commit d533e3b341
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,8 @@ class MyAvatar : public Avatar {
* registration point of the 3D model. * registration point of the 3D model.
* *
* @property {Vec3} position * @property {Vec3} position
* @property {number} scale * @property {number} scale - The target scale in which the avatar is set to by the user.
* @property {number} domainLimitedScale - The avatar's scale limited by the domain.
* @property {number} density <em>Read-only.</em> * @property {number} density <em>Read-only.</em>
* @property {Vec3} handPosition * @property {Vec3} handPosition
* @property {number} bodyYaw - The rotation left or right about an axis running from the head to the feet of the avatar. * @property {number} bodyYaw - The rotation left or right about an axis running from the head to the feet of the avatar.
@ -982,7 +983,7 @@ public:
/**jsdoc /**jsdoc
* @function MyAvatar.getAvatarScale * @function MyAvatar.getAvatarScale
* @returns {number} * @returns {number}
*/ */
Q_INVOKABLE float getAvatarScale(); Q_INVOKABLE float getAvatarScale();

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

@ -364,6 +364,7 @@ class AvatarData : public QObject, public SpatiallyNestable {
// The following properties have JSDoc in MyAvatar.h and ScriptableAvatar.h // The following properties have JSDoc in MyAvatar.h and ScriptableAvatar.h
Q_PROPERTY(glm::vec3 position READ getWorldPosition WRITE setPositionViaScript) Q_PROPERTY(glm::vec3 position READ getWorldPosition WRITE setPositionViaScript)
Q_PROPERTY(float scale READ getTargetScale WRITE setTargetScale) Q_PROPERTY(float scale READ getTargetScale WRITE setTargetScale)
Q_PROPERTY(float domainLimitedScale READ getDomainLimitedScale)
Q_PROPERTY(float density READ getDensity) Q_PROPERTY(float density READ getDensity)
Q_PROPERTY(glm::vec3 handPosition READ getHandPosition WRITE setHandPosition) Q_PROPERTY(glm::vec3 handPosition READ getHandPosition WRITE setHandPosition)
Q_PROPERTY(float bodyYaw READ getBodyYaw WRITE setBodyYaw) Q_PROPERTY(float bodyYaw READ getBodyYaw WRITE setBodyYaw)