From 05e9978671dd8a6d2dae8ccf28ea47ae2cdb242d Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Sun, 22 May 2022 13:29:55 -0300 Subject: [PATCH] Sounds and LightManager --- .../Lua/DefaultLib/LibClient.lua | 8 ++++++++ .../Lua/DefaultRegister/RegisterClient.lua | 18 ++++++++++++++++++ .../Lua/DefaultRegister/RegisterShared.lua | 2 ++ .../LuaCs/Lua/LuaClasses/LuaGame.cs | 16 ++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua index 57821cca4..c5f8a45d6 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultLib/LibClient.lua @@ -11,6 +11,14 @@ for key, value in pairs(localizedStrings) do defaultLib[value] = CreateStatic("Barotrauma." .. value, true) end +defaultLib["Sounds.LowpassFilter"] = CreateStatic("Barotrauma.Sounds.LowpassFilter") +defaultLib["Sounds.HighpassFilter"] = CreateStatic("Barotrauma.Sounds.HighpassFilter") +defaultLib["Sounds.BandpassFilter"] = CreateStatic("Barotrauma.Sounds.BandpassFilter") +defaultLib["Sounds.NotchFilter"] = CreateStatic("Barotrauma.Sounds.NotchFilter") +defaultLib["Sounds.LowShelfFilter"] = CreateStatic("Barotrauma.Sounds.LowShelfFilter") +defaultLib["Sounds.HighShelfFilter"] = CreateStatic("Barotrauma.Sounds.HighShelfFilter") +defaultLib["Sounds.PeakFilter"] = CreateStatic("Barotrauma.Sounds.PeakFilter") + defaultLib["Sprite"] = CreateStatic("Barotrauma.Sprite", true) defaultLib["PlayerInput"] = CreateStatic("Barotrauma.PlayerInput", true) diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua index 73b1023db..002df25f9 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua @@ -12,6 +12,24 @@ end RegisterBarotrauma("Networking.ClientPeer") RegisterBarotrauma("Networking.GameClient") +RegisterBarotrauma("Sounds.SoundManager") +RegisterBarotrauma("Sounds.OggSound") +RegisterBarotrauma("Sounds.VideoSound") +RegisterBarotrauma("Sounds.VoipSound") +RegisterBarotrauma("Sounds.SoundChannel") + +RegisterBarotrauma("Sounds.LowpassFilter") +RegisterBarotrauma("Sounds.HighpassFilter") +RegisterBarotrauma("Sounds.BandpassFilter") +RegisterBarotrauma("Sounds.NotchFilter") +RegisterBarotrauma("Sounds.LowShelfFilter") +RegisterBarotrauma("Sounds.HighShelfFilter") +RegisterBarotrauma("Sounds.PeakFilter") + +RegisterBarotrauma("Lights.LightManager") +RegisterBarotrauma("Lights.LightSource") +RegisterBarotrauma("Lights.LightSourceParams") + RegisterBarotrauma("ChatBox") RegisterBarotrauma("GUICanvas") RegisterBarotrauma("Anchor") diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua index e87c4745c..0e39cbe04 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua @@ -232,6 +232,8 @@ RegisterBarotrauma("SubmarineInfo") RegisterBarotrauma("MapCreatures.Behavior.BallastFloraBehavior") RegisterBarotrauma("MapCreatures.Behavior.BallastFloraBranch") +RegisterBarotrauma("PetBehavior") + Register("Microsoft.Xna.Framework.Vector2") Register("Microsoft.Xna.Framework.Vector3") Register("Microsoft.Xna.Framework.Vector4") diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs index 49a1cd15b..92f10d7d2 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs @@ -31,6 +31,22 @@ namespace Barotrauma return GameMain.Client.ChatBox; } } + + public Sounds.SoundManager SoundManager + { + get + { + return GameMain.SoundManager; + } + } + + public Lights.LightManager LightManager + { + get + { + return GameMain.LightManager; + } + } #else public bool IsDedicated