mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 10:19:06 +02:00
Formatting changes
This commit is contained in:
parent
ef325db052
commit
05b361affc
3 changed files with 100 additions and 100 deletions
|
@ -1,7 +1,7 @@
|
|||
//
|
||||
// walkObjects.js
|
||||
//
|
||||
// version 1.000
|
||||
// version 1.001
|
||||
//
|
||||
// Created by David Wooldridge, Autumn 2014
|
||||
//
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
//
|
||||
// walkFilters.js
|
||||
//
|
||||
// version 1.000
|
||||
// version 1.001
|
||||
//
|
||||
// Created by David Wooldridge, Autumn 2014
|
||||
//
|
||||
|
@ -32,7 +32,9 @@ AveragingFilter = function(length) {
|
|||
var nextOutputValue = 0;
|
||||
for (var ea in this.pastValues) nextOutputValue += this.pastValues[ea];
|
||||
return nextOutputValue / this.pastValues.length;
|
||||
} else return 0;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -141,10 +143,9 @@ HarmonicsFilter = function(magnitudes, phaseAngles) {
|
|||
var harmonics = 0;
|
||||
var numHarmonics = magnitudes.length;
|
||||
|
||||
for(var n = 0; n < numHarmonics; n++)
|
||||
|
||||
for(var n = 0; n < numHarmonics; n++) {
|
||||
harmonics += this.magnitudes[n] * Math.cos(n * twoPiFT - this.phaseAngles[n]);
|
||||
|
||||
}
|
||||
return harmonics;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
//
|
||||
// walkInterface.js
|
||||
//
|
||||
// version 1.000
|
||||
// version 1.001
|
||||
//
|
||||
// Created by David Wooldridge, Autumn 2014
|
||||
//
|
||||
|
@ -2159,7 +2159,7 @@ walkInterface = (function() {
|
|||
// exit edit modes
|
||||
_motion.curAnim = _motion.selStand;
|
||||
_state.setInternalState(_state.STANDING);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _onButton:
|
||||
|
||||
|
@ -2171,8 +2171,7 @@ walkInterface = (function() {
|
|||
Overlays.editOverlay(_onButton, {
|
||||
visible: false
|
||||
});
|
||||
//resetJoints();
|
||||
break;
|
||||
return;
|
||||
|
||||
case _backButton:
|
||||
case _backButtonSelected:
|
||||
|
@ -2184,57 +2183,57 @@ walkInterface = (function() {
|
|||
visible: false
|
||||
});
|
||||
_state.setInternalState(_state.STANDING);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configWalkStylesButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_WALK_STYLES);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configWalkTweaksButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_WALK_TWEAKS);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configWalkJointsButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_WALK_JOINTS);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configWalkButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_WALK_STYLES);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configStandButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_STANDING);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configSideStepLeftButton:
|
||||
_state.setInternalState(_state.EDIT_SIDESTEP_LEFT);
|
||||
|
||||
break;
|
||||
_state.setInternalState(_state.EDIT_SIDESTEP_LEFT);
|
||||
return;
|
||||
|
||||
case _configSideStepRightButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_SIDESTEP_RIGHT);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configFlyingButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_FLYING);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configFlyingUpButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_FLYING_UP);
|
||||
break;
|
||||
return;
|
||||
|
||||
case _configFlyingDownButton:
|
||||
|
||||
_state.setInternalState(_state.EDIT_FLYING_DOWN);
|
||||
break;
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue