mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-05-28 21:01:16 +02:00
quiet jshint
This commit is contained in:
parent
5511b18432
commit
17ceda0d3e
1 changed files with 4 additions and 4 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
/* global Script, MyAvatar, Controller, Uuid, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule,
|
/* global Script, MyAvatar, Controller, Uuid, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule,
|
||||||
makeRunningValues, Vec3, makeDispatcherModuleParameters, Overlays, HMD, Settings, getEnabledModuleByName, Pointers,
|
makeRunningValues, Vec3, makeDispatcherModuleParameters, Overlays, HMD, Settings, getEnabledModuleByName, Pointers,
|
||||||
Picks, PickType
|
Picks, PickType, Keyboard
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Script.include("/~/system/libraries/controllerDispatcherUtils.js");
|
Script.include("/~/system/libraries/controllerDispatcherUtils.js");
|
||||||
|
@ -64,8 +64,8 @@ Script.include("/~/system/libraries/controllers.js");
|
||||||
var nearTabletHighlightModuleName =
|
var nearTabletHighlightModuleName =
|
||||||
this.hand === RIGHT_HAND ? "RightNearTabletHighlight" : "LeftNearTabletHighlight";
|
this.hand === RIGHT_HAND ? "RightNearTabletHighlight" : "LeftNearTabletHighlight";
|
||||||
var nearTabletHighlightModule = getEnabledModuleByName(nearTabletHighlightModuleName);
|
var nearTabletHighlightModule = getEnabledModuleByName(nearTabletHighlightModuleName);
|
||||||
var nearTabletHighlightModuleReady = nearTabletHighlightModule
|
var nearTabletHighlightModuleReady = nearTabletHighlightModule ?
|
||||||
? nearTabletHighlightModule.isReady(controllerData) : makeRunningValues(false, [], []);
|
nearTabletHighlightModule.isReady(controllerData) : makeRunningValues(false, [], []);
|
||||||
return grabOverlayModuleReady.active || farGrabModuleReady.active || grabEntityModuleReady.active
|
return grabOverlayModuleReady.active || farGrabModuleReady.active || grabEntityModuleReady.active
|
||||||
/* || nearTabletHighlightModuleReady.active */ ;
|
/* || nearTabletHighlightModuleReady.active */ ;
|
||||||
};
|
};
|
||||||
|
@ -129,7 +129,7 @@ Script.include("/~/system/libraries/controllers.js");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const WEB_DISPLAY_STYLUS_DISTANCE = (Keyboard.raised && Keyboard.preferMalletsOverLasers) ? 0.2 : 0.5;
|
var WEB_DISPLAY_STYLUS_DISTANCE = (Keyboard.raised && Keyboard.preferMalletsOverLasers) ? 0.2 : 0.5;
|
||||||
var nearStylusTarget = isNearStylusTarget(stylusTargets, WEB_DISPLAY_STYLUS_DISTANCE * sensorScaleFactor);
|
var nearStylusTarget = isNearStylusTarget(stylusTargets, WEB_DISPLAY_STYLUS_DISTANCE * sensorScaleFactor);
|
||||||
|
|
||||||
if (nearStylusTarget.length !== 0) {
|
if (nearStylusTarget.length !== 0) {
|
||||||
|
|
Loading…
Reference in a new issue