chore: Minor naming cleaning

include/core/precisionevaluator.h

@@ -23,7 +23,10 @@ class PrecisionEvaluator
         _end_handling_offset = _offset + intervals.back();
     }
 
-    inline microsec offset() const noexcept { return _offset; }
+    inline microsec offset() const noexcept
+    {
+        return _offset;
+    }
 
     inline bool isActive(microsec music_play_offset) const noexcept
     {
@@ -35,9 +38,6 @@ class PrecisionEvaluator
     {
         microsec shift_from_perfect = std::abs(odds - offset());
 
-        std::cout << "Shift " << ((odds > _offset) ? "late: " : "early: ")
-                  << shift_from_perfect << "\n";
-
         std::size_t raw_grade;
         for (raw_grade = 0; raw_grade < _intervals.size(); ++raw_grade)
         {

include/core/timeline.h

@@ -15,9 +15,7 @@ template <class TNote,
 class Timeline
 {
   public:
-    explicit Timeline() : _current_offset(0)
-    {
-    }
+    explicit Timeline() : _current_offset(0) {}
 
     typedef typename std::set<TNote *>::const_iterator Iterator;
 
@@ -26,30 +24,30 @@ class Timeline
         _current_offset = offset;
         expire(_top_note);
 
-        if (_timeline.empty())
-            return;
-
-        Iterator head_iterator = _timeline.begin();
-
-        while (!isExpired(head_iterator))
+        if (!_timeline.empty())
         {
-            if ((*head_iterator)->getPerfectOffset() >= offset)
-            {
-                Iterator pre_head = head_iterator;
-                --pre_head;
+            Iterator head_iterator = _timeline.begin();
 
-                _top_note =
-                    !isExpired(pre_head) && (*pre_head)->isActive(offset)
-                        ? pre_head
-                        : head_iterator;
-                break;
+            while (!isExpired(head_iterator))
+            {
+                if ((*head_iterator)->getPerfectOffset() >= offset)
+                {
+                    Iterator pre_head = head_iterator;
+                    --pre_head;
+
+                    _top_note =
+                        !isExpired(pre_head) && (*pre_head)->isActive(offset)
+                            ? pre_head
+                            : head_iterator;
+                    break;
+                }
+
+                ++head_iterator;
             }
 
-            ++head_iterator;
+            if (isExpired(_top_note))
+                _top_note = _timeline.begin();
         }
-
-        if (isExpired(_top_note))
-            _top_note = _timeline.begin();
     }
 
     void setNotes(const std::set<TNote *, NotePtrComparator> &notes)
@@ -130,20 +128,11 @@ class Timeline
         iterator = _timeline.end();
     }
 
-    inline Iterator getTopNote() const noexcept
-    {
-        return _top_note;
-    }
+    inline Iterator getTopNote() const noexcept { return _top_note; }
 
-    inline Iterator begin() const noexcept
-    {
-        return _timeline.begin();
-    }
+    inline Iterator begin() const noexcept { return _timeline.begin(); }
 
-    inline Iterator end() const noexcept
-    {
-        return _timeline.end();
-    }
+    inline Iterator end() const noexcept { return _timeline.end(); }
 
   private:
     std::set<TNote *, NotePtrComparator> _timeline;

src/application/shared/application/log.h

@@ -35,7 +35,7 @@ class Log
     void log(LogLevel level, const std::string &fmt, ...);
 
   private:
-    inline std::string _getLabel(LogLevel level)
+    inline std::string getLabel(LogLevel level)
     {
         switch (level)
         {

src/application/src/log.cpp

@@ -23,5 +23,5 @@ void Log::log(LogLevel level, const std::string &fmt, ...)
     std::vsnprintf(&buf[0], len + 1, fmt.c_str(), args);
     va_end(args);
 
-    std::cout << this->_getLabel(level) << " " << &buf[0] << std::endl;
+    std::cout << this->getLabel(level) << " " << &buf[0] << std::endl;
 }

src/impl/sfml/application/applicationsfml.cpp

@@ -51,8 +51,8 @@ void ApplicationSFML::run()
             }
         }
 
-        bool isOneFramePassed = time_since_last_update >= TIME_PER_FRAME;
-        if (isOneFramePassed)
+        bool is_frame_passed = time_since_last_update >= TIME_PER_FRAME;
+        if (is_frame_passed)
         {
             time_since_last_update -= TIME_PER_FRAME;
             update(time_since_last_update.asMicroseconds());

src/modes/classicmode/classicfactory.cpp

@@ -36,8 +36,7 @@ classic::getEditor(const std::shared_ptr<kku::CoreFactory> &core_factory)
 
     const auto factory = std::make_shared<ClassicGraphicsFactory>(core_factory);
     const auto timeline = std::make_shared<kku::Timeline<ClassicNote>>();
-    const auto selection_manager =
-        std::make_shared<SelectionManager<ClassicNote>>();
+    const auto selection_manager = std::make_shared<SelectionManager>();
     std::vector<std::shared_ptr<ClassicGraphicsManager>> graphics_managers;
     graphics_managers.emplace_back(
         std::make_shared<ClassicSceneGraphicsManager>(timeline, factory,

src/modes/classicmode/editor/classiceditor.cpp

@@ -43,6 +43,7 @@ ClassicEditor::ClassicEditor(
 
         element.position = kku::Point(x, 390.f);
         element.falling_curve_interpolation = {};
+        element.id = 0;
 
         element.keys = {kku::SystemEvent::Key::Code::W,
                         kku::SystemEvent::Key::Code::Up};
@@ -103,7 +104,6 @@ void ClassicEditor::input(kku::GameEvent &&input)
 
     switch (input.event.type)
     {
-
     default:
         break;
 
@@ -153,8 +153,6 @@ void ClassicEditor::input(kku::GameEvent &&input)
         if (!_context->getSelectionManager()->isMultiselectionEnabled())
             _context->getSelectionManager()->discard();
 
-        //_graphics_manager->input(std::move(input));
-
         break;
     }
     }

src/modes/classicmode/editor/editorcontext.cpp

@@ -5,7 +5,7 @@
 #include "graphics/classicnotegraphics.h"
 
 EditorContext::EditorContext(
-    const std::shared_ptr<SelectionManager<ClassicNote>> &selection_manager,
+    const std::shared_ptr<SelectionManager> &selection_manager,
     std::vector<std::shared_ptr<ClassicGraphicsManager>> &&graphics_managers)
     : _selection_manager(selection_manager),
       _graphics_managers(std::move(graphics_managers))
@@ -14,41 +14,27 @@ EditorContext::EditorContext(
 
 void EditorContext::input(ClassicArrowNote *note, kku::GameEvent &&input) const
 {
-    (void)note;
     switch (input.event.type)
     {
-
     default:
         break;
 
-        /*case kku::SystemEvent::Type::MousePress:
+    case kku::SystemEvent::Type::MousePress:
+    {
+        const auto clicked_position =
+            std::get<kku::SystemEvent::Mouse>(input.event.data).position;
+        for (auto &element : note->getElements())
         {
-            bool selection_changed = false;
-            std::size_t amount_selected = 0;
-
-            const auto position =
-        std::get<kku::SystemEvent::Mouse>(input.event.data).position; for (auto&
-        element : note->getElements())
+            if (element.sprite->getRectangle()->contains(clicked_position))
             {
-                if (element.sprite->getRectangle()->contains(position))
-                {
-                    element.selected = !element.selected;
-                    selection_changed = true;
-                    if (element.selected)
-                        ++amount_selected;
-                }
-            }
-
-            if (selection_changed)
-            {
-                if (amount_selected > 0)
-                    _selection_manager->fetch(note);
+                if (_selection_manager->isSelected(note->getId(), element.id))
+                    _selection_manager->remove(note->getId(), element.id);
                 else
-                    _selection_manager->remove(note);
+                    _selection_manager->fetch(note->getId(), element.id);
             }
-
-            break;
-        }*/
+        }
+        break;
+    }
     }
 }
 
@@ -95,8 +81,7 @@ void EditorContext::update(ClassicArrowNote *note,
             element.animations[note->getState()]->update(music_offset);
 }
 
-std::shared_ptr<SelectionManager<ClassicNote>>
-EditorContext::getSelectionManager() const
+std::shared_ptr<SelectionManager> EditorContext::getSelectionManager() const
 {
     return _selection_manager;
 }

src/modes/classicmode/editor/editorcontext.h

@@ -11,7 +11,7 @@ class ClassicGraphicsManager;
 class EditorContext : public Context
 {
 public:
-    explicit EditorContext(const std::shared_ptr<SelectionManager<ClassicNote>>& selection_manager,
+    explicit EditorContext(const std::shared_ptr<SelectionManager>& selection_manager,
                            std::vector<std::shared_ptr<ClassicGraphicsManager>>&& graphics_managers);
 
     virtual void input(ClassicArrowNote *note, kku::GameEvent&& input) const override;
@@ -21,9 +21,9 @@ public:
     void updateGraphics(const kku::microsec& music_offset);
     void displayGraphics() const;
 
-    std::shared_ptr<SelectionManager<ClassicNote>> getSelectionManager() const;
+    std::shared_ptr<SelectionManager> getSelectionManager() const;
 
 private:
-    const std::shared_ptr<SelectionManager<ClassicNote>> _selection_manager;
+    const std::shared_ptr<SelectionManager> _selection_manager;
     const std::vector<std::shared_ptr<ClassicGraphicsManager>> _graphics_managers;
 };

src/modes/classicmode/editor/selectionmanager.h

@@ -1,51 +1,54 @@
 #pragma once
 
+#include <map>
 #include <vector>
 #include <algorithm>
 #include <functional>
 
-template <class T>
 class SelectionManager
 {
 public:
-    SelectionManager() :
+    explicit SelectionManager() :
         _multiselection_enabled(false)
     {}
 
     void discard()
     {
-        _selected_things.clear();
+        _selected_ids.clear();
     }
 
-    void fetch(T * const thing)
+    void fetch(int note_id, int element_id)
     {
-        bool already_there = std::any_of(_selected_things.begin(), _selected_things.end(),
-                                         [&thing](const auto& selected_thing)
-                                         {
-                                             return thing == selected_thing;
-                                         });
-
-        if (!already_there)
-            _selected_things.emplace_back(thing);
+        if (!isSelected(note_id, element_id))
+            _selected_ids[note_id].emplace_back(element_id);
     }
 
-    void remove(T * const thing)
+    void remove(int note_id, int element_id)
     {
-        for (std::size_t i = 0; i < _selected_things.size(); ++i)
+        if (_selected_ids.count(note_id) == 0)
+            return;
+
+        auto& elements_ids = _selected_ids[note_id];
+
+        for (std::size_t i = 0; i < elements_ids.size(); ++i)
         {
-            if (thing == _selected_things.at(i))
+            if (element_id == elements_ids.at(i))
             {
-                _selected_things[i] = std::move(_selected_things.back());
-                _selected_things.pop_back();
+                elements_ids[i] = std::move(elements_ids.back());
+                elements_ids.pop_back();
                 break;
             }
         }
     }
 
-    bool isSelected(const T * const thing) const
+    bool isSelected(int note_id, int element_id) const
     {
-        for (const auto& selected_thing : thing)
-            if (thing == selected_thing)
+        if (_selected_ids.count(note_id) == 0)
+            return false;
+
+        const std::vector<int>& selected_elements = _selected_ids.at(note_id);
+        for (const auto& selected_element : selected_elements)
+            if (selected_element == element_id)
                 return true;
 
         return false;
@@ -61,13 +64,7 @@ public:
         return _multiselection_enabled;
     }
 
-    void apply(const std::function<void(T*)>& function)
-    {
-        for (auto& thing : _selected_things)
-            function(thing);
-    }
-
 private:
-    std::vector<T*> _selected_things;
+    std::map<int, std::vector<int>> _selected_ids;
     bool _multiselection_enabled;
 };

src/modes/classicmode/game/arrowelement.h

@@ -10,10 +10,12 @@
 #include <array>
 
 class ClassicNoteGraphics;
+class ClassicSelectionGraphics;
 class ClassicAnimationScenario;
 
 struct ArrowElement
 {
+    std::shared_ptr<ClassicSelectionGraphics> selection;
     std::shared_ptr<ClassicNoteGraphics> sprite;
     std::array<std::shared_ptr<ClassicAnimationScenario>, 5> animations;
 
@@ -24,6 +26,7 @@ struct ArrowElement
     std::array<kku::SystemEvent::Key::Code, 2> keys;
     Type type = Type::NONE;
     bool pressed = false;
+    int id = 0;
 
     // Each note may consist of several buttons.
     // For example, ↑ → or ↓ → ←

src/modes/classicmode/graphics/classicgraphicsmanager.h

@@ -7,6 +7,7 @@
 #include <vector>
 
 class ClassicArrowNote;
+class SelectionManager;
 class ArrowElement;
 // class ClassicSliderNote;
 
@@ -22,11 +23,14 @@ public:
     virtual void display() const = 0;
     virtual void update(const kku::microsec& offset) = 0;
 
+    virtual void switchSelection(ArrowElement* element) = 0;
+
     virtual void update(const kku::microsec& offset, ClassicArrowNote* note) = 0;
  // virtual void update(const kku::microsec& offset, ClassicSliderNote* note) = 0;
 
     virtual void draw(const ClassicArrowNote * const note) const = 0;
  // virtual void draw(ClassicSliderNote* note) const = 0;
+    virtual void draw(const std::shared_ptr<SelectionManager>& selection_manager) const = 0;
 
 protected:
     kku::microsec _visibility_offset;

src/modes/classicmode/graphics/classicscenegraphicsmanager.cpp

@@ -87,6 +87,17 @@ void ClassicSceneGraphicsManager::draw(const ClassicArrowNote *const note) const
     }
 }
 
+void ClassicSceneGraphicsManager::switchSelection(ArrowElement *element)
+{
+    if (element->selection)
+        element->selection->reset();
+    else
+    {
+        element->selection = _factory->createSelection();
+        element->selection->adjustTo(element->sprite);
+    }
+}
+
 void ClassicSceneGraphicsManager::setGraphics(
     std::vector<ArrowElement> &elements, kku::TimeRange &&range)
 {

src/modes/classicmode/graphics/classicscenegraphicsmanager.h

@@ -25,10 +25,12 @@ public:
     virtual void update(const kku::microsec& offset, ClassicArrowNote* note) override;
     virtual void draw(const ClassicArrowNote * const note) const override;
 
+    virtual void switchSelection(ArrowElement* element) override;
+    virtual void draw(const std::shared_ptr<SelectionManager>& selection_manager) const override;
+
     void setGraphics(std::vector<ArrowElement>& elements, kku::TimeRange&& range);
     void removeGraphics(std::vector<ArrowElement>& elements);
 
-
 protected:
     kku::SpriteContainer<Type, ClassicGraphicsFactory, ClassicNoteGraphics> _sprite_container;
     const std::shared_ptr<const ClassicGraphicsFactory> _factory;

src/modes/classicmode/graphics/classictimelinegraphicsmanager.h

@@ -25,6 +25,9 @@ public:
     virtual void update(const kku::microsec& offset, ClassicArrowNote* note) override;
     virtual void draw(const ClassicArrowNote * const note) const override;
 
+    virtual void switchSelection(ArrowElement* element) override;
+    virtual void draw(const std::shared_ptr<SelectionManager>& selection_manager) const override;
+
 protected:
     kku::SpriteContainer<Type, ClassicGraphicsFactory, ClassicNoteGraphics> _sprite_container;
     const std::shared_ptr<const ClassicGraphicsFactory> _factory;