rewrite reactive UVOL

packages/engine/src/audio/components/PositionalAudioComponent.ts

@@ -27,8 +27,6 @@ import { useEffect } from 'react'
 
 import {
   defineComponent,
-  hasComponent,
-  setComponent,
   useComponent,
   useOptionalComponent
 } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
@@ -38,7 +36,7 @@ import { PositionalAudioHelper } from '../../debug/PositionalAudioHelper'
 import { useEntityContext } from '../../ecs/functions/EntityFunctions'
 import { RendererState } from '../../renderer/RendererState'
 import { addObjectToGroup, removeObjectFromGroup } from '../../scene/components/GroupComponent'
-import { AudioNodeGroups, MediaComponent, MediaElementComponent } from '../../scene/components/MediaComponent'
+import { AudioNodeGroups, MediaElementComponent } from '../../scene/components/MediaComponent'
 import { ObjectLayers } from '../../scene/constants/ObjectLayers'
 import { setObjectLayers } from '../../scene/functions/setObjectLayers'
 
@@ -110,11 +108,6 @@ export const PositionalAudioComponent = defineComponent({
     const debugEnabled = useHookstate(getMutableState(RendererState).nodeHelperVisibility)
     const audio = useComponent(entity, PositionalAudioComponent)
     const mediaElement = useOptionalComponent(entity, MediaElementComponent)
-    useEffect(() => {
-      if (hasComponent(entity, MediaComponent)) return
-
-      setComponent(entity, MediaComponent, {})
-    }, [])
 
     useEffect(() => {
       if (

packages/engine/src/audio/systems/MediaSystem.ts

@@ -36,7 +36,7 @@ import { EngineRenderer } from '../../renderer/WebGLRendererSystem'
 import { StandardCallbacks, setCallback } from '../../scene/components/CallbackComponent'
 import { MediaComponent } from '../../scene/components/MediaComponent'
 import { VideoComponent, VideoTexturePriorityQueueState } from '../../scene/components/VideoComponent'
-import { VolumetricComponent, endLoadingEffect } from '../../scene/components/VolumetricComponent'
+// import { VolumetricComponent } from '../../scene/components/VolumetricComponent'
 import { AudioSettingReceptor, AudioState } from '../AudioState'
 import { PositionalAudioComponent } from '../components/PositionalAudioComponent'
 
@@ -102,7 +102,7 @@ globalThis.AudioEffectPlayer = AudioEffectPlayer
 
 const mediaQuery = defineQuery([MediaComponent])
 const videoQuery = defineQuery([VideoComponent])
-const volumetricQuery = defineQuery([VolumetricComponent])
+// const volumetricQuery = defineQuery([VolumetricComponent])
 const audioQuery = defineQuery([PositionalAudioComponent])
 
 const execute = () => {
@@ -112,30 +112,6 @@ const execute = () => {
     setCallback(entity, StandardCallbacks.PAUSE, () => media.paused.set(true))
   }
 
-  for (const entity of volumetricQuery()) {
-    const volumetric = getComponent(entity, VolumetricComponent)
-    const player = volumetric.player
-    if (player) {
-      player.update()
-      const height = volumetric.height
-      const step = volumetric.height / 150
-      if (volumetric.loadingEffectActive && player.mesh) {
-        if (volumetric.loadingEffectTime <= height) {
-          player.mesh.traverse((child: any) => {
-            if (child['material']) {
-              if (child.material.uniforms) {
-                child.material.uniforms.time = volumetric.loadingEffectTime
-              }
-            }
-          })
-          volumetric.loadingEffectTime += step
-        } else {
-          volumetric.loadingEffectActive = false
-          endLoadingEffect(entity, player.mesh)
-        }
-      }
-    }
-  }
   for (const entity of audioQuery()) getComponent(entity, PositionalAudioComponent).helper?.update()
 
   const videoPriorityQueue = getState(VideoTexturePriorityQueueState).queue