Improve visible notes calculation for scrolling in editor

include/core/timeline.h

@@ -135,6 +135,11 @@ public:
         return _top_note;
     }
 
+    inline Iterator begin() const noexcept
+    {
+        return _timeline.begin();
+    }
+
 private:
     std::set<TNote*, NotePtrComparator> _timeline;
     microsec _current_offset;

src/modes/classicmode/editor/classicmocknote.cpp

@@ -99,6 +99,12 @@ void ClassicMockNote::setGraphics(ClassicGraphicsManager * const manager, kku::T
     manager->setGraphics(_elements, std::move(range));
 }
 
+void ClassicMockNote::removeGraphics(ClassicGraphicsManager * const manager)
+{
+    manager->removeGraphics(_elements);
+}
+
+
 std::vector<MockElement>& ClassicMockNote::getElements()
 {
     return _elements;

src/modes/classicmode/editor/classicmocknote.h

@@ -19,6 +19,7 @@ public:
 
     virtual void display(const ClassicGraphicsManager * const manager) const override;
     virtual void setGraphics(ClassicGraphicsManager * const manager, kku::TimeRange&& range) override;
+    virtual void removeGraphics(ClassicGraphicsManager * const manager) override;
 
     std::vector<MockElement>& getElements();
 

src/modes/classicmode/game/classicarrownote.cpp

@@ -104,6 +104,11 @@ void ClassicArrowNote::setGraphics(ClassicGraphicsManager * const manager, kku::
     manager->setGraphics(_elements, std::move(range));
 }
 
+void ClassicArrowNote::removeGraphics(ClassicGraphicsManager * const manager)
+{
+    manager->removeGraphics(_elements);
+}
+
 bool ClassicArrowNote::allElementsPressed() const
 {
     return std::all_of(_elements.begin(), _elements.end(),

src/modes/classicmode/game/classicarrownote.h

@@ -26,6 +26,7 @@ public:
 
     virtual void display(const ClassicGraphicsManager * const manager) const override;
     virtual void setGraphics(ClassicGraphicsManager * const manager, kku::TimeRange&& range) override;
+    virtual void removeGraphics(ClassicGraphicsManager * const manager) override;
 
     bool allElementsPressed() const;
     bool isPressedAs(kku::SystemEvent::Key::Code key) const;

src/modes/classicmode/graphics/classicgraphicsmanager.h

@@ -21,9 +21,11 @@ public:
 
     virtual void display(const std::vector<ArrowElement>& elements) const = 0;
     virtual void setGraphics(std::vector<ArrowElement>& elements, kku::TimeRange&& range) = 0;
+    virtual void removeGraphics(std::vector<ArrowElement>& elements) = 0;
 
     virtual void display(const std::vector<MockElement>& elements) const = 0;
     virtual void setGraphics(std::vector<MockElement>& elements, kku::TimeRange&& range) = 0;
+    virtual void removeGraphics(std::vector<MockElement>& elements) = 0;
 
     virtual void display() const = 0;
     virtual void update(const kku::microsec& offset) = 0;

src/modes/classicmode/graphics/classicscenegraphicsmanager.cpp

@@ -87,6 +87,20 @@ void ClassicSceneGraphicsManager::setGraphics(std::vector<ArrowElement>& element
     }
 }
 
+void ClassicSceneGraphicsManager::removeGraphics(std::vector<ArrowElement>& elements)
+{
+    for (auto& element : elements)
+    {
+        _sprite_container.resetSprite(element.sprite, element.type);
+        element.sprite = nullptr;
+
+        element.animations[ClassicNote::State::NONE] = nullptr;
+        element.animations[ClassicNote::State::FLYING] = nullptr;
+        element.animations[ClassicNote::State::DYING] = nullptr;
+        element.animations[ClassicNote::State::DEAD] = nullptr;
+    }
+}
+
 void ClassicSceneGraphicsManager::display(const std::vector<MockElement>& elements) const
 {
     for (std::size_t i = 0; i < elements.size(); ++i)
@@ -128,6 +142,20 @@ void ClassicSceneGraphicsManager::setGraphics(std::vector<MockElement>& elements
     }
 }
 
+void ClassicSceneGraphicsManager::removeGraphics(std::vector<MockElement>& elements)
+{
+    for (auto& element : elements)
+    {
+        _sprite_container.resetSprite(element.sprite, element.type);
+        element.sprite = nullptr;
+
+        element.animations[ClassicNote::State::NONE] = nullptr;
+        element.animations[ClassicNote::State::FLYING] = nullptr;
+        element.animations[ClassicNote::State::DYING] = nullptr;
+        element.animations[ClassicNote::State::DEAD] = nullptr;
+    }
+}
+
 /*sf::VertexArray ClassicSceneGraphicsSFML::makeLine(const kku::Point& c1, const kku::Point& c2) const
 {
     sf::VertexArray line(sf::LinesStrip, 2);
@@ -147,19 +175,42 @@ void ClassicSceneGraphicsManager::updateVisibleNotes(const kku::microsec &offset
 
 void ClassicSceneGraphicsManager::fetchFirstNote(const kku::microsec& offset)
 {
-    (void)offset; // ????
-
     if (nothingToDraw())
         return;
 
-    Iterator note_iterator = _first;
+    if (offset < (*_first)->getPerfectOffset())
-    while (note_iterator != _last)
     {
-        auto note = *note_iterator;
+        Iterator note_iterator = _first;
-        if (note->getState() == ClassicNote::State::DEAD)
+        while (note_iterator != _timeline->begin() && !isVisiblyClose(note_iterator, offset))
-            ++_first;
+        {
+            --note_iterator;
+        }
 
-        ++note_iterator;
+        _first = note_iterator;
+
+        auto note = *_first;
+        if (note->getState() != ClassicNote::State::FLYING
+        &&  note->getState() != ClassicNote::State::DYING
+        &&  offset <= note->getPerfectOffset())
+        {
+            note->setState(ClassicNote::State::FLYING);
+            note->setGraphics(this, kku::TimeRange{offset, note->getPerfectOffset()});
+        }
+    }
+    else
+    {
+        Iterator note_iterator = _first;
+        while (note_iterator != _last)
+        {
+            auto note = *note_iterator;
+            if (note->getState() == ClassicNote::State::DEAD)
+            {
+               // note->removeGraphics(this);
+                ++_first;
+            }
+
+            ++note_iterator;
+        }
     }
 }
 
@@ -174,7 +225,8 @@ void ClassicSceneGraphicsManager::fetchLastNote(const kku::microsec& offset)
         auto note = *note_iterator;
 
         if (note->getState() != ClassicNote::State::FLYING
-        &&  note->getState() != ClassicNote::State::DYING)
+        &&  note->getState() != ClassicNote::State::DYING
+        &&  offset <= note->getPerfectOffset())
         {
             note->setState(ClassicNote::State::FLYING);
             note->setGraphics(this, kku::TimeRange{offset, note->getPerfectOffset()});

src/modes/classicmode/graphics/classicscenegraphicsmanager.h

@@ -22,9 +22,11 @@ public:
 
     virtual void display(const std::vector<ArrowElement>& elements) const override;
     virtual void setGraphics(std::vector<ArrowElement>& elements, kku::TimeRange&& range) override;
+    virtual void removeGraphics(std::vector<ArrowElement>& elements) override;
 
     virtual void display(const std::vector<MockElement>& elements) const override;
     virtual void setGraphics(std::vector<MockElement>& elements, kku::TimeRange&& range) override;
+    virtual void removeGraphics(std::vector<MockElement>& elements) override;
 
 protected:
     kku::SpriteContainer<Type, ClassicGraphicsFactory, ClassicSprite> _sprite_container;

src/modes/classicmode/include/classicmode/classicnote.h

@@ -29,6 +29,7 @@ public:
 
     virtual void display(const ClassicGraphicsManager * const manager) const = 0;
     virtual void setGraphics(ClassicGraphicsManager * const manager, kku::TimeRange&& range) = 0;
+    virtual void removeGraphics(ClassicGraphicsManager * const manager) = 0;
 
     void setState(State state) noexcept;
     State getState() const noexcept;