fix playAudio node

EtherealEngine · Sep 1, 2023 · dadc9c7 · dadc9c7
1 parent 307f0d4
commit dadc9c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/engine/src/behave-graph/nodes/Profiles/Engine/Values/CustomNodes.ts b/packages/engine/src/behave-graph/nodes/Profiles/Engine/Values/CustomNodes.ts
@@ -44,7 +44,12 @@ import { FollowCameraComponent } from '../../../../../camera/components/FollowCa
 import { Engine } from '../../../../../ecs/classes/Engine'
 import { Entity } from '../../../../../ecs/classes/Entity'
 import { SceneServices } from '../../../../../ecs/classes/Scene'
-import { getComponent, hasComponent, setComponent } from '../../../../../ecs/functions/ComponentFunctions'
+import {
+  getComponent,
+  getMutableComponent,
+  hasComponent,
+  setComponent
+} from '../../../../../ecs/functions/ComponentFunctions'
 import { StandardCallbacks, getCallback } from '../../../../../scene/components/CallbackComponent'
 import { MediaComponent } from '../../../../../scene/components/MediaComponent'
 import { VideoComponent } from '../../../../../scene/components/VideoComponent'
@@ -157,7 +162,8 @@ export const playAudio = makeFlowNodeDefinition({
       volume: volume,
       playMode: playMode!
     }) // play
-    const component = getComponent(entity, MediaComponent)
+    const component = getMutableComponent(entity, MediaComponent)
+    component.paused.set(false)
     commit('flow')
   }
 })

diff --git a/packages/engine/src/scene/components/MediaComponent.ts b/packages/engine/src/scene/components/MediaComponent.ts
@@ -37,6 +37,7 @@ import { Entity } from '../../ecs/classes/Entity'
 import {
   ComponentType,
   defineComponent,
+  getComponent,
   getMutableComponent,
   getOptionalComponent,
   hasComponent,
@@ -239,6 +240,9 @@ export function MediaReactor() {
     // This must be outside of the normal ECS flow by necessity, since we have to respond to user-input synchronously
     // in order to ensure media will play programmatically
     const handleAutoplay = () => {
+      // handle when we dont have autoplay enabled but have programatically started playback
+      if (!media.autoplay.value && !media.paused.value) getComponent(entity, MediaElementComponent)?.element.play()
+      // handle when we have autoplay enabled but have paused playback
       if (media.autoplay.value && media.paused.value) media.paused.set(false)
       window.removeEventListener('pointerdown', handleAutoplay)
       window.removeEventListener('keypress', handleAutoplay)