Merge pull request #11764 from luiscuenca/case7587

7587 Lasers resize with avatar

interface/src/raypick/LaserPointer.cpp

@@ -15,7 +15,7 @@
 #include "RayPickScriptingInterface.h"
 
 LaserPointer::LaserPointer(const QVariant& rayProps, const RenderStateMap& renderStates, const DefaultRenderStateMap& defaultRenderStates,
-        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool enabled) :
+        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled) :
     _renderingEnabled(enabled),
     _renderStates(renderStates),
     _defaultRenderStates(defaultRenderStates),
@@ -23,6 +23,7 @@ LaserPointer::LaserPointer(const QVariant& rayProps, const RenderStateMap& rende
     _centerEndY(centerEndY),
     _lockEnd(lockEnd),
     _distanceScaleEnd(distanceScaleEnd),
+    _scaleWithAvatar(scaleWithAvatar),
     _rayPickUID(DependencyManager::get<RayPickScriptingInterface>()->createRayPick(rayProps))
 {
 
@@ -94,6 +95,10 @@ void LaserPointer::editRenderState(const std::string& state, const QVariant& sta
         if (endDim.isValid()) {
             _renderStates[state].setEndDim(vec3FromVariant(endDim));
         }
+        QVariant lineWidth = pathProps.toMap()["lineWidth"];
+        if (lineWidth.isValid()) {
+            _renderStates[state].setLineWidth(lineWidth.toFloat());
+        }
     });
 }
 
@@ -152,6 +157,7 @@ void LaserPointer::updateRenderState(const RenderState& renderState, const Inter
             }
         }
     }
+    
     QVariant end = vec3toVariant(endVec);
     if (!renderState.getPathID().isNull()) {
         QVariantMap pathProps;
@@ -159,6 +165,9 @@ void LaserPointer::updateRenderState(const RenderState& renderState, const Inter
         pathProps.insert("end", end);
         pathProps.insert("visible", true);
         pathProps.insert("ignoreRayIntersection", renderState.doesPathIgnoreRays());
+        if (_scaleWithAvatar) {
+            pathProps.insert("lineWidth", renderState.getLineWidth() * DependencyManager::get<AvatarManager>()->getMyAvatar()->getSensorToWorldScale());
+        }
         qApp->getOverlays().editOverlay(renderState.getPathID(), pathProps);
     }
     if (!renderState.getEndID().isNull()) {
@@ -166,7 +175,7 @@ void LaserPointer::updateRenderState(const RenderState& renderState, const Inter
         glm::quat faceAvatarRotation = DependencyManager::get<AvatarManager>()->getMyAvatar()->getOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, 180.0f, 0.0f)));
         glm::vec3 dim = vec3FromVariant(qApp->getOverlays().getProperty(renderState.getEndID(), "dimensions").value);
         if (_distanceScaleEnd) {
-            dim = renderState.getEndDim() * glm::distance(pickRay.origin, endVec) * DependencyManager::get<AvatarManager>()->getMyAvatar()->getSensorToWorldScale();
+            dim = renderState.getEndDim() * glm::distance(pickRay.origin, endVec);
             endProps.insert("dimensions", vec3toVariant(dim));
         }
         if (_centerEndY) {
@@ -258,6 +267,7 @@ RenderState::RenderState(const OverlayID& startID, const OverlayID& pathID, cons
     }
     if (!_pathID.isNull()) {
         _pathIgnoreRays = qApp->getOverlays().getProperty(_pathID, "ignoreRayIntersection").value.toBool();
+        _lineWidth = qApp->getOverlays().getProperty(_pathID, "lineWidth").value.toFloat();
     }
     if (!_endID.isNull()) {
         _endDim = vec3FromVariant(qApp->getOverlays().getProperty(_endID, "dimensions").value);

interface/src/raypick/LaserPointer.h

@@ -43,6 +43,9 @@ public:
     void setEndDim(const glm::vec3& endDim) { _endDim = endDim; }
     const glm::vec3& getEndDim() const { return _endDim; }
 
+    void setLineWidth(const float& lineWidth) { _lineWidth = lineWidth; }
+    const float& getLineWidth() const { return _lineWidth; }
+
     void deleteOverlays();
 
 private:
@@ -54,6 +57,7 @@ private:
     bool _endIgnoreRays;
 
     glm::vec3 _endDim;
+    float _lineWidth;
 };
 
 
@@ -66,7 +70,7 @@ public:
     typedef std::unordered_map<std::string, std::pair<float, RenderState>> DefaultRenderStateMap;
 
     LaserPointer(const QVariant& rayProps, const RenderStateMap& renderStates, const DefaultRenderStateMap& defaultRenderStates,
-        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool enabled);
+        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled);
     ~LaserPointer();
 
     QUuid getRayUID() { return _rayPickUID; }
