Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 21:27:52 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix EarTrans assignment (#2057)

Browse source 
and some slight cleaning
This commit is contained in:
Ziemas 2022-12-22 19:58:37 +01:00 committed by GitHub
parent 1b2db09f51
commit 4edec2730f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/overlord/srpc.cpp
View file

@ -634,7 +634,7 @@ void* RPC_Player2(unsigned int /*fno*/, void* data, int size) {
// TODO reverb // TODO reverb
} break; } break;
case Jak2SoundCommand::set_ear_trans: { case Jak2SoundCommand::set_ear_trans: {
SetEarTrans(&cmd->ear_trans_j2.ear_trans1, &cmd->ear_trans_j2.ear_trans2, SetEarTrans(&cmd->ear_trans_j2.ear_trans0, &cmd->ear_trans_j2.ear_trans1,
&cmd->ear_trans_j2.cam_trans, cmd->ear_trans_j2.cam_angle); &cmd->ear_trans_j2.cam_trans, cmd->ear_trans_j2.cam_angle);
} break; } break;
case Jak2SoundCommand::shutdown: { case Jak2SoundCommand::shutdown: {

2
game/overlord/srpc.h
View file

@ -152,7 +152,7 @@ struct SoundRpcSetEarTrans {
struct SoundRpc2SetEarTrans { struct SoundRpc2SetEarTrans {
Vec3w ear_trans1; Vec3w ear_trans1;
Vec3w ear_trans2; Vec3w ear_trans0;
Vec3w cam_trans; Vec3w cam_trans;
s32 cam_angle; s32 cam_angle;
}; };

26
game/overlord/ssound.cpp
View file

@ -13,7 +13,7 @@
using namespace iop; using namespace iop;
Sound gSounds[64]; Sound gSounds[64];
Curve gCurve[12]; // TODO verify count Curve gCurve[16];
VolumePair gPanTable[361]; VolumePair gPanTable[361];
Vec3w gEarTrans[2]; Vec3w gEarTrans[2];
@ -285,15 +285,7 @@ s32 CalculateFallofVolume(Vec3w* pos, s32 volume, s32 fo_curve, s32 fo_min, s32
s32 min = fo_min << 8; s32 min = fo_min << 8;
s32 max = fo_max << 8; s32 max = fo_max << 8;
if (max < xdiff) { if (max < xdiff || max < ydiff || max < zdiff) {
return 0;
}
if (max < ydiff) {
return 0;
}
if (max < zdiff) {
return 0; return 0;
} }
@ -494,13 +486,13 @@ void UpdateVolume(Sound* sound) {
} }
} }
void SetEarTrans(Vec3w* ear_trans1, Vec3w* ear_trans2, Vec3w* cam_trans, s32 cam_angle) { void SetEarTrans(Vec3w* ear_trans0, Vec3w* ear_trans1, Vec3w* cam_trans, s32 cam_angle) {
s32 tick = snd_GetTick(); s32 tick = snd_GetTick();
u32 delta = tick - sLastTick; u32 delta = tick - sLastTick;
sLastTick = tick; sLastTick = tick;
gEarTrans[0] = *ear_trans1; gEarTrans[0] = *ear_trans0;
gEarTrans[1] = *ear_trans2; gEarTrans[1] = *ear_trans1;
gCamTrans = *cam_trans; gCamTrans = *cam_trans;
gCamAngle = cam_angle; gCamAngle = cam_angle;
@ -543,10 +535,10 @@ void PrintActiveSounds() {
} }
} }
void SetCurve(s32 curve, s32 fallof, s32 ease) { void SetCurve(s32 curve, s32 falloff, s32 ease) {
gCurve[curve].unk1 = ease << 1; gCurve[curve].unk1 = ease * 2;
gCurve[curve].unk2 = fallof + ease * -3; gCurve[curve].unk2 = falloff - 3 * ease;
gCurve[curve].unk3 = (ease - fallof) + -0x1000; gCurve[curve].unk3 = ease - falloff - 0x1000;
gCurve[curve].unk4 = 0x1000; gCurve[curve].unk4 = 0x1000;
} }