Merge pull request #327 from calband/sprite_animations

Adding sprites to Animation screen.

Author: rmpowell77

.gitignore

@@ -1,3 +1,4 @@
+build/*
 build-macos/CalChart.xcodeproj/project.xcworkspace/*
 build-macos/CalChart.xcodeproj/xcuserdata/*
 build-win/README.txt

CMakeLists.txt

@@ -188,8 +188,105 @@ source_group(
 
 add_executable (
   CalChart
-  ${CalChartSources}
-  ${CalChartHeaders}
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationCanvas.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationCanvas.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationErrorsPanel.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationErrorsPanel.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationPanel.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationPanel.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationView.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationView.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CCOmniviewCanvas.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CCOmniviewCanvas.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartApp.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartApp.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartDoc.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartDoc.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartDocCommand.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartDocCommand.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartFrame.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartFrame.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartPreferences.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartPreferences.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSizes.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSizes.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartToolBar.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartToolBar.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartView.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartView.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ColorPalette.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ColorPalette.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ColorSetupCanvas.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ColorSetupCanvas.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ColorSetupDialog.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ColorSetupDialog.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityBrowser.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityBrowser.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityBrowserPanel.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityBrowserPanel.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityComposerDialog.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityComposerDialog.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityEditorPopup.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ContinuityEditorPopup.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CustomListViewPanel.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CustomListViewPanel.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldCanvas.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldCanvas.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldControlsToolBar.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldControlsToolBar.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldThumbnailBrowser.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldThumbnailBrowser.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesContCellSetup.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesContCellSetup.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesDrawingSetup.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesDrawingSetup.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesGeneralSetup.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesGeneralSetup.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesPSPrintingSetup.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesPSPrintingSetup.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesShowModeSetup.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesShowModeSetup.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesUtils.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesUtils.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PrintContinuityEditor.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PrintContinuityEditor.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/TopFrame.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/TopFrame.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/background_image.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/background_image.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/basic_ui.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/basic_ui.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/cc_omniview_constants.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/confgr.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/confgr.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/cont_box_draw.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/cont_box_draw.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/draw.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/draw.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/draw_utils.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/e7_transition_solver_ui.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/e7_transition_solver_ui.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/field_canvas_shapes.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/field_canvas_shapes.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ghost_module.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ghost_module.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/linmath.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog_canvas.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog_canvas.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/platconf.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/precomp.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/precomp.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/print_ps_dialog.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/print_ps_dialog.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/setup_wizards.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/setup_wizards.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/show_ui.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/show_ui.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/single_instance_ipc.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/single_instance_ipc.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/ui_enums.h
   ${CalChartDocs}
   ${CalChartResources}
   "${CMAKE_CURRENT_SOURCE_DIR}/calchart.rc"

resources/default_sprite_strip.png

@@ -56,6 +56,17 @@ void AnimationCanvas::CreateControls()
     SetSizer(topSizer);
 }
 
+bool AnimationCanvas::GetUseSprites() const
+{
+    return CalChartConfiguration::GetGlobalConfig().Get_UseSprites();
+}
+
+void AnimationCanvas::SetUseSprites(bool useSprites)
+{
+    CalChartConfiguration::GetGlobalConfig().Set_UseSprites(useSprites);
+    Refresh();
+}
+
 void AnimationCanvas::SetZoomOnMarchers(bool zoomOnMarchers)
 {
     mZoomOnMarchers = zoomOnMarchers;

shows/Dance Show final.shw

@@ -35,13 +35,15 @@ class AnimationCanvas : public wxPanel {
     ~AnimationCanvas() override = default;
 
     void OnUpdate(); // Refresh from the View
-    void SetView(AnimationView* view) { mView = view; }
     auto GetView() const { return mView; }
+    void SetView(AnimationView* view) { mView = view; }
 
-    void SetZoomOnMarchers(bool zoomOnMarchers);
+    bool GetUseSprites() const;
+    void SetUseSprites(bool useSprites);
     auto GetZoomOnMarchers() const { return mZoomOnMarchers; }
-    void SetStepsOutForMarchersZoom(int steps);
+    void SetZoomOnMarchers(bool zoomOnMarchers);
     auto GetStepsOutForMarchersZoom() const { return mStepsOutForMarcherZoom; }
+    void SetStepsOutForMarchersZoom(int steps);
 
 private:
     void Init();

src/AnimationCanvas.cpp

@@ -109,6 +109,14 @@ void AnimationPanel::CreateControls()
     AddToSizerBasic(boxsizer, mTempoCtrl);
     mItemsToHide.push_back(mTempoCtrl);
 
+    mSpritesCheckbox = new wxCheckBox(this, wxID_ANY, wxT("Sprites"));
+    mSpritesCheckbox->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent& event) {
+        mCanvas->SetUseSprites(event.IsChecked());
+    });
+    mSpritesCheckbox->SetValue(mCanvas->GetUseSprites());
+    AddToSizerBasic(toprow, mSpritesCheckbox);
+    mItemsToHide.push_back(mSpritesCheckbox);
+
     auto sizer1 = new wxBoxSizer(wxVERTICAL);
     mZoomCheckbox = new wxCheckBox(this, wxID_ANY, wxT("Zoom"));
     mZoomCheckbox->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent& event) {
@@ -183,13 +191,15 @@ void AnimationPanel::OnCmd_ToggleAnimOmni(wxCommandEvent& event)
     mShowOmni = !mShowOmni;
     if (mShowOmni) {
         mCanvas->Hide();
+        mSpritesCheckbox->Hide();
         mZoomCheckbox->Hide();
         mCollisionCheckbox->Hide();
         mOmniCanvas->Show();
         mOmniHelpButton->Show();
         mAnimateOmniToggle->SetLabel(wxT("Animate"));
     } else {
         mCanvas->Show();
+        mSpritesCheckbox->Show();
         mZoomCheckbox->Show();
         mCollisionCheckbox->Show();
         mOmniCanvas->Hide();

src/AnimationCanvas.h

@@ -54,6 +54,7 @@ class AnimationPanel : public wxPanel {
     void ToggleTimer();
     void UpdatePanel(); // specfically to update the controls
     bool OnBeat() const;
+    auto TimerOn() const { return mTimerOn; }
 
     auto GetInMiniMode() const { return mInMiniMode; }
     void SetInMiniMode(bool);
@@ -82,6 +83,7 @@ class AnimationPanel : public wxPanel {
     wxStaticText* mTempoLabel{};
     wxSpinCtrl* mTempoCtrl{};
     wxSlider* mBeatSlider{};
+    wxCheckBox* mSpritesCheckbox{};
     wxCheckBox* mZoomCheckbox{};
     wxCheckBox* mCollisionCheckbox{};
     wxBitmapToggleButton* mPlayPauseButton{};