History

Merge remote-tracking branch 'SamGondelman/parabolic' into M17217-a

# Conflicts: # scripts/system/controllers/controllerModules/teleport.js

David Rowe committed 8 years ago

Commit ee605e52 parents 5be9457 e9d14234 files · +42 −12Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+7−6
@@ -92,7 +92,7 @@ unsigned int PointerScriptingInterface::createStylus(const QVariant& properties) · 91 unmodified lines
92 * @typedef {object} Pointers.LaserPointerProperties92 * @typedef {object} Pointers.LaserPointerProperties
93 * @property {boolean} [faceAvatar=false] If true, the end of the Pointer will always rotate to face the avatar.93 * @property {boolean} [faceAvatar=false] If true, the end of the Pointer will always rotate to face the avatar.
94 * @property {boolean} [centerEndY=true] If false, the end of the Pointer will be moved up by half of its height.94 * @property {boolean} [centerEndY=true] If false, the end of the Pointer will be moved up by half of its height.
95 * @property {boolean} [lockEnd=false] If true, the end of the Pointer will lock on to the center of the object at which the laser is pointing.95 * @property {boolean} [lockEnd=false] If true, the end of the Pointer will lock on to the center of the object at which the pointer is pointing.
96 * @property {boolean} [distanceScaleEnd=false] If true, the dimensions of the end of the Pointer will scale linearly with distance.96 * @property {boolean} [distanceScaleEnd=false] If true, the dimensions of the end of the Pointer will scale linearly with distance.
97 * @property {boolean} [scaleWithAvatar=false] If true, the width of the Pointer's path will scale linearly with your avatar's scale.97 * @property {boolean} [scaleWithAvatar=false] If true, the width of the Pointer's path will scale linearly with your avatar's scale.
98 * @property {boolean} [followNormal=false] If true, the end of the Pointer will rotate to follow the normal of the intersected surface.98 * @property {boolean} [followNormal=false] If true, the end of the Pointer will rotate to follow the normal of the intersected surface.
@@ -207,9 +207,10 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 108 unmodified lines
207* The rendering properties of the parabolic path207* The rendering properties of the parabolic path
208*208*
209* @typedef {object} Pointers.ParabolaProperties209* @typedef {object} Pointers.ParabolaProperties
210* @property {Color} color The color of the parabola.210* @property {Color} color=255,255,255 The color of the parabola.
211* @property {number} alpha The alpha of the parabola.211* @property {number} alpha=1.0 The alpha of the parabola.
212* @property {number} width The width of the parabola, in meters.212* @property {number} width=0.01 The width of the parabola, in meters.
213* @property {boolean} isVisibleInSecondaryCamera=false The width of the parabola, in meters.
213*/214*/
214/**jsdoc215/**jsdoc
215* A set of properties used to define the visual aspect of a Parabola Pointer in the case that the Pointer is not intersecting something. Same as a {@link Pointers.ParabolaPointerRenderState},216* A set of properties used to define the visual aspect of a Parabola Pointer in the case that the Pointer is not intersecting something. Same as a {@link Pointers.ParabolaPointerRenderState},
@@ -232,10 +233,10 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 16 unmodified lines
232*/233*/
233/**jsdoc234/**jsdoc
234* A set of properties that can be passed to {@link Pointers.createPointer} to create a new Pointer. Contains the relevant {@link Picks.PickProperties} to define the underlying Pick.235* A set of properties that can be passed to {@link Pointers.createPointer} to create a new Pointer. Contains the relevant {@link Picks.PickProperties} to define the underlying Pick.
235* @typedef {object} Pointers.LaserPointerProperties236* @typedef {object} Pointers.ParabolaPointerProperties
236* @property {boolean} [faceAvatar=false] If true, the end of the Pointer will always rotate to face the avatar.237* @property {boolean} [faceAvatar=false] If true, the end of the Pointer will always rotate to face the avatar.
237* @property {boolean} [centerEndY=true] If false, the end of the Pointer will be moved up by half of its height.238* @property {boolean} [centerEndY=true] If false, the end of the Pointer will be moved up by half of its height.
238* @property {boolean} [lockEnd=false] If true, the end of the Pointer will lock on to the center of the object at which the laser is pointing.239* @property {boolean} [lockEnd=false] If true, the end of the Pointer will lock on to the center of the object at which the pointer is pointing.
239* @property {boolean} [distanceScaleEnd=false] If true, the dimensions of the end of the Pointer will scale linearly with distance.240* @property {boolean} [distanceScaleEnd=false] If true, the dimensions of the end of the Pointer will scale linearly with distance.
240* @property {boolean} [scaleWithAvatar=false] If true, the width of the Pointer's path will scale linearly with your avatar's scale.241* @property {boolean} [scaleWithAvatar=false] If true, the width of the Pointer's path will scale linearly with your avatar's scale.
241* @property {boolean} [followNormal=false] If true, the end of the Pointer will rotate to follow the normal of the intersected surface.242* @property {boolean} [followNormal=false] If true, the end of the Pointer will rotate to follow the normal of the intersected surface.