wiggly lasers

HifiExperiments committed 2 years ago

Commit 30646471 parent bc45c1715 files · +205 −144Browse files

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

Unified · Split

interface/src/raypick/PointerScriptingInterface.cpp+39−46

 #include <ScriptManager.h>
 STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){
-    qDebug() << "STATIC_SCRIPT_TYPES_INITIALIZER PointerScriptingInterface";
     auto scriptEngine = manager->engine().get();
     scriptRegisterMetaType<RayPointerProperties, rayPointerPropertiesToScriptValue, rayPointerPropertiesFromScriptValue>(scriptEngine);
     scriptRegisterMetaType<StylusPointerProperties, stylusPointerPropertiesToScriptValue, stylusPointerPropertiesFromScriptValue>(scriptEngine);
     return createPointerInternal(PickQuery::PickType::Parabola, properties);
 }
 bool PointerScriptingInterface::isPointerEnabled(unsigned int uid) const {
     return DependencyManager::get<PointerManager>()->isPointerEnabled(uid);
 }
  * Properties that define the visual appearance of a ray pointer when the pointer is intersecting something.
  * @typedef {object} Pointers.RayPointerRenderState
  * @property {string} name - When creating using {@link Pointers.createPointer}, the name of the render state.
- * @property {Overlays.OverlayProperties|Uuid} [start]
+ * @property {Entities.EntityProperties|Uuid} [start]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     an overlay to render at the start of the ray pointer. The <code>type</code> property must be specified.</p>
+ *     an entity to render at the start of the ray pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the start of the ray;
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the start of the ray;
- *     <code>null</code> if there is no overlay.
+ *     <code>null</code> if there is no entity.
  *
- * @property {Overlays.OverlayProperties|Uuid} [path]
+ * @property {Entities.EntityProperties|Uuid} [path]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     the overlay rendered for the path of the ray pointer. The <code>type</code> property must be specified and be
+ *     the entity rendered for the path of the ray pointer. The <code>type</code> property must be specified and be
- *     <code>"line3d"</code>.</p>
+ *     <code>"PolyLine"</code>.</p>  Specify <code>linePoints</code> to control how many segments make up the path.
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered for the path of the ray;
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered for the path of the ray;
- *     <code>null</code> if there is no overlay.
+ *     <code>null</code> if there is no entity.
  *
- * @property {Overlays.OverlayProperties|Uuid} [end]
+ * @property {Entities.EntityProperties|Uuid} [end]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     an overlay to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
+ *     an entity to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the end of the ray;
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the end of the ray;
- *     <code>null</code> if there is no overlay.
+ *     <code>null</code> if there is no entity.
  */
 /*@jsdoc
  * The properties of a ray pointer. These include the properties from the underlying ray pick that the pointer uses.
  * @typedef {object} Pointers.RayPointerProperties
- * @property {boolean} [faceAvatar=false] - <code>true</code> if the overlay rendered at the end of the ray rotates about the
+ * @property {boolean} [faceAvatar=false] - <code>true</code> if the entity rendered at the end of the ray rotates about the
  *     world y-axis to always face the avatar; <code>false</code> if it maintains its world orientation.
- * @property {boolean} [centerEndY=true] - <code>true</code> if the overlay rendered at the end of the ray is centered on
+ * @property {boolean} [centerEndY=true] - <code>true</code> if the entity rendered at the end of the ray is centered on
- *     the ray end; <code>false</code> if the overlay is positioned against the surface if <code>followNormal</code> is
+ *     the ray end; <code>false</code> if the entity is positioned against the surface if <code>followNormal</code> is
  *     <code>true</code>, or above the ray end if <code>followNormal</code> is <code>false</code>.
 * @property {boolean} [lockEnd=false] - <code>true</code> if the end of the ray is locked to the center of the object at
  *     which the ray is pointing; <code>false</code> if the end of the ray is at the intersected surface.
- * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the overlay at the end of the ray
+ * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the entity at the end of the ray
  *     scale linearly with distance; <code>false</code> if they aren't.
  * @property {boolean} [scaleWithParent=false] - <code>true</code> if the width of the ray's path and the size of the
- *     start and end overlays scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
+ *     start and end entities scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
  * @property {boolean} [scaleWithAvatar=false] - A synonym for <code>scalewithParent</code>.
  *     <p class="important">Deprecated: This property is deprecated and will be removed.</p>
- * @property {boolean} [followNormal=false] - <code>true</code> if the overlay rendered at the end of the ray rotates to
+ * @property {boolean} [followNormal=false] - <code>true</code> if the entity rendered at the end of the ray rotates to
  *     follow the normal of the surface if one is intersected; <code>false</code> if it doesn't.
- * @property {number} [followNormalStrength=0.0] - How quickly the overlay rendered at the end of the ray rotates to follow
+ * @property {number} [followNormalStrength=0.0] - How quickly the entity rendered at the end of the ray rotates to follow
- *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the overlay rotation follows instantaneously;
+ *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the entity rotation follows instantaneously;
  *    for other values, the larger the value the more quickly the rotation follows.
  * @property {Pointers.RayPointerRenderState[]|Object.<string, Pointers.RayPointerRenderState>} [renderStates]
  *     <p>A set of visual states that can be switched among using {@link Pointers.setRenderState}. These define the visual
  * @property {boolean} [hover=false] - <code>true</code> if the pointer generates {@link Entities} hover events,
  *     <code>false</code> if it doesn't.
  * @property {Pointers.Trigger[]} [triggers=[]] - A list of ways that a {@link Controller} action or function should trigger
- *     events on the entity or overlay currently intersected.
+ *     events on the object currently intersected.
  * @property {PickType} pointerType - The type of pointer returned from {@link Pointers.getPointerProperties} or
  *     {@link Pointers.getPointerScriptParameters}. A laser pointer's type is {@link PickType(0)|PickType.Ray}.
  * @property {number} [pickID] - The ID of the pick created alongside this pointer, returned from
  * Properties that define the visual appearance of a parabola pointer when the pointer is intersecting something.
  * @typedef {object} Pointers.ParabolaPointerRenderState
  * @property {string} name - When creating using {@link Pointers.createPointer}, the name of the render state.
- * @property {Overlays.OverlayProperties|Uuid} [start]
+ * @property {Entities.EntityProperties|Uuid} [start]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     an overlay to render at the start of the parabola pointer. The <code>type</code> property must be specified.</p>
+ *     an entity to render at the start of the parabola pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the start of the
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the start of the
- *     parabola; <code>null</code> if there is no overlay.
+ *     parabola; <code>null</code> if there is no entity.
  * @property {Pointers.ParabolaPointerPath|Uuid} [path]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
  *     the rendered path of the parabola pointer.</p>
  *     <p>This property is not provided when getting using {@link Pointers.getPointerProperties}.
- * @property {Overlays.OverlayProperties|Uuid} [end]
+ * @property {Entities.EntityProperties|Uuid} [end]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     an overlay to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
+ *     an entity to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the end of the parabola;
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the end of the parabola;
- *     <code>null</code> if there is no overlay.
+ *     <code>null</code> if there is no entity.
  */
 /*@jsdoc
  * The properties of a parabola pointer. These include the properties from the underlying parabola pick that the pointer uses.
  * @typedef {object} Pointers.ParabolaPointerProperties
- * @property {boolean} [faceAvatar=false] - <code>true</code> if the overlay rendered at the end of the ray rotates about the
+ * @property {boolean} [faceAvatar=false] - <code>true</code> if the entity rendered at the end of the ray rotates about the
  *     world y-axis to always face the avatar; <code>false</code> if it maintains its world orientation.
- * @property {boolean} [centerEndY=true] - <code>true</code> if the overlay rendered at the end of the ray is centered on
+ * @property {boolean} [centerEndY=true] - <code>true</code> if the entity rendered at the end of the ray is centered on
- *     the ray end; <code>false</code> if the overlay is positioned against the surface if <code>followNormal</code> is
+ *     the ray end; <code>false</code> if the entity is positioned against the surface if <code>followNormal</code> is
  *     <code>true</code>, or above the ray end if <code>followNormal</code> is <code>false</code>.
 * @property {boolean} [lockEnd=false] - <code>true</code> if the end of the ray is locked to the center of the object at
  *     which the ray is pointing; <code>false</code> if the end of the ray is at the intersected surface.
- * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the overlay at the end of the ray
+ * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the entity at the end of the ray
  *     scale linearly with distance; <code>false</code> if they aren't.
  * @property {boolean} [scaleWithParent=false] - <code>true</code> if the width of the ray's path and the size of the
- *     start and end overlays scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
+ *     start and end entities scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
  * @property {boolean} [scaleWithAvatar=false] - A synonym for <code>scalewithParent</code>.
  *     <p class="important">Deprecated: This property is deprecated and will be removed.</p>
- * @property {boolean} [followNormal=false] - <code>true</code> if the overlay rendered at the end of the ray rotates to
+ * @property {boolean} [followNormal=false] - <code>true</code> if the entity rendered at the end of the ray rotates to
  *     follow the normal of the surface if one is intersected; <code>false</code> if it doesn't.
- * @property {number} [followNormalStrength=0.0] - How quickly the overlay rendered at the end of the ray rotates to follow
+ * @property {number} [followNormalStrength=0.0] - How quickly the entity rendered at the end of the ray rotates to follow
- *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the overlay rotation follows instantaneously;
+ *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the entity rotation follows instantaneously;
  *    for other values, the larger the value the more quickly the rotation follows.
  * @property {Pointers.ParabolaPointerRenderState[]|Object.<string, Pointers.ParabolaPointerRenderState>} [renderStates]
  *     <p>A set of visual states that can be switched among using {@link Pointers.setRenderState}. These define the visual
  * @property {boolean} [hover=false] - <code>true</code> if the pointer generates {@link Entities} hover events,
  *     <code>false</code> if it doesn't.
  * @property {Pointers.Trigger[]} [triggers=[]] - A list of ways that a {@link Controller} action or function should trigger
- *     events on the entity or overlay currently intersected.
+ *     events on the object currently intersected.
  * @property {PickType} pointerType - The type of pointer returned from {@link Pointers.getPointerProperties} or
  *     {@link Pointers.getPointerScriptParameters}. A parabola pointer's type is {@link PickType(0)|PickType.Parabola}.
  * @property {number} [pickID] - The ID of the pick created alongside this pointer, returned from
             out.properties[*renderStatesName].setValue(renderStates);
         }
     }
-    qDebug() << "rayPointerPropertiesFromScriptValue" << out.properties;
     return true;
 }
             out.properties[*renderStatesName].setValue(renderStates);
         }
     }
-    qDebug() << "stylusPointerPropertiesFromScriptValue" << out.properties;
     return true;
 }
                         pathProperties.copyFromScriptValue(path, false);
                         stateMap.insert("pathPropertyIndex", QVariant(out.entityProperties.length()));
                         out.entityProperties.append(pathProperties);
-                        qDebug() << "parabolaPointerPropertiesFromScriptValue : added path entity";
                     }
                     if (stateMap["end"].isValid()) {
                         endProperties.copyFromScriptValue(end, false);
                         stateMap.insert("endPropertyIndex", QVariant(out.entityProperties.length()));
                         out.entityProperties.append(endProperties);
-                        qDebug() << "parabolaPointerPropertiesFromScriptValue : added end entity";
                     }
                     renderStates[i].setValue(stateMap);
                 }
             out.properties[*renderStatesName].setValue(renderStates);
         }
     }
-    qDebug() << "parabolaPointerPropertiesFromScriptValue" << out.properties;
     return true;
 }