Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
keianhzo committed Jun 2, 2023
1 parent b85d5bc commit f58af3c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 20 deletions.
14 changes: 6 additions & 8 deletions src/bit-systems/audio-emitter-system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,12 @@ export const updatePannerNode = (() => {
obj.updateMatrices();
obj.matrixWorld.decompose(_position, _quaternion, _scale);
_orientation.set(0, 0, -1).applyQuaternion(_quaternion);
const timeDelta = APP.world.time.delta / 1000;
const endTime = APP.audioCtx.currentTime + timeDelta;
audio.positionX.linearRampToValueAtTime(_position.x, endTime);
audio.positionY.linearRampToValueAtTime(_position.y, endTime);
audio.positionZ.linearRampToValueAtTime(_position.z, endTime);
audio.orientationX.linearRampToValueAtTime(_orientation.x, endTime);
audio.orientationY.linearRampToValueAtTime(_orientation.y, endTime);
audio.orientationZ.linearRampToValueAtTime(_orientation.z, endTime);
audio.positionX.setValueAtTime(_position.x, 0);
audio.positionY.setValueAtTime(_position.y, 0);
audio.positionZ.setValueAtTime(_position.z, 0);
audio.orientationX.setValueAtTime(_orientation.x, 0);
audio.orientationY.setValueAtTime(_orientation.y, 0);
audio.orientationZ.setValueAtTime(_orientation.z, 0);
};
})();

Expand Down
21 changes: 9 additions & 12 deletions src/bit-systems/audio-listener-system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ export function audioListenerSystem(world: HubsWorld) {

const up = obj.up;

const timeDelta = world.time.delta / 1000;

obj.matrixWorld.decompose(_position, _quaternion, _scale);

_orientation.set(0, 0, -1).applyQuaternion(_quaternion);
Expand All @@ -31,16 +29,15 @@ export function audioListenerSystem(world: HubsWorld) {
if (positionUpdated || orientationUpdated || lastUpUpdated) {
if (listener.positionX) {
// code path for Chrome (see #14393)
const endTime = APP.audioCtx.currentTime + timeDelta;
listener.positionX.linearRampToValueAtTime(_position.x, endTime);
listener.positionY.linearRampToValueAtTime(_position.y, endTime);
listener.positionZ.linearRampToValueAtTime(_position.z, endTime);
listener.forwardX.linearRampToValueAtTime(_orientation.x, endTime);
listener.forwardY.linearRampToValueAtTime(_orientation.y, endTime);
listener.forwardZ.linearRampToValueAtTime(_orientation.z, endTime);
listener.upX.linearRampToValueAtTime(up.x, endTime);
listener.upY.linearRampToValueAtTime(up.y, endTime);
listener.upZ.linearRampToValueAtTime(up.z, endTime);
listener.positionX.setValueAtTime(_position.x, 0);
listener.positionY.setValueAtTime(_position.y, 0);
listener.positionZ.setValueAtTime(_position.z, 0);
listener.forwardX.setValueAtTime(_orientation.x, 0);
listener.forwardY.setValueAtTime(_orientation.y, 0);
listener.forwardZ.setValueAtTime(_orientation.z, 0);
listener.upX.setValueAtTime(up.x, 0);
listener.upY.setValueAtTime(up.y, 0);
listener.upZ.setValueAtTime(up.z, 0);
} else {
// Although these methods are deprecated they are currently the only way to set the orientation and position in Firefox.
listener.setPosition(_position.x, _position.y, _position.z);
Expand Down

0 comments on commit f58af3c

Please sign in to comment.