Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Audio Now Travels Through Portals

Browse source 
- audio travels through portals now by updating the soundPlayerDetermine3DSound function
- basically instead of just checking distance to the sound producer, we also check sound->portal0+portal1->listener and sound->portal1+portal0->listener to see if any of them are a smaller distance.
- works pretty seamlessly

Fixes #115
This commit is contained in:
westonCoder 2023-10-14 17:34:10 -05:00
parent ea5665af0f
commit 3b43017b03
1 changed files with 49 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/audio/soundplayer.c
View file

@ -5,6 +5,8 @@
#include "util/time.h"
#include "math/mathf.h"
#include "clips.h"
#include "../physics/collision_scene.h"
#include "../math/transform.h"
struct SoundArray* gSoundClipArray;
ALSndPlayer gSoundPlayer;
@ -50,13 +52,48 @@ void soundPlayerDetermine3DSound(struct Vector3* at, struct Vector3* velocity, f
struct SoundListener* nearestListener = &gSoundListeners[0];
float distance = vector3DistSqrd(at, &gSoundListeners[0].worldPos);
int through_0_from_1 = 0;
int through_1_from_0 = 0;
for (int i = 1; i < MAX_SOUND_LISTENERS; ++i) {
int portalsPresent = 0;
struct Transform portal0transform;
struct Transform portal1transform;
if (gCollisionScene.portalTransforms[0] != NULL && gCollisionScene.portalTransforms[1] != NULL){
portalsPresent = 1;
portal0transform = *gCollisionScene.portalTransforms[0];
portal1transform = *gCollisionScene.portalTransforms[1];
}
for (int i = 0; i < MAX_SOUND_LISTENERS; ++i) {
float check = vector3DistSqrd(at, &gSoundListeners[i].worldPos);
if (check < distance) {
distance = check;
nearestListener = &gSoundListeners[i];
through_0_from_1 = 0;
through_1_from_0 = 0;
}
if (portalsPresent){
float dist1,dist2;
// check dist from obj to 0 portal + from 1 portal to listener
dist1 = vector3DistSqrd(at, &portal0transform.position);
dist2 = vector3DistSqrd(&portal1transform.position, &gSoundListeners[i].worldPos);
if ((dist1+dist2) < distance){
distance = (dist1+dist2);
nearestListener = &gSoundListeners[i];
through_0_from_1 = 1;
through_1_from_0 = 0;
}
// check dist from obj to 1 portal + from 0 portal to listener
dist1 = vector3DistSqrd(at, &portal1transform.position);
dist2 = vector3DistSqrd(&portal0transform.position, &gSoundListeners[i].worldPos);
if ((dist1+dist2) < distance){
distance = (dist1+dist2);
nearestListener = &gSoundListeners[i];
through_0_from_1 = 0;
through_1_from_0 = 1;
}
}
}
@ -75,8 +112,16 @@ void soundPlayerDetermine3DSound(struct Vector3* at, struct Vector3* velocity, f
}
struct Vector3 offset;
vector3Sub(at, &nearestListener->worldPos, &offset);
if (through_0_from_1){
vector3Sub(&portal1transform.position, &nearestListener->worldPos, &offset);
}
else if(through_1_from_0){
vector3Sub(&portal0transform.position, &nearestListener->worldPos, &offset);
}
else{
vector3Sub(at, &nearestListener->worldPos, &offset);
}
struct Vector3 relativeVelocity;
vector3Sub(velocity, &nearestListener->velocity, &relativeVelocity);