@@ -97,6 +101,7 @@ private:
     bool _centerEndY;
     bool _lockEnd;
     bool _distanceScaleEnd;
+    bool _scaleWithAvatar;
     LockEndObject _lockEndObject;
 
     const QUuid _rayPickUID;

interface/src/raypick/LaserPointerManager.cpp

@@ -11,9 +11,9 @@
 #include "LaserPointerManager.h"
 
 QUuid LaserPointerManager::createLaserPointer(const QVariant& rayProps, const LaserPointer::RenderStateMap& renderStates, const LaserPointer::DefaultRenderStateMap& defaultRenderStates,
-    const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool enabled) {
+    const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled) {
     QUuid result;
-    std::shared_ptr<LaserPointer> laserPointer = std::make_shared<LaserPointer>(rayProps, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled);
+    std::shared_ptr<LaserPointer> laserPointer = std::make_shared<LaserPointer>(rayProps, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, distanceScaleEnd, scaleWithAvatar, enabled);
     if (!laserPointer->getRayUID().isNull()) {
         result = QUuid::createUuid();
         withWriteLock([&] { _laserPointers[result] = laserPointer; });

interface/src/raypick/LaserPointerManager.h

@@ -25,7 +25,7 @@ class LaserPointerManager : protected ReadWriteLockable {
 
 public:
     QUuid createLaserPointer(const QVariant& rayProps, const LaserPointer::RenderStateMap& renderStates, const LaserPointer::DefaultRenderStateMap& defaultRenderStates,
-        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool enabled);
+        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled);
 
     void removeLaserPointer(const QUuid& uid);
     void enableLaserPointer(const QUuid& uid) const;

interface/src/raypick/LaserPointerScriptingInterface.cpp

@@ -51,6 +51,11 @@ QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& propert
         enabled = propertyMap["enabled"].toBool();
     }
 
+    bool scaleWithAvatar = false;
+    if (propertyMap["scaleWithAvatar"].isValid()) {
+        scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool();
+    }
+
     LaserPointer::RenderStateMap renderStates;
     if (propertyMap["renderStates"].isValid()) {
         QList<QVariant> renderStateVariants = propertyMap["renderStates"].toList();
@@ -80,7 +85,7 @@ QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& propert
         }
     }
 
-    return qApp->getLaserPointerManager().createLaserPointer(properties, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, distanceScaleEnd, enabled);
+    return qApp->getLaserPointerManager().createLaserPointer(properties, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, distanceScaleEnd, scaleWithAvatar, enabled);
 }
 
 void LaserPointerScriptingInterface::editRenderState(const QUuid& uid, const QString& renderState, const QVariant& properties) const {

interface/src/ui/overlays/Base3DOverlay.cpp

@@ -16,13 +16,11 @@
 #include "Application.h"
 
 
-const float DEFAULT_LINE_WIDTH = 1.0f;
 const bool DEFAULT_IS_SOLID = false;
 const bool DEFAULT_IS_DASHED_LINE = false;
 
 Base3DOverlay::Base3DOverlay() :
     SpatiallyNestable(NestableType::Overlay, QUuid::createUuid()),
-    _lineWidth(DEFAULT_LINE_WIDTH),
     _isSolid(DEFAULT_IS_SOLID),
     _isDashedLine(DEFAULT_IS_DASHED_LINE),
     _ignoreRayIntersection(false),
@@ -34,7 +32,6 @@ Base3DOverlay::Base3DOverlay() :
 Base3DOverlay::Base3DOverlay(const Base3DOverlay* base3DOverlay) :
     Overlay(base3DOverlay),
     SpatiallyNestable(NestableType::Overlay, QUuid::createUuid()),
-    _lineWidth(base3DOverlay->_lineWidth),
     _isSolid(base3DOverlay->_isSolid),
     _isDashedLine(base3DOverlay->_isDashedLine),
     _ignoreRayIntersection(base3DOverlay->_ignoreRayIntersection),
@@ -153,12 +150,6 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
         setLocalOrientation(quatFromVariant(properties["orientation"]));
         needRenderItemUpdate = true;
     }
