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

Formatting changes

Browse source
This commit is contained in:
DaveDubUK 2014-11-11 07:34:18 +00:00
parent ef325db052
commit 05b361affc
3 changed files with 100 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
examples/libraries/walkApi.js
View file

@ -1,7 +1,7 @@
//
// walkObjects.js
//
// version 1.000
// version 1.001
//
// Created by David Wooldridge, Autumn 2014
//
@ -93,19 +93,19 @@ Motion = function() {
if (i > 17 || i < 34) {
// left hand fingers
MyAvatar.setJointData(this.avatarJointNames[i], Quat.fromPitchYawRollDegrees(16, 0, 0));
} else if (i > 33 || i < 38) {
} else if (i > 33 || i < 38) {
// left hand thumb
MyAvatar.setJointData(this.avatarJointNames[i], Quat.fromPitchYawRollDegrees(4, 0, 0));
} else if (i > 41 || i < 58) {
} else if (i > 41 || i < 58) {
// right hand fingers
MyAvatar.setJointData(this.avatarJointNames[i], Quat.fromPitchYawRollDegrees(16, 0, 0));
} else if (i > 57 || i < 62) {
} else if (i > 57 || i < 62) {
// right hand thumb
MyAvatar.setJointData(this.avatarJointNames[i], Quat.fromPitchYawRollDegrees(4, 0, 0));
} else {
// zero out the remaining joints
MyAvatar.clearJointData(this.avatarJointNames[i]);
}
}
}
}
@ -123,7 +123,7 @@ Motion = function() {
this.walkWheelPos += angle;
if (motion.walkWheelPos >= 360) {
this.walkWheelPos = this.walkWheelPos % 360;
}
}
}
// last frame history
@ -284,9 +284,9 @@ state = (function () {
motion.setGender(MALE);
if (motion.direction === BACKWARDS) {
motion.strideLength = motion.selWalk.calibration.strideLengthBackwards;
} else {
} else {
motion.strideLength = motion.selWalk.calibration.strideLengthForwards;
}
}
}
return;
}
@ -302,19 +302,19 @@ Transition = function(lastAnimation, nextAnimation, reachPoses, transitionDurati
if (lastAnimation === motion.selWalk ||
nextAnimation === motion.selSideStepLeft ||
nextAnimation === motion.selSideStepRight) {
// boolean - is the last animation a walking animation?
// boolean - is the last animation a walking animation?
this.walkingAtStart = true;
} else {
} else {
this.walkingAtStart = false;
}
}
if (nextAnimation === motion.selWalk ||
nextAnimation === motion.selSideStepLeft ||
nextAnimation === motion.selSideStepRight) {
// boolean - is the next animation a walking animation?
// boolean - is the next animation a walking animation?
this.walkingAtEnd = true;
} else {
} else {
this.walkingAtEnd = false;
}
}
this.reachPoses = reachPoses; // placeholder / stub: array of reach poses for squash and stretch techniques
this.transitionDuration = transitionDuration; // length of transition (seconds)
this.easingLower = easingLower; // Bezier curve handle (normalised)

33
examples/libraries/walkFilters.js
View file

@ -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;
}
};
};
@ -40,10 +42,10 @@ AveragingFilter = function(length) {
// provides LP filtering with a more stable frequency / phase response
ButterworthFilter = function(cutOff) {
// cut off frequency = 5Hz
this.gain = 20.20612010;
this.coeffOne = -0.4775922501;
this.coeffTwo = 1.2796324250;
// cut off frequency = 5Hz
this.gain = 20.20612010;
this.coeffOne = -0.4775922501;
this.coeffTwo = 1.2796324250;
// initialise the arrays
this.xv = [];
@ -87,8 +89,8 @@ WaveSynth = function(waveShape, numHarmonics, smoothing) {
var multiplier = 0;
var iterations = this.numHarmonics * 2 + 2;
if (this.waveShape === TRIANGLE) {
iterations++;
}
iterations++;
}
for(var n = 2; n < iterations; n++) {
@ -99,7 +101,7 @@ WaveSynth = function(waveShape, numHarmonics, smoothing) {
multiplier = 1 / n;
harmonics += multiplier * Math.sin(n * frequency);
break;
}
}
case TRIANGLE: {
@ -108,11 +110,11 @@ WaveSynth = function(waveShape, numHarmonics, smoothing) {
// multiply (4n-1)th harmonics by -1
if (n === 3 || n === 7 || n === 11 || n === 15) {
mulitplier *= -1;
}
}
harmonics += mulitplier * Math.sin(n * frequency);
}
break;
}
}
case SQUARE: {
@ -121,7 +123,7 @@ WaveSynth = function(waveShape, numHarmonics, smoothing) {
harmonics += multiplier * Math.sin(n * frequency);
}
break;
}
}
}
}
@ -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;
};
};
@ -216,7 +217,7 @@ filter = (function() {
var outputValue = inputValue * strength;
if (outputValue < -peak) {
outputValue = -peak;
}
}
return outputValue;
}
}

