Issue #542: crashes when going to last sheet of animation in RAINBOW …

…show
calband · Nov 14, 2024 · 8a4766e · 8a4766e
1 parent 985f83f
commit 8a4766e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/LATEST_RELEASE_NOTES.md b/LATEST_RELEASE_NOTES.md
@@ -6,6 +6,7 @@ Bugs addressed in this release:
 * [#497](../../issues/497) Animate ctor should be explicit
 * [#518](../../issues/518) Animation looks wrong
 * [#540](../../issues/540) Current 3.7.1 does not run
+* [#542](../../issues/542) crashes when going to last sheet of animation in RAINBOW show
 
 Other changes:
 

diff --git a/src/AnimationView.cpp b/src/AnimationView.cpp
@@ -237,7 +237,7 @@ void AnimationView::RefreshFrame()
 void AnimationView::RefreshAnimationSheet()
 {
     if (mAnimation) {
-        mCurrentBeat = mAnimation->GetTotalNumberBeatsUpTo(mView->GetCurrentSheetNum());
+        mCurrentBeat = mAnimation->GetTotalNumberBeatsUpTo(mAnimation->ShowSheetToAnimSheetTranslate(mView->GetCurrentSheetNum()));
         RefreshFrame();
     }
 }

diff --git a/src/core/CalChartAnimation.cpp b/src/core/CalChartAnimation.cpp
@@ -71,6 +71,12 @@ auto AnimateShow(const Show& show) -> std::tuple<Sheets, std::vector<Errors>>
     auto sheets = std::vector<Animate::Sheet>{};
     auto endSheet = show.GetSheetEnd();
 
+    auto runningIndex = std::vector<unsigned>{};
+    for (auto curr_sheet = show.GetSheetBegin(); curr_sheet != endSheet; ++curr_sheet) {
+        runningIndex.push_back(curr_sheet->IsInAnimation() ? 1 : 0);
+    }
+    std::exclusive_scan(runningIndex.begin(), runningIndex.end(), runningIndex.begin(), 0);
+
     for (auto curr_sheet = show.GetSheetBegin(); curr_sheet != endSheet; ++curr_sheet) {
 
         if (!curr_sheet->IsInAnimation()) {
@@ -136,7 +142,7 @@ auto AnimateShow(const Show& show) -> std::tuple<Sheets, std::vector<Errors>>
         sheets.emplace_back(curr_sheet->GetName(), numBeats, theCommands);
     }
 
-    return { Animate::Sheets{ sheets }, animationErrors };
+    return { Animate::Sheets{ sheets, runningIndex }, animationErrors };
 }
 }
 

diff --git a/src/core/CalChartAnimation.h b/src/core/CalChartAnimation.h
@@ -93,6 +93,7 @@ class Animation {
 
     [[nodiscard]] auto GenPathToDraw(unsigned whichSheet, unsigned point, Coord::units endRadius) const { return mSheets.GeneratePathToDraw(whichSheet, point, endRadius); }
 
+    [[nodiscard]] auto ShowSheetToAnimSheetTranslate(unsigned showSheet) const { return mSheets.ShowSheetToAnimSheetTranslate(showSheet); }
     /*!
      * @brief Generates JSON that could represent of all the marchers in an Online Viewer '.viewer' file.
      * @param pointsOverSheets All of the points in all of the sheets.

diff --git a/src/core/CalChartAnimationSheet.cpp b/src/core/CalChartAnimationSheet.cpp
@@ -195,9 +195,10 @@ namespace {
     }
 }
 
-Sheets::Sheets(std::vector<Sheet> const& sheets)
+Sheets::Sheets(std::vector<Sheet> const& sheets, std::vector<unsigned> const& showSheetToAnimationSheet)
     : mSheets(sheets)
     , mRunningBeatCount{ GetRunningBeats(sheets) }
+    , mShowSheetToAnimationSheet{ showSheetToAnimationSheet }
 {
 }
 

diff --git a/src/core/CalChartAnimationSheet.h b/src/core/CalChartAnimationSheet.h
@@ -96,7 +96,7 @@ class Sheet {
 
 class Sheets {
 public:
-    explicit Sheets(std::vector<Sheet> const& sheets);
+    explicit Sheets(std::vector<Sheet> const& sheets, std::vector<unsigned> const& showSheetToAnimationSheet = {});
     [[nodiscard]] auto TotalSheets() const -> size_t { return mSheets.size(); }
     [[nodiscard]] auto TotalBeats() const -> beats_t;
     [[nodiscard]] auto BeatToSheetOffsetAndBeat(beats_t beat) const -> std::tuple<size_t, beats_t>;
@@ -141,9 +141,12 @@ class Sheets {
 
     [[nodiscard]] auto toOnlineViewerJSON() const -> std::vector<std::vector<std::vector<nlohmann::json>>>;
 
+    [[nodiscard]] auto ShowSheetToAnimSheetTranslate(unsigned sheet) const { return mShowSheetToAnimationSheet.at(sheet); }
+
 private:
     std::vector<Sheet> mSheets;
     std::vector<beats_t> mRunningBeatCount;
+    std::vector<unsigned> mShowSheetToAnimationSheet;
 };
 
 }