Change "Append scene" to "Add scene" and jump to the new scene right …

…away part of #38
vooku · Mar 28, 2020 · 9e033a0 · 9e033a0
1 parent ab00a69
commit 9e033a0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/skinny/src/Gui.cpp b/skinny/src/Gui.cpp
@@ -6,7 +6,7 @@ namespace skinny {
 const std::string Gui::Btn::NEXT = "Next scene";
 const std::string Gui::Btn::PREV = "Previous scene";
 const std::string Gui::Btn::JUMP = "Jump to scene";
-const std::string Gui::Btn::APPEND = "Append scene";
+const std::string Gui::Btn::NEW = "New scene";
 const std::string Gui::Btn::SAVE = "Save";
 const std::string Gui::Btn::SAVE_AS = "Save as";
 const std::string Gui::Btn::LOAD = "Load";
@@ -195,7 +195,6 @@ void Gui::onLayerButton(ofxDatGuiButtonEvent e)
             layerDescription.path = openFileResult.getPath();
         else
             layerDescription = { static_cast<unsigned int>(idx), openFileResult.getPath() };
-        Status::instance().load = true;
         Status::instance().loadDir = LoadDir::Current;
     }
 }
@@ -232,26 +231,24 @@ void Gui::onControlButton(ofxDatGuiButtonEvent e)
                 ofLog(OF_LOG_WARNING, "Cannot load config file %s, creating default scene instead.", openFileResult.fileName.c_str());
                 showDescription_.appendScene();
             }
-            Status::instance().load = true;
             Status::instance().loadDir = LoadDir::Current;
         }
     };
 
     const auto name = e.target->getName();
     if (name == Btn::NEXT) {
-        Status::instance().load = true;
         Status::instance().loadDir = LoadDir::Forward;
     } else if (name == Btn::PREV) {
-        Status::instance().load = true;
         Status::instance().loadDir = LoadDir::Backward;
     } else if (name == Btn::JUMP) {
-        Status::instance().load = true;
         Status::instance().loadDir = LoadDir::Jump;
-        // # TODO jump to
+        Status::instance().jumpToIndex = getJumpToIndex();
     }
-    else if (name == Btn::APPEND) {
+    else if (name == Btn::NEW) {
         showDescription_.appendScene();
         jumpToInput_->setLabel(buildJumpToLabel(showDescription_.currentIdx_ + 1, showDescription_.getSize()));
+        Status::instance().loadDir = LoadDir::Jump;
+        Status::instance().jumpToIndex = showDescription_.getSize() - 1;
     } else if (name == Btn::LOAD) {
         load();
     } else if (name == Btn::SAVE) {
@@ -438,7 +435,7 @@ void Gui::setupControlPanel(glm::ivec2& pos)
     jumpToInput_->setLabel(buildJumpToLabel(0, 0));
     jumpToInput_->setText("0");
     controlButtons_.push_back(controlPanel_->addButton(Btn::JUMP));
-    controlButtons_.push_back(controlPanel_->addButton(Btn::APPEND));
+    controlButtons_.push_back(controlPanel_->addButton(Btn::NEW));
     controlPanel_->addBreak();
     controlButtons_.push_back(controlPanel_->addButton(Btn::SAVE));
     controlButtons_.push_back(controlPanel_->addButton(Btn::SAVE_AS));

diff --git a/skinny/src/Gui.h b/skinny/src/Gui.h
@@ -64,7 +64,7 @@ class Gui {
         static const std::string NEXT;
         static const std::string PREV;
         static const std::string JUMP;
-        static const std::string APPEND;
+        static const std::string NEW;
         static const std::string SAVE;
         static const std::string SAVE_AS;
         static const std::string LOAD;

diff --git a/skinny/src/Status.h b/skinny/src/Status.h
@@ -16,15 +16,9 @@ class Status
         return status;
     }
 
-    void resetLoad()
-    {
-        load = false;
-        loadDir = LoadDir::None;
-    }
-
     bool exit = false;    //!< The app should exit.
-    bool load = false;    //!< Load a scene according to loadDir.
     LoadDir loadDir = LoadDir::None;
+    int jumpToIndex = 0;  //!< In the case of LoadDir::Jump
 
 private:
     Status() = default;

diff --git a/skinny/src/ofApp.cpp b/skinny/src/ofApp.cpp
@@ -69,9 +69,8 @@ void ofApp::update()
         //return;
     }
 
-    if (Status::instance().load) {
+    if (Status::instance().loadDir != LoadDir::None) {
         reload();
-        Status::instance().resetLoad();
     }
 
     show_->update();
@@ -132,7 +131,6 @@ void ofApp::newMidiMessage(ofxMidiMessage & msg)
     }
 
     if (msg.status == MIDI_NOTE_ON && msg.pitch == showDescription_.getSwitchNote()) {
-        Status::instance().load = true;
         Status::instance().loadDir = LoadDir::Forward;
     }
     else {
@@ -201,7 +199,7 @@ bool ofApp::reload()
 
     gui_.displayMessage("Loading...");
 
-    const auto shifted = showDescription_.shift(Status::instance().loadDir, gui_.getJumpToIndex());
+    const auto shifted = showDescription_.shift(Status::instance().loadDir, Status::instance().jumpToIndex);
     if (!shifted && Status::instance().loadDir != LoadDir::Current) {
         gui_.resetJumpToIndex();
         return false;
@@ -216,6 +214,7 @@ bool ofApp::reload()
         ofLog(OF_LOG_WARNING, "Scene %s encountered loading problems.", showDescription_.currentScene().name.c_str());
     }
 
+    Status::instance().loadDir = LoadDir::None;
     return true;
 }