History

Add collision group parameter to collision pick and set my avatar as the default

sabrina-shanman committed 8 years ago

Commit 9a86b741 parent 8d4c47c3 files · +15 −4Browse files

Showing the changes to interface/src/raypick/PickScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

interface/src/raypick/PickScriptingInterface.cpp+2−0
@@ -270,6 +270,8 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti · 269 unmodified lines
270270 * @property {Quat} orientation - The orientation of the collision region, relative to a parent if defined.
271271 * @property {float} threshold - The approximate minimum penetration depth for a test object to be considered in contact with the collision region.
272272 * The depth is measured in world space, but will scale with the parent if defined.
273+* @property {CollisionMask} [collisionGroup=8] - The type of object this collision pick collides as. Objects whose collision masks overlap with the pick's collision group
274+* will be considered colliding with the pick.
273275 * @property {Uuid} parentID - The ID of the parent, either an avatar, an entity, or an overlay.
274276 * @property {number} parentJointIndex - The joint of the parent to parent to, for example, the joints on the model of an avatar. (default = 0, no joint)
275277 * @property {string} joint - If "Mouse," parents the pick to the mouse. If "Avatar," parents the pick to MyAvatar's head. Otherwise, parents to the joint of the given name on MyAvatar.