Showing the changes to interface/src/raypick/PickScriptingInterface.cpp (1 of 23 files). Show all
Unified · Split
| @@ -83,12 +83,12 @@ PickFilter getPickFilter(unsigned int filter) { · 82 unmodified lines | |||
| 83 | * means no maximum. | 83 | * means no maximum. |
| 84 | * @property {Uuid} [parentID] - The ID of the parent: an avatar, an entity, or another pick. | 84 | * @property {Uuid} [parentID] - The ID of the parent: an avatar, an entity, or another pick. |
| 85 | * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, an avatar joint. | 85 | * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, an avatar joint. |
| 86 | * A value of <code>0</code> means no joint.<br /> | 86 | * A value of <code>0</code> means no joint. |
| 87 | * <em>Used only if <code>parentID</code> is specified.</em> | 87 | * <p><em>Used only if <code>parentID</code> is specified.</em></p> |
| 88 | * @property {string} [joint] - <code>"Mouse"</code> parents the pick to the mouse; <code>"Avatar"</code> parents the pick to | 88 | * @property {string} [joint] - <code>"Mouse"</code> parents the pick to the mouse; <code>"Avatar"</code> parents the pick to |
| 89 | * the user's avatar head; a joint name parents to the joint in the user's avatar; otherwise, the pick is "static", not | 89 | * the user's avatar head; a joint name parents to the joint in the user's avatar; otherwise, the pick is "static", not |
| 90 | * parented to anything.<br /> | 90 | * parented to anything. |
| 91 | * <em>Used only if <code>parentID</code> is not specified.</em> | 91 | * <p><em>Used only if <code>parentID</code> is not specified.</em></p> |
| 92 | * @property {Vec3} [position=Vec3.ZERO] - The offset of the ray origin from its parent if parented, otherwise the ray origin | 92 | * @property {Vec3} [position=Vec3.ZERO] - The offset of the ray origin from its parent if parented, otherwise the ray origin |
| 93 | * in world coordinates. | 93 | * in world coordinates. |
| 94 | * @property {Vec3} [posOffset] - Synonym for <code>position</code>. | 94 | * @property {Vec3} [posOffset] - Synonym for <code>position</code>. |
| @@ -217,12 +217,12 @@ std::shared_ptr<PickQuery> PickScriptingInterface::buildStylusPick(const QVarian · 122 unmodified lines | |||
| 217 | * means no maximum. | 217 | * means no maximum. |
| 218 | * @property {Uuid} [parentID] - The ID of the parent: an avatar, an entity, or another pick. | 218 | * @property {Uuid} [parentID] - The ID of the parent: an avatar, an entity, or another pick. |
| 219 | * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, an avatar joint. | 219 | * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, an avatar joint. |
| 220 | * A value of <code>0</code> means no joint.<br /> | 220 | * A value of <code>0</code> means no joint. |
| 221 | * <em>Used only if <code>parentID</code> is specified.</em> | 221 | * <p><em>Used only if <code>parentID</code> is specified.</em></p> |
| 222 | * @property {string} [joint] - <code>"Mouse"</code> parents the pick to the mouse; <code>"Avatar"</code> parents the pick to | 222 | * @property {string} [joint] - <code>"Mouse"</code> parents the pick to the mouse; <code>"Avatar"</code> parents the pick to |
| 223 | * the user's avatar head; a joint name parents to the joint in the user's avatar; otherwise, the pick is "static", not | 223 | * the user's avatar head; a joint name parents to the joint in the user's avatar; otherwise, the pick is "static", not |
| 224 | * parented to anything. | 224 | * parented to anything. |
| 225 | * <em>Used only if <code>parentID</code> is not specified.</em> | 225 | * <p><em>Used only if <code>parentID</code> is not specified.</em></p> |
| 226 | * @property {Vec3} [position=Vec3.ZERO] - The offset of the parabola origin from its parent if parented, otherwise the | 226 | * @property {Vec3} [position=Vec3.ZERO] - The offset of the parabola origin from its parent if parented, otherwise the |
| 227 | * parabola origin in world coordinates. | 227 | * parabola origin in world coordinates. |
| 228 | * @property {Vec3} [posOffset] - Synonym for <code>position</code>. | 228 | * @property {Vec3} [posOffset] - Synonym for <code>position</code>. |
| @@ -327,12 +327,12 @@ std::shared_ptr<PickQuery> PickScriptingInterface::buildParabolaPick(const QVari · 98 unmodified lines | |||
| 327 | * means no maximum. | 327 | * means no maximum. |
| 328 | * @property {Uuid} [parentID] - The ID of the parent: an avatar, an entity, or another pick. | 328 | * @property {Uuid} [parentID] - The ID of the parent: an avatar, an entity, or another pick. |
| 329 | * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, an avatar joint. | 329 | * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, an avatar joint. |
| 330 | * A value of <code>0</code> means no joint.<br /> | 330 | * A value of <code>0</code> means no joint. |
| 331 | * <em>Used only if <code>parentID</code> is specified.</em> | 331 | * <p><em>Used only if <code>parentID</code> is specified.</em></p> |
| 332 | * @property {string} [joint] - <code>"Mouse"</code> parents the pick to the mouse; <code>"Avatar"</code> parents the pick to | 332 | * @property {string} [joint] - <code>"Mouse"</code> parents the pick to the mouse; <code>"Avatar"</code> parents the pick to |
| 333 | * the user's avatar head; a joint name parents to the joint in the user's avatar; otherwise, the pick is "static", not | 333 | * the user's avatar head; a joint name parents to the joint in the user's avatar; otherwise, the pick is "static", not |
| 334 | * parented to anything.<br /> | 334 | * parented to anything. |
| 335 | * <em>Used only if <code>parentID</code> is not specified.</em> | 335 | * <p><em>Used only if <code>parentID</code> is not specified.</em></p> |
| 336 | * @property {boolean} [scaleWithParent=true] - <code>true</code> to scale the pick's dimensions and threshold according to the | 336 | * @property {boolean} [scaleWithParent=true] - <code>true</code> to scale the pick's dimensions and threshold according to the |
| 337 | * scale of the parent. | 337 | * scale of the parent. |
| 338 | * | 338 | * |