From 6f6fe5f2443467cedd2a7df5a1a2e97af6aca088 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Fri, 8 Jul 2016 18:22:37 -0700 Subject: [PATCH] reduced radius of grab sphere --- scripts/system/controllers/handControllerGrab.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index 39afe122b7..416e6b10d8 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -45,6 +45,10 @@ var DRAW_GRAB_BOXES = false; var DRAW_HAND_SPHERES = false; var DROP_WITHOUT_SHAKE = false; +var EQUIP_SPHERE_COLOR = { red: 179, green: 120, blue: 211 }; +var EQUIP_SPHERE_ALPHA = 0.15; +var EQUIP_SPHERE_SCALE_FACTOR = 0.65; + // // distant manipulation // @@ -939,13 +943,12 @@ function MyController(hand) { overlays: [] }; - var EQUIP_SPHERE_COLOR = { red: 179, green: 120, blue: 211 }; - var EQUIP_SPHERE_ALPHA = 0.3; + var diameter = hotspot.radius * 2; overlayInfoSet.overlays.push(Overlays.addOverlay("sphere", { position: hotspot.worldPosition, rotation: {x: 0, y: 0, z: 0, w: 1}, - size: hotspot.radius * 2, + dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR, color: EQUIP_SPHERE_COLOR, alpha: EQUIP_SPHERE_ALPHA, solid: true, @@ -960,12 +963,12 @@ function MyController(hand) { this.updateOverlayInfoSet = function (overlayInfoSet, timestamp, potentialEquipHotspot) { overlayInfoSet.timestamp = timestamp; - var radius = overlayInfoSet.hotspot.radius; + var diameter = overlayInfoSet.hotspot.radius * 2; // embiggen the overlays if it maches the potentialEquipHotspot if (potentialEquipHotspot && overlayInfoSet.entityID == potentialEquipHotspot.entityID && Vec3.equal(overlayInfoSet.localPosition, potentialEquipHotspot.localPosition)) { - radius = radius * EQUIP_RADIUS_EMBIGGEN_FACTOR; + diameter = diameter * EQUIP_RADIUS_EMBIGGEN_FACTOR; } var props = _this.entityPropertyCache.getProps(overlayInfoSet.entityID); @@ -976,7 +979,7 @@ function MyController(hand) { Overlays.editOverlay(overlay, { position: position, rotation: props.rotation, - dimensions: radius * 2 + dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR }); }); };