From 564602fdbeef2065c8f14a541b796ac7100605b6 Mon Sep 17 00:00:00 2001 From: EpicGamer2469 Date: Thu, 21 Mar 2024 16:52:32 -0500 Subject: [PATCH] Fix preview sound pooling + add BTS preview sound --- .../Editor/SettingsMenu/EditorSettings.prefab | 2 +- .../Sfx/games/builtToScaleDS/PianoPreview.ogg | Bin 0 -> 10258 bytes .../builtToScaleDS/PianoPreview.ogg.meta | 22 ++++++++++++++++++ .../Games/BuiltToScaleDS/BuiltToScaleDS.cs | 14 +++++------ .../PropertyPrefabs/NotePropertyPrefab.cs | 13 +++++++++-- Assets/Scripts/Util/Sound.cs | 5 ++++ 6 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 Assets/Resources/Sfx/games/builtToScaleDS/PianoPreview.ogg create mode 100644 Assets/Resources/Sfx/games/builtToScaleDS/PianoPreview.ogg.meta diff --git a/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab b/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab index 8277a2000..21b10452c 100644 --- a/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab +++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab @@ -2527,7 +2527,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 9208581106079180837} m_TargetAssemblyTypeName: HeavenStudio.Editor.EditorSettings, Assembly-CSharp - m_MethodName: OnCursorCheckboxChanged + m_MethodName: OnPreviewNoteSoundsChanged m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Resources/Sfx/games/builtToScaleDS/PianoPreview.ogg b/Assets/Resources/Sfx/games/builtToScaleDS/PianoPreview.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7f84f6208792fcdd1e72b66c3bffe388c0d9924b GIT binary patch literal 10258 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 bCnN7SH?Ml{wn=I7{pR4WN+|4Vgu2M literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sfx/games/builtToScaleDS/PianoPreview.ogg.meta b/Assets/Resources/Sfx/games/builtToScaleDS/PianoPreview.ogg.meta new file mode 100644 index 000000000..07c1871ee --- /dev/null +++ b/Assets/Resources/Sfx/games/builtToScaleDS/PianoPreview.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 32a60be2b7dcb764a91b761a6a3d3022 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs index 34a0f0b5c..7854ab72c 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs @@ -26,12 +26,12 @@ namespace HeavenStudio.Games.Loaders { new Param.CollapseParam((x, _) => !(bool)x, new string[] { "note1", "note2", "note3", "note4", "note5", "note6"}) }), - new Param("note1", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 0, 3, 4, "builtToScaleDS/Piano"), "1st note", "Set the number of semitones up or down this note should be pitched."), - new Param("note2", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 2, 3, 4, "builtToScaleDS/Piano"), "2nd note", "Set the number of semitones up or down this note should be pitched."), - new Param("note3", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 4, 3, 4, "builtToScaleDS/Piano"), "3rd note", "Set the number of semitones up or down this note should be pitched."), - new Param("note4", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 5, 3, 4, "builtToScaleDS/Piano"), "4th note", "Set the number of semitones up or down this note should be pitched."), - new Param("note5", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 7, 3, 4, "builtToScaleDS/Piano"), "5th note", "Set the number of semitones up or down this note should be pitched. This note plays together with the 6th note."), - new Param("note6", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 12, 3, 4, "builtToScaleDS/Piano"), "6th note", "Set the number of semitones up or down this note should be pitched. This note plays together with the 5th note."), + new Param("note1", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 0, 3, 4, "builtToScaleDS/PianoPreview"), "1st note", "Set the number of semitones up or down this note should be pitched."), + new Param("note2", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 2, 3, 4, "builtToScaleDS/PianoPreview"), "2nd note", "Set the number of semitones up or down this note should be pitched."), + new Param("note3", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 4, 3, 4, "builtToScaleDS/PianoPreview"), "3rd note", "Set the number of semitones up or down this note should be pitched."), + new Param("note4", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 5, 3, 4, "builtToScaleDS/PianoPreview"), "4th note", "Set the number of semitones up or down this note should be pitched."), + new Param("note5", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 7, 3, 4, "builtToScaleDS/PianoPreview"), "5th note", "Set the number of semitones up or down this note should be pitched. This note plays together with the 6th note."), + new Param("note6", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 12, 3, 4, "builtToScaleDS/PianoPreview"), "6th note", "Set the number of semitones up or down this note should be pitched. This note plays together with the 5th note."), } }, new GameAction("play piano", "Play Note") @@ -40,7 +40,7 @@ namespace HeavenStudio.Games.Loaders resizable = true, parameters = new List() { - new Param("type", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 0, 3, 4, "builtToScaleDS/Piano"), "Semitones", "Set the number of semitones up or down this note should be pitched.") + new Param("type", new EntityTypes.Note(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 0, 3, 4, "builtToScaleDS/PianoPreview"), "Semitones", "Set the number of semitones up or down this note should be pitched.") }, }, new GameAction("color", "Color Palette") diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NotePropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NotePropertyPrefab.cs index c89c2d377..e489bc882 100644 --- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NotePropertyPrefab.cs +++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NotePropertyPrefab.cs @@ -85,8 +85,17 @@ public class NotePropertyPrefab : NumberPropertyPrefab private void PlayPreview(EntityTypes.Note note, int currentSemitones) { if (note.sampleName.Equals("") || !PersistentDataManager.gameSettings.previewNoteSounds) return; - - if(previewAudioSource) previewAudioSource.Stop(); + + if (previewAudioSource != null) + { + if (!previewAudioSource.available) + { + GameManager.instance.SoundObjects.Release(previewAudioSource); + } + + previewAudioSource.Stop(); + previewAudioSource = null; + } float pitch = SoundByte.GetPitchFromSemiTones(currentSemitones, true); previewAudioSource = SoundByte.PlayOneShotGame(note.sampleName, pitch: pitch, volume: 0.75f, forcePlay: true, ignoreConductorPause: true); diff --git a/Assets/Scripts/Util/Sound.cs b/Assets/Scripts/Util/Sound.cs index 681c94bec..7fa6ded85 100644 --- a/Assets/Scripts/Util/Sound.cs +++ b/Assets/Scripts/Util/Sound.cs @@ -117,6 +117,7 @@ namespace HeavenStudio.Util { if (!ignoreConductorPause && !(cond.isPlaying || cond.isPaused)) { + Debug.Log("release 1"); GameManager.instance.SoundObjects.Release(this); return; } @@ -174,11 +175,15 @@ namespace HeavenStudio.Util { if (!ignoreConductorPause && !(cond.isPlaying || cond.isPaused)) { + Debug.Log("release2"); + GameManager.instance.SoundObjects.Release(this); return; } if (!(looping || paused || audioSource.isPlaying)) { + Debug.Log("release3"); + GameManager.instance.SoundObjects.Release(this); return; }