etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-25 11:05:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Editor: Timeline now scales to fit song length

Browse source
This commit is contained in:
Jenny Crowe 2022-03-09 21:24:06 -07:00
parent b1e70bc64b
commit a570793803
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Assets/Scripts/LevelEditor/Editor.cs
View file

@ -224,6 +224,8 @@ namespace RhythmHeavenMania.Editor
{ {
Conductor.instance.musicSource.clip = await LoadClip(Path.Combine(paths)); Conductor.instance.musicSource.clip = await LoadClip(Path.Combine(paths));
changedMusic = true; changedMusic = true;
Timeline.FitToSong();
} }
} }
); );
@ -349,6 +351,8 @@ namespace RhythmHeavenMania.Editor
if (path != String.Empty) if (path != String.Empty)
{ {
loadedMusic = false;
using (FileStream zipFile = File.Open(path, FileMode.Open)) using (FileStream zipFile = File.Open(path, FileMode.Open))
{ {
using (var archive = new ZipArchive(zipFile, ZipArchiveMode.Read)) using (var archive = new ZipArchive(zipFile, ZipArchiveMode.Read))
@ -387,10 +391,14 @@ namespace RhythmHeavenMania.Editor
} }
} }
if (!loadedMusic)
Conductor.instance.musicSource.clip = null;
currentRemixPath = path; currentRemixPath = path;
remixName = Path.GetFileName(path); remixName = Path.GetFileName(path);
UpdateEditorStatus(false); UpdateEditorStatus(false);
CommandManager.instance.Clear(); CommandManager.instance.Clear();
Timeline.FitToSong();
} }
}); });
} }

9
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -189,6 +189,15 @@ namespace RhythmHeavenMania.Editor.Track
AutoBtnUpdate(); AutoBtnUpdate();
} }
public void FitToSong()
{
var currentSizeDelta = TimelineContent.sizeDelta;
float songBeats = Conductor.instance.SongLengthInBeats();
if (songBeats == 0) songBeats = 320;
else songBeats += 10;
TimelineContent.sizeDelta = new Vector2(songBeats, currentSizeDelta.y);
}
public void AutoBtnUpdate() public void AutoBtnUpdate()
{ {
var animName = GameManager.instance.autoplay ? "Idle" : "Disabled"; var animName = GameManager.instance.autoplay ? "Idle" : "Disabled";

3
Assets/Scripts/Util/Sound.cs
View file

@ -107,7 +107,8 @@ namespace RhythmHeavenMania.Util
public void Stop() public void Stop()
{ {
audioSource.Stop(); if (audioSource != null)
audioSource.Stop();
} }
public void Delete() public void Delete()