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

Fix eslint

Browse source
This commit is contained in:
luiscuenca 2018-01-04 12:04:52 -07:00
parent ef0164c272
commit 367e2266f7
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/system/controllers/handTouch.js
View file

@ -9,6 +9,11 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
/* jslint bitwise: true */
/* global Script, Overlays, Controller, Vec3, Quat, MyAvatar, Entities
*/
(function(){ (function(){
var updateFingerWithIndex = 0; var updateFingerWithIndex = 0;
@ -376,7 +381,7 @@
} }
// Calculate new interpolation data // Calculate new interpolation data
var totalDistance = addVals(dataClose[side][finger], dataOpen[side][finger], -1); var totalDistance = addVals(dataClose[side][finger], dataOpen[side][finger], -1);
var percent = varsToDebug.fingerPercent[side][finger]; percent = varsToDebug.fingerPercent[side][finger];
var newFingerData = addVals(dataOpen[side][finger], multiplyValsBy(totalDistance, percent), 1); var newFingerData = addVals(dataOpen[side][finger], multiplyValsBy(totalDistance, percent), 1);
// Assign animation interpolation steps // Assign animation interpolation steps
@ -453,16 +458,17 @@
updateSphereHand("left"); updateSphereHand("left");
// Assign interpolated values // Assign interpolated values
var i, j, index; var i, j, index, finger, names, quatRot;
for (i = 0; i < dataKeys.length; i++) { for (i = 0; i < dataKeys.length; i++) {
var finger = dataKeys[i]; finger = dataKeys[i];
var names = getJointNames("Right", finger, 3); names = getJointNames("Right", finger, 3);
dataCurrent["right"][finger] = addVals(dataCurrent["right"][finger], dataDelta["right"][finger], 1); dataCurrent["right"][finger] = addVals(dataCurrent["right"][finger], dataDelta["right"][finger], 1);
for (j = 0; j < names.length; j++) { for (j = 0; j < names.length; j++) {
index = MyAvatar.getJointIndex(names[j]); index = MyAvatar.getJointIndex(names[j]);
// if no finger is touching restate the default poses // if no finger is touching restate the default poses
if (getTouching("right")) { if (getTouching("right")) {
var quatRot = Quat.fromVec3Degrees(dataCurrent["right"][finger][j]); quatRot = Quat.fromVec3Degrees(dataCurrent["right"][finger][j]);
MyAvatar.setJointRotation(index, quatRot); MyAvatar.setJointRotation(index, quatRot);
} else { } else {
MyAvatar.clearJointData(index); MyAvatar.clearJointData(index);
@ -471,14 +477,14 @@
} }
for (i = 0; i < dataKeys.length; i++) { for (i = 0; i < dataKeys.length; i++) {
var finger = dataKeys[i]; finger = dataKeys[i];
var names = getJointNames("Left", finger, 3); names = getJointNames("Left", finger, 3);
dataCurrent["left"][finger] = addVals(dataCurrent["left"][finger], dataDelta["left"][finger], 1); dataCurrent["left"][finger] = addVals(dataCurrent["left"][finger], dataDelta["left"][finger], 1);
for (j = 0; j < names.length; j++) { for (j = 0; j < names.length; j++) {
index = MyAvatar.getJointIndex(names[j]); index = MyAvatar.getJointIndex(names[j]);
// if no finger is touching restate the default poses // if no finger is touching restate the default poses
if (getTouching("left")) { if (getTouching("left")) {
var quatRot = Quat.fromVec3Degrees(dataCurrent["left"][finger][j]); quatRot = Quat.fromVec3Degrees(dataCurrent["left"][finger][j]);
MyAvatar.setJointRotation(index, quatRot); MyAvatar.setJointRotation(index, quatRot);
} else { } else {
MyAvatar.clearJointData(index); MyAvatar.clearJointData(index);