GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Audio Fixes

Browse source 
Reactor load RTPC wasn't being set correctly
Turns out you actually have to assign audio emitter positions manually, wow
This commit is contained in:
Reinier Vens 2021-03-16 18:17:38 +00:00
commit c0494ee3d8
11 changed files with 107 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
View file

@ -205,10 +205,14 @@
<ChildrenList>
<ActorMixer Name="Spaceship" ID="{C6CE2D3B-502C-4CC5-815A-B01D11C157EE}" ShortID="291090047">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="1"/>
<Property Name="Color" Type="int16" Value="3"/>
<Property Name="OverrideColor" Type="bool" Value="True"/>
</PropertyList>
<ReferenceList>
<Reference Name="Attenuation">
<ObjectRef Name="Global" ID="{5E898FAD-333F-4A95-8DE3-F822CADCB43E}" WorkUnitID="{E4509B27-E9F5-476A-9C34-332C4DF09EF7}"/>
</Reference>
<Reference Name="Conversion">
<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{499CA58A-C702-47D8-B39A-D2BA9F895A1F}"/>
</Reference>
@ -224,15 +228,15 @@
</PropertyList>
<ReferenceList>
<Reference Name="Attenuation">
<Custom>
<Attenuation Name="Attenuation (Custom)" ID="{505F8F56-EE33-409A-A053-92E65207DEE5}" ShortID="1015097335">
<Custom CreatedFrom="{5E898FAD-333F-4A95-8DE3-F822CADCB43E}">
<Attenuation Name="Global (Custom)" ID="{7C6E349B-A8DF-42AF-A121-81EDB128A17F}" ShortID="135451905">
<PropertyList>
<Property Name="RadiusMax" Type="Real64" Value="1000"/>
<Property Name="RadiusMax" Type="Real64" Value="2000"/>
</PropertyList>
<CurveUsageInfoList>
<VolumeDryUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
<Curve Name="VolumeDry" ID="{4613ED8A-0FE9-44F0-9192-BE375AF00EA8}">
<Curve Name="VolumeDry" ID="{CD8DFF13-655A-49FC-A984-0D0C4767D9DE}">
<PropertyList>
<Property Name="Flags" Type="int32" Value="3"/>
</PropertyList>
@ -244,7 +248,7 @@
<SegmentShape>Log3</SegmentShape>
</Point>
<Point>
<XPos>1000</XPos>
<XPos>2000</XPos>
<YPos>-200</YPos>
<Flags>37</Flags>
</Point>
@ -284,6 +288,7 @@
<ChildrenList>
<BlendContainer Name="thruster_large" ID="{35564C2D-1BC9-40BB-B365-D9C4A47AE5F1}" ShortID="493176318">
<PropertyList>
<Property Name="EnableAttenuation" Type="bool" Value="False"/>
<Property Name="Volume" Type="Real64">
<ValueList>
<Value>2.8</Value>
@ -2535,15 +2540,17 @@
</ChildrenList>
</BlendContainer>
</ChildrenList>
<PositioningInfo>
<Panner Name="" ID="{445B7FB9-8B58-4FB3-A064-C753B668FFB8}"/>
</PositioningInfo>
</ActorMixer>
<Sound Name="reactor_type1" ID="{3AA3BAA8-A42D-4EAE-B9BD-BC64D22B2753}" ShortID="920506659">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="1"/>
<Property Name="OverrideEffect" Type="bool" Value="True"/>
<Property Name="OverridePositioning" Type="bool" Value="True"/>
<Property Name="Volume" Type="Real64">
<ValueList>
<Value>-7.4</Value>
<Value>0.6</Value>
</ValueList>
<RTPCList>
<RTPC Name="" ID="{285F5B1C-FCC2-4201-9C09-78E410762672}" ShortID="728973403">
@ -2559,9 +2566,14 @@
<PointList>
<Point>
<XPos>0</XPos>
<YPos>-200</YPos>
<YPos>-12.14909</YPos>
<Flags>5</Flags>
</Point>
<Point>
<XPos>1</XPos>
<YPos>-5</YPos>
<Flags>0</Flags>
</Point>
<Point>
<XPos>10</XPos>
<YPos>0</YPos>
@ -2601,10 +2613,13 @@
<Reference Name="Attenuation">
<Custom>
<Attenuation Name="Attenuation (Custom)" ID="{6CBE652C-F9FF-4117-92B4-786A4F684E42}" ShortID="155989005">
<PropertyList>
<Property Name="RadiusMax" Type="Real64" Value="1000"/>
</PropertyList>
<CurveUsageInfoList>
<VolumeDryUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
<Curve Name="VolumeDry" ID="{4F485AC2-4335-455A-9B5F-C879B6268D9B}">
<Curve Name="VolumeDry" ID="{4CC4FE0C-0142-4A61-B3C7-7E11EA93BCE9}">
<PropertyList>
<Property Name="Flags" Type="int32" Value="3"/>
</PropertyList>
@ -2615,7 +2630,7 @@
<Flags>5</Flags>
</Point>
<Point>
<XPos>100</XPos>
<XPos>1000</XPos>
<YPos>-200</YPos>
<Flags>37</Flags>
</Point>
@ -2852,6 +2867,9 @@
<Language>SFX</Language>
</SourcePlugin>
</ChildrenList>
<PositioningInfo>
<Position Name="" ID="{F729D680-DCFC-4114-87D9-9CEFABB93FA1}"/>
</PositioningInfo>
<ActiveSourceList>
<ActiveSource Name="SoundSeed Grain" ID="{977AC916-0B90-426D-88DC-F48040D2DB92}" Platform="Linked"/>
</ActiveSourceList>

