Mocap pose based interactions

packages/engine/src/avatar/functions/avatarFunctions.ts

@@ -180,7 +180,6 @@ export const createIKAnimator = async (entity: Entity) => {
   const rigComponent = getComponent(entity, AvatarRigComponent)
   const animations = await getAnimations()
   const manager = getState(AnimationState)
-  const avatar = getComponent(entity, AvatarComponent)
 
   for (let i = 0; i < animations!.length; i++) {
     animations[i] = retargetMixamoAnimation(

packages/engine/src/avatar/systems/AvatarInputSystem.ts

@@ -27,13 +27,12 @@ import { Quaternion, Vector3 } from 'three'
 
 import { isDev } from '@etherealengine/common/src/config'
 import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState'
-import { dispatchAction, getMutableState, getState } from '@etherealengine/hyperflux'
+import { getMutableState, getState } from '@etherealengine/hyperflux'
 
 import { CameraComponent } from '../../camera/components/CameraComponent'
 import { FollowCameraComponent } from '../../camera/components/FollowCameraComponent'
 import { V_000, V_010 } from '../../common/constants/MathConstants'
 import { Engine } from '../../ecs/classes/Engine'
-import { EngineActions } from '../../ecs/classes/EngineState'
 import { Entity } from '../../ecs/classes/Entity'
 import {
   ComponentType,
@@ -47,10 +46,9 @@ import {
 import { defineSystem } from '../../ecs/functions/SystemFunctions'
 import { InputComponent } from '../../input/components/InputComponent'
 import { InputSourceComponent } from '../../input/components/InputSourceComponent'
-import { StandardGamepadButton, XRStandardGamepadButton } from '../../input/state/ButtonState'
+import { StandardGamepadButton } from '../../input/state/ButtonState'
 import { InputState } from '../../input/state/InputState'
 import { ClientInputSystem } from '../../input/systems/ClientInputSystem'
-import { InteractState } from '../../interaction/systems/InteractiveSystem'
 import { Physics, RaycastArgs } from '../../physics/classes/Physics'
 import { RigidBodyFixedTagComponent } from '../../physics/components/RigidBodyComponent'
 import { CollisionGroups } from '../../physics/enums/CollisionGroups'
@@ -137,15 +135,6 @@ const onShiftLeft = () => {
   controller.isWalking.set(!controller.isWalking.value)
 }
 
-const onInteract = (handedness: XRHandedness = 'none') => {
-  dispatchAction(
-    EngineActions.interactedWithObject({
-      targetEntity: getState(InteractState).available[0],
-      handedness
-    })
-  )
-}
-
 const onKeyP = () => {
   getMutableState(RendererState).physicsDebug.set(!getMutableState(RendererState).physicsDebug.value)
 }
@@ -245,21 +234,6 @@ const execute = () => {
     }
   }
 
-  /** @todo until we have something more sophisticated, allow interaction input even when interactables are captured */
-  for (const inputSourceEntity of inputSourceQuery()) {
-    const inputSource = getComponent(inputSourceEntity, InputSourceComponent)
-
-    const buttons = inputSource.buttons
-
-    const standardGamepad =
-      inputSource.source.gamepad?.mapping === 'standard' || inputSource.source.gamepad?.mapping === ''
-
-    if (buttons.KeyE?.down) onInteract()
-
-    if (standardGamepad && buttons[StandardGamepadButton.ButtonY]?.down) {
-      onInteract()
-    }
-  }
   let inputEntities: Entity[] = nonCapturedInputSourceEntities
   if (inputEntities.length === 0) {
     inputEntities = inputSourceQuery().filter((entity) => {
@@ -274,12 +248,8 @@ const execute = () => {
 
     const standardGamepad =
       inputSource.source.gamepad?.mapping === 'standard' || inputSource.source.gamepad?.mapping === ''
-    const xrStandardGamepad = inputSource.source.gamepad?.mapping === 'xr-standard'
 
     if (buttons.ShiftLeft?.down) onShiftLeft()
-    if (xrStandardGamepad) {
-      if (buttons[XRStandardGamepadButton.Trigger]?.down) onInteract(inputSource.source.handedness)
-    }
 
     const gamepadJump = standardGamepad && buttons[StandardGamepadButton.ButtonA]?.down
 

packages/engine/src/ecs/classes/EngineState.ts

@@ -25,7 +25,7 @@ Ethereal Engine. All Rights Reserved.
 
 import { defineAction, defineState } from '@etherealengine/hyperflux'
 
-import { matches, matchesEntity, Validator } from '../../common/functions/MatchesUtils'
+import { matches } from '../../common/functions/MatchesUtils'
 
 // TODO: #6016 Refactor EngineState into multiple state objects: timer, scene, world, xr, etc.
 export const EngineState = defineState({
@@ -75,12 +75,6 @@ export class EngineActions {
     type: 'ee.engine.Engine.EXIT_SPECTATE' as const
   })
 
-  static interactedWithObject = defineAction({
-    type: 'ee.engine.Engine.INTERACTED_WITH_OBJECT' as const,
-    targetEntity: matchesEntity.optional(),
-    handedness: matches.string as Validator<unknown, XRHandedness>
-  })
-
   static notification = defineAction({
     type: 'ee.engine.Engine.ERROR' as const,
     text: matches.string,

packages/engine/src/input/InputModule.ts

@@ -24,7 +24,8 @@ Ethereal Engine. All Rights Reserved.
 */
 
 import { FlyControlSystem } from '../avatar/systems/FlyControlSystem'
+import { MotionCaptureInputSystem } from '../mocap/MotionCaptureInputSystem'
 import { ButtonCleanupSystem } from './systems/ButtonCleanupSystem'
 import { ClientInputSystem } from './systems/ClientInputSystem'
 
-export { FlyControlSystem, ButtonCleanupSystem, ClientInputSystem }
+export { FlyControlSystem, ButtonCleanupSystem, ClientInputSystem, MotionCaptureInputSystem }

packages/engine/src/input/systems/ClientInputSystem.ts

@@ -26,14 +26,14 @@ Ethereal Engine. All Rights Reserved.
 import { useEffect } from 'react'
 import { Mesh, MeshBasicMaterial, Quaternion, Ray, Raycaster, Vector3 } from 'three'
 
-import { dispatchAction, getMutableState, getState, useHookstate } from '@etherealengine/hyperflux'
+import { getMutableState, getState, useHookstate } from '@etherealengine/hyperflux'
 
 import { CameraComponent } from '../../camera/components/CameraComponent'
 import { ObjectDirection } from '../../common/constants/Axis3D'
 import { Object3DUtils } from '../../common/functions/Object3DUtils'
 import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
-import { EngineActions, EngineState } from '../../ecs/classes/EngineState'
+import { EngineState } from '../../ecs/classes/EngineState'
 import { Entity, UndefinedEntity } from '../../ecs/classes/Entity'
 import {
   defineQuery,
@@ -48,7 +48,6 @@ import { createEntity, removeEntity } from '../../ecs/functions/EntityFunctions'
 import { EntityTreeComponent } from '../../ecs/functions/EntityTree'
 import { defineSystem } from '../../ecs/functions/SystemFunctions'
 import { BoundingBoxComponent } from '../../interaction/components/BoundingBoxComponents'
-import { InteractState } from '../../interaction/systems/InteractiveSystem'
 import { Physics, RaycastArgs } from '../../physics/classes/Physics'
 import { RigidBodyComponent } from '../../physics/components/RigidBodyComponent'
 import { AllCollisionMask } from '../../physics/enums/CollisionGroups'
@@ -264,17 +263,6 @@ export const addClientInputListeners = () => {
   }
   document.addEventListener('touchstickmove', handleTouchDirectionalPad)
 
-  /** @deprecated */
-  const handleTouchGampadButton = () => {
-    dispatchAction(
-      EngineActions.interactedWithObject({
-        targetEntity: getState(InteractState).available[0],
-        handedness: 'none'
-      })
-    )
-  }
-  document.addEventListener('touchgamepadbuttondown', handleTouchGampadButton)
-
   /**
    * AR uses the `select` event as taps on the screen for mobile AR sessions
    * This gets piped into the input system as a TouchInput.Touch
@@ -370,7 +358,6 @@ export const addClientInputListeners = () => {
     canvas.removeEventListener('touchend', handleMouseClick)
 
     document.removeEventListener('touchstickmove', handleTouchDirectionalPad)
-    document.removeEventListener('touchgamepadbuttondown', handleTouchGampadButton)
 
     session?.removeEventListener('selectstart', onXRSelectStart)
     session?.removeEventListener('selectend', onXRSelectEnd)

packages/engine/src/interaction/systems/GrabbableSystem.tsx

@@ -46,7 +46,7 @@ import { getAvatarBoneWorldPosition } from '../../avatar/functions/avatarFunctio
 import { matches, matchesEntityUUID } from '../../common/functions/MatchesUtils'
 import { isClient } from '../../common/functions/getEnvironment'
 import { Engine } from '../../ecs/classes/Engine'
-import { EngineActions, EngineState } from '../../ecs/classes/EngineState'
+import { EngineState } from '../../ecs/classes/EngineState'
 import { Entity } from '../../ecs/classes/Entity'
 import {
   defineQuery,
@@ -58,6 +58,7 @@ import {
 import { SimulationSystemGroup } from '../../ecs/functions/EngineFunctions'
 import { defineSystem } from '../../ecs/functions/SystemFunctions'
 import { InputSourceComponent } from '../../input/components/InputSourceComponent'
+import { XRStandardGamepadButton } from '../../input/state/ButtonState'
 import { NetworkState } from '../../networking/NetworkState'
 import { NetworkTopics } from '../../networking/classes/Network'
 import { NetworkObjectAuthorityTag, NetworkObjectComponent } from '../../networking/components/NetworkObjectComponent'
@@ -71,7 +72,7 @@ import { TransformComponent } from '../../transform/components/TransformComponen
 import { BoundingBoxComponent } from '../components/BoundingBoxComponents'
 import { GrabbableComponent, GrabbedComponent, GrabberComponent } from '../components/GrabbableComponent'
 import { createInteractUI } from '../functions/interactUI'
-import { InteractableTransitions, addInteractableUI, removeInteractiveUI } from './InteractiveSystem'
+import { InteractState, InteractableTransitions, addInteractableUI, removeInteractiveUI } from './InteractiveSystem'
 
 export class GrabbableNetworkAction {
   static setGrabbedObject = defineAction({
@@ -315,7 +316,6 @@ export const dropEntity = (grabberEntity: Entity): void => {
  */
 export const grabbableInteractMessage = 'Grab'
 
-const interactedActionQueue = defineActionQueue(EngineActions.interactedWithObject.matches)
 const transferAuthorityOfObjectQueue = defineActionQueue(WorldNetworkAction.transferAuthorityOfObject.matches)
 
 const grabberQuery = defineQuery([GrabberComponent])
@@ -347,13 +347,8 @@ const execute = () => {
     const inputSource = getComponent(nonCapturedInputSource, InputSourceComponent)
     if (inputSource.buttons.KeyU?.down) onDrop()
     /** @todo currently mouse has to be over the grabbable for it to be grabbed */
-    // if (inputSource.buttons.KeyE?.down) onGrab(inputSource.assignedButtonEntity)
-  }
-
-  for (const action of interactedActionQueue()) {
-    if (action.targetEntity && hasComponent(action.targetEntity, GrabbableComponent)) {
-      onGrab(action.targetEntity, action.handedness === 'none' ? 'right' : action.handedness)
-    }
+    if (inputSource.buttons.KeyE?.down || inputSource.buttons[XRStandardGamepadButton.Trigger]?.down)
+      onGrab(getState(InteractState).available[0], inputSource.source.handedness)
   }
 
   for (const action of transferAuthorityOfObjectQueue()) transferAuthorityOfObjectReceptor(action)