Skip to content

Commit

Permalink
Sound Overhaul & Misc bugfixes (#430)
Browse files Browse the repository at this point in the history 
* fix fms fuel count

fix #413

* possible unstow fix

* fix ROF build issue

* hide monocle where necessary

* improve monocle check

* fix GVAR error

* fix copilot attenuation

* DAP minigun displayname

* add simple startup addon option

* fix cargo unloading not unlocking seats

* fix fms fuel count

fix #413

* possible unstow fix

* fix ROF build issue

* hide monocle where necessary

* improve monocle check

* fix GVAR error

* fix copilot attenuation

* DAP minigun displayname

* add simple startup addon option

* fix cargo unloading not unlocking seats

* add sound compat for AFM

* Add APU startup sound (Int/Ext)
Fix MP Engine startup sound can't be heard if the bird isn't Local to 
the player
Tweak and Redo sounds (RotorBrake,EngineStart,EngineShutdown,cabin 
Door,CptDoor)

* Fix Sound Cracks
Increase Obstruction and Occlusion factors

* Balance engine sounds volume

* Adjust Occlusion Obstruction Factors
Fix internal wind washing sound when getIn the bird
Tweak sound volume

* Fix APU + Engine Sounds in MP (Tested on Dedicated Server)
 - Can be heard on other clients

Add wind-washing sound can be interacted by ACE Action
Optimize Net traffic and performance
Change Engine Sound Ext
Change APU distance Ext
Tweak Turbine Sound Ext

* Tweak Sound Sources

* Adjust Sound Balance
Make Sound more Directional

* Sounds crispier + directional + less overwhelming
Tweak Sound3Dprocessor
Sound Blance

* Tweak Sound Setups

* Change Ext Engine Noise

* more robust laser code setup

* fix helis hidden in zeus

* qol build change

* fix ESIS not working with simple startup

* actually fix fuel discrep

* fix another debug msg

* temp fix for flir unstow/jvmf breaking

fix #420

* Sound Tweaks
Optimize Sound Render
Add Internal Volume Multiplier (in case they're too loud for people)
Add Internal Rotor Sound on passenger seats
Fix External Environment Sound as Emitter

* Fix JVMF compat from most used cTabs
TF_Ghost_1_4_1 :
　https://steamcommunity.com/sharedfiles/filedetails/?id=871504836
Devastator :
　https://steamcommunity.com/sharedfiles/filedetails/?id=2189592034
NSWDG :
　https://steamcommunity.com/sharedfiles/filedetails/?id=2511318948
1erGTD :
　https://steamcommunity.com/sharedfiles/filedetails/?id=2262006564

* delete waypoint through fms

* Balance APU Sound Volume
- Remove some unused sounds

* Fix multiple play at the same time
- Remove **APU Gen** Updating APU state
- Use Say3D instead PlaySound3D to have better sounding
- some cleanUps

* Rework close rotor sound
Balance sounds at close range
Remove WAV files

* Sound Adjustments :
- Sound Balance
- Apply Startup + Shutdown + APU Startup Sound s to new the sound engine
- Add APU Fuel Pump Delay
- heli sound can travel much further now
- Remove un-needed sound

* fix monocle staying w/ hud off

* Minor optimization

---------

Co-authored-by: Aaren <aaren.yang@gmail.com>
  • Loading branch information
@BroBeansCPG @Aaren882
BroBeansCPG and Aaren882 authored Sep 27, 2024
1 parent a85d195 commit a98df6e
Show file tree
Hide file tree
Showing 109 changed files with 889 additions and 337 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ texHeaders.bin
*.biprivatekey
build/
Thumbs.db
.sconsign.dblite
.sconsign.dblite
*.wav
*.pkf
105 changes: 59 additions & 46 deletions addons/H60_SFX/CfgSoundSets.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class vtx_Internal_Base
{
volumefactor=0.3;
volumefactor=vtx_Vol_Multi_Int(0.3);
spatial=0;
loop=1;
};
Expand All @@ -9,103 +9,115 @@ class vtx_External_Base
sound3dprocessingtype="vtx_Close_3DProcessor";
distancefilter="vtx_Close_Engine_Filter";
volumecurve="vtx_Ext_Base_Curve";
occlusionfactor=0.35;
obstructionfactor=0;
occlusionObstruction=1;
occlusionFactor=0.3;
obstructionFactor=0.2;
volumefactor=1;
spatial=1;
loop=1;
};
class vtx_Standard_External_Base: vtx_External_Base
{
sound3dprocessingtype="default3DProcessingType";
};

//External

// -Empty
class vtx_Empty_SoundSet: vtx_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Empty_SoundShader"
};
};

// -Alarm
class vtx_Alarm_Damage_Ext_SoundSet_Base: vtx_External_Base
class vtx_Alarm_Damage_Ext_SoundSet_Base: vtx_Standard_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Alarm_Damage_Ext_SoundShader_Base"
};
volumefactor=0.2;
};
class vtx_Alarm_RotorLow_Ext_SoundSet_Base: vtx_External_Base
class vtx_Alarm_RotorLow_Ext_SoundSet_Base: vtx_Alarm_Damage_Ext_SoundSet_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Alarm_RotorLow_Ext_SoundShader_Base"
};
};

// -Scrub Sound
class vtx_ScrubTree_Ext_SoundSet_Base: vtx_External_Base
class vtx_ScrubTree_Ext_SoundSet_Base: vtx_Standard_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_ScrubTree_Ext_SoundShader_Base"
};
volumefactor=0.5;
};

// -Damage
class vtx_TransmissionDamage_Ext_phase1_SoundSet_Base: vtx_External_Base
class vtx_TransmissionDamage_Ext_phase1_SoundSet_Base: vtx_Standard_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_TransmissionDamage_Ext_phase1_SoundShader_Base"
};
volumefactor=0.4;
};
class vtx_TransmissionDamage_Ext_phase2_SoundSet_Base: vtx_External_Base
class vtx_TransmissionDamage_Ext_phase2_SoundSet_Base: vtx_TransmissionDamage_Ext_phase1_SoundSet_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_TransmissionDamage_Ext_phase2_SoundShader_Base"
};
};

//-SlingLoad
class vtx_SlingLoadDown_Ext_SoundSet_Base: vtx_External_Base
class vtx_SlingLoadDown_Ext_SoundSet_Base: vtx_Standard_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_SlingLoadUp_Ext_SoundShader_Base"
"vtx_SlingLoadDown_Ext_SoundShader_Base"
};
volumefactor=0.2;
};
class vtx_SlingLoadUp_Ext_SoundSet_Base: vtx_External_Base
class vtx_SlingLoadUp_Ext_SoundSet_Base: vtx_SlingLoadDown_Ext_SoundSet_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_SlingLoadUp_Ext_SoundShader_Base"
};
};
//-Noise
class vtx_Rain_Ext_SoundSet_Base: vtx_External_Base
class vtx_Rain_Ext_SoundSet_Base: vtx_Standard_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Rain_Ext_SoundShader_Base"
};
volumefactor=0.25;
};
class vtx_Rotor_Stress_Ext_SoundSet_Base: vtx_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Rotor_Stress_Ext_SoundShader_Base"
};
shape="vtx_BottomLess_Shape";
sound3dprocessingtype="vtx_Rotor_3DProcessor";
};
class vtx_Wind_Close_Ext_SoundSet_Base: vtx_External_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Wind_Close_Ext_SoundShader_Base"
};
volumefactor=0.15;
sound3dprocessingtype="vtx_WindWash_3DProcessor";
};

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -114,39 +126,39 @@ class vtx_Wind_Close_Ext_SoundSet_Base: vtx_External_Base
// -Alarm
class vtx_Alarm_Damage_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Alarm_Damage_Int_SoundShader_Base"
};
volumefactor=3;
volumefactor=vtx_Vol_Multi_Int(2);
};
class vtx_Alarm_RotorLow_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Alarm_RotorLow_Int_SoundShader_Base"
};
volumefactor=4;
volumefactor=vtx_Vol_Multi_Int(2);
};

// -Scrub Sound
class vtx_ScrubLand_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_ScrubLand_Int_SoundShader_Base"
};
};
class vtx_ScrubBuilding_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_ScrubBuilding_Int_SoundShader_Base"
};
};
class vtx_ScrubTree_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_ScrubTree_Int_SoundShader_Base"
};
Expand All @@ -155,21 +167,21 @@ class vtx_ScrubTree_Int_SoundSet_Base: vtx_Internal_Base
// -Damage
class vtx_TransmissionDamage_Int_phase1_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_TransmissionDamage_Int_phase1_SoundShader_Base"
};
};
class vtx_TransmissionDamage_Int_phase2_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_TransmissionDamage_Int_phase2_SoundShader_Base"
};
};
class vtx_TransmissionDamage_Int_phase3_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_TransmissionDamage_Int_phase3_SoundShader_Base"
};
Expand All @@ -178,14 +190,14 @@ class vtx_TransmissionDamage_Int_phase3_SoundSet_Base: vtx_Internal_Base
//-SlingLoad
class vtx_SlingLoadDown_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_SlingLoadDown_Int_SoundShader_Base"
};
};
class vtx_SlingLoadUp_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_SlingLoadUp_Int_SoundShader_Base"
};
Expand All @@ -194,53 +206,54 @@ class vtx_SlingLoadUp_Int_SoundSet_Base: vtx_Internal_Base
//-Noise
class vtx_Rain_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Rain_Int_SoundShader_Base"
};
volumefactor=vtx_Vol_Multi_Int(0.5);
};
class vtx_Wind_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_Wind_Int_SoundShader_Base"
};
};
class vtx_WindWash_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_WindWash_Int_SoundShader_Base"
};
volumeFactor=2;
volumeFactor=vtx_Vol_Multi_Int(1.2);
};
class vtx_WindWash_Int_Transport_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_WindWash_Int_Transport_SoundShader_Base"
};
volumeFactor=3;
volumeFactor=vtx_Vol_Multi_Int(5);
};
class vtx_FrameStress_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_FrameStress_Int_SoundShader_Base"
};
volumeFactor=0.8;
volumeFactor=vtx_Vol_Multi_Int(0.8);
};
class vtx_GStress_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_GStress_Int_SoundShader_Base"
};
volumeFactor=0.45;
volumeFactor=vtx_Vol_Multi_Int(0.45);
};
class vtx_SpeedStress_Int_SoundSet_Base: vtx_Internal_Base
{
soundshaders[] =
soundshaders[]=
{
"vtx_SpeedStress_Int_SoundShader_Base"
};
Expand Down
Loading

0 comments on commit a98df6e

Please sign in to comment.