bitecs audio-target and zone-audio-source #5960
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keianhzo
changed the title
Comment on lines
40
to
114
| const SourceTypeToAudioParams = { | ||
| [SourceType.MEDIA_VIDEO]: MediaAudioDefaults, | ||
| [SourceType.AVATAR_AUDIO_SOURCE]: MediaAudioDefaults, | ||
| [SourceType.AUDIO_TARGET]: TargetAudioDefaults, | ||
| [SourceType.AUDIO_ZONE]: ZoneAudioDefaults, | ||
| [SourceType.SFX]: SfxAudioDefaults | ||
| }; | ||
|
|
||
| const getOverriddenPanningModelType = () => { | ||
| switch (APP.store.state.preferences.audioPanningQuality) { | ||
| case "High": | ||
| return PanningModelType.HRTF; | ||
| case "Low": | ||
| return PanningModelType.EqualPower; | ||
| default: | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| const getCurrentAudioSettings = (eid: number) => { | ||
| const sourceType = APP.sourceType.get(eid)!; | ||
| const defaults = SourceTypeToAudioParams[sourceType]; | ||
| const sceneOverrides = APP.sceneAudioDefaults.get(sourceType); | ||
| const audioOverrides = APP.audioOverrides.get(eid); | ||
| const audioDebugPanelOverrides = APP.audioDebugPanelOverrides.get(sourceType); | ||
| const zoneSettings = APP.zoneOverrides.get(eid); | ||
| const preferencesOverrides = {} as AudioSettings; | ||
|
|
||
| const overriddenPanningModelType = getOverriddenPanningModelType(); | ||
|
|
||
| if (overriddenPanningModelType !== null) { | ||
| preferencesOverrides.panningModel = overriddenPanningModelType; | ||
| } | ||
|
|
||
| if (APP.store.state.preferences.disableLeftRightPanning) { | ||
| preferencesOverrides.audioType = AudioType.Stereo; | ||
| } | ||
|
|
||
| const settings = Object.assign( | ||
| {}, | ||
| defaults, | ||
| sceneOverrides, | ||
| audioOverrides, | ||
| audioDebugPanelOverrides, | ||
| zoneSettings, | ||
| preferencesOverrides | ||
| ); | ||
|
|
||
| // TODO Handle voice permissions | ||
| if (AudioEmitter.flags[eid] & EMITTER_FLAGS.CLIPPED || AudioEmitter.flags[eid] & EMITTER_FLAGS.MUTED) { | ||
| settings.gain = 0; | ||
| } else if (APP.gainMultipliers.has(eid)) { | ||
| settings.gain = settings.gain * APP.gainMultipliers.get(eid)!; | ||
| } | ||
|
|
||
| if (APP.supplementaryAttenuation.has(eid)) { | ||
| settings.gain = settings.gain * APP.supplementaryAttenuation.get(eid)!; | ||
| } | ||
|
|
||
| return settings; | ||
| }; | ||
|
|
||
| const applySettings = (audio: AudioObject3D, settings: AudioSettings) => { | ||
| if (audio instanceof PositionalAudio) { | ||
| audio.setDistanceModel(settings.distanceModel); | ||
| audio.setRolloffFactor(settings.rolloffFactor); | ||
| audio.setRefDistance(settings.refDistance); | ||
| audio.setMaxDistance(settings.maxDistance); | ||
| audio.panner.panningModel = settings.panningModel; | ||
| audio.panner.coneInnerAngle = settings.coneInnerAngle; | ||
| audio.panner.coneOuterAngle = settings.coneOuterAngle; | ||
| audio.panner.coneOuterGain = settings.coneOuterGain; | ||
| } | ||
| audio.gain.gain.setTargetAtTime(settings.gain, audio.context.currentTime, 0.1); | ||
| }; |
There was a problem hiding this comment.
Isn't this code in update-audio-settings.js? Why is it duplicated here?
keianhzo
force-pushed
the
bitecs-audio-zone
branch
from
1217098
to
3656167
Compare
keianhzo
force-pushed
the
bitecs-audio-target
branch
2 times, most recently
from
03937c6
to
7d4ad4e
Compare
johnshaughnessy
suggested changes
Mar 9, 2023
| import { AudioSystem } from "../systems/audio-system"; | ||
| import { AudioObject3D, Emitter2Audio, EMITTER_FLAGS, makeAudioEntity } from "./audio-emitter-system"; | ||
|
|
||
| const createWhiteNoise = (audioContext: AudioContext, gain: number): AudioBufferSourceNode => { |
There was a problem hiding this comment.
This function exists in avatar-audio-source.js. If you are moving it here in order to add type info, remove the function from the original file.
| @@ -168,7 +168,7 @@ export function audioDebugSystem(world: HubsWorld) { | |||
| } | |||
| if (idx >= maxDebugEmitters) return; | |||
|
|
|||
| const audio = APP.audios.get(emitterEid)!; | |||
| const audio = APP.world.eid2obj.get(emitterEid)! as AudioObject3D; | |||
There was a problem hiding this comment.
We should not change how we're storing these audios until after the migration.
APP.audios and the rest of the audio state maps have key types of AEntity | EntityID because they are used by both code paths. There's no advantage to changing these now, and it will be significantly easier to do (with confidence) after we remove AEntitys. Please reverse these changes.
src/components/audio-params.ts
Outdated
| gain: 1.0 | ||
| }; | ||
|
|
||
| export const ZoneAudioDefaults: AudioSettings = { |
There was a problem hiding this comment.
Why were new defaults introduced?
keianhzo
force-pushed
the
bitecs-audio-target
branch
from
1a98653
to
1eb7da7
Compare
|
@johnshaughnessy I've moved the systems that were using |
johnshaughnessy
approved these changes
Apr 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This builds on top of #5944 and adds support for audio-target and zone-audio-source.
APP.audiosfor the bit-ecs systems as the audio object is already stored inAPP.world.obj2eid. More store migration will happen in next PRs as we move bit-ecs systems away from APP audio stores.If you have reviewed #5944 you should only care about the commits after 5329bfe