Showing the changes to interface/src/raypick/PointerScriptingInterface.cpp (1 of 62 files). Show all
Unified · Split
| @@ -99,7 +99,7 @@ unsigned int PointerScriptingInterface::createStylus(const QVariant& properties) · 98 unmodified lines | ||
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | − return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<StylusPointer>(properties, StylusPointer::buildStylusOverlay(propertyMap), hover, enabled, modelPositionOffset, | |
| 102 | + return DependencyManager::get<PointerManager>()->addPointer(std::make_shared<StylusPointer>(properties, StylusPointer::buildStylus(propertyMap), hover, enabled, modelPositionOffset, | |
| 103 | 103 | modelRotationOffset, modelDimensions)); |
| 104 | 104 | } |
| 105 | 105 | |
| @@ -116,15 +116,15 @@ unsigned int PointerScriptingInterface::createStylus(const QVariant& properties) · 10 unmodified lines | ||
| 116 | 116 | * |
| 117 | 117 | * @typedef {object} Pointers.RayPointerRenderState |
| 118 | 118 | * @property {string} name When using {@link Pointers.createPointer}, the name of this render state, used by {@link Pointers.setRenderState} and {@link Pointers.editRenderState} |
| 119 | − * @property {Overlays.OverlayProperties|QUuid} [start] When using {@link Pointers.createPointer}, an optionally defined overlay to represent the beginning of the Ray Pointer, | |
| 119 | + * @property {Overlays.OverlayProperties|QUuid} [start] When using {@link Pointers.createPointer}, an optionally defined object to represent the beginning of the Ray Pointer, | |
| 120 | 120 | * using the properties you would normally pass to {@link Overlays.addOverlay}, plus the type (as a <code>type</code> field). |
| 121 | − * When returned from {@link Pointers.getPointerProperties}, the ID of the created overlay if it exists, or a null ID otherwise. | |
| 122 | − * @property {Overlays.OverlayProperties|QUuid} [path] When using {@link Pointers.createPointer}, an optionally defined overlay to represent the path of the Ray Pointer, | |
| 121 | + * When returned from {@link Pointers.getPointerProperties}, the ID of the created object if it exists, or a null ID otherwise. | |
| 122 | + * @property {Overlays.OverlayProperties|QUuid} [path] When using {@link Pointers.createPointer}, an optionally defined object to represent the path of the Ray Pointer, | |
| 123 | 123 | * using the properties you would normally pass to {@link Overlays.addOverlay}, plus the type (as a <code>type</code> field), which <b>must</b> be <code>"line3d"</code>. |
| 124 | − * When returned from {@link Pointers.getPointerProperties}, the ID of the created overlay if it exists, or a null ID otherwise. | |
| 125 | − * @property {Overlays.OverlayProperties|QUuid} [end] When using {@link Pointers.createPointer}, an optionally defined overlay to represent the end of the Ray Pointer, | |
| 124 | + * When returned from {@link Pointers.getPointerProperties}, the ID of the created object if it exists, or a null ID otherwise. | |
| 125 | + * @property {Overlays.OverlayProperties|QUuid} [end] When using {@link Pointers.createPointer}, an optionally defined object to represent the end of the Ray Pointer, | |
| 126 | 126 | * using the properties you would normally pass to {@link Overlays.addOverlay}, plus the type (as a <code>type</code> field). |
| 127 | − * When returned from {@link Pointers.getPointerProperties}, the ID of the created overlay if it exists, or a null ID otherwise. | |
| 127 | + * When returned from {@link Pointers.getPointerProperties}, the ID of the created object if it exists, or a null ID otherwise. | |
| 128 | 128 | */ |
| 129 | 129 | /**jsdoc |
| 130 | 130 | * 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. |
| @@ -271,14 +271,14 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope · 140 unmodified lines | ||
| 271 | 271 | * |
| 272 | 272 | * @typedef {object} Pointers.ParabolaPointerRenderState |
| 273 | 273 | * @property {string} name When using {@link Pointers.createPointer}, the name of this render state, used by {@link Pointers.setRenderState} and {@link Pointers.editRenderState} |
| 274 | −* @property {Overlays.OverlayProperties|QUuid} [start] When using {@link Pointers.createPointer}, an optionally defined overlay to represent the beginning of the Parabola Pointer, | |
| 274 | +* @property {Overlays.OverlayProperties|QUuid} [start] When using {@link Pointers.createPointer}, an optionally defined object to represent the beginning of the Parabola Pointer, | |
| 275 | 275 | * using the properties you would normally pass to {@link Overlays.addOverlay}, plus the type (as a <code>type</code> field). |
| 276 | −* When returned from {@link Pointers.getPointerProperties}, the ID of the created overlay if it exists, or a null ID otherwise. | |
| 276 | +* When returned from {@link Pointers.getPointerProperties}, the ID of the created object if it exists, or a null ID otherwise. | |
| 277 | 277 | * @property {Pointers.ParabolaProperties} [path] When using {@link Pointers.createPointer}, the optionally defined rendering properties of the parabolic path defined by the Parabola Pointer. |
| 278 | 278 | * Not defined in {@link Pointers.getPointerProperties}. |
| 279 | −* @property {Overlays.OverlayProperties|QUuid} [end] When using {@link Pointers.createPointer}, an optionally defined overlay to represent the end of the Parabola Pointer, | |
| 279 | +* @property {Overlays.OverlayProperties|QUuid} [end] When using {@link Pointers.createPointer}, an optionally defined object to represent the end of the Parabola Pointer, | |
| 280 | 280 | * using the properties you would normally pass to {@link Overlays.addOverlay}, plus the type (as a <code>type</code> field). |
| 281 | −* When returned from {@link Pointers.getPointerProperties}, the ID of the created overlay if it exists, or a null ID otherwise. | |
| 281 | +* When returned from {@link Pointers.getPointerProperties}, the ID of the created object if it exists, or a null ID otherwise. | |
| 282 | 282 | */ |
| 283 | 283 | /**jsdoc |
| 284 | 284 | * 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. |