Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 15:46:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

script fixes

Browse source
This commit is contained in:
SamGondelman 2017-08-09 11:56:25 -07:00
parent 3645bf04b6
commit 6157f4fa55
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/system/controllers/handControllerGrab.js
View file

@ -3442,6 +3442,7 @@ function MyController(hand) {
}; };
this.offEnter = function() { this.offEnter = function() {
var existingSearchDistance = this.searchSphereDistance;
this.release(); this.release();
if (hoveredEntityID) { if (hoveredEntityID) {

8
scripts/system/controllers/handControllerPointer.js
View file

@ -160,7 +160,7 @@ var systemLaserOn = false;
var triggerPath = { var triggerPath = {
type: "line3d", type: "line3d",
color: LASER_SEARCH_COLOR, color: LASER_TRIGGER_COLOR,
ignoreRayIntersection: true, ignoreRayIntersection: true,
visible: true, visible: true,
alpha: LASER_ALPHA, alpha: LASER_ALPHA,
@ -171,7 +171,7 @@ var triggerPath = {
var triggerEnd = { var triggerEnd = {
type: "sphere", type: "sphere",
dimensions: {x: END_DIAMETER, y: END_DIAMETER, z: END_DIAMETER}, dimensions: {x: END_DIAMETER, y: END_DIAMETER, z: END_DIAMETER},
color: LASER_SEARCH_COLOR, color: LASER_TRIGGER_COLOR,
ignoreRayIntersection: true, ignoreRayIntersection: true,
visible: true, visible: true,
alpha: LASER_ALPHA, alpha: LASER_ALPHA,
@ -181,7 +181,7 @@ var triggerEnd = {
var searchPath = { var searchPath = {
type: "line3d", type: "line3d",
color: LASER_TRIGGER_COLOR, color: LASER_SEARCH_COLOR,
ignoreRayIntersection: true, ignoreRayIntersection: true,
visible: true, visible: true,
alpha: LASER_ALPHA, alpha: LASER_ALPHA,
@ -192,7 +192,7 @@ var searchPath = {
var searchEnd = { var searchEnd = {
type: "sphere", type: "sphere",
dimensions: {x: END_DIAMETER, y: END_DIAMETER, z: END_DIAMETER}, dimensions: {x: END_DIAMETER, y: END_DIAMETER, z: END_DIAMETER},
color: LASER_TRIGGER_COLOR, color: LASER_SEARCH_COLOR,
ignoreRayIntersection: true, ignoreRayIntersection: true,
visible: true, visible: true,
alpha: LASER_ALPHA, alpha: LASER_ALPHA,