-
-    if (properties["lineWidth"].isValid()) {
-        setLineWidth(properties["lineWidth"].toFloat());
-        needRenderItemUpdate = true;
-    }
-
     if (properties["isSolid"].isValid()) {
         setIsSolid(properties["isSolid"].toBool());
     }
@@ -225,9 +216,6 @@ QVariant Base3DOverlay::getProperty(const QString& property) {
     if (property == "localRotation" || property == "localOrientation") {
         return quatToVariant(getLocalOrientation());
     }
-    if (property == "lineWidth") {
-        return _lineWidth;
-    }
     if (property == "isSolid" || property == "isFilled" || property == "solid" || property == "filed") {
         return _isSolid;
     }

interface/src/ui/overlays/Base3DOverlay.h

@@ -38,7 +38,6 @@ public:
     // TODO: consider implementing registration points in this class
     glm::vec3 getCenter() const { return getPosition(); }
 
-    float getLineWidth() const { return _lineWidth; }
     bool getIsSolid() const { return _isSolid; }
     bool getIsDashedLine() const { return _isDashedLine; }
     bool getIsSolidLine() const { return !_isDashedLine; }
@@ -47,7 +46,6 @@ public:
     bool getDrawHUDLayer() const { return _drawHUDLayer; }
     bool getIsGrabbable() const { return _isGrabbable; }
 
-    void setLineWidth(float lineWidth) { _lineWidth = lineWidth; }
     void setIsSolid(bool isSolid) { _isSolid = isSolid; }
     void setIsDashedLine(bool isDashedLine) { _isDashedLine = isDashedLine; }
     void setIgnoreRayIntersection(bool value) { _ignoreRayIntersection = value; }
@@ -85,7 +83,6 @@ protected:
     void setRenderVisible(bool visible);
     const Transform& getRenderTransform() const { return _renderTransform; }
 
-    float _lineWidth;
     bool _isSolid;
     bool _isDashedLine;
     bool _ignoreRayIntersection;

interface/src/ui/overlays/Line3DOverlay.cpp

@@ -33,8 +33,8 @@ Line3DOverlay::Line3DOverlay(const Line3DOverlay* line3DOverlay) :
     _length = line3DOverlay->getLength();
     _endParentID = line3DOverlay->getEndParentID();
     _endParentJointIndex = line3DOverlay->getEndJointIndex();
+    _lineWidth = line3DOverlay->getLineWidth();
     _glow = line3DOverlay->getGlow();
-    _glowWidth = line3DOverlay->getGlowWidth();
 }
 
 Line3DOverlay::~Line3DOverlay() {
@@ -145,7 +145,7 @@ void Line3DOverlay::render(RenderArgs* args) {
             geometryCache->renderDashedLine(*batch, start, end, colorv4, _geometryCacheID);
         } else {
             // renderGlowLine handles both glow = 0 and glow > 0 cases
-            geometryCache->renderGlowLine(*batch, start, end, colorv4, _glow, _glowWidth, _geometryCacheID);
+            geometryCache->renderGlowLine(*batch, start, end, colorv4, _glow, _lineWidth, _geometryCacheID);
         }
     }
 }
@@ -239,11 +239,10 @@ void Line3DOverlay::setProperties(const QVariantMap& originalProperties) {
         }
     }
 
