diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index 209b976c44..34aa4f2cc0 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -55,6 +55,7 @@ using SortedAvatar = std::pair>; * @borrows AvatarList.sessionUUIDChanged as sessionUUIDChanged * @borrows AvatarList.processAvatarDataPacket as processAvatarDataPacket * @borrows AvatarList.processAvatarIdentityPacket as processAvatarIdentityPacket + * @borrows AvatarList.processBulkAvatarTraits as processBulkAvatarTraits * @borrows AvatarList.processKillAvatar as processKillAvatar */ @@ -152,6 +153,13 @@ public: const QVector& avatarsToInclude, const QVector& avatarsToDiscard); + /**jsdoc + * @function AvatarManager.findParabolaIntersectionVector + * @param {PickParabola} pick + * @param {Uuid[]} avatarsToInclude + * @param {Uuid[]} avatarsToDiscard + * @returns {ParabolaToAvatarIntersectionResult} + */ Q_INVOKABLE ParabolaToAvatarIntersectionResult findParabolaIntersectionVector(const PickParabola& pick, const QVector& avatarsToInclude, const QVector& avatarsToDiscard); @@ -176,7 +184,7 @@ public: * than iterating over each avatar and obtaining data about them in JavaScript, as that method * locks and unlocks each avatar's data structure potentially hundreds of times per update tick. * @function AvatarManager.getPalData - * @param {string[]} specificAvatarIdentifiers - A list of specific Avatar Identifiers about + * @param {string[]} [specificAvatarIdentifiers] - A list of specific Avatar Identifiers about * which you want to get PAL data * @returns {object} */ diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h index c2cb448e52..4d6bf6ea81 100644 --- a/libraries/avatars/src/AvatarHashMap.h +++ b/libraries/avatars/src/AvatarHashMap.h @@ -161,6 +161,11 @@ protected slots: */ void processAvatarIdentityPacket(QSharedPointer message, SharedNodePointer sendingNode); + /**jsdoc + * @function AvatarList.processBulkAvatarTraits + * @param {} message + * @param {} sendingNode + */ void processBulkAvatarTraits(QSharedPointer message, SharedNodePointer sendingNode); /**jsdoc diff --git a/libraries/pointers/src/Pick.h b/libraries/pointers/src/Pick.h index bde38575ee..a1c86ed32e 100644 --- a/libraries/pointers/src/Pick.h +++ b/libraries/pointers/src/Pick.h @@ -145,9 +145,11 @@ public: * @hifi-interface * @hifi-client-entity * - * @property {number} Ray Ray Picks intersect a ray with the nearest object in front of them, along a given direction. - * @property {number} Stylus Stylus Picks provide "tapping" functionality on/into flat surfaces. - * @property {number} Parabola Parabola Picks intersect a parabola with the nearest object in front of them, with a given initial velocity and acceleration. + * @property {number} Ray Ray picks intersect a ray with the nearest object in front of them, along a given direction. + * @property {number} Stylus Stylus picks provide "tapping" functionality on/into flat surfaces. + * @property {number} Parabola Parabola picks intersect a parabola with the nearest object in front of them, with a given + * initial velocity and acceleration. + * @property {number} Collision Collision picks intersect a collision volume with avatars and entities that have collisions. */ /**jsdoc * @@ -158,6 +160,7 @@ public: * * * + * * *
{@link PickType(0)|PickType.Ray}
{@link PickType(0)|PickType.Stylus}
{@link PickType(0)|PickType.Parabola}
{@link PickType(0)|PickType.Collision}
* @typedef {number} PickType