Skip to content

bugfix(audio): Decouple Particle Cannon audio spawn point from visual beam to restore correct position and fix quiet beam audio #2415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 3 commits into from
Mar 8, 2026
+18 −0
Merged

bugfix(audio): Decouple Particle Cannon audio spawn point from visual beam to restore correct position and fix quiet beam audio #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05fd43e
fix(audio): Decouple Particle Cannon audio spawn point from visual be…
githubawn Mar 7, 2026
8d5ac97
Added ORBITAL_BEAM_AUDIO_Z_OFFSET
githubawn Mar 8, 2026
32bbb50
comments removed
githubawn Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that
// enormous camera heights cannot see above the laser origin.
constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;
// TheSuperHackers @fix The positional audio is now decoupled from the beam origin.
// 500 units represent the height of the original audio emitter.
constexpr const Real ORBITAL_BEAM_AUDIO_Z_OFFSET = 500.0f;

//-------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -573,6 +576,9 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
templateLaserRadius = update->getTemplateLaserRadius();
visualLaserRadius = update->getCurrentLaserRadius();
}
Coord3D audioPos = m_currentTargetPosition;
audioPos.z += ORBITAL_BEAM_AUDIO_Z_OFFSET;
beam->setPosition( &audioPos );
}
// TheSuperHackers @refactor helmutbuhler/xezon 17/05/2025
// Originally the damageRadius was calculated with a value updated by LaserUpdate::clientUpdate.
Expand Down Expand Up @@ -962,6 +968,9 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra
orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
update->initLaser( nullptr, &orbitPosition, &m_initialTargetPosition, growthFrames );
}
Coord3D audioPos = m_initialTargetPosition;
audioPos.z += ORBITAL_BEAM_AUDIO_Z_OFFSET;
beam->setPosition( &audioPos );
}
}
if( m_annihilationSound.getEventName().isNotEmpty() )
Expand Down
9 changes: 9 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that
// enormous camera heights cannot see above the laser origin.
constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;
// TheSuperHackers @fix The positional audio is now decoupled from the beam origin.
// 500 units represent the height of the original audio emitter.
constexpr const Real ORBITAL_BEAM_AUDIO_Z_OFFSET = 500.0f;

//-------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -648,6 +651,9 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
templateLaserRadius = update->getTemplateLaserRadius();
visualLaserRadius = update->getCurrentLaserRadius();
}
Coord3D audioPos = m_currentTargetPosition;
audioPos.z += ORBITAL_BEAM_AUDIO_Z_OFFSET;
beam->setPosition( &audioPos );
}
// TheSuperHackers @refactor helmutbuhler/xezon 17/05/2025
// Originally the damageRadius was calculated with a value updated by LaserUpdate::clientUpdate.
Expand Down Expand Up @@ -1047,6 +1053,9 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra
orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
update->initLaser( nullptr, nullptr, &orbitPosition, &m_initialTargetPosition, "", growthFrames );
}
Coord3D audioPos = m_initialTargetPosition;
audioPos.z += ORBITAL_BEAM_AUDIO_Z_OFFSET;
beam->setPosition( &audioPos );
}
}
if( m_annihilationSound.getEventName().isNotEmpty() )
Expand Down
Loading