Added analog metrics.

src/stats/common.ts

@@ -75,6 +75,13 @@ export interface InputCountsType {
   total: number;
 }
 
+export interface AnalogMotionType {
+  distanceTraveled: number;
+  metersTraveled: number;
+  analogMotionFrameCount: number;
+  averageVelocity: RatioType;
+}
+
 export interface OverallType extends PlayerIndexedType {
   inputCounts: InputCountsType;
   conversionCount: number;
@@ -83,6 +90,7 @@ export interface OverallType extends PlayerIndexedType {
   successfulConversions: RatioType;
   inputsPerMinute: RatioType;
   digitalInputsPerMinute: RatioType;
+  joystickMotion: AnalogMotionType;
   openingsPerKill: RatioType;
   damagePerOpening: RatioType;
   neutralWinRatio: RatioType;

src/stats/inputs.ts

@@ -24,6 +24,8 @@ export interface PlayerInput {
   cstickInputCount: number;
   buttonInputCount: number;
   triggerInputCount: number;
+  joystickDistanceTraveled: number;
+  joystickMotionFrameCount: number;
 }
 
 export class InputComputer implements StatComputer<PlayerInput[]> {
@@ -41,6 +43,8 @@ export class InputComputer implements StatComputer<PlayerInput[]> {
         cstickInputCount: 0,
         buttonInputCount: 0,
         triggerInputCount: 0,
+        joystickDistanceTraveled: 0,
+        joystickMotionFrameCount: 0,
       };
       this.state.set(indices, playerState);
     });
@@ -115,6 +119,17 @@ function handleInputCompute(
     state.inputCount += 1;
     state.triggerInputCount += 1;
   }
+
+  // Track the distance that the joystick has traveled. These are in unit coordinates and can
+  // be converted into meters, provided the controller being used has a standard gamecube stick.
+  const deltaX = playerFrame.joystickX - prevPlayerFrame.joystickX;
+  const deltaY = playerFrame.joystickY - prevPlayerFrame.joystickY;
+  const joystickDistance = getJoystickAnalogDistance(deltaX, deltaY);
+  state.joystickDistanceTraveled += joystickDistance;
+  if(joystickDistance > .001)
+  {
+  	state.joystickMotionFrameCount += 1;
+  }
 }
 
 function countSetBits(x: number): number {
@@ -131,6 +146,10 @@ function countSetBits(x: number): number {
   return count;
 }
 
+function getJoystickAnalogDistance(x: number, y: number): number {
+  return Math.sqrt(x * x + y * y)
+}
+
 function getJoystickRegion(x: number, y: number): JoystickRegion {
   let region = JoystickRegion.DZ;
 

src/stats/overall.ts

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { ConversionType, PlayerIndexedType, StockType, OverallType, RatioType, InputCountsType } from "./common";
+import { ConversionType, PlayerIndexedType, StockType, OverallType, RatioType, InputCountsType, AnalogMotionType } from "./common";
 import { PlayerInput } from "./inputs";
 
 interface ConversionsByPlayerByOpening {
@@ -45,6 +45,18 @@ export function generateOverallStats(
     const totalDamage = _.sumBy(opponentStocks, "currentPercent") || 0;
     const killCount = opponentEndedStocks.length;
 
+    const joystickAnalogDistance = _.get(playerInputs, "joystickDistanceTraveled");
+    const joystickMotionFrameCount = _.get(playerInputs, "joystickMotionFrameCount");
+    // Distance from stick top to gyro center is ~2cm. Distance from center to edge of gate is ~.47 rad.
+    // If there are more detailed measurements that have been taken, this is the place to use them.
+    const joystickMetersTraveled = joystickAnalogDistance * (.02 * .47);
+    const joystickMotion: AnalogMotionType = {
+      distanceTraveled: joystickAnalogDistance,
+      metersTraveled: joystickMetersTraveled,
+      analogMotionFrameCount: joystickMotionFrameCount,
+      averageVelocity: getRatio(joystickMetersTraveled, joystickMotionFrameCount / 60),
+    }
+
     return {
       playerIndex: playerIndex,
       opponentIndex: opponentIndex,
@@ -56,6 +68,7 @@ export function generateOverallStats(
       successfulConversions: getRatio(successfulConversionCount, conversionCount),
       inputsPerMinute: getRatio(inputCounts.total, gameMinutes),
       digitalInputsPerMinute: getRatio(inputCounts.buttons, gameMinutes),
+      joystickMotion: joystickMotion,
       openingsPerKill: getRatio(conversionCount, killCount),
       damagePerOpening: getRatio(totalDamage, conversionCount),
       neutralWinRatio: getOpeningRatio(conversionsByPlayerByOpening, playerIndex, opponentIndex, "neutral-win"),