Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:57:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidying

Browse source
This commit is contained in:
David Rowe 2017-02-17 16:39:10 +13:00
parent 25761adf6c
commit bdfc9fd418
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
scripts/system/fingerPaint.js
View file

@ -122,8 +122,6 @@
var entities, var entities,
entitiesLength, entitiesLength,
properties, properties,
entityID,
entityDistance,
i, i,
pointsLength, pointsLength,
j, j,
@ -186,12 +184,12 @@
TRIGGER_SMOOTH_RATIO = 0.1, TRIGGER_SMOOTH_RATIO = 0.1,
TRIGGER_OFF = 0.05, TRIGGER_OFF = 0.05,
TRIGGER_ON = 0.1, TRIGGER_ON = 0.1,
TRIGGER_START_WIDTH = 0.15, TRIGGER_START_WIDTH_RAMP = 0.15,
TRIGGER_FINISH_WIDTH = 1.0, TRIGGER_FINISH_WIDTH_RAMP = 1.0,
TRIGGER_RANGE_WIDTH = TRIGGER_FINISH_WIDTH - TRIGGER_START_WIDTH, TRIGGER_RAMP_WIDTH = TRIGGER_FINISH_WIDTH_RAMP - TRIGGER_START_WIDTH_RAMP,
START_LINE_WIDTH = 0.005, MIN_LINE_WIDTH = 0.005,
FINISH_LINE_WIDTH = 0.010, MAX_LINE_WIDTH = 0.03,
RANGE_LINE_WIDTH = FINISH_LINE_WIDTH - START_LINE_WIDTH, RAMP_LINE_WIDTH = MAX_LINE_WIDTH - MIN_LINE_WIDTH,
gripValue = 0.0, gripValue = 0.0,
isGripPressed = false, isGripPressed = false,
@ -223,11 +221,11 @@
if (wasTriggerPressed || isTriggerPressed) { if (wasTriggerPressed || isTriggerPressed) {
fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex4" : "RightHandIndex4"); fingerTipPosition = MyAvatar.getJointPosition(handName === "left" ? "LeftHandIndex4" : "RightHandIndex4");
if (triggerValue < TRIGGER_START_WIDTH) { if (triggerValue < TRIGGER_START_WIDTH_RAMP) {
lineWidth = START_LINE_WIDTH; lineWidth = MIN_LINE_WIDTH;
} else { } else {
lineWidth = START_LINE_WIDTH lineWidth = MIN_LINE_WIDTH
+ (triggerValue - TRIGGER_START_WIDTH) / TRIGGER_RANGE_WIDTH * RANGE_LINE_WIDTH; + (triggerValue - TRIGGER_START_WIDTH_RAMP) / TRIGGER_RAMP_WIDTH * RAMP_LINE_WIDTH;
} }
if (!wasTriggerPressed && isTriggerPressed) { if (!wasTriggerPressed && isTriggerPressed) {
@ -362,6 +360,9 @@
return; return;
} }
isFingerPainting = false;
updateHandFunctions();
button.clicked.disconnect(onButtonClicked); button.clicked.disconnect(onButtonClicked);
tablet.removeButton(button); tablet.removeButton(button);