History

Merge branch 'master' into feature/ant-man

Anthony J. Thibault committed 9 years ago

Commit 0757f512 parents f534ee5 765031b75 files · +590 −456Browse files

Showing the changes to scripts/system/controllers/controllerModules/webEntityLaserInput.js (1 of 75 files). Show all

Unified · Split

scripts/system/controllers/controllerModules/webEntityLaserInput.js+3−6
@@ -7,13 +7,10 @@ · 6 unmodified lines
77
88 /* jslint bitwise: true */
99
10−/* global Script, Controller, LaserPointers, RayPick, RIGHT_HAND, LEFT_HAND, Mat4, MyAvatar, Vec3, Camera, Quat,
11− getGrabPointSphereOffset, getEnabledModuleByName, makeRunningValues, Entities, NULL_UUID,
12− enableDispatcherModule, disableDispatcherModule, entityIsDistanceGrabbable,
13− makeDispatcherModuleParameters, MSECS_PER_SEC, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION,
10+/* global Script, Controller, LaserPointers, RayPick, RIGHT_HAND, LEFT_HAND, Vec3, Quat, getGrabPointSphereOffset,
11+ makeRunningValues, Entities, NULL_UUID, enableDispatcherModule, disableDispatcherModule, makeDispatcherModuleParameters,
1412 PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
15− AVATAR_SELF_ID, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC
16−
13+ AVATAR_SELF_ID, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_ON_VALUE, ZERO_VEC, Overlays
1714 */
1815
1916 Script.include("/~/system/libraries/controllerDispatcherUtils.js");