Showing the changes to interface/src/raypick/PickScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -158,7 +158,7 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties · 157 unmodified lines | |||
| 158 | * @property {Vec3} [accelerationAxis=-Vec3.UP] The acceleration of the parabola, i.e. the acceleration of the projectile whose trajectory defines the parabola, both magnitude and direction. | 158 | * @property {Vec3} [accelerationAxis=-Vec3.UP] The acceleration of the parabola, i.e. the acceleration of the projectile whose trajectory defines the parabola, both magnitude and direction. |
| 159 | * @property {boolean} [rotateAccelerationWithAvatar=true] Whether or not the acceleration axis should rotate with the avatar's local Y axis. | 159 | * @property {boolean} [rotateAccelerationWithAvatar=true] Whether or not the acceleration axis should rotate with the avatar's local Y axis. |
| 160 | * @property {boolean} [rotateAccelerationWithParent=false] Whether or not the acceleration axis should rotate with the parent's local Y axis, if available. | 160 | * @property {boolean} [rotateAccelerationWithParent=false] Whether or not the acceleration axis should rotate with the parent's local Y axis, if available. |
| 161 | * @property {boolean} [scaleWithParent=false] If true, the velocity and acceleration of the Pick will scale linearly with the parent, if available. | 161 | * @property {boolean} [scaleWithParent=true] If true, the velocity and acceleration of the Pick will scale linearly with the parent, if available. |
| 162 | * @property {boolean} [scaleWithAvatar] Alias for scaleWithParent. <em>Deprecated.</em> | 162 | * @property {boolean} [scaleWithAvatar] Alias for scaleWithParent. <em>Deprecated.</em> |
| 163 | */ | 163 | */ |
| 164 | unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properties) { | 164 | unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properties) { |
| @@ -199,7 +199,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti · 34 unmodified lines | |||
| 199 | rotateAccelerationWithParent = propMap["rotateAccelerationWithParent"].toBool(); | 199 | rotateAccelerationWithParent = propMap["rotateAccelerationWithParent"].toBool(); |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | bool scaleWithParent = false; | 202 | bool scaleWithParent = true; |
| 203 | if (propMap["scaleWithParent"].isValid()) { | 203 | if (propMap["scaleWithParent"].isValid()) { |
| 204 | scaleWithParent = propMap["scaleWithParent"].toBool(); | 204 | scaleWithParent = propMap["scaleWithParent"].toBool(); |
| 205 | } else if (propMap["scaleWithAvatar"].isValid()) { | 205 | } else if (propMap["scaleWithAvatar"].isValid()) { |