teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-04 23:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified Duke's sound frontend

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-14 18:35:53 +02:00
parent 6ed157ccdb
commit b9d803bc24
2 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/games/duke/src/sounds.cpp
View file

@ -254,7 +254,7 @@ inline bool S_IsAmbientSFX(DDukeActor* actor)
//==========================================================================
static int GetPositionInfo(DDukeActor* actor, int soundNum, sectortype* sect,
const vec3_t *cam, const vec3_t &pos, int *distPtr, FVector3 *sndPos)
const DVector3 &cam, const DVector3 &pos, int *distPtr, FVector3 *sndPos)
{
// There's a lot of hackery going on here that could be mapped to rolloff and attenuation parameters.
// However, ultimately rolloff would also just reposition the sound source so this can remain as it is.
@ -278,7 +278,7 @@ static int GetPositionInfo(DDukeActor* actor, int soundNum, sectortype* sect,
sndist += dist_adjust;
if (sndist < 0) sndist = 0;
if (sect!= nullptr && sndist && actor->spr.picnum != MUSICANDSFX && !cansee(cam->X, cam->Y, cam->Z - (24 << 8), sect, actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z - (24 << 8), actor->sector()))
if (sect!= nullptr && sndist && actor->spr.picnum != MUSICANDSFX && !cansee(cam.plusZ(-24), sect, actor->spr.pos.plusZ(-24), actor->sector()))
sndist += sndist >> (isRR() ? 2 : 5);
// Here the sound distance was clamped to a minimum of 144*4.
@ -312,20 +312,20 @@ static int GetPositionInfo(DDukeActor* actor, int soundNum, sectortype* sect,
//
//==========================================================================
void S_GetCamera(vec3_t* c, int32_t* ca, sectortype** cs)
void S_GetCamera(DVector3* c, DAngle* ca, sectortype** cs)
{
if (ud.cameraactor == nullptr)
{
auto p = &ps[screenpeek];
if (c) *c = p->player_int_pos();
if (c) *c = p->pos;
if (cs) *cs = p->cursector;
if (ca) *ca = p->angle.ang.Buildang();
if (ca) *ca = p->angle.ang;
}
else
{
if (c) *c = ud.cameraactor->int_pos();
if (c) *c = ud.cameraactor->spr.pos;
if (cs) *cs = ud.cameraactor->sector();
if (ca) *ca = ud.cameraactor->int_ang();
if (ca) *ca = ud.cameraactor->spr.angle;
}
}
@ -341,7 +341,7 @@ void DukeSoundEngine::CalcPosVel(int type, const void* source, const float pt[3]
{
if (pos != nullptr)
{
vec3_t campos;
DVector3 campos;
sectortype* camsect;
S_GetCamera(&campos, nullptr, &camsect);
@ -358,7 +358,7 @@ void DukeSoundEngine::CalcPosVel(int type, const void* source, const float pt[3]
auto aactor = (DDukeActor*)source;
if (aactor != nullptr)
{
GetPositionInfo(aactor, chanSound - 1, camsect, &campos, aactor->int_pos(), nullptr, pos);
GetPositionInfo(aactor, chanSound - 1, camsect, campos, aactor->spr.pos, nullptr, pos);
/*
if (vel) // DN3D does not properly maintain this.
{
@ -386,8 +386,8 @@ void DukeSoundEngine::CalcPosVel(int type, const void* source, const float pt[3]
void GameInterface::UpdateSounds(void)
{
SoundListener listener;
vec3_t c;
int32_t ca;
DVector3 c;
DAngle ca;
sectortype* cs;
if (isRR() && !Mus_IsPlaying() && !paused && gamestate == GS_LEVEL)
@ -395,7 +395,7 @@ void GameInterface::UpdateSounds(void)
S_GetCamera(&c, &ca, &cs);
listener.angle = -float(ca * BAngRadian); // Build uses a period of 2048.
listener.angle = -float(ca.Radians());
listener.velocity.Zero();
listener.position = GetSoundPos(c);
listener.underwater = false;
@ -416,7 +416,7 @@ void GameInterface::UpdateSounds(void)
//
//==========================================================================
int S_PlaySound3D(int sndnum, DDukeActor* actor, const vec3_t& pos, int channel, EChanFlags flags)
int S_PlaySound3D(int sndnum, DDukeActor* actor, const DVector3& pos, int channel, EChanFlags flags)
{
auto const pl = &ps[myconnectindex];
if (!soundEngine->isValidSoundId(sndnum+1) || !SoundEnabled() || actor == nullptr || !playrunning() ||
@ -454,11 +454,11 @@ int S_PlaySound3D(int sndnum, DDukeActor* actor, const vec3_t& pos, int channel,
int32_t sndist;
FVector3 sndpos; // this is in sound engine space.
vec3_t campos;
DVector3 campos;
sectortype* camsect;
S_GetCamera(&campos, nullptr, &camsect);
GetPositionInfo(actor, sndnum, camsect, &campos, pos, &sndist, &sndpos);
GetPositionInfo(actor, sndnum, camsect, campos, pos, &sndist, &sndpos);
int pitch = S_GetPitch(sndnum);
bool explosion = ((userflags & (SF_GLOBAL | SF_DTAG)) == (SF_GLOBAL | SF_DTAG)) || ((sndnum == PIPEBOMB_EXPLODE || sndnum == LASERTRIP_EXPLODE || sndnum == RPG_EXPLODE));

7
source/games/duke/src/sounds.h
View file

@ -40,12 +40,7 @@ int S_DefineSound(unsigned index, const char* filename, int ps, int pe, int pr,
void S_WorldTourMappingsForOldSounds();
int S_PlaySound(int num, int channel = CHAN_AUTO, EChanFlags flags = 0, float vol =0.8f);
int S_PlaySound3D(int num, DDukeActor* spriteNum, const vec3_t& pos, int channel = CHAN_AUTO, EChanFlags flags = 0);
inline int S_PlaySound3D(int num, DDukeActor* spriteNum, const DVector3& pos, int channel = CHAN_AUTO, EChanFlags flags = 0)
{
vec3_t v( pos.X * worldtoint, pos.Y * worldtoint, pos.Z * zworldtoint);
return S_PlaySound3D(num, spriteNum, v, channel, flags);
}
int S_PlaySound3D(int num, DDukeActor* spriteNum, const DVector3& pos, int channel = CHAN_AUTO, EChanFlags flags = 0);
int S_PlayActorSound(int soundNum, DDukeActor* spriteNum, int channel = CHAN_AUTO, EChanFlags flags = 0);
void S_MenuSound(void);