139
examples/libraries/walkInterface.js
View file

@ -1,7 +1,7 @@
//
// walkInterface.js
//
// version 1.000
// version 1.001
//
// Created by David Wooldridge, Autumn 2014
//
@ -1367,9 +1367,9 @@ walkInterface = (function() {
Overlays.editOverlay(_backgroundOverlays[i], {
visible: true
});
} else {
Overlays.editOverlay(_backgroundOverlays[i], { visible: false });
}
} else {
Overlays.editOverlay(_backgroundOverlays[i], { visible: false });
}
}
};
@ -1481,8 +1481,8 @@ walkInterface = (function() {
}
if (!showButtons) {
return;
}
return;
}
// set all the non-selected ones to showing
for (var i = 8; i < _bigbuttonOverlays.length; i += 2) {
@ -2082,10 +2082,10 @@ walkInterface = (function() {
case _standardWalkBigButton:
if (_motion.avatarGender === FEMALE) {
_motion.selWalk = _motion.femaleStandardWalk;
} else {
_motion.selWalk = _motion.maleStandardWalk;
}
_motion.selWalk = _motion.femaleStandardWalk;
} else {
_motion.selWalk = _motion.maleStandardWalk;
}
_motion.curAnim = _motion.selWalk;
initialiseWalkStylesPanel(true);
return;
@ -2096,8 +2096,8 @@ walkInterface = (function() {
if (_motion.direction === FORWARDS) {
_motion.direction = BACKWARDS;
} else {
_motion.direction = FORWARDS;
}
_motion.direction = FORWARDS;
}
return;
case _sliderOne:
@ -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;
}
};
@ -2243,8 +2242,8 @@ walkInterface = (function() {
// workaround for bug (https://worklist.net/20160)
if ((event.x > 310 && event.x < 318 && event.y > 1350 && event.y < 1355) ||
(event.x > 423 && event.x < 428 && event.y > 1505 && event.y < 1508 )) {
return;
}
return;
}
if (_state.currentState === _state.EDIT_WALK_JOINTS ||
_state.currentState === _state.EDIT_STANDING ||
@ -2257,10 +2256,10 @@ walkInterface = (function() {
var thumbClickOffsetX = event.x - _minSliderX;
var thumbPositionNormalised = thumbClickOffsetX / _sliderRangeX;
if (thumbPositionNormalised < 0) {
thumbPositionNormalised = 0;
} else if (thumbPositionNormalised > 1) {
thumbPositionNormalised = 1;
}
thumbPositionNormalised = 0;
} else if (thumbPositionNormalised > 1) {
thumbPositionNormalised = 1;
}
var sliderX = thumbPositionNormalised * _sliderRangeX; // sets range
if (_movingSliderOne) {
@ -2358,11 +2357,11 @@ walkInterface = (function() {
});
if (_state.editingTranslation) {
var newOffset = (thumbPositionNormalised - 0.5) *
2 * _sliderRanges.joints[0].swayOffsetRange;
2 * _sliderRanges.joints[0].swayOffsetRange;
_motion.curAnim.joints[0].swayOffset = newOffset;
} else {
var newOffset = (thumbPositionNormalised - 0.5) *
2 * _sliderRanges.joints[_motion.curJointIndex].pitchOffsetRange;
2 * _sliderRanges.joints[_motion.curJointIndex].pitchOffsetRange;
_motion.curAnim.joints[_motion.curJointIndex].pitchOffset = newOffset;
}
@ -2374,11 +2373,11 @@ walkInterface = (function() {
});
if (_state.editingTranslation) {
var newOffset = (thumbPositionNormalised - 0.5) *
2 *_sliderRanges.joints[0].bobOffsetRange;
2 *_sliderRanges.joints[0].bobOffsetRange;
_motion.curAnim.joints[0].bobOffset = newOffset;
} else {
var newOffset = (thumbPositionNormalised - 0.5) *
2 * _sliderRanges.joints[_motion.curJointIndex].yawOffsetRange;
2 * _sliderRanges.joints[_motion.curJointIndex].yawOffsetRange;
_motion.curAnim.joints[_motion.curJointIndex].yawOffset = newOffset;
}
@ -2390,16 +2389,16 @@ walkInterface = (function() {
});
if (_state.editingTranslation) {
var newOffset = (thumbPositionNormalised - 0.5) *
2 * _sliderRanges.joints[0].thrustOffsetRange;
2 * _sliderRanges.joints[0].thrustOffsetRange;
_motion.curAnim.joints[0].thrustOffset = newOffset;
} else {
var newOffset = (thumbPositionNormalised - 0.5) *
2 * _sliderRanges.joints[_motion.curJointIndex].rollOffsetRange;
2 * _sliderRanges.joints[_motion.curJointIndex].rollOffsetRange;
_motion.curAnim.joints[_motion.curJointIndex].rollOffset = newOffset;
}
}
// end if editing joints
// end if editing joints
} else if (_state.currentState === _state.EDIT_WALK_TWEAKS) {
@ -2479,24 +2478,24 @@ walkInterface = (function() {
function mouseReleaseEvent(event) {
if (_movingSliderOne) {
_movingSliderOne = false;
} else if (_movingSliderTwo) {
_movingSliderTwo = false;
} else if (_movingSliderThree) {
_movingSliderThree = false;
} else if (_movingSliderFour) {
_movingSliderFour = false;
} else if (_movingSliderFive) {
_movingSliderFive = false;
} else if (_movingSliderSix) {
_movingSliderSix = false;
} else if (_movingSliderSeven) {
_movingSliderSeven = false;
} else if (_movingSliderEight) {
_movingSliderEight = false;
} else if (_movingSliderNine) {
_movingSliderNine = false;
}
_movingSliderOne = false;
} else if (_movingSliderTwo) {
_movingSliderTwo = false;
} else if (_movingSliderThree) {
_movingSliderThree = false;
} else if (_movingSliderFour) {
_movingSliderFour = false;
} else if (_movingSliderFive) {
_movingSliderFive = false;
} else if (_movingSliderSix) {
_movingSliderSix = false;
} else if (_movingSliderSeven) {
_movingSliderSeven = false;
} else if (_movingSliderEight) {
_movingSliderEight = false;
} else if (_movingSliderNine) {
_movingSliderNine = false;
}
};
Controller.mousePressEvent.connect(mousePressEvent);
@ -2580,9 +2579,9 @@ walkInterface = (function() {
if (_state.editingTranslation) {
setBackground(_controlsBackgroundWalkEditHipTrans);
} else {
} else {
setBackground(_controlsBackgroundWalkEditJoints);
}
}
initialiseWalkStylesPanel(false);
setSliderThumbsVisible(true);
@ -2594,7 +2593,7 @@ walkInterface = (function() {
setButtonOverlayVisible(_onButton);
setButtonOverlayVisible(_backButton);
return;
}
}
case _state.EDIT_STANDING:
case _state.EDIT_SIDESTEP_LEFT:
@ -2602,9 +2601,9 @@ walkInterface = (function() {
if (_state.editingTranslation) {
setBackground(_controlsBackgroundWalkEditHipTrans);
} else {
} else {
setBackground(_controlsBackgroundWalkEditJoints);
}
}
hideMenuButtons();
initialiseWalkStylesPanel(false);
initialiseFrontPanel(false);
@ -2631,7 +2630,7 @@ walkInterface = (function() {
setButtonOverlayVisible(_onButton);
setButtonOverlayVisible(_backButton);
return;
}
}
case _state.EDIT_FLYING:
case _state.EDIT_FLYING_UP:
@ -2663,7 +2662,7 @@ walkInterface = (function() {
setButtonOverlayVisible(_onButton);
setButtonOverlayVisible(_backButton);
return;
}
}
case _state.STANDING:
case _state.WALKING:
@ -2675,10 +2674,10 @@ walkInterface = (function() {
hideJointSelectors();
setBackground(_controlsBackground);
if (_state.powerOn) {
setButtonOverlayVisible(_onButton);
} else {
setButtonOverlayVisible(_offButton);
}
setButtonOverlayVisible(_onButton);
} else {
setButtonOverlayVisible(_offButton);
}
setButtonOverlayVisible(_configWalkButton);
setButtonOverlayVisible(_configStandButton);
setButtonOverlayVisible(_configFlyingButton);
@ -2687,7 +2686,7 @@ walkInterface = (function() {
initialiseFrontPanel(true);
initialiseWalkStylesPanel(false);
return;
}
}
}
}
}