-    auto glowWidth = properties["glowWidth"];
+    auto lineWidth = properties["lineWidth"];
-    if (glowWidth.isValid()) {
+    if (lineWidth.isValid()) {
-        setGlowWidth(glowWidth.toFloat());
+        setLineWidth(lineWidth.toFloat());
     }
-
 }
 
 QVariant Line3DOverlay::getProperty(const QString& property) {
@@ -262,6 +261,9 @@ QVariant Line3DOverlay::getProperty(const QString& property) {
     if (property == "length") {
         return QVariant(getLength());
     }
+    if (property == "lineWidth") {
+        return _lineWidth;
+    }
 
     return Base3DOverlay::getProperty(property);
 }

interface/src/ui/overlays/Line3DOverlay.h

@@ -31,8 +31,8 @@ public:
     // getters
     glm::vec3 getStart() const;
     glm::vec3 getEnd() const;
+    const float& getLineWidth() const { return _lineWidth; }
     const float& getGlow() const { return _glow; }
-    const float& getGlowWidth() const { return _glowWidth; }
 
     // setters
     void setStart(const glm::vec3& start);
@@ -41,8 +41,8 @@ public:
     void setLocalStart(const glm::vec3& localStart) { setLocalPosition(localStart); }
     void setLocalEnd(const glm::vec3& localEnd);
 
+    void setLineWidth(const float& lineWidth) { _lineWidth = lineWidth; }
     void setGlow(const float& glow) { _glow = glow; }
-    void setGlowWidth(const float& glowWidth) { _glowWidth = glowWidth; }
 
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
@@ -70,8 +70,9 @@ private:
     glm::vec3 _direction; // in parent frame
     float _length { 1.0 }; // in parent frame
 
+    const float DEFAULT_LINE_WIDTH = 0.02f;
+    float _lineWidth { DEFAULT_LINE_WIDTH };
     float _glow { 0.0 };
-    float _glowWidth { 0.0 };
     int _geometryCacheID;
 };
 

libraries/render-utils/src/GeometryCache.cpp

@@ -1931,9 +1931,10 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const
             vec4 p1;
             vec4 p2;
             vec4 color;
+            float width;
         };
 
-        LineData lineData { vec4(p1, 1.0f), vec4(p2, 1.0f), color };
+        LineData lineData { vec4(p1, 1.0f), vec4(p2, 1.0f), color, glowWidth };
         details.uniformBuffer->resize(sizeof(LineData));
         details.uniformBuffer->setSubData(0, lineData);
     }

libraries/render-utils/src/glowLine.slf

@@ -10,8 +10,8 @@
 //
 
 in vec4 _color;
-in float distanceFromCenter;
 
+in float distanceFromCenter;
 out vec4 _fragColor;
 
 void main(void) {

libraries/render-utils/src/glowLine.slv

@@ -16,6 +16,7 @@ layout(std140) uniform lineData {
     vec4 p1;
     vec4 p2;
     vec4 color;
+    float width;
 };
 
 out vec4 _color;
@@ -39,7 +40,7 @@ void main(void) {
     // Find the vector from the eye to one of the points
     vec3 v2 = normalize(p1eye.xyz);
     // The orthogonal vector is the cross product of these two
-    vec3 orthogonal = cross(v1, v2) * 0.02;
+    vec3 orthogonal = cross(v1, v2) * width;
     
     // Deteremine which end to emit based on the vertex id (even / odd)
     vec4 eye = (0 == gl_VertexID % 2) ? p1eye : p2eye;

scripts/developer/tests/performance/rayPickPerformance.js

@@ -96,7 +96,6 @@ function rayCastTest() {
                             color: color,
                             alpha: 1,
                             visible: visible,
-                            lineWidth: 2,
                             start: origin,
                             end: Vec3.sum(origin,Vec3.multiply(5,direction))
                         });

scripts/system/chat.js

@@ -284,8 +284,7 @@
             endParentJointIndex: yourJointIndex,
             end: yourJointPosition,
             color: identifyAvatarLineColor,
-            alpha: 1,
+            alpha: 1
-            lineWidth: 1
         };
 
         avatarIdentifiers[yourAvatarID] = identifierParams;

