Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 21:47:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Multiple events can now be called onto same frame + more Spaceball camera fixes

Browse Source
This commit is contained in:
Starpelly
2021-12-26 00:11:54 -05:00
parent 417986c08c
commit 95ac1306d4
11 changed files with 128 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Assets/Scripts/GameManager.cs
View File

@ -37,7 +37,8 @@ namespace RhythmHeavenMania
instance = this;
}
private void Start()
// before Start() since this is very important
private void OnEnable()
{
SortEventsList();
@ -71,11 +72,14 @@ namespace RhythmHeavenMania
if (Input.GetKeyDown(KeyCode.A))
{
Conductor.instance.musicSource.time += 3;
SetCurrentEventToClosest();
GetGame(currentGame).holder.GetComponent<Minigame>().OnTimeChange();
}
else if (Input.GetKeyDown(KeyCode.S))
{
Conductor.instance.musicSource.time -= 3;
GameManager.instance.SetCurrentEventToClosest();
SetCurrentEventToClosest();
GetGame(currentGame).holder.GetComponent<Minigame>().OnTimeChange();
}
List<float> entities = Beatmap.entities.Select(c => c.beat).ToList();
@ -84,9 +88,18 @@ namespace RhythmHeavenMania
{
if (Conductor.instance.songPositionInBeats >= entities[currentEvent])
{
eventCaller.CallEvent(Beatmap.entities[currentEvent].datamodel);
// allows for multiple events on the same beat to be executed on the same frame, so no more 1-frame delay
List<Beatmap.Entity> entitesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentEvent].beat);
currentEvent++;
for (int i = 0; i < entitesAtSameBeat.Count; i++)
{
eventCaller.CallEvent(entitesAtSameBeat[i].datamodel);
currentEvent++;
}
// eventCaller.CallEvent(Beatmap.entities[currentEvent].datamodel);
// currentEvent++;
}
}
}