laser on tablet update

druiz17 committed 9 years ago

Commit e33012e1 parent dbb91e52 files · +3 −2Browse files

Showing the changes to scripts/system/controllers/controllerModules (2 of 2 files). Show all

Unified · Split

2 files

scripts/system/controllers/controllerModules/overlayLaserInput.js +2 −1
scripts/system/controllers/controllerModules/tabletStylusInput.js +1 −1

scripts/system/controllers/controllerModules/overlayLaserInput.js+2−1

@@ -433,7 +433,8 @@ Script.include("/~/system/libraries/controllers.js"); · 432 unmodified lines
433	var nearGrabModule = getEnabledModuleByName(nearGrabName);	433	var nearGrabModule = getEnabledModuleByName(nearGrabName);
434	var status = nearGrabModule ? nearGrabModule.isReady(controllerData) : makeRunningValues(false, [], []);	434	var status = nearGrabModule ? nearGrabModule.isReady(controllerData) : makeRunningValues(false, [], []);
435	var offOverlay = (intersection.type !== RayPick.INTERSECTED_OVERLAY);	435	var offOverlay = (intersection.type !== RayPick.INTERSECTED_OVERLAY);
436	return offOverlay \|\| status.active;	436	var triggerOff = (controllerData.triggerValues[this.hand] === 0);
		437	return offOverlay \|\| status.active \|\| triggerOff;
437	};	438	};
438		439
439	this.exitModule = function() {	440	this.exitModule = function() {

scripts/system/controllers/controllerModules/tabletStylusInput.js+1−1

@@ -20,7 +20,7 @@ Script.include("/~/system/libraries/controllers.js"); · 19 unmodified lines
20	var HAPTIC_STYLUS_STRENGTH = 1.0;	20	var HAPTIC_STYLUS_STRENGTH = 1.0;
21	var HAPTIC_STYLUS_DURATION = 20.0;	21	var HAPTIC_STYLUS_DURATION = 20.0;
22		22
23	var WEB_DISPLAY_STYLUS_DISTANCE = 0.5;	23	var WEB_DISPLAY_STYLUS_DISTANCE = 0.2;
24	var WEB_STYLUS_LENGTH = 0.2;	24	var WEB_STYLUS_LENGTH = 0.2;
25	var WEB_TOUCH_Y_OFFSET = 0.05; // how far forward (or back with a negative number) to slide stylus in hand	25	var WEB_TOUCH_Y_OFFSET = 0.05; // how far forward (or back with a negative number) to slide stylus in hand
26		26