scripts/system/controllers/controllerModules/farActionGrabEntity.js

@@ -33,7 +33,6 @@ Script.include("/~/system/libraries/Xform.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -55,7 +54,6 @@ Script.include("/~/system/libraries/Xform.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -77,7 +75,6 @@ Script.include("/~/system/libraries/Xform.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -649,6 +646,7 @@ Script.include("/~/system/libraries/Xform.js");
             renderStates: renderStates,
             faceAvatar: true,
             distanceScaleEnd: true,
+            scaleWithAvatar: true,
             defaultRenderStates: defaultRenderStates
         });
     }

scripts/system/controllers/controllerModules/farTrigger.js

@@ -25,7 +25,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -47,7 +46,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -69,7 +67,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -190,6 +187,7 @@ Script.include("/~/system/libraries/controllers.js");
             renderStates: renderStates,
             faceAvatar: true,
             distanceScaleEnd: true,
+            scaleWithAvatar: true,
             defaultRenderStates: defaultRenderStates
         });
 

scripts/system/controllers/controllerModules/hudOverlayPointer.js

@@ -31,7 +31,6 @@
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawHUDLayer: true,
         parentID: MyAvatar.SELF_ID
@@ -53,7 +52,6 @@
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawHUDLayer: true,
         parentID: MyAvatar.SELF_ID
@@ -75,7 +73,6 @@
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawHUDLayer: true,
         parentID: MyAvatar.SELF_ID

scripts/system/controllers/controllerModules/inEditMode.js

@@ -27,7 +27,6 @@ Script.include("/~/system/libraries/utils.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -49,7 +48,6 @@ Script.include("/~/system/libraries/utils.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -71,7 +69,6 @@ Script.include("/~/system/libraries/utils.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -237,6 +234,7 @@ Script.include("/~/system/libraries/utils.js");
             posOffset: getGrabPointSphereOffset(this.handToController(), true),
             renderStates: renderStates,
             faceAvatar: true,
+            scaleWithAvatar: true,
             defaultRenderStates: defaultRenderStates
         });
 

scripts/system/controllers/controllerModules/overlayLaserInput.js

@@ -26,7 +26,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -48,7 +47,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -70,7 +68,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -371,6 +368,7 @@ Script.include("/~/system/libraries/controllers.js");
             posOffset: getGrabPointSphereOffset(this.handToController(), true),
             renderStates: renderStates,
             faceAvatar: true,
+            scaleWithAvatar: true,
             defaultRenderStates: defaultRenderStates
         });
 

scripts/system/controllers/controllerModules/teleport.js

@@ -153,6 +153,7 @@ Script.include("/~/system/libraries/controllers.js");
             joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
             filter: RayPick.PICK_ENTITIES,
             faceAvatar: true,
+            scaleWithAvatar: true,
             centerEndY: false,
             renderStates: teleportRenderStates,
             defaultRenderStates: teleportDefaultRenderStates
@@ -161,6 +162,7 @@ Script.include("/~/system/libraries/controllers.js");
             joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
             filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,
             faceAvatar: true,
+            scaleWithAvatar: true,
             centerEndY: false,
             renderStates: teleportRenderStates
         });
@@ -168,6 +170,7 @@ Script.include("/~/system/libraries/controllers.js");
             joint: "Avatar",
             filter: RayPick.PICK_ENTITIES,
             faceAvatar: true,
+            scaleWithAvatar: true,
             centerEndY: false,
             renderStates: teleportRenderStates,
             defaultRenderStates: teleportDefaultRenderStates
@@ -176,6 +179,7 @@ Script.include("/~/system/libraries/controllers.js");
             joint: "Avatar",
             filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,
             faceAvatar: true,
+            scaleWithAvatar: true,
             centerEndY: false,
             renderStates: teleportRenderStates
         });

scripts/system/controllers/controllerModules/webEntityLaserInput.js

@@ -26,7 +26,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -48,7 +47,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -70,7 +68,6 @@ Script.include("/~/system/libraries/controllers.js");
         alpha: 1,
         solid: true,
         glow: 1.0,
-        lineWidth: 5,
         ignoreRayIntersection: true, // always ignore this
         drawInFront: true, // Even when burried inside of something, show it.
         parentID: MyAvatar.SELF_ID
@@ -88,7 +85,6 @@ Script.include("/~/system/libraries/controllers.js");
         {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
     ];
 
-
     // triggered when stylus presses a web overlay/entity
     var HAPTIC_STYLUS_STRENGTH = 1.0;
     var HAPTIC_STYLUS_DURATION = 20.0;
@@ -452,6 +448,7 @@ Script.include("/~/system/libraries/controllers.js");
             posOffset: getGrabPointSphereOffset(this.handToController(), true),
             renderStates: renderStates,
             faceAvatar: true,
+            scaleWithAvatar: true,
             defaultRenderStates: defaultRenderStates
         });
     }

scripts/system/libraries/entitySelectionTool.js

@@ -339,7 +339,6 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
         borderSize: 1.4
     };
@@ -352,7 +351,6 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
         borderSize: 1.4
     };
@@ -365,7 +363,6 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
         borderSize: 1.4
     };
@@ -378,14 +375,12 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
         borderSize: 1.4
     };
 
     var spotLightLineProperties = {
-        color: lightOverlayColor,
+        color: lightOverlayColor
-        lineWidth: 1.5
     };
 
     var highlightBox = Overlays.addOverlay("cube", {
@@ -400,7 +395,6 @@ SelectionDisplay = (function() {
         solid: false,
         visible: false,
         dashed: true,
-        lineWidth: 2.0,
         ignoreRayIntersection: true, // this never ray intersects
         drawInFront: true
     });
@@ -416,8 +410,7 @@ SelectionDisplay = (function() {
         alpha: 1,
         solid: false,
         visible: false,
-        dashed: false,
+        dashed: false
-        lineWidth: 1.0
     });
 
     var selectionBoxes = [];
@@ -466,7 +459,6 @@ SelectionDisplay = (function() {
 
     // var normalLine = Overlays.addOverlay("line3d", {
     //                 visible: true,
-    //                 lineWidth: 2.0,
     //                 start: { x: 0, y: 0, z: 0 },
     //                 end: { x: 0, y: 0, z: 0 },
     //                 color: { red: 255, green: 255, blue: 0 },
@@ -656,7 +648,6 @@ SelectionDisplay = (function() {
 
     var xRailOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 1.0,
         start: Vec3.ZERO,
         end: Vec3.ZERO,
         color: {
@@ -668,7 +659,6 @@ SelectionDisplay = (function() {
     });
     var yRailOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 1.0,
         start: Vec3.ZERO,
         end: Vec3.ZERO,
         color: {
@@ -680,7 +670,6 @@ SelectionDisplay = (function() {
     });
     var zRailOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 1.0,
         start: Vec3.ZERO,
         end: Vec3.ZERO,
         color: {
@@ -693,7 +682,6 @@ SelectionDisplay = (function() {
 
     var rotateZeroOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 2.0,
         start: Vec3.ZERO,
         end: Vec3.ZERO,
         color: {
@@ -706,7 +694,6 @@ SelectionDisplay = (function() {
 
     var rotateCurrentOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 2.0,
         start: Vec3.ZERO,
         end: Vec3.ZERO,
         color: {
@@ -1788,7 +1775,6 @@ SelectionDisplay = (function() {
                             y: distance,
                             z: 1
                         },
-                        lineWidth: 1.5,
                         rotation: rotation,
                         visible: true
                     });
@@ -1994,7 +1980,6 @@ SelectionDisplay = (function() {
                     solid: false,
                     visible: false,
                     dashed: false,
-                    lineWidth: 1.0,
                     ignoreRayIntersection: true
                 }));
         }

scripts/system/pal.js

@@ -189,7 +189,6 @@ function HighlightedEntity(id, entityProperties) {
             green: 0x91,
             blue: 0x29
         },
-        lineWidth: 1.0,
         ignoreRayIntersection: true,
         drawInFront: false // Arguable. For now, let's not distract with mysterious wires around the scene.
     });

scripts/tutorials/entity_scripts/pistol.js

@@ -350,8 +350,7 @@
                 end: ZERO_VECTOR,
                 color: { red: 255, green: 0, blue: 0},
                 alpha: 1,
-                visible: true,
+                visible: true
-                lineWidth: 2
             });
         },
     };

unpublishedScripts/DomainContent/Toybox/bow/bow.js

@@ -329,7 +329,6 @@
                     y: 0,
                     z: 0
                 }, lineVectors[0]],
-                lineWidth: 5,
                 color: this.stringData.currentColor
             });
 
@@ -339,7 +338,6 @@
                     y: 0,
                     z: 0
                 }, lineVectors[1]],