12
Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
View file

@ -31,7 +31,7 @@
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Switches\Default Work Unit.wwu" DateLow="1615759138" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\States\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Soundcaster Sessions\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\Default Work Unit.wwu" DateLow="1615892234" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\Default Work Unit.wwu" DateLow="1615911545" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Queries\Factory Queries.wwu" DateLow="1614439251" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Queries\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Presets\Factory Spatial Audio.wwu" DateLow="1614439251" DateHigh="0"/>
@ -41,11 +41,11 @@
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Master-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Game Parameters\test_paramenters.wwu" DateLow="1615582814" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Game Parameters\item_properties.wwu" DateLow="1615760391" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Game Parameters\item_properties.wwu" DateLow="1615908789" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Game Parameters\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\test_sounds.wwu" DateLow="1615582814" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Ship Audio.wwu" DateLow="1615892234" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Default Work Unit.wwu" DateLow="1615760391" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Ship Audio.wwu" DateLow="1615911751" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Default Work Unit.wwu" DateLow="1615909571" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Effects\Factory Effects.wwu" DateLow="1614439251" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Effects\Default Work Unit.wwu" DateLow="1615582814" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Dynamic Dialogue\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
@ -55,7 +55,7 @@
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Audio Devices\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Attenuations\Default Work Unit.wwu" DateLow="1614440366" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.wproj" DateLow="1615891381" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.rwvens.wsettings" DateLow="1615892525" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1615892234" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.rwvens.wsettings" DateLow="1615912046" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1615908590" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\copy_Unit.wwu" DateLow="1615582814" DateHigh="0"/>
</ValidationCache>

10
Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
View file

@ -36,6 +36,14 @@
<Value Platform="Windows">GeneratedSoundBanks\Windows\</Value>
</ValueList>
</Property>
<Property Name="Game Profiler\Capture List\Filters\Scope - Game Object" Type="bool" Value="True"/>
<Property Name="Game Profiler\Capture List\Filters\Scope - Global" Type="bool" Value="True"/>
<Property Name="Game Profiler\Capture List\Filters\Sub Type - Mask" Type="int32" Value="8191"/>
<Property Name="Game Profiler\Capture List\Filters\Type - Mask" Type="int32" Value="8191"/>
<Property Name="Game Profiler\Capture List\Filters\Wwise Objects - Game Objects" Type="bool" Value="False"/>
<Property Name="Game Profiler\Capture List\Filters\Wwise Objects - Hierarchy" Type="string" Value="{00000000-0000-0000-0000-000000000000}"/>
<Property Name="Game Profiler\Capture List\Filters\Wwise Objects - Parents" Type="bool" Value="False"/>
<Property Name="Game Profiler\Capture List\Filters\Wwise Objects - PlayingID" Type="bool" Value="False"/>
<Property Name="Game Profiler\Voice Monitor\LastBus" Type="string" Value="{00000000-0000-0000-0000-000000000000}"/>
<Property Name="General\LatestLanguage" Type="int32" Value="684519430"/>
<Property Name="General\LatestPlatform" Type="string" Value="Windows"/>
@ -43,7 +51,7 @@
<Property Name="GenerateSoundBanks\ListMode" Type="string" Value="Tree"/>
<Property Name="GenerateSoundBanks\x64_SelectedLanguages" Type="string" Value="BvDMKA=="/>
<Property Name="GenerateSoundBanks\x64_SelectedPlatforms" Type="string" Value="74wppGGLGUKocCTUjliE6atk2Ww+IVRJs5fEQCA5KRI="/>
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="IQwTht2BuE2QKvFyzNeWZqRAiPqpRl5Fv4jXI54ubXI="/>
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="pECI+qlGXkW/iNcjni5tciEME4bdgbhNkCrxcszXlmY="/>
<Property Name="HardwareController\CurrentSession" Type="string" Value="{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}"/>
<Property Name="HardwareController\{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}\x64_ActiveGroups" Type="string" Value="sahohopAK0WRE4XvXPYF/QGOFFX/////+lZlPDTFnUSwqLpTpFltuQGOFFX/////"/>
<Property Name="MeterView\LastObject1" Type="string" Value="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}"/>

52
Aetheria-Economy_WwiseProject/Attenuations/Default Work Unit.wwu
View file

@ -1,6 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<WwiseDocument Type="WorkUnit" ID="{E4509B27-E9F5-476A-9C34-332C4DF09EF7}" SchemaVersion="97">
<Attenuations>
<WorkUnit Name="Default Work Unit" ID="{E4509B27-E9F5-476A-9C34-332C4DF09EF7}" PersistMode="Standalone"/>
<WorkUnit Name="Default Work Unit" ID="{E4509B27-E9F5-476A-9C34-332C4DF09EF7}" PersistMode="Standalone">
<ChildrenList>
<Attenuation Name="Global" ID="{5E898FAD-333F-4A95-8DE3-F822CADCB43E}" ShortID="316315052">
<PropertyList>
<Property Name="RadiusMax" Type="Real64" Value="2000"/>
</PropertyList>
<CurveUsageInfoList>
<VolumeDryUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
<Curve Name="VolumeDry" ID="{AA962D79-A449-42E7-AB97-62F3AA51923C}">
<PropertyList>
<Property Name="Flags" Type="int32" Value="3"/>
</PropertyList>
<PointList>
<Point>
<XPos>0</XPos>
<YPos>0</YPos>
<Flags>5</Flags>
<SegmentShape>Log3</SegmentShape>
</Point>
<Point>
<XPos>2000</XPos>
<YPos>-200</YPos>
<Flags>37</Flags>
</Point>
</PointList>
</Curve>
</CurveUsageInfo>
</VolumeDryUsage>
<VolumeWetGameUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
</VolumeWetGameUsage>
<VolumeWetUserUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
</VolumeWetUserUsage>
<LowPassFilterUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
</LowPassFilterUsage>
<HighPassFilterUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
</HighPassFilterUsage>
<SpreadUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
</SpreadUsage>
<FocusUsage>
<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
</FocusUsage>
</CurveUsageInfoList>
</Attenuation>
</ChildrenList>
</WorkUnit>
</Attenuations>
</WwiseDocument>

2
Assets/Materials/UI/Map Gravity Lines.mat
View file

@ -86,7 +86,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Scale: 5.978973
- _Scale: 6.029707
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1

38
Assets/Scenes/ARPG.unity
View file

@ -15030,8 +15030,6 @@ GameObject:
m_Component:
- component: {fileID: 1005979865}
- component: {fileID: 1005979868}
- component: {fileID: 1005979867}
- component: {fileID: 1005979866}
m_Layer: 0
m_Name: Influence Camera
m_TagString: MainCamera
@ -15053,42 +15051,6 @@ Transform:
m_Father: {fileID: 1665127616}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1005979866
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1005979864}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4ae335524e949404bb57f1612ec4b9b5, type: 3}
m_Name:
m_EditorClassIdentifier:
isDefaultListener: 1
listenerId: 0
--- !u!114 &1005979867
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1005979864}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f27db6b94e477054e96392f94dc50c9d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_listeners:
initialListenerList: []
useDefaultListeners: 1
isEnvironmentAware: 0
isStaticObject: 0
m_positionOffsetData:
KeepMe: 0
positionOffset: {x: 0, y: 0, z: 0}
m_posOffsetData: {fileID: 0}
listenerMask: 1
--- !u!20 &1005979868
Camera:
m_ObjectHideFlags: 0

2
Assets/Scripts/Gameplay/EntityInstance.cs
View file

@ -464,6 +464,7 @@ public class EntityInstance : MonoBehaviour
foreach (var r in _radiatorSfx)
{
r.Value.SetActive(r.Key.Item.Online.Value);
AkSoundEngine.SetObjectPosition(r.Value, r.Value.transform);
AkSoundEngine.SetRTPCValue("performance_durability", r.Key.Item.DurabilityPerformance, r.Value);
AkSoundEngine.SetRTPCValue("performance_thermal", r.Key.Item.ThermalPerformance, r.Value);
AkSoundEngine.SetRTPCValue("performance_quality", r.Key.Item.ItemManager.CompoundQuality(r.Key.Item.EquippableItem), r.Value);
@ -472,6 +473,7 @@ public class EntityInstance : MonoBehaviour
if (_reactor.reactor != null)
{
_reactor.sfxSource.SetActive(_reactor.reactor.Item.Online.Value);
AkSoundEngine.SetObjectPosition(_reactor.sfxSource, _reactor.sfxSource.transform);
AkSoundEngine.SetRTPCValue("reactor_load", _reactor.reactor.CurrentLoadRatio, _reactor.sfxSource);
AkSoundEngine.SetRTPCValue("performance_durability", _reactor.reactor.Item.DurabilityPerformance, _reactor.sfxSource);
AkSoundEngine.SetRTPCValue("performance_thermal", _reactor.reactor.Item.ThermalPerformance, _reactor.sfxSource);

1
Assets/Scripts/Gameplay/ShipInstance.cs
View file

@ -92,6 +92,7 @@ public class ShipInstance : EntityInstance
var throttle = 0f;
if (thrusterInstance.System.particleCount > 0)
throttle = (float) thrusterInstance.System.particleCount / thrusterInstance.MaxParticleCount;
AkSoundEngine.SetObjectPosition(thrusterInstance.SfxSource, thrusterInstance.SfxSource.transform);
AkSoundEngine.SetRTPCValue("thruster_throttle", throttle, thrusterInstance.SfxSource);
AkSoundEngine.SetRTPCValue("performance_durability", thrusterInstance.Thruster.Item.DurabilityPerformance, thrusterInstance.SfxSource);
AkSoundEngine.SetRTPCValue("performance_thermal", thrusterInstance.Thruster.Item.ThermalPerformance, thrusterInstance.SfxSource);

7
Assets/Scripts/ServerShared/Behaviors/Reactor.cs
View file

@ -80,7 +80,6 @@ public class Reactor : IBehavior, IOrderedBehavior
// This behavior executes last, so any components drawing power have already done so
CurrentLoadRatio = Draw / max(charge, .01f);
// Subtract the baseline charge from draw
Draw -= charge;
@ -90,6 +89,7 @@ public class Reactor : IBehavior, IOrderedBehavior
// We have an energy deficit, have to overload the reactor
if (Draw > .01f)
{
CurrentLoadRatio = (Draw + charge) / max(charge, .01f);
var overloadEfficiency = Item.Evaluate(_data.OverloadEfficiency);
// Generate heat using overload efficiency, usually much less efficient!
@ -122,9 +122,14 @@ public class Reactor : IBehavior, IOrderedBehavior
// We still have an energy surplus, try to throttle the reactor to reduce heat generation
if (Draw < -.01f)
{
CurrentLoadRatio = (Draw + charge) / max(charge, .01f);
heat -= Draw / efficiency * (1 - 1 / Item.Evaluate(_data.ThrottlingFactor));
Draw = 0;
}
else
{
CurrentLoadRatio = 1;
}
Item.AddHeat(heat);
return true;

BIN
Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset (Stored with Git LFS)
View file

Binary file not shown.

BIN
GameData/PlayerSettings.msgpack (Stored with Git LFS)
View file

Binary file not shown.