mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-12-01 22:07:31 +00:00
3cdb63917e
* play sfx and play animation blocks i also changed prescheduleFunction to preFunction, and removed the unused preFunction argument in GameAction i can revert this if need be but it just seemed vestigial * count in rework + preloading, multisound addition multisound was using an array that was converted to a list..? very silly when you consider it's a list first so sometimes it's list -> array -> list lol new Count-In and Play SFX block preloads sfx now!! epic. * prefab-ify event properties, Button EntityType * things are very nearly working! however i just hit an insane hurdle. how do i modify a dropdown while still being able to access the index/int value of that param directly. UGHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH * okay it's WORKING now i just need to do some better dropdown stuff * ITS WORKING ITS WORKING ITS WORKING arbitrary animations, now accessible to those without prefab knowledge! and it's piss easy to use!! * about to make a struct + class, tooltip improvements gonna make the struct define it, then the class will actually be the dropdown this is gonna make things so so so so much easier to comprehend * finishing up, probably one more commit after this * split up Dropdown into Dropdown and DropdownObj, which basically fixed all of my problems lol * fixed a count bug * added param tooltip toggle * grah it's ALMOST DONE * it's 99.9% finished. just some touch ups, i don't think i even know of any bugs * alright, looks like that's all the bugs gone * EVERYTHING IS FINISHED!!
110 lines
No EOL
3.4 KiB
C#
110 lines
No EOL
3.4 KiB
C#
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using UnityEngine;
|
|
using Cysharp.Threading.Tasks;
|
|
|
|
namespace HeavenStudio.Util
|
|
{
|
|
public class MultiSound : MonoBehaviour
|
|
{
|
|
private double startBeat;
|
|
private bool game;
|
|
private bool forcePlay;
|
|
private bool commited;
|
|
public List<Sound> sounds = new List<Sound>();
|
|
public List<Util.Sound> playingSounds = new List<Util.Sound>();
|
|
|
|
public class Sound
|
|
{
|
|
public string name { get; set; }
|
|
public double beat { get; set; }
|
|
public float pitch { get; set; }
|
|
public float volume { get; set; }
|
|
public bool looping { get; set; }
|
|
public double offset { get; set; }
|
|
|
|
public Sound(string name, double beat, float pitch = 1f, float volume = 1f, bool looping = false, double offset = 0f)
|
|
{
|
|
this.name = name;
|
|
this.beat = beat;
|
|
this.pitch = pitch;
|
|
this.volume = volume;
|
|
this.looping = looping;
|
|
this.offset = offset;
|
|
}
|
|
}
|
|
|
|
public static MultiSound Play(Sound[] snds, bool game = true, bool forcePlay = false)
|
|
{
|
|
return Play(snds.ToList(), game, forcePlay);
|
|
}
|
|
|
|
public static MultiSound Play(List<Sound> sounds, bool game = true, bool forcePlay = false)
|
|
{
|
|
if (Conductor.instance == null || sounds.Count <= 0) return null;
|
|
|
|
GameObject go = new GameObject("MultiSound");
|
|
MultiSound ms = go.AddComponent<MultiSound>();
|
|
|
|
ms.sounds = sounds;
|
|
ms.startBeat = sounds[0].beat;
|
|
ms.game = game;
|
|
ms.forcePlay = forcePlay;
|
|
ms.commited = false;
|
|
|
|
if (Conductor.instance.WaitingForDsp)
|
|
{
|
|
Debug.Log("Multisound waiting for DSP, deferring play");
|
|
ms.PlayDeferred().Forget();
|
|
}
|
|
else
|
|
{
|
|
ms.CommitPlay();
|
|
}
|
|
|
|
return ms;
|
|
}
|
|
|
|
void CommitPlay()
|
|
{
|
|
for (int i = 0; i < sounds.Count; i++)
|
|
{
|
|
Util.Sound s;
|
|
if (game)
|
|
s = SoundByte.PlayOneShotGame(sounds[i].name, sounds[i].beat, sounds[i].pitch, sounds[i].volume, sounds[i].looping, forcePlay, sounds[i].offset);
|
|
else
|
|
s = SoundByte.PlayOneShot(sounds[i].name, sounds[i].beat, sounds[i].pitch, sounds[i].volume, sounds[i].looping, null, sounds[i].offset);
|
|
playingSounds.Add(s);
|
|
}
|
|
commited = true;
|
|
}
|
|
|
|
async UniTaskVoid PlayDeferred()
|
|
{
|
|
await UniTask.WaitUntil(() => !Conductor.instance.WaitingForDsp, PlayerLoopTiming.LastUpdate);
|
|
Debug.Log("Multisound DSP ready, playing");
|
|
CommitPlay();
|
|
}
|
|
|
|
private void Update()
|
|
{
|
|
if (!commited) return;
|
|
foreach (Util.Sound sound in playingSounds)
|
|
{
|
|
if (sound == null) continue;
|
|
if (!sound.available) return;
|
|
}
|
|
Destroy(gameObject);
|
|
}
|
|
|
|
public void Delete()
|
|
{
|
|
foreach (Util.Sound sound in playingSounds)
|
|
{
|
|
GameManager.instance.SoundObjects.Release(sound);
|
|
}
|
|
Destroy(gameObject);
|
|
}
|
|
}
|
|
} |