-                lineWidth: 5,
                 color: this.stringData.currentColor
             });
 

unpublishedScripts/DomainContent/Toybox/bow/createBow.js

@@ -125,7 +125,6 @@ function createPreNotchString() {
             y: 0,
             z: 0
         }, downOffset)],
-        lineWidth: 5,
         color: {
             red: 255,
             green: 255,

unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js

@@ -450,7 +450,6 @@
                         y: 0,
                         z: 0
                     }, downOffset)],
-                    lineWidth: 5,
                     color: {
                         red: 255,
                         green: 255,

unpublishedScripts/DomainContent/Toybox/masterReset.js

@@ -427,7 +427,6 @@ MasterReset = function() {
                     y: 0,
                     z: 0
                 }, downOffset)],
-                lineWidth: 5,
                 color: {
                     red: 255,
                     green: 255,

unpublishedScripts/DomainContent/Toybox/pistol/pistol.js

@@ -346,8 +346,7 @@
                 end:  { x: 0, y: 0, z: 0 },
                 color: COLORS.RED,
                 alpha: 1,
-                visible: true,
+                visible: true
-                lineWidth: 2
             });
         },
     };

unpublishedScripts/marketplace/bow/bow.js

@@ -266,7 +266,6 @@
                     dimensions: { "x": 5, "y": 5, "z": 5 },
                     ignoreForCollisions: 1,
                     linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                    lineWidth: 5,
                     name: STRING_NAME,
                     parentID: this.entityID,
                     localPosition: { "x": 0, "y": 0.6, "z": 0.1 },
@@ -287,7 +286,6 @@
         resetStringToIdlePosition: function() {
             Entities.editEntity(this.stringID, {
                 linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                lineWidth: 5,
                 localPosition: { "x": 0, "y": 0.6, "z": 0.1 },
                 localRotation: { "w": 1, "x": 0, "y": 0, "z": 0 },
             });

unpublishedScripts/marketplace/laser/laserPointerApp.js

@@ -99,7 +99,6 @@
                 lifetime: 360,
                 type: 'Line',
                 glow: 1.0,
-                lineWidth: 5,
                 alpha: 0.5,
                 ignoreRayIntersection: true,
                 drawInFront: true,

unpublishedScripts/marketplace/shapes/modules/laser.js

@@ -72,7 +72,6 @@ Laser = function (side) {
     }
 
     laserLine = Overlays.addOverlay("line3d", {
-        lineWidth: 5,
         alpha: 1.0,
         glow: 1.0,
         ignoreRayIntersection: true,

unpublishedScripts/marketplace/shortbow/bow/bow.js

@@ -408,7 +408,6 @@ function getControllerLocation(controllerHand) {
                     dimensions: { "x": 5, "y": 5, "z": 5 },
                     ignoreForCollisions: 1,
                     linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                    lineWidth: 5,
                     color: { red: 153, green: 102, blue: 51 },
                     name: STRING_NAME,
                     parentID: this.entityID,
@@ -430,7 +429,6 @@ function getControllerLocation(controllerHand) {
         resetStringToIdlePosition: function() {
             Entities.editEntity(this.stringID, {
                 linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                lineWidth: 5,
                 localPosition: { "x": 0, "y": 0.6, "z": 0.1 },
                 localRotation: { "w": 1, "x": 0, "y": 0, "z": 0 },
             });