Implement selection functions for graphics managers

.clang-format

@@ -1,18 +0,0 @@
-IndentWidth: 4
-BreakBeforeBraces: Allman
-AlignAfterOpenBracket: Align
-AlignArrayOfStructures: Right
-AllowShortBlocksOnASingleLine: Empty
-AllowShortFunctionsOnASingleLine: None
-BraceWrapping:
-  AfterClass:      true
-  AfterControlStatement: true
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  true
-  AfterObjCDeclaration: true
-  AfterStruct:     true
-  AfterUnion:      true
-  BeforeCatch:     true
-  BeforeElse:      true
-  IndentBraces:    true

.envrc

@@ -1,2 +0,0 @@
-use flake
-watch_file shell.nix

README.md

@@ -1,32 +0,0 @@
-# project-kyoku
-
-I am just trying to create a rhythm game inspired by project-diva
-
-### Initial setup
-
-- Make sure you have a compiler supporting c++17 and cmake
-- Make sure you have [sfml](https://www.sfml-dev.org/) installed, either static or not, just make sure to edit impl/ CMake file, you'll see it.
-- Now clone it
-```
-git clone https://dev.udongein.xyz/NaiJi/project-kyoku
-```
-
-- Go to the project folder
-```
-cd project-kyoku/
-```
-
-- Now build it!
-```
-cmake CMakeLists.txt -B ./build
-cd ./build
-make
-```
-
-### Conventional commits
-
-This project follows [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/). 
-
-`<type>(optional scope): <description>`
-
-Example: `feat(classic-mode): Implement something great`

flake.lock

@@ -1,40 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-utils",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1663491030,
-        "narHash": "sha256-MVsfBhE9US5DvLtBAaTRjwYdv1tLO8xjahM8qLXTgTo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "767542707d394ff15ac1981e903e005ba69528b5",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,14 +0,0 @@
-{
-  description = "Project Kyoku";
-
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem
-      (system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        {
-          devShell = import ./shell.nix { inherit pkgs; };
-        }
-      );
-}

include/core/area.h

@@ -27,10 +27,8 @@ struct Area
 
     inline kku::Point position() const noexcept
     {
-        return kku::Point{
+        return kku::Point{static_cast<float>(left),
-            static_cast<float>(left),
+                          static_cast<float>(top) };
-            static_cast<float>(top),
-        };
     }
 
     inline void moveBy(const kku::Vector2<T>& vector)
@@ -45,4 +43,4 @@ struct Area
     }
 };
 
-} // namespace kku
+}

include/core/bpmsection.h

@@ -40,4 +40,4 @@ struct BPMSectionComparator
     }
 };
 
-} // namespace kku
+}

include/core/color.h

@@ -14,4 +14,4 @@ struct Color
     unsigned char alpha = 0;
 };
 
-} // namespace kku
+}

include/core/corefactory.h

@@ -2,13 +2,13 @@
 
 #include <memory>
 
-#include "core/line.h"
 #include "core/music.h"
-#include "core/rectangle.h"
-#include "core/resourceholder.h"
-#include "core/sprite.h"
 #include "core/text.h"
+#include "core/resourceholder.h"
+#include "core/rectangle.h"
 #include "core/vector.h"
+#include "core/line.h"
+#include "core/sprite.h"
 
 namespace kku
 {
@@ -25,9 +25,8 @@ class CoreFactory
     virtual std::shared_ptr<kku::Text> getText(kku::Font::Id id) const = 0;
     virtual std::shared_ptr<kku::Rectangle> getRectangle() const = 0;
     virtual std::shared_ptr<kku::Line> getLine() const = 0;
-    virtual std::shared_ptr<kku::Sprite>
+    virtual std::shared_ptr<kku::Sprite> getSprite(kku::GUISprite::Id id) const = 0;
-    getSprite(kku::GUISprite::Id id) const = 0;
     virtual kku::Vector2<std::size_t> getRenderSize() const = 0;
 };
 
-} // namespace kku
+}

include/core/editor.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <algorithm>
 #include <set>
+#include <algorithm>
 
-#include "core/bpmsection.h"
 #include "core/gameevent.h"
 #include "core/updatedata.h"
+#include "core/bpmsection.h"
 
 namespace kku
 {
@@ -24,14 +24,12 @@ class Editor
     virtual void display() const = 0;
     virtual void recalculate(const microsec& timestamp) = 0;
 
-    void setBPMSections(
+    void setBPMSections(const std::set<BPMSection, BPMSectionComparator>& sections) noexcept
-        const std::set<BPMSection, BPMSectionComparator> &sections) noexcept
     {
         _bpm_sections = sections;
     }
 
-    void setBPMSections(
+    void setBPMSections(std::set<BPMSection, BPMSectionComparator>&& sections) noexcept
-        std::set<BPMSection, BPMSectionComparator> &&sections) noexcept
     {
         _bpm_sections = std::move(sections);
     }
@@ -48,10 +46,11 @@ class Editor
 
     bool removeBPMSectionAt(const microsec& offset)
     {
-        auto section_it =
+        auto section_it = std::find_if(_bpm_sections.rbegin(), _bpm_sections.rend(),
-            std::find_if(_bpm_sections.rbegin(), _bpm_sections.rend(),
                                        [offset](const auto& section)
-                         { return section.offset_start < offset; });
+                                       {
+                                           return section.offset_start < offset;
+                                       });
 
         if (section_it != _bpm_sections.rend())
         {
@@ -66,10 +65,11 @@ class Editor
 
     BPMSection getBPMSectionAt(const microsec& offset) const
     {
-        auto section_it =
+        auto section_it = std::find_if(_bpm_sections.rbegin(), _bpm_sections.rend(),
-            std::find_if(_bpm_sections.rbegin(), _bpm_sections.rend(),
                                        [offset](const auto& section)
-                         { return section.offset_start < offset; });
+                                       {
+                                           return section.offset_start < offset;
+                                       });
 
         if (section_it != _bpm_sections.rend())
         {
@@ -80,10 +80,13 @@ class Editor
         return BPMSection();
     }
 
-    void clearBPMSections() noexcept { _bpm_sections.clear(); }
+    void clearBPMSections() noexcept
+    {
+        _bpm_sections.clear();
+    }
 
 protected:
     std::set<BPMSection, BPMSectionComparator> _bpm_sections;
 };
 
-} // namespace kku
+}

include/core/editorcallback.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "core/systemevent.h"
 #include <string>
 
 namespace kku
@@ -22,4 +23,4 @@ class EditorCallback
     virtual Metadata getMetadata() const = 0;
 };
 
-} // namespace kku
+}

include/core/functional.h

@@ -8,4 +8,4 @@ namespace kku
 using lambda = std::function<void(void)>;
 using predicate = std::function<bool(void)>;
 
-} // namespace kku
+}

include/core/game.h

@@ -21,4 +21,4 @@ class Game
     virtual void display() const = 0;
 };
 
-} // namespace kku
+}

include/core/gameevent.h

@@ -12,4 +12,4 @@ struct GameEvent
     const SystemEvent event;
 };
 
-} // namespace kku
+}

include/core/line.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "core/color.h"
 #include "core/point.h"
+#include "core/color.h"
 
 namespace kku
 {
@@ -18,4 +18,4 @@ class Line
     virtual void display() = 0;
 };
 
-} // namespace kku
+}

include/core/music.h

@@ -32,4 +32,4 @@ class Music
     virtual kku::microsec getDuration() const = 0;
 };
 
-} // namespace kku
+}

include/core/note.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "core/gameevent.h"
 #include "core/time.h"
+#include "core/gameevent.h"
 
 namespace kku
 {
@@ -9,7 +9,8 @@ namespace kku
 class Note
 {
 public:
-    explicit Note(microsec perfect_offset) : _perfect_offset(perfect_offset) {}
+    explicit Note(microsec perfect_offset) :
+        _perfect_offset(perfect_offset) {}
     virtual ~Note() = default;
 
     virtual bool isActive(const microsec& offset) const = 0;
@@ -49,4 +50,6 @@ struct NotePtrComparator
     }
 };
 
-} // namespace kku
+}
+
+

include/core/point.h

@@ -8,11 +8,17 @@ struct Point
     float x;
     float y;
 
-    constexpr inline explicit Point() noexcept : x(0.), y(0.) {}
+    constexpr inline explicit Point() noexcept :
+        x(0.), y(0.)
+    {}
 
-    constexpr inline explicit Point(int x, int y) noexcept : x(x), y(y) {}
+    constexpr inline explicit Point(int x, int y) noexcept :
+        x(x), y(y)
+    {}
 
-    constexpr inline explicit Point(float x, float y) noexcept : x(x), y(y) {}
+    constexpr inline explicit Point(float x, float y) noexcept :
+        x(x), y(y)
+    {}
 
     constexpr inline Point operator+(const Point& right) const noexcept
     {
@@ -37,4 +43,4 @@ struct Point
     }
 };
 
-} // namespace kku
+}

include/core/precisionevaluator.h

@@ -1,34 +1,37 @@
 #pragma once
 
-#include <cmath>
-#include <iostream>
 #include <numeric>
 #include <type_traits>
 #include <vector>
+#include <cmath>
+#include <iostream>
 
 #include "core/time.h"
 
 namespace kku
 {
 
-template <typename Grade,
+template<typename Grade, typename = std::enable_if_t<std::is_enum<Grade>::value>>
-          typename = std::enable_if_t<std::is_enum<Grade>::value>>
 class PrecisionEvaluator
 {
 public:
-    PrecisionEvaluator(const std::vector<microsec> &intervals, microsec offset)
+    PrecisionEvaluator(const std::vector<microsec>& intervals, microsec offset) :
-        : _offset(offset), _intervals(intervals)
+        _offset(offset),
+        _intervals(intervals)
     {
         _start_handling_offset = _offset - intervals.back();
         _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
     {
-        return music_play_offset > _start_handling_offset &&
+        return music_play_offset > _start_handling_offset
-               music_play_offset < _end_handling_offset;
+            && music_play_offset < _end_handling_offset;
     }
 
     Grade calculatePrecision(microsec odds) const
@@ -63,4 +66,4 @@ class PrecisionEvaluator
     const std::vector<microsec> _intervals;
 };
 
-} // namespace kku
+}

include/core/rectangle.h

@@ -24,4 +24,4 @@ class Rectangle
     virtual void display() = 0;
 };
 
-} // namespace kku
+}

include/core/resourceholder.h

@@ -1,12 +1,13 @@
 #pragma once
 
-#include <map>
 #include <memory>
+#include <map>
 
 namespace kku
 {
 
-template <typename Resource, typename Id> class ResourceHolder
+template <typename Resource, typename Id>
+class ResourceHolder
 {
 public:
     inline void load(Id id, std::unique_ptr<Resource>&& resource) noexcept
@@ -48,4 +49,4 @@ enum class Id
     };
 }
 
-} // namespace kku
+}

include/core/sprite.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "core/point.h"
+#include "core/area.h"
-#include "core/vector.h"
 
 namespace kku
 {
@@ -18,4 +17,4 @@ class Sprite
     virtual void display() const = 0;
 };
 
-} // namespace kku
+}

include/core/spritecontainer.h

@@ -1,9 +1,7 @@
 #pragma once
-
-#include <map>
 #include <memory>
 #include <stack>
-
+#include <map>
 namespace kku
 {
 
@@ -14,8 +12,9 @@ class SpriteContainer
 public:
     explicit SpriteContainer(std::initializer_list<Type>&& types,
                              const std::shared_ptr<SpriteFactory>& factory,
-                             std::size_t reserve_size = 20)
+                             std::size_t reserve_size = 20) :
-        : _sprite_factory(factory), _poll_reserve_size(reserve_size)
+        _sprite_factory(factory),
+        _poll_reserve_size(reserve_size)
     {
         for (const Type& type : types)
             reallocatePoll(type);
@@ -34,8 +33,7 @@ class SpriteContainer
         return sprite;
     }
 
-    inline void resetSprite(const std::shared_ptr<Sprite> &sprite,
+    inline void resetSprite(const std::shared_ptr<Sprite> &sprite, Type action) noexcept
-                            Type action) noexcept
     {
         sprite->reset();
         _sprite_dispatcher[action].push(sprite);
@@ -61,4 +59,4 @@ class SpriteContainer
     std::size_t _poll_reserve_size;
 };
 
-} // namespace kku
+}

include/core/systemevent.h

@@ -162,11 +162,10 @@ struct SystemEvent
     };
 
     struct None
-    {
+    {};
-    };
 
     Type type = Type::None;
     std::variant<Size, Key, Mouse, None> data;
 };
     
-} // namespace kku
+}

include/core/text.h

@@ -1,9 +1,9 @@
 #pragma once
 
+#include <string>
 #include "core/color.h"
 #include "core/point.h"
 #include "core/vector.h"
-#include <string>
 
 namespace kku
 {
@@ -21,4 +21,4 @@ class Text
     virtual void display() = 0;
 };
 
-} // namespace kku
+}

include/core/time.h

@@ -3,41 +3,20 @@
 namespace kku
 {
 
-/// microsec
-///
-/// Primitive alias representing microseconds, which
-/// is the main time measure in-game.
-/// 1 second is 1000000 microseconds.
 using microsec = long long;
 
-/// TimeRange
-///
-/// Object representing a section of time.
-/// To ensure order safety use
-/// static produceValidated function.
 struct TimeRange
 {
     const microsec begin = 0;
     const microsec end = 0;
 
-    constexpr inline explicit TimeRange() noexcept : begin(0), end(0)
+    constexpr inline explicit TimeRange() noexcept :
-    {
+        begin(0), end(0)
-    }
+    {}
 
-    constexpr inline explicit TimeRange(microsec x, microsec y) noexcept
+    constexpr inline explicit TimeRange(microsec x, microsec y) noexcept :
-        : begin(x), end(y)
+        begin(x), end(y)
-    {
+    {}
-    }
-
-    /// produceValidated
-    ///
-    /// Creates an object of TimeRange, but
-    /// also makes sure to place begin and end
-    /// in the right order to avoid confusion.
-    static inline TimeRange produceValidated(microsec x, microsec y) noexcept
-    {
-        return (x < y) ? TimeRange(x, y) : TimeRange(y, x);
-    }
 };
 
-} // namespace kku
+}

include/core/timeline.h

@@ -1,23 +1,22 @@
 #pragma once
 
-#include <algorithm>
-#include <memory>
 #include <set>
+#include <memory>
+#include <algorithm>
 
-#include "core/note.h"
 #include "core/time.h"
+#include "core/note.h"
 
 namespace kku
 {
 
-template <class TNote,
+template <class TNote, class = std::enable_if_t<std::is_base_of<Note, TNote>::value>>
-          class = std::enable_if_t<std::is_base_of<Note, TNote>::value>>
 class Timeline
 {
 public:
-    explicit Timeline() : _current_offset(0)
+    explicit Timeline() :
-    {
+        _current_offset(0)
-    }
+    {}
 
     typedef typename std::set<TNote*>::const_iterator Iterator;
 
@@ -26,9 +25,8 @@ class Timeline
         _current_offset = offset;
         expire(_top_note);
 
-        if (_timeline.empty())
+        if (!_timeline.empty())
-            return;
+        {
-
             Iterator head_iterator = _timeline.begin();
 
             while (!isExpired(head_iterator))
@@ -38,8 +36,7 @@ class Timeline
                     Iterator pre_head = head_iterator;
                     --pre_head;
 
-                _top_note =
+                    _top_note = !isExpired(pre_head) && (*pre_head)->isActive(offset)
-                    !isExpired(pre_head) && (*pre_head)->isActive(offset)
                               ? pre_head
                               : head_iterator;
                     break;
@@ -51,6 +48,7 @@ class Timeline
             if (isExpired(_top_note))
                 _top_note = _timeline.begin();
         }
+    }
 
     void setNotes(const std::set<TNote*, NotePtrComparator>& notes)
     {
@@ -74,6 +72,7 @@ class Timeline
         _timeline.insert(notes.begin(), notes.end());
         recalculate(_current_offset);
         update(_current_offset);
+
     }
 
     inline void clear()
@@ -115,7 +114,8 @@ class Timeline
     inline Iterator getNoteBy(const microsec& music_offset) noexcept
     {
         return std::find_if(_timeline.begin(), _timeline.end(),
-                            [music_offset](const auto &note) {
+                            [music_offset](const auto& note)
+                            {
                                 return note->getPerfectOffset() == music_offset;
                             });
     }
@@ -156,8 +156,8 @@ class Timeline
 
         const auto& top_note = *_top_note;
 
-        bool already_played = top_note->getPerfectOffset() < music_offset &&
+        bool already_played = top_note->getPerfectOffset() < music_offset
-                              !top_note->isActive(music_offset);
+                          && !top_note->isActive(music_offset);
 
         if (already_played)
             ++_top_note;
@@ -166,4 +166,6 @@ class Timeline
     Iterator _top_note;
 };
 
-} // namespace kku
+}
+
+

include/core/updatedata.h

@@ -11,4 +11,6 @@ struct UpdateData
     const microsec dt;
 };
 
-} // namespace kku
+}
+
+

include/core/vector.h

@@ -9,7 +9,8 @@ namespace kku
 ///
 /// Meaning an element of a vector space in math.
 /// Don't mistake for std::vector<T>
-template <typename T> using Vector2 = std::pair<T, T>;
+template <typename T>
+using Vector2 = std::pair<T, T>;
 
 template <typename T>
 inline constexpr auto makeVector(T&& l, T&& r) -> Vector2<T>
@@ -17,4 +18,4 @@ inline constexpr auto makeVector(T &&l, T &&r) -> Vector2<T>
     return std::make_pair(std::forward<T>(l), std::forward<T>(r));
 }
 
-} // namespace kku
+}

shell.nix

@@ -1,10 +0,0 @@
-{
-  pkgs     ? import <nixpkgs> {},
-  unstable ? import <nixos-unstable> {},
-}:
-
-with pkgs;
-mkShell {
-  buildInputs = [ sfml ];
-  nativeBuildInputs = [ ccls cmake ];
-}

src/application/include/application/about.h

@@ -7,22 +7,18 @@
 class Group;
 class PushButton;
 
-namespace kku
+namespace kku { class Sprite; class Text; }
-{
-class Sprite;
-class Text;
-} // namespace kku
 
 class About : public GUIState
 {
 public:
+
     struct Callbacks
     {
         kku::lambda onLeaveAboutState;
     };
 
-    explicit About(const std::shared_ptr<kku::CoreFactory> &factory,
+    explicit About(const std::shared_ptr<kku::CoreFactory>& factory, Callbacks&& callbacks);
-                   Callbacks &&callbacks);
     virtual void input(const kku::SystemEvent& event) override;
     virtual void update(const kku::microsec& dt) override;
     virtual void display() const override;
@@ -40,3 +36,4 @@ class About : public GUIState
     std::shared_ptr<Group> _buttons;
     std::shared_ptr<PushButton> _exit_button;
 };
+

src/application/include/application/editorstate.h

@@ -2,28 +2,24 @@
 
 #include "application/state.h"
 #include "core/corefactory.h"
-#include "core/functional.h"
 #include "core/music.h"
+#include "core/functional.h"
 
 class BPMCalculator;
 class Group;
 
-namespace kku
+namespace kku { class Editor; }
-{
-class Editor;
-}
 
 class EditorState : public GUIState
 {
 public:
+
     struct Callbacks
     {
         kku::lambda onLeaveEditorState;
     };
 
-    explicit EditorState(const std::shared_ptr<kku::CoreFactory> &core_factory,
+    explicit EditorState(const std::shared_ptr<kku::CoreFactory>& core_factory, std::unique_ptr<kku::Editor>&& editor, Callbacks&& callbacks);
-                         std::unique_ptr<kku::Editor> &&editor,
-                         Callbacks &&callbacks);
     virtual ~EditorState() override;
     virtual void input(const kku::SystemEvent& event) override;
     virtual void update(const kku::microsec& dt) override;
@@ -42,3 +38,4 @@ class EditorState : public GUIState
 
     std::unique_ptr<kku::Editor> _editor;
 };
+

src/application/include/application/gamestate.h

@@ -1,24 +1,24 @@
 #pragma once
 
+#include "state.h"
+#include "core/music.h"
+#include "core/game.h"
 #include "core/corefactory.h"
 #include "core/functional.h"
-#include "core/game.h"
-#include "core/music.h"
-#include "state.h"
 
 class Group;
 
 class GameState : public GUIState
 {
 public:
+
     struct Callbacks
     {
         kku::lambda onLeaveGame;
     };
 
-    explicit GameState(const std::shared_ptr<kku::CoreFactory> &core_factory,
+
-                       const std::shared_ptr<kku::Game> &game,
+    explicit GameState(const std::shared_ptr<kku::CoreFactory>& core_factory, const std::shared_ptr<kku::Game>& game, Callbacks&& callbacks);
-                       Callbacks &&callbacks);
 
     virtual void input(const kku::SystemEvent& event) override;
     virtual void update(const kku::microsec& dt) override;
@@ -35,3 +35,4 @@ class GameState : public GUIState
     kku::lambda _onEnterGameCallback;
     kku::lambda _onLeaveGameCallback;
 };
+

src/application/include/application/mainmenu.h

@@ -9,6 +9,7 @@ class Group;
 class MainMenu : public GUIState
 {
 public:
+
     struct Callbacks
     {
         kku::lambda onAppendGameState;
@@ -16,8 +17,7 @@ class MainMenu : public GUIState
         kku::lambda onAppendAboutState;
     };
 
-    explicit MainMenu(const std::shared_ptr<kku::CoreFactory> &factory,
+    explicit MainMenu(const std::shared_ptr<kku::CoreFactory>& factory, Callbacks&& callbacks);
-                      Callbacks &&callbacks);
     virtual void input(const kku::SystemEvent& event) override;
     virtual void update(const kku::microsec& dt) override;
     virtual void display() const override;
@@ -31,3 +31,4 @@ class MainMenu : public GUIState
 
     std::shared_ptr<Group> _buttons;
 };
+

src/application/include/application/state.h

@@ -1,17 +1,17 @@
 #pragma once
 
-#include <memory>
 #include <stack>
+#include <memory>
 
 #include "core/systemevent.h"
-#include "core/time.h"
 #include "core/vector.h"
+#include "core/time.h"
 
 class GUIState
 {
 public:
-    enum Tag
+
-    {
+    enum Tag {
         SPLASH_SCREEN,
         MAIN_MENU,
         GAME_PICKER,

src/application/shared/application/application.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <array>
-#include <memory>
 #include <vector>
+#include <memory>
+#include <array>
 
 #include "../../include/application/state.h" // HOW? WHY DOESN'T "application/state.h" LINK ON BY ITSELF
 #include "core/corefactory.h"

src/application/shared/application/log.h

@@ -1,64 +0,0 @@
-#pragma once
-
-#include <string>
-
-/**
- * @brief Basic logging class
- *
- * Defines helper functions for logging facility. Configured in
- * Application::init()
- *
- */
-class Log
-{
-  public:
-    enum LogLevel
-    {
-        FATAL,
-        ERROR,
-        WARN,
-        INFO,
-        DEBUG,
-    };
-
-    LogLevel level = WARN; ///< Default logging level
-
-    /**
-     * @brief Prints message to stdout
-     *
-     * TODO: write to configurable stream, be it stdout, stderr or even a file
-     *
-     * @param level the message level
-     * @param fmt the message format
-     * @param ... variable parameters
-     */
-    void log(LogLevel level, const std::string &fmt, ...);
-
-  private:
-    inline std::string _getLabel(LogLevel level)
-    {
-        switch (level)
-        {
-        case DEBUG:
-            return "DEBUG";
-        case INFO:
-            return "INFO ";
-        case WARN:
-            return "WARN ";
-        case ERROR:
-            return "ERROR";
-        case FATAL:
-            return "FATAL";
-        default:
-            return "UNK  ";
-        }
-    }
-};
-
-extern Log LOG; /// Global variable :(
-
-#define INFO(fmt, ...) LOG.log(Log::INFO, fmt, ##__VA_ARGS__)
-#define WARN(fmt, ...) LOG.log(Log::WARN, fmt, ##__VA_ARGS__)
-#define ERROR(fmt, ...) LOG.log(Log::ERROR, fmt, ##__VA_ARGS__)
-#define FATAL(fmt, ...) LOG.log(Log::FATAL, fmt, ##__VA_ARGS__)
-#define DEBUG(fmt, ...) LOG.log(Log::DEBUG, fmt, ##__VA_ARGS__)

src/application/src/about.cpp

@@ -1,10 +1,10 @@
 #include "application/about.h"
-#include "widgets/group.h"
 #include "widgets/pushbutton.h"
+#include "widgets/group.h"
 
-About::About(const std::shared_ptr<kku::CoreFactory> &factory,
+About::About(const std::shared_ptr<kku::CoreFactory>& factory, About::Callbacks&& callbacks) :
-             About::Callbacks &&callbacks)
+    _callbacks(std::move(callbacks)),
-    : _callbacks(std::move(callbacks)), _core_factory(factory),
+    _core_factory(factory),
     _sfml_logo(factory->getSprite(kku::GUISprite::Id::SFML_LOGO)),
     _cryptopp_logo(factory->getSprite(kku::GUISprite::Id::CRYPTOPP_LOGO)),
     _powered_by_text(factory->getText(kku::Font::Id::GUI)),
@@ -42,14 +42,12 @@ void About::enter()
 
     if (!_exit_button)
     {
-        _exit_button =
+        _exit_button = std::make_shared<PushButton>("Return", _core_factory, 48);
-            std::make_shared<PushButton>("Return", _core_factory, 48);
         _exit_button->setCallback(_callbacks.onLeaveAboutState);
         _buttons->addChild(_exit_button);
     }
 
-    _exit_button->setRect(
+    _exit_button->setRect(kku::Area<float>{window_width / 3.f, window_height / 7.f * 4,
-        kku::Area<float>{window_width / 3.f, window_height / 7.f * 4,
                                            window_width / 3.f, window_height / 7.f});
     _buttons->setVisibility();
 }
@@ -58,3 +56,4 @@ void About::leave()
 {
     _buttons->setVisibility(false);
 }
+

src/application/src/application.cpp

@@ -1,41 +1,30 @@
 #include "application/application.h"
-#include "application/log.h"
-#include "core/editor.h"
 #include "core/gameevent.h"
+#include "core/editor.h"
 
-#include "application/about.h"
-#include "application/editorstate.h"
-#include "application/gamestate.h"
 #include "application/mainmenu.h"
+#include "application/gamestate.h"
+#include "application/editorstate.h"
+#include "application/about.h"
 
 #include "classicmode/classicfactory.h"
 
-Log LOG;
-
 bool Application::init()
 {
-    LOG.level = Log::DEBUG;
-    DEBUG("Initializing Application");
-
     if (!_core_factory)
         return false;
 
-    MainMenu::Callbacks callbacks = {
+    MainMenu::Callbacks callbacks =
+    {
         [&](){ pushState(GUIState::Tag::GAME); },
         [&](){ pushState(GUIState::Tag::EDITOR); },
         [&](){ pushState(GUIState::Tag::ABOUT); },
     };
 
-    const auto main_menu =
+    const auto main_menu = std::make_shared<MainMenu>(_core_factory, std::move(callbacks));
-        std::make_shared<MainMenu>(_core_factory, std::move(callbacks));
+    const auto game_state = std::make_shared<GameState>(_core_factory, classic::getGame(_core_factory), GameState::Callbacks{[&](){ popState(); }});
-    const auto game_state = std::make_shared<GameState>(
+    const auto editor = std::make_shared<EditorState>(_core_factory, classic::getEditor(_core_factory), EditorState::Callbacks{[&](){ popState(); }});
-        _core_factory, classic::getGame(_core_factory),
+    const auto about = std::make_shared<About>(_core_factory, About::Callbacks{[&](){ popState(); }});
-        GameState::Callbacks{[&]() { popState(); }});
-    const auto editor = std::make_shared<EditorState>(
-        _core_factory, classic::getEditor(_core_factory),
-        EditorState::Callbacks{[&]() { popState(); }});
-    const auto about = std::make_shared<About>(
-        _core_factory, About::Callbacks{[&]() { popState(); }});
 
     _states[GUIState::Tag::MAIN_MENU] = main_menu;
     _states[GUIState::Tag::GAME] = game_state;
@@ -59,8 +48,6 @@ void Application::update(const kku::microsec &dt)
 
 void Application::pushState(GUIState::Tag new_state)
 {
-    DEBUG("Pushing state %d", new_state);
-
     if (!_state_stack.empty())
         _state_stack.back()->leave();
 
@@ -70,7 +57,6 @@ void Application::pushState(GUIState::Tag new_state)
 
 void Application::popState()
 {
-    DEBUG("Popping state");
     _state_stack.back()->leave();
     _state_stack.pop_back();
     _state_stack.back()->enter();

src/application/src/editorstate.cpp

@@ -1,25 +1,24 @@
 #include "application/editorstate.h"
-#include "tools/bpmcalculator.h"
-#include "widgets/bpmcalculatorwidget.h"
 #include "widgets/button.h"
-#include "widgets/editorwidget.h"
 #include "widgets/group.h"
 #include "widgets/menubar.h"
 #include "widgets/window.h"
+#include "widgets/editorwidget.h"
+#include "widgets/bpmcalculatorwidget.h"
+#include "tools/bpmcalculator.h"
 
 #include "core/editor.h"
 
 EditorState::EditorState(const std::shared_ptr<kku::CoreFactory>& core_factory,
                          std::unique_ptr<kku::Editor>&& editor,
-                         Callbacks &&callbacks)
+                         Callbacks&& callbacks) :
-    : _callbacks(std::move(callbacks)), _core_factory(core_factory),
+    _callbacks(std::move(callbacks)),
+    _core_factory(core_factory),
     _editor(std::move(editor))
-{
+{}
-}
 
 EditorState::~EditorState()
-{
+{}
-}
 
 void EditorState::input(const kku::SystemEvent& event)
 {
@@ -48,15 +47,13 @@ void EditorState::enter()
 
     _bpm_calculator = std::make_shared<BPMCalculator>();
     auto& bpm_calculator = _bpm_calculator;
-    std::shared_ptr<BPMCalculatorWidget> bpm_widget =
+    std::shared_ptr<BPMCalculatorWidget> bpm_widget = std::make_shared<BPMCalculatorWidget>(_bpm_calculator, _core_factory);
-        std::make_shared<BPMCalculatorWidget>(_bpm_calculator, _core_factory);
 
     auto button_start = std::make_shared<PushButton>("Start", _core_factory);
     auto button_stop = std::make_shared<PushButton>("Stop", _core_factory);
     auto button_apply = std::make_shared<PushButton>("Apply", _core_factory);
 
-    button_start->setCallback(
+    button_start->setCallback([bpm_calculator, button_start, button_stop, &music]()
-        [bpm_calculator, button_start, button_stop, &music]()
     {
         music->play();
         bpm_calculator->start();
@@ -64,8 +61,7 @@ void EditorState::enter()
         button_stop->setVisibility(true);
     });
 
-    button_stop->setCallback(
+    button_stop->setCallback([bpm_calculator, button_start, button_stop, &music]()
-        [bpm_calculator, button_start, button_stop, &music]()
     {
         music->stop();
         bpm_calculator->stop();
@@ -73,8 +69,7 @@ void EditorState::enter()
         button_stop->setVisibility(false);
     });
 
-    button_apply->setCallback(
+    button_apply->setCallback([&editor, bpm_calculator]()
-        [&editor, bpm_calculator]()
     {
         kku::BPMSection section;
         const auto& info = bpm_calculator->fetchApproximatedInfo();
@@ -90,8 +85,7 @@ void EditorState::enter()
     bpm_widget_init.stop = button_stop;
     bpm_widget_init.apply = button_apply;
     bpm_widget_init.start = button_start;
-    bpm_widget_init.current_time = [&music]() -> kku::microsec
+    bpm_widget_init.current_time = [&music]() -> kku::microsec { return music->fetchOffset(); };
-    { return music->fetchOffset(); };
 
     bpm_widget->init(std::move(bpm_widget_init));
     const auto bpm_widget_callback = [&group, bpm_widget=bpm_widget, &music]()
@@ -106,18 +100,15 @@ void EditorState::enter()
 
     auto menu_bar = std::make_shared<MenuBar>(_core_factory);
 
-    auto bpm_button =
+    auto bpm_button = std::make_shared<PushButton>("Calculate BPM", _core_factory);
-        std::make_shared<PushButton>("Calculate BPM", _core_factory);
 
-    bpm_button->setCallback(
+    bpm_button->setCallback([&group, bpm_widget=bpm_widget]()
-        [&group, bpm_widget = bpm_widget]()
                             {
                                 group->blockBy(bpm_widget);
                                 bpm_widget->setVisibility(true);
                             });
 
-    bpm_widget->setRect(
+    bpm_widget->setRect(kku::Area<float>{render_size.first / 3.f, render_size.second / 3.f,
-        kku::Area<float>{render_size.first / 3.f, render_size.second / 3.f,
                                          render_size.first / 3.f, render_size.second / 3.f});
 
     bpm_widget->addBarButton("X", bpm_widget_callback);
@@ -129,11 +120,9 @@ void EditorState::enter()
     auto test_menu_3 = std::make_shared<MenuDrop>(_core_factory);
     test_menu_3->setRect(kku::Area<float>{0., 0., 200., 27. * 5.});
 
-    auto test_cascade_button =
+    auto test_cascade_button = std::make_shared<CascadeMenuButton>("Show submenu", _core_factory);
-        std::make_shared<CascadeMenuButton>("Show submenu", _core_factory);
 
-    auto test_cascade_button_2 =
+    auto test_cascade_button_2 = std::make_shared<CascadeMenuButton>("Show submenu 2", _core_factory);
-        std::make_shared<CascadeMenuButton>("Show submenu 2", _core_factory);
 
     auto quit_button = std::make_shared<PushButton>("Quit", _core_factory);
     quit_button->setCallback(_callbacks.onLeaveEditorState);
@@ -161,18 +150,19 @@ void EditorState::enter()
     menu_bar->setVisibility(true);
 
     EditorWidget::Callbacks callbacks;
-    callbacks.onDisplay = [&editor]() { editor->display(); };
+    callbacks.onDisplay = [&editor]()
+    {
+        editor->display();
+    };
 
     callbacks.onInput = [&editor, &music](const kku::SystemEvent& event)
     {
-        if (event.type == kku::SystemEvent::Type::KeyRelease &&
+        if (event.type == kku::SystemEvent::Type::KeyRelease
-            std::get<kku::SystemEvent::Key>(event.data).view ==
+        &&  std::get<kku::SystemEvent::Key>(event.data).view == kku::SystemEvent::Key::Code::Space)
-                kku::SystemEvent::Key::Code::Space)
             music->isPlaying() ? music->pause() : music->play();
         else if (event.type == kku::SystemEvent::Type::MouseWheelScroll)
         {
-            const auto &up =
+            const auto& up = std::get<kku::SystemEvent::Mouse>(event.data).scrolled_up;
-                std::get<kku::SystemEvent::Mouse>(event.data).scrolled_up;
             music->moveOffset(up ? 500000 : -500000);
             editor->recalculate(music->fetchOffset());
         }
@@ -180,7 +170,8 @@ void EditorState::enter()
             editor->input(kku::GameEvent{music->fetchOffset(), event});
     };
 
-    callbacks.onUpdate = [&editor, &music](const kku::microsec &dt) {
+    callbacks.onUpdate = [&editor, &music](const kku::microsec& dt)
+    {
         editor->update(kku::UpdateData{music->fetchOffset(), dt});
     };
 

src/application/src/gamestate.cpp

@@ -4,10 +4,9 @@
 
 #include "core/game.h"
 
-GameState::GameState(const std::shared_ptr<kku::CoreFactory> &core_factory,
+GameState::GameState(const std::shared_ptr<kku::CoreFactory>& core_factory, const std::shared_ptr<kku::Game>& game, Callbacks&& callbacks) :
-                     const std::shared_ptr<kku::Game> &game,
+    _core_factory(core_factory),
-                     Callbacks &&callbacks)
+    _game(game),
-    : _core_factory(core_factory), _game(game),
     _onLeaveGameCallback(callbacks.onLeaveGame)
 {
 }

src/application/src/log.cpp

@@ -1,27 +0,0 @@
-#include <cstdarg>
-#include <iostream>
-#include <vector>
-
-#include "application/log.h"
-
-void Log::log(LogLevel level, const std::string &fmt, ...)
-{
-    if (level > this->level)
-        return;
-
-    va_list args;
-
-    // First va_start: count how many characters are needed for formatting
-    va_start(args, fmt);
-    size_t len = std::vsnprintf(NULL, 0, fmt.c_str(), args);
-    va_end(args);
-
-    std::vector<char> buf(len + 1);
-
-    // Second va_start: actually write formatted message to buffer
-    va_start(args, fmt);
-    std::vsnprintf(&buf[0], len + 1, fmt.c_str(), args);
-    va_end(args);
-
-    std::cout << this->_getLabel(level) << " " << &buf[0] << std::endl;
-}

src/application/src/mainmenu.cpp

@@ -1,10 +1,10 @@
 #include "application/mainmenu.h"
-#include "widgets/group.h"
 #include "widgets/pushbutton.h"
+#include "widgets/group.h"
 
-MainMenu::MainMenu(const std::shared_ptr<kku::CoreFactory> &factory,
+MainMenu::MainMenu(const std::shared_ptr<kku::CoreFactory>& factory, MainMenu::Callbacks&& callbacks) :
-                   MainMenu::Callbacks &&callbacks)
+    _callbacks(std::move(callbacks)),
-    : _callbacks(std::move(callbacks)), _core_factory(factory),
+    _core_factory(factory),
     _buttons(std::make_shared<Group>())
 {
 }
@@ -30,24 +30,18 @@ void MainMenu::enter()
     const float window_width = render_size.first;
     const float window_height = render_size.second;
 
-    auto button_start =
+    auto button_start = std::make_shared<PushButton>("Start", _core_factory, 48);
-        std::make_shared<PushButton>("Start", _core_factory, 48);
+    button_start->setRect(kku::Area<float>{window_width / 3.f, window_height / 7.f,
-    button_start->setRect(
-        kku::Area<float>{window_width / 3.f, window_height / 7.f,
                                            window_width / 3.f, window_height / 7.f});
     button_start->setCallback(_callbacks.onAppendGameState);
 
-    auto button_editor =
+    auto button_editor = std::make_shared<PushButton>("Editor", _core_factory, 48);
-        std::make_shared<PushButton>("Editor", _core_factory, 48);
+    button_editor->setRect(kku::Area<float>{window_width / 3.f, window_height / 7.f * 3,
-    button_editor->setRect(
-        kku::Area<float>{window_width / 3.f, window_height / 7.f * 3,
                                             window_width / 3.f, window_height / 7.f});
     button_editor->setCallback(_callbacks.onAppendEditorState);
 
-    auto button_about =
+    auto button_about = std::make_shared<PushButton>("About", _core_factory, 48);
-        std::make_shared<PushButton>("About", _core_factory, 48);
+    button_about->setRect(kku::Area<float>{window_width / 3.f, window_height / 7.f * 5,
-    button_about->setRect(
-        kku::Area<float>{window_width / 3.f, window_height / 7.f * 5,
                                             window_width / 3.f, window_height / 7.f});
     button_about->setCallback(_callbacks.onAppendAboutState);
 
@@ -62,3 +56,4 @@ void MainMenu::leave()
 {
     _buttons->setVisibility(false);
 }
+

src/application/src/widgets/bpmcalculatorwidget.cpp

@@ -1,14 +1,14 @@
 #include "bpmcalculatorwidget.h"
-#include "core/editor.h"
 #include "tools/bpmcalculator.h"
+#include "core/editor.h"
 
 #include <iostream>
 
-BPMCalculatorWidget::BPMCalculatorWidget(
+BPMCalculatorWidget::BPMCalculatorWidget(const std::shared_ptr<BPMCalculator>& bpm_calculator, const std::shared_ptr<kku::CoreFactory>& factory) :
-    const std::shared_ptr<BPMCalculator> &bpm_calculator,
+    Window(factory, "BPM Calculation"),
-    const std::shared_ptr<kku::CoreFactory> &factory)
+    _bpm_calculator(bpm_calculator),
-    : Window(factory, "BPM Calculation"), _bpm_calculator(bpm_calculator),
+    _slider(std::make_shared<BPMSlider>(factory)),
-      _slider(std::make_shared<BPMSlider>(factory)), _core_factory(factory),
+    _core_factory(factory),
     _ticked(false)
 {
     _bpm_value = _core_factory->getText(kku::Font::Id::GUI);
@@ -29,8 +29,7 @@ void BPMCalculatorWidget::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::KeyPress:
     {
-        if (std::get<kku::SystemEvent::Key>(event.data).view ==
+        if (std::get<kku::SystemEvent::Key>(event.data).view == kku::SystemEvent::Key::Code::Space)
-            kku::SystemEvent::Key::Code::Space)
         {
             _bpm_calculator->click(_current_time());
         }
@@ -50,11 +49,8 @@ void BPMCalculatorWidget::update(const kku::microsec &dt)
     {
         _bpm_value->setString(std::to_string(static_cast<int>(beat_info.BPM)));
 
-        const kku::microsec until_beat =
+        const kku::microsec until_beat = _bpm_calculator->fetchTimeUntilNextBeat(_current_time());
-            _bpm_calculator->fetchTimeUntilNextBeat(_current_time());
+        const auto time_relation = static_cast<long double>(beat_info.interval) / static_cast<long double>(until_beat);
-        const auto time_relation =
-            static_cast<long double>(beat_info.interval) /
-            static_cast<long double>(until_beat);
         const auto slider_path_left = _slider->getRect().width / time_relation;
         if (slider_path_left < 50)
         {
@@ -87,30 +83,22 @@ void BPMCalculatorWidget::setRect(const kku::Area<float> &rect)
 {
     Window::setRect(rect);
     _slider->setRect(kku::Area<float>{0, 0, rect.width / 8 * 6, 100});
-    _slider->setPosition(
+    _slider->setPosition(kku::Point{_window_content->getRect().left + rect.width / 8,
-        kku::Point{_window_content->getRect().left + rect.width / 8,
                                     _window_content->getRect().top + rect.height / 8 * 3});
 
     _button_start->setRect(kku::Area<float>{0, 0, rect.width / 10 * 3, 30});
-    _button_start->setPosition(
+    _button_start->setPosition(kku::Point{_window_content->getRect().left + rect.width / 7,
-        kku::Point{_window_content->getRect().left + rect.width / 7,
+                                          _window_content->getRect().top + _window_content->getRect().height - 40});
-                   _window_content->getRect().top +
-                       _window_content->getRect().height - 40});
 
     _button_stop->setRect(kku::Area<float>{0, 0, rect.width / 10 * 3, 30});
-    _button_stop->setPosition(
+    _button_stop->setPosition(kku::Point{_window_content->getRect().left + rect.width / 7,
-        kku::Point{_window_content->getRect().left + rect.width / 7,
+                                         _window_content->getRect().top + _window_content->getRect().height - 40});
-                   _window_content->getRect().top +
-                       _window_content->getRect().height - 40});
 
     _button_apply->setRect(kku::Area<float>{0, 0, rect.width / 10 * 3, 30});
-    _button_apply->setPosition(kku::Point{
+    _button_apply->setPosition(kku::Point{_window_content->getRect().left + 50 + (2 * (rect.width / 7)),
-        _window_content->getRect().left + 50 + (2 * (rect.width / 7)),
+                                _window_content->getRect().top + _window_content->getRect().height - 40});
-        _window_content->getRect().top + _window_content->getRect().height -
-            40});
 
-    _bpm_value->setPosition(
+    _bpm_value->setPosition(kku::Point{_window_content->getRect().left + rect.width / 8,
-        kku::Point{_window_content->getRect().left + rect.width / 8,
                                        _window_content->getRect().top + rect.height / 8 });
 }
 

src/application/src/widgets/bpmslider.cpp

@@ -29,8 +29,10 @@ void BPMSlider::display() const
 void BPMSlider::setRect(const kku::Area<float>& rect)
 {
     _slider_background->setRect(rect);
-    _slider_tick->setRect(
+    _slider_tick->setRect(kku::Area<float>{rect.left,
-        kku::Area<float>{rect.left, rect.top, rect.width / 30.f, rect.height});
+                                           rect.top,
+                                           rect.width / 30.f,
+                                           rect.height});
 }
 
 void BPMSlider::setPosition(const kku::Point& position)
@@ -62,7 +64,6 @@ kku::Point BPMSlider::getPosition() const
 
 void BPMSlider::setTickPosition(float x_position)
 {
-    _slider_tick->setPosition(
+    _slider_tick->setPosition(kku::Point{_slider_background->getPosition().x + x_position,
-        kku::Point{_slider_background->getPosition().x + x_position,
                                          _slider_tick->getPosition().y});
 }

src/application/src/widgets/button.cpp

@@ -1,10 +1,8 @@
 #include "button.h"
 #include <iostream>
 
-Button::Button(const std::string &text,
+Button::Button(const std::string &text, const std::shared_ptr<kku::CoreFactory>& factory, unsigned int font_size) :
-               const std::shared_ptr<kku::CoreFactory> &factory,
+    _core_factory(factory)
-               unsigned int font_size)
-    : _core_factory(factory)
 {
     _button_text = _core_factory->getText(kku::Font::Id::GUI);
     _button_text->setString(text);
@@ -31,7 +29,8 @@ void Button::display() const
 void Button::setRect(const kku::Area<float>& rect)
 {
     _button_content->setRect(rect);
-    _button_text->setPosition(kku::Point{rect.left + 5, rect.top + 5});
+    _button_text->setPosition(kku::Point{rect.left + 5,
+                                        rect.top  + 5});
 }
 
 void Button::setPosition(const kku::Point& position)

src/application/src/widgets/cascademenubutton.cpp

@@ -1,10 +1,8 @@
 #include "cascademenubutton.h"
 #include "menudrop.h"
 
-CascadeMenuButton::CascadeMenuButton(
+CascadeMenuButton::CascadeMenuButton(const std::string& text, const std::shared_ptr<kku::CoreFactory>& factory, unsigned int font_size) :
-    const std::string &text, const std::shared_ptr<kku::CoreFactory> &factory,
+    Button(text, factory, font_size)
-    unsigned int font_size)
-    : Button(text, factory, font_size)
 {
     _color_idle = kku::Color{230, 230, 230, 255};
     _color_hover = kku::Color{84, 158, 253, 255};
@@ -25,8 +23,7 @@ void CascadeMenuButton::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::MouseMove:
     {
-        const auto position =
+        const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-            std::get<kku::SystemEvent::Mouse>(event.data).position;
         if (isUnderMouse(position))
         {
             _button_content->setColor(_color_hover);
@@ -43,6 +40,7 @@ void CascadeMenuButton::input(const kku::SystemEvent &event)
         }
         break;
     }
+
     }
 }
 
@@ -67,14 +65,12 @@ void CascadeMenuButton::resetRect()
 {
     if (_submenu)
     {
-        _submenu->setPosition(kku::Point{_button_content->getPosition().x +
+        _submenu->setPosition(kku::Point{_button_content->getPosition().x + _button_content->getRect().width,
-                                             _button_content->getRect().width,
                                          _button_content->getPosition().y});
     }
 }
 
-void CascadeMenuButton::setFillColors(kku::Color &&idle_color,
+void CascadeMenuButton::setFillColors(kku::Color&& idle_color, kku::Color&& hover_color)
-                                      kku::Color &&hover_color)
 {
     _color_idle = idle_color;
     _color_hover = hover_color;

src/application/src/widgets/editorwidget.cpp

@@ -1,12 +1,11 @@
 #include "editorwidget.h"
 #include "core/editor.h"
 
-EditorWidget::EditorWidget(Callbacks &&callbacks)
+EditorWidget::EditorWidget(Callbacks&& callbacks) :
-    : _input(std::move(callbacks.onInput)),
+    _input(std::move(callbacks.onInput)),
     _update(std::move(callbacks.onUpdate)),
     _draw(std::move(callbacks.onDisplay))
-{
+{}
-}
 
 void EditorWidget::input(const kku::SystemEvent& event)
 {

src/application/src/widgets/group.cpp

@@ -46,5 +46,10 @@ kku::Area<float> Group::getRect() const
 
 kku::Point Group::getPosition() const
 {
-    return kku::Point{_rect.top, _rect.left};
+    return kku::Point
+    {
+        _rect.top,
+        _rect.left
+    };
 }
+

src/application/src/widgets/menubar.cpp

@@ -1,8 +1,10 @@
 #include "menubar.h"
 
-MenuBar::MenuBar(const std::shared_ptr<kku::CoreFactory> &factory)
+MenuBar::MenuBar(const std::shared_ptr<kku::CoreFactory>& factory) :
-    : _core_factory(factory), _bar_rect(factory->getRectangle()),
+    _core_factory(factory),
-      _amount_buttons(0), _button_width(170)
+    _bar_rect(factory->getRectangle()),
+    _amount_buttons(0),
+    _button_width(170)
 {
     _bar_rect->setColor(kku::Color{88, 57, 107, 255});
 }
@@ -16,8 +18,7 @@ void MenuBar::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::MouseRelease:
     {
-        const auto position =
+        const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-            std::get<kku::SystemEvent::Mouse>(event.data).position;
         if (!isUnderMouse(position))
         {
             for (auto& submenu : _submenus)
@@ -71,29 +72,29 @@ bool MenuBar::isUnderMouse(const kku::Point &position) const
 
     bool submenus_under_mouse = std::any_of(_children.begin(), _children.end(),
                                             [p=position](const auto& child)
-                                            { return child->isUnderMouse(p); });
+                                            {
+                                                return child->isUnderMouse(p);
+                                            });
 
     return bar_under_mouse || submenus_under_mouse;
 }
 
-void MenuBar::addRootSubMenu(std::string name,
+void MenuBar::addRootSubMenu(std::string name, const std::shared_ptr<MenuDrop>& submenu)
-                             const std::shared_ptr<MenuDrop> &submenu)
 {
     const auto new_button = std::make_shared<PushButton>(name, _core_factory);
 
     std::size_t current_index = _amount_buttons;
-    new_button->setRect(kku::Area<float>{
+    new_button->setRect(kku::Area<float>{static_cast<float>(current_index * _button_width),
-        static_cast<float>(current_index * _button_width), 0.f,
+                                         0.f,
-        static_cast<float>(_button_width), _bar_rect->getRect().height});
+                                         static_cast<float>(_button_width),
-    new_button->setCallback(
+                                         _bar_rect->getRect().height});
-        [submenu = submenu]()
+    new_button->setCallback([submenu=submenu]()
                             {
                                 submenu->setVisibility(true);
                                 submenu->lock();
                             });
 
-    submenu->setPosition(
+    submenu->setPosition(kku::Point{static_cast<float>(current_index * _button_width),
-        kku::Point{static_cast<float>(current_index * _button_width),
                                     _bar_rect->getRect().height});
 
     new_button->setColors(kku::Color{171, 141, 189, 255},

src/application/src/widgets/menudrop.cpp

@@ -1,8 +1,10 @@
 #include "menudrop.h"
 #include "core/corefactory.h"
 
-MenuDrop::MenuDrop(const std::shared_ptr<kku::CoreFactory> &factory)
+MenuDrop::MenuDrop(const std::shared_ptr<kku::CoreFactory>& factory) :
-    : _is_locked(false), _button_height(27), _button_index(0)
+    _is_locked(false),
+    _button_height(27),
+    _button_index(0)
 {
     _is_visible = false;
     _content_rect = factory->getRectangle();
@@ -23,8 +25,7 @@ void MenuDrop::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::MouseRelease:
     {
-        const auto position =
+        const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-            std::get<kku::SystemEvent::Mouse>(event.data).position;
         if (isUnderMouse(position))
         {
             setVisibility(false);
@@ -39,8 +40,7 @@ void MenuDrop::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::MouseMove:
     {
-        const auto position =
+        const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-            std::get<kku::SystemEvent::Mouse>(event.data).position;
         if (!isUnderMouse(position))
         {
             if (!isLocked() && !hasActiveSubmenus())
@@ -55,7 +55,9 @@ bool MenuDrop::hasActiveSubmenus() const
 {
     return std::any_of(_submenus.begin(), _submenus.end(),
                        [](const auto& submenu) -> bool
-                       { return submenu->_is_visible; });
+                       {
+                           return submenu->_is_visible;
+                       });
 }
 
 void MenuDrop::update(const kku::microsec& dt)
@@ -109,8 +111,7 @@ void MenuDrop::addPushButton(const std::shared_ptr<PushButton> &button)
     add(button);
 }
 
-void MenuDrop::addCascadeButton(
+void MenuDrop::addCascadeButton(const std::shared_ptr<CascadeMenuButton>& button)
-    const std::shared_ptr<CascadeMenuButton> &button)
 {
     auto& submenu = button->submenu();
     _submenus.emplace_back(submenu);
@@ -128,10 +129,10 @@ void MenuDrop::add(const std::shared_ptr<Widget> &widget)
 {
     const auto& parent_rect = _content_rect->getRect();
 
-    widget->setRect(kku::Area<float>{
+    widget->setRect(kku::Area<float>{parent_rect.left,
-        parent_rect.left,
                                      parent_rect.top + (parent_rect.height * _button_index),
-        parent_rect.width, static_cast<float>(_button_height)});
+                                     parent_rect.width,
+                                     static_cast<float>(_button_height)});
 
     addChild(widget);
     ++_button_index;

src/application/src/widgets/pushbutton.cpp

@@ -1,9 +1,8 @@
 #include "pushbutton.h"
 
-PushButton::PushButton(const std::string &text,
+PushButton::PushButton(const std::string& text, const std::shared_ptr<kku::CoreFactory>& factory, unsigned int font_size) :
-                       const std::shared_ptr<kku::CoreFactory> &factory,
+    Button(text, factory, font_size),
-                       unsigned int font_size)
+    _pressed(false)
-    : Button(text, factory, font_size), _pressed(false)
 {
     _color_idle = kku::Color{230, 230, 230, 255};
     _color_pressed = kku::Color{200, 200, 200, 255};
@@ -20,8 +19,7 @@ void PushButton::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::MousePress:
     {
-        const auto position =
+        const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-            std::get<kku::SystemEvent::Mouse>(event.data).position;
         if (isUnderMouse(position))
         {
             _pressed = true;
@@ -34,8 +32,7 @@ void PushButton::input(const kku::SystemEvent &event)
     {
         if (_pressed)
         {
-            const auto position =
+            const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-                std::get<kku::SystemEvent::Mouse>(event.data).position;
             _button_content->setColor(_color_idle);
             _pressed = false;
             if (isUnderMouse(position))

src/application/src/widgets/window.cpp

@@ -1,8 +1,8 @@
 #include "window.h"
 
-Window::Window(const std::shared_ptr<kku::CoreFactory> &factory,
+Window::Window(const std::shared_ptr<kku::CoreFactory>& factory, const std::string& title) :
-               const std::string &title)
+    _core_factory(factory),
-    : _core_factory(factory), _is_dragging(false)
+    _is_dragging(false)
 {
     _bar_title = _core_factory->getText(kku::Font::Id::GUI);
     _bar_title->setString(title);
@@ -27,8 +27,7 @@ void Window::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::MousePress:
     {
-        const auto position =
+        const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-            std::get<kku::SystemEvent::Mouse>(event.data).position;
         if (_bar->contains(position))
         {
             _is_dragging = true;
@@ -43,8 +42,7 @@ void Window::input(const kku::SystemEvent &event)
 
     case kku::SystemEvent::Type::MouseMove:
     {
-        const auto position =
+        const auto position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-            std::get<kku::SystemEvent::Mouse>(event.data).position;
         if (_is_dragging)
         {
             float x_mouse_diff = position.x - _previous_click_position.x;
@@ -82,7 +80,8 @@ void Window::setRect(const kku::Area<float> &rect)
     kku::Area<float> bar_rect = {rect.left, rect.top, rect.width, 30};
     _bar->setRect(bar_rect);
     
-    _bar_title->setPosition(kku::Point{rect.left + 5, rect.top + 5});
+    _bar_title->setPosition(kku::Point{rect.left + 5,
+                                      rect.top  + 5});
 }
 
 void Window::setPosition(const kku::Point& position)
@@ -115,7 +114,8 @@ void Window::addBarButton(const std::string &text, kku::lambda callback)
 
     auto b = std::make_shared<PushButton>(text, _core_factory, 20);
     b->setCallback(callback);
-    b->setRect({area.left + area.width - 35, area.top, 30, 30});
+    b->setRect({area.left + area.width - 35,
+                area.top, 30, 30});
 
     Widget::addChild(b);
 }

src/impl/sfml/application/applicationsfml.cpp

@@ -1,13 +1,13 @@
 #include "applicationsfml.h"
-#include "sfml/application/inputconvertersfml.h"
 #include "sfml/corefactorysfml.h"
+#include "sfml/application/inputconvertersfml.h"
 
 #include <SFML/System/Clock.hpp>
 
 const sf::Time TIME_PER_FRAME = sf::seconds(1.f / 90.f);
 
-ApplicationSFML::ApplicationSFML(sf::RenderWindow *const render_window)
+ApplicationSFML::ApplicationSFML(sf::RenderWindow * const render_window) :
-    : _render_window(render_window)
+    _render_window(render_window)
 {
     _render_window->setFramerateLimit(60);
     _render_window->setKeyRepeatEnabled(false);

src/impl/sfml/application/inputconvertersfml.h

@@ -19,64 +19,120 @@ constexpr kku::SystemEvent convert(const sf::Event &event) noexcept
         break;
 
     case sf::Event::Resized:
-        return kku::SystemEvent{
+        return kku::SystemEvent
+        {
             kku::SystemEvent::Type::Resize,
-            kku::SystemEvent::Size{event.size.width, event.size.height}};
+            kku::SystemEvent::Size
+            {
+                event.size.width,
+                event.size.height
+            }
+        };
 
     case sf::Event::KeyPressed:
-        return kku::SystemEvent{
+        return kku::SystemEvent
+        {
             kku::SystemEvent::Type::KeyPress,
-            kku::SystemEvent::Key{kku::convert(event.key.code), event.key.alt,
+            kku::SystemEvent::Key
-                                  event.key.control, event.key.shift}};
+            {
+                kku::convert(event.key.code),
+                event.key.alt,
+                event.key.control,
+                event.key.shift
+            }
+        };
 
     case sf::Event::KeyReleased:
-        return kku::SystemEvent{
+        return kku::SystemEvent
+        {
             kku::SystemEvent::Type::KeyRelease,
-            kku::SystemEvent::Key{kku::convert(event.key.code), event.key.alt,
+            kku::SystemEvent::Key
-                                  event.key.control, event.key.shift}};
+            {
+                kku::convert(event.key.code),
+                event.key.alt,
+                event.key.control,
+                event.key.shift
+            }
+        };
 
     case sf::Event::MouseWheelScrolled:
-        return kku::SystemEvent{
+        return kku::SystemEvent
+        {
             kku::SystemEvent::Type::MouseWheelScroll,
-            kku::SystemEvent::Mouse{
+            kku::SystemEvent::Mouse
-                kku::Point{event.mouseWheelScroll.x, event.mouseWheelScroll.y},
+            {
+                kku::Point
+                {
+                    event.mouseWheelScroll.x,
+                    event.mouseWheelScroll.y
+                },
 
                 (event.mouseWheelScroll.delta > 0),
-                kku::SystemEvent::Mouse::Button::Wheel}};
+                kku::SystemEvent::Mouse::Button::Wheel
+            }
+        };
 
     case sf::Event::MouseMoved:
-        return kku::SystemEvent{
+        return kku::SystemEvent
+        {
             kku::SystemEvent::Type::MouseMove,
-            kku::SystemEvent::Mouse{
+            kku::SystemEvent::Mouse
-                kku::Point{event.mouseMove.x, event.mouseMove.y},
+            {
+                kku::Point
+                {
+                    event.mouseMove.x,
+                    event.mouseMove.y
+                },
 
-                false, kku::SystemEvent::Mouse::Button::None}};
+                false,
+                kku::SystemEvent::Mouse::Button::None
+            }
+        };
 
     case sf::Event::MouseButtonPressed:
-        return kku::SystemEvent{
+        return kku::SystemEvent
+        {
             kku::SystemEvent::Type::MousePress,
-            kku::SystemEvent::Mouse{
+            kku::SystemEvent::Mouse
-                kku::Point{event.mouseButton.x, event.mouseButton.y},
+            {
+                kku::Point
+                {
+                    event.mouseButton.x,
+                    event.mouseButton.y
+                },
 
                 false,
                 ((event.mouseButton.button == sf::Mouse::Button::Left)
                  ? kku::SystemEvent::Mouse::Button::Left
-                     : kku::SystemEvent::Mouse::Button::Right)}};
+                 : kku::SystemEvent::Mouse::Button::Right)
+            }
+        };
 
     case sf::Event::MouseButtonReleased:
-        return kku::SystemEvent{
+        return kku::SystemEvent
+        {
             kku::SystemEvent::Type::MouseRelease,
-            kku::SystemEvent::Mouse{
+            kku::SystemEvent::Mouse
-                kku::Point{event.mouseButton.x, event.mouseButton.y},
+            {
+                kku::Point
+                {
+                    event.mouseButton.x,
+                    event.mouseButton.y
+                },
 
                 false,
                 ((event.mouseButton.button == sf::Mouse::Button::Left)
                  ? kku::SystemEvent::Mouse::Button::Left
-                     : kku::SystemEvent::Mouse::Button::Right)}};
+                 : kku::SystemEvent::Mouse::Button::Right)
+            }
+        };
     }
 
-    return kku::SystemEvent{kku::SystemEvent::Type::None,
+    return kku::SystemEvent
-                            kku::SystemEvent::None{}};
+    {
+        kku::SystemEvent::Type::None,
+        kku::SystemEvent::None{}
+    };
 }
 
-} // namespace kku
+}

src/impl/sfml/corefactorysfml.cpp

@@ -1,13 +1,13 @@
 #include "corefactorysfml.h"
 
-#include "linesfml.h"
-#include "musicsfml.h"
 #include "rectanglesfml.h"
-#include "spritesfml.h"
+#include "musicsfml.h"
 #include "textsfml.h"
+#include "linesfml.h"
+#include "spritesfml.h"
 
-CoreFactorySFML::CoreFactorySFML(sf::RenderTarget *const render_target)
+CoreFactorySFML::CoreFactorySFML(sf::RenderTarget * const render_target) :
-    : _render_target(render_target)
+    _render_target(render_target)
 {
     auto gui_font = std::make_unique<sf::Font>();
     gui_font->loadFromFile("resources/SourceCodePro-Regular.ttf");
@@ -38,8 +38,7 @@ std::shared_ptr<kku::Line> CoreFactorySFML::getLine() const
      return std::make_unique<LineSFML>(_render_target);
  }
 
-std::shared_ptr<kku::Sprite>
+ std::shared_ptr<kku::Sprite> CoreFactorySFML::getSprite(kku::GUISprite::Id id) const
-CoreFactorySFML::getSprite(kku::GUISprite::Id id) const
  {
     const auto texture = _texture_holder.get(kku::Texture::Id::GUI);
     switch (id)
@@ -49,14 +48,12 @@ CoreFactorySFML::getSprite(kku::GUISprite::Id id) const
         break;
 
     case kku::GUISprite::Id::SFML_LOGO:
-        return std::make_unique<SpriteSFML>(
+        return std::make_unique<SpriteSFML>(_render_target, _texture_holder.get(kku::Texture::Id::GUI),
-            _render_target, _texture_holder.get(kku::Texture::Id::GUI),
                                             kku::Area<unsigned int>{0, 0, 252, 81});
         break;
 
     case kku::GUISprite::Id::CRYPTOPP_LOGO:
-        return std::make_unique<SpriteSFML>(
+        return std::make_unique<SpriteSFML>(_render_target, _texture_holder.get(kku::Texture::Id::GUI),
-            _render_target, _texture_holder.get(kku::Texture::Id::GUI),
                                             kku::Area<unsigned int>{252, 0, 135, 36});
         break;
     }

src/impl/sfml/corefactorysfml.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/RectangleShape.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
+#include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/Sprite.hpp>
 #include <SFML/Graphics/Texture.hpp>
 
@@ -16,8 +16,7 @@ class CoreFactorySFML : public kku::CoreFactory
     virtual std::shared_ptr<kku::Text> getText(kku::Font::Id id) const override;
     virtual std::shared_ptr<kku::Rectangle> getRectangle() const override;
     virtual std::shared_ptr<kku::Line> getLine() const override;
-    virtual std::shared_ptr<kku::Sprite>
+    virtual std::shared_ptr<kku::Sprite> getSprite(kku::GUISprite::Id id) const override;
-    getSprite(kku::GUISprite::Id id) const override;
     virtual kku::Vector2<std::size_t> getRenderSize() const override;
 
 private:

src/impl/sfml/linesfml.cpp

@@ -1,7 +1,7 @@
 #include "linesfml.h"
 
-LineSFML::LineSFML(sf::RenderTarget *const render_target)
+LineSFML::LineSFML(sf::RenderTarget * const render_target) :
-    : _render_target(render_target)
+    _render_target(render_target)
 {
     _vertex = sf::VertexArray(sf::LinesStrip, 2);
 }

src/impl/sfml/linesfml.h

@@ -10,8 +10,7 @@ class LineSFML : public kku::Line
 {
 public:
     explicit LineSFML(sf::RenderTarget * const render_target);
-    virtual void setPosition(const kku::Point &p1,
+    virtual void setPosition(const kku::Point& p1, const kku::Point& p2) override;
-                             const kku::Point &p2) override;
     virtual void setColor(const kku::Color& c1, const kku::Color& c2) override;
     virtual void display() override;
 

src/impl/sfml/musicsfml.cpp

@@ -1,9 +1,10 @@
 #include "musicsfml.h"
 
-MusicSFML::MusicSFML()
+MusicSFML::MusicSFML() :
-    : _sfml_music_offset(0), _previous_frame_offset(0), _absolute_offset(0)
+    _sfml_music_offset(0),
-{
+    _previous_frame_offset(0),
-}
+    _absolute_offset(0)
+{}
 
 bool MusicSFML::open(const std::string& filepath)
 {
@@ -47,8 +48,7 @@ kku::microsec MusicSFML::fetchOffset()
     if (_music.getStatus() != sf::Music::Status::Playing)
         return _absolute_offset;
 
-    const auto interpolator_timestamp =
+    const auto interpolator_timestamp = _offset_interpolator.getElapsedTime().asMicroseconds();
-        _offset_interpolator.getElapsedTime().asMicroseconds();
     const auto sfml_new_offset = _music.getPlayingOffset().asMicroseconds();
 
     _absolute_offset += (interpolator_timestamp - _previous_frame_offset);
@@ -86,3 +86,4 @@ kku::microsec MusicSFML::getDuration() const
 {
     return _music.getDuration().asMicroseconds();
 }
+

src/impl/sfml/rectanglesfml.cpp

@@ -1,9 +1,8 @@
 #include "rectanglesfml.h"
 
-RectangleSFML::RectangleSFML(sf::RenderTarget *const render_target)
+RectangleSFML::RectangleSFML(sf::RenderTarget * const render_target) :
-    : _render_target(render_target)
+    _render_target(render_target)
-{
+{}
-}
 
 void RectangleSFML::setRect(const kku::Area<float>& rect)
 {
@@ -37,8 +36,8 @@ kku::Point RectangleSFML::getPosition() const
 
 void RectangleSFML::setColor(const kku::Color& color)
 {
-    _rectangle.setFillColor(
+    _rectangle.setFillColor(sf::Color{color.red, color.green,
-        sf::Color{color.red, color.green, color.blue, color.alpha});
+                                      color.blue, color.alpha});
 }
 
 kku::Color RectangleSFML::getColor() const

src/impl/sfml/rectanglesfml.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SFML/Graphics/RectangleShape.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
+#include <SFML/Graphics/RectangleShape.hpp>
 #include <memory>
 
 #include "core/rectangle.h"

src/impl/sfml/spritesfml.cpp

@@ -2,12 +2,10 @@
 
 SpriteSFML::SpriteSFML(sf::RenderTarget * const render_target,
                        const std::shared_ptr<sf::Texture>& texture,
-                       const kku::Area<unsigned int> &cropping)
+                       const kku::Area<unsigned int> &cropping) :
-    : _render_target(render_target),
+    _render_target(render_target),
-      _sprite(*texture, sf::IntRect(cropping.left, cropping.top, cropping.width,
+    _sprite(*texture, sf::IntRect(cropping.left, cropping.top, cropping.width, cropping.height))
-                                    cropping.height))
+{}
-{
-}
 
 void SpriteSFML::setPosition(const kku::Point& position)
 {
@@ -17,7 +15,11 @@ void SpriteSFML::setPosition(const kku::Point &position)
 kku::Point SpriteSFML::getPosition() const
 {
     const auto& position = _sprite.getPosition();
-    return kku::Point{position.x, position.y};
+    return kku::Point
+    {
+        position.x,
+        position.y
+    };
 }
 
 void SpriteSFML::move(const kku::Vector2<float>& delta)

src/impl/sfml/spritesfml.h

@@ -4,7 +4,6 @@
 #include <SFML/Graphics/Sprite.hpp>
 #include <memory>
 
-#include "core/area.h"
 #include "core/sprite.h"
 
 class SpriteSFML : public kku::Sprite

src/impl/sfml/textsfml.cpp

@@ -1,8 +1,8 @@
 #include "textsfml.h"
 
 TextSFML::TextSFML(sf::RenderTarget * const render_target,
-                   const std::shared_ptr<const sf::Font> &font)
+                   const std::shared_ptr<const sf::Font>& font) :
-    : _render_target(render_target)
+    _render_target(render_target)
 {
     _text.setFont(*font);
 }
@@ -29,8 +29,7 @@ void TextSFML::move(const kku::Vector2<float> &delta)
 
 void TextSFML::setColor(const kku::Color& color)
 {
-    _text.setFillColor(
+    _text.setFillColor(sf::Color{color.red, color.green, color.blue, color.alpha});
-        sf::Color{color.red, color.green, color.blue, color.alpha});
 }
 
 void TextSFML::display()

src/impl/sfml/textsfml.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Text.hpp>
+#include <SFML/Graphics/Font.hpp>
 #include <memory>
 
 #include "core/text.h"

src/main.cpp

@@ -2,9 +2,7 @@
 
 int main()
 {    
-    sf::RenderWindow window(sf::VideoMode{1280, 720}, "Project Kyoku",
+    sf::RenderWindow window(sf::VideoMode{1280, 720}, "Project Kyoku", sf::Style::Default);
-                            sf::Style::Default);
-
     ApplicationSFML app(&window);
     if (app.init())
         app.run();

src/modes/classicmode/classicfactory.cpp

@@ -1,53 +1,44 @@
 #include "classicmode/classicfactory.h"
 
-#include "graphics/classicgraphicsfactory.h"
 #include "graphics/classicscenegraphicsmanager.h"
 #include "graphics/classictimelinegraphicsmanager.h"
+#include "graphics/classicgraphicsfactory.h"
 
 #include "core/timeline.h"
-#include "editor/classiceditor.h"
-#include "editor/editorcontext.h"
-#include "editor/selectionmanager.h"
 #include "game/classicgame.h"
 #include "game/gamecontext.h"
 #include "game/holdmanager.h"
+#include "editor/classiceditor.h"
+#include "editor/editorcontext.h"
+#include "editor/selectionmanager.h"
 
-std::unique_ptr<kku::Game>
+
-classic::getGame(const std::shared_ptr<kku::CoreFactory> &core_factory)
+std::unique_ptr<kku::Game> classic::getGame(const std::shared_ptr<kku::CoreFactory>& core_factory)
 {
     const kku::microsec visibility_offset = 1648648;
 
     const auto factory = std::make_shared<ClassicGraphicsFactory>(core_factory);
     const auto timeline = std::make_shared<kku::Timeline<ClassicNote>>();
-    const auto graphics_manager = std::make_shared<ClassicSceneGraphicsManager>(
+    const auto graphics_manager = std::make_shared<ClassicSceneGraphicsManager>(timeline, factory, visibility_offset);
-        timeline, factory, visibility_offset);
     const auto hold_manager = std::make_shared<HoldManager>();
 
-    const auto context =
+    const auto context = std::make_shared<GameContext>(hold_manager, graphics_manager);
-        std::make_shared<GameContext>(hold_manager, graphics_manager);
 
     return std::make_unique<ClassicGame>(timeline, context);
 }
 
-std::unique_ptr<kku::Editor>
+std::unique_ptr<kku::Editor> classic::getEditor(const std::shared_ptr<kku::CoreFactory>& core_factory)
-classic::getEditor(const std::shared_ptr<kku::CoreFactory> &core_factory)
 {
     const kku::microsec visibility_offset = 1648648;
 
     const auto factory = std::make_shared<ClassicGraphicsFactory>(core_factory);
     const auto timeline = std::make_shared<kku::Timeline<ClassicNote>>();
-    const auto selection_manager =
+    const auto selection_manager = std::make_shared<SelectionManager>();
-        std::make_shared<SelectionManager<ClassicNote>>();
     std::vector<std::shared_ptr<ClassicGraphicsManager>> graphics_managers;
-    graphics_managers.emplace_back(
+    graphics_managers.emplace_back(std::make_shared<ClassicSceneGraphicsManager>(timeline, factory, visibility_offset));
-        std::make_shared<ClassicSceneGraphicsManager>(timeline, factory,
+    graphics_managers.emplace_back(std::make_shared<ClassicTimelineGraphicsManager>(timeline, factory, visibility_offset * 2));
-                                                      visibility_offset));
-    graphics_managers.emplace_back(
-        std::make_shared<ClassicTimelineGraphicsManager>(
-            timeline, factory, visibility_offset * 2));
 
-    const auto context = std::make_shared<EditorContext>(
+    const auto context = std::make_shared<EditorContext>(selection_manager, std::move(graphics_managers));
-        selection_manager, std::move(graphics_managers));
 
     return std::make_unique<ClassicEditor>(timeline, context);
 }

src/modes/classicmode/classicnote.cpp

@@ -1,9 +1,10 @@
 #include "classicmode/classicnote.h"
 
-ClassicNote::ClassicNote(const kku::microsec &perfect_offset, int id)
+ClassicNote::ClassicNote(const kku::microsec& perfect_offset, int id) :
-    : Note(perfect_offset), _state(State::NONE), _id(id)
+    Note(perfect_offset),
-{
+    _state(State::NONE),
-}
+    _id(id)
+{}
 
 void ClassicNote::setState(ClassicNote::State state) noexcept
 {

src/modes/classicmode/editor/callbacks/callbacksimple.cpp

@@ -1,10 +1,10 @@
 #include "callbacksimple.h"
 
-CallbackSimple::CallbackSimple(Init &&init, Metadata &&metadata)
+CallbackSimple::CallbackSimple(Init&& init, Metadata&& metadata) :
-    : _run(std::move(init.run)), _is_enabled(std::move(init.is_enabled)),
+    _run(std::move(init.run)),
+    _is_enabled(std::move(init.is_enabled)),
     _metadata(std::move(metadata))
-{
+{}
-}
 
 bool CallbackSimple::isEnabled() const
 {

src/modes/classicmode/editor/classiceditor.cpp

@@ -1,22 +1,25 @@
 #include "classiceditor.h"
 
-#include "editor/selectionmanager.h"
 #include "graphics/classicgraphicsmanager.h"
+#include "editor/selectionmanager.h"
 
 // Replace with interface by dependency injection
-#include "graphics/animations/classicdyinganimationscenario.h"
 #include "graphics/animations/classicflyinganimationscenario.h"
+#include "graphics/animations/classicdyinganimationscenario.h"
 //
 
-#include "callbacks/callbacksimple.h"
-#include "editorcontext.h"
 #include "game/classicarrownote.h"
+#include "editorcontext.h"
+#include "callbacks/callbacksimple.h"
 
-ClassicEditor::ClassicEditor(
+ClassicEditor::ClassicEditor(const std::shared_ptr<kku::Timeline<ClassicNote>>& timeline,
-    const std::shared_ptr<kku::Timeline<ClassicNote>> &timeline,
+                             const std::shared_ptr<EditorContext>& context) :
-    const std::shared_ptr<EditorContext> &context)
+    _timeline(timeline),
-    : _timeline(timeline), _context(context), _selected_type(Type::UP),
+    _context(context),
-      _current_time(0), _scroll_step(500000), _note_id(0)
+    _selected_type(Type::UP),
+    _current_time(0),
+    _scroll_step(500000),
+    _note_id(0)
 {
     kku::microsec starting_beat_offset = 402162;
     int amount_of_beats = 209;
@@ -27,8 +30,7 @@ ClassicEditor::ClassicEditor(
     kku::microsec bpm_iterator = starting_beat_offset;
     kku::microsec bpm_end = starting_beat_offset + (interval * amount_of_beats);
 
-    std::vector<kku::microsec> input_intervals = {
+    std::vector<kku::microsec> input_intervals = {note_input_offset / 3, note_input_offset / 3 * 2, note_input_offset};
-        note_input_offset / 3, note_input_offset / 3 * 2, note_input_offset};
     std::set<ClassicNote*, kku::NotePtrComparator> notes;
     input_intervals.shrink_to_fit();
 
@@ -43,6 +45,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};
@@ -73,8 +76,15 @@ ClassicEditor::ClassicEditor(
 
         --counter;
 
-        ClassicArrowNote::Init init{_note_id++,      context,   bpm_iterator,
+        ClassicArrowNote::Init init
-                                    input_intervals, {element}, hold};
+        {
+            _note_id++,
+            context,
+            bpm_iterator,
+            input_intervals,
+            {element},
+            hold
+        };
 
         notes.insert(new ClassicArrowNote(std::move(init)));
 
@@ -103,7 +113,6 @@ void ClassicEditor::input(kku::GameEvent &&input)
 
     switch (input.event.type)
     {
-
     default:
         break;
 
@@ -130,13 +139,11 @@ void ClassicEditor::input(kku::GameEvent &&input)
     case kku::SystemEvent::Type::MousePress:
     {
         const auto note = _timeline->getNoteBy(_current_time);
-        if (_timeline->isExpired(note) && !_bpm_sections.empty() &&
+        if (_timeline->isExpired(note) && !_bpm_sections.empty() && _current_time >= (*_bpm_sections.begin()).offset_start)
-            _current_time >= (*_bpm_sections.begin()).offset_start)
         {
             ArrowElement element;
 
-            element.position =
+            element.position = std::get<kku::SystemEvent::Mouse>(event.data).position;
-                std::get<kku::SystemEvent::Mouse>(event.data).position;
             element.falling_curve_interpolation = {};
 
             element.keys = {kku::SystemEvent::Key::Code::W,
@@ -144,8 +151,15 @@ void ClassicEditor::input(kku::GameEvent &&input)
 
             element.type = Type::UP;
 
-            ClassicArrowNote::Init init{_note_id++, _context,  _current_time,
+            ClassicArrowNote::Init init
-                                        {},         {element}, false};
+            {
+                _note_id++,
+                _context,
+                _current_time,
+                {},
+                {element},
+                false
+            };
 
             _timeline->insertNote(new ClassicArrowNote(std::move(init)));
         }
@@ -153,8 +167,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

@@ -4,56 +4,39 @@
 #include "graphics/classicgraphicsmanager.h"
 #include "graphics/classicnotegraphics.h"
 
-EditorContext::EditorContext(
+EditorContext::EditorContext(const std::shared_ptr<SelectionManager>& selection_manager,
-    const std::shared_ptr<SelectionManager<ClassicNote>> &selection_manager,
+                             std::vector<std::shared_ptr<ClassicGraphicsManager>>&& graphics_managers) :
-    std::vector<std::shared_ptr<ClassicGraphicsManager>> &&graphics_managers)
+    _selection_manager(selection_manager),
-    : _selection_manager(selection_manager),
     _graphics_managers(std::move(graphics_managers))
-{
+{}
-}
 
 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:
     {
-            bool selection_changed = false;
+        const auto clicked_position = std::get<kku::SystemEvent::Mouse>(input.event.data).position;
-            std::size_t amount_selected = 0;
+        for (auto& element : note->getElements())
-
-            const auto position =
-        std::get<kku::SystemEvent::Mouse>(input.event.data).position; for (auto&
-        element : note->getElements())
         {
-                if (element.sprite->getRectangle()->contains(position))
+            if (element.sprite->getRectangle()->contains(clicked_position))
             {
-                    element.selected = !element.selected;
+                if (_selection_manager->isSelected(note->getId(), element.id))
-                    selection_changed = true;
+                    _selection_manager->remove(note->getId(), element.id);
-                    if (element.selected)
-                        ++amount_selected;
-                }
-            }
-
-            if (selection_changed)
-            {
-                if (amount_selected > 0)
-                    _selection_manager->fetch(note);
                 else
-                    _selection_manager->remove(note);
+                    _selection_manager->fetch(note->getId(), element.id);
+            }
         }
-
         break;
-        }*/
+    }
+
     }
 }
 
-void EditorContext::update(ClassicArrowNote *note,
+void EditorContext::update(ClassicArrowNote *note, const kku::microsec& music_offset) const
-                           const kku::microsec &music_offset) const
 {
     auto& elements = note->getElements();
 
@@ -70,13 +53,11 @@ void EditorContext::update(ClassicArrowNote *note,
         break;
 
     case ClassicArrowNote::State::FLYING:
-        if (!note->isActive(music_offset) &&
+        if (!note->isActive(music_offset) && music_offset > note->getPerfectOffset())
-            music_offset > note->getPerfectOffset())
         {
             note->setState(ClassicArrowNote::State::DYING);
             for (auto& element : elements)
-                element.animations[note->getState()]->launch(
+                element.animations[note->getState()]->launch(element.sprite, music_offset, note->getPerfectOffset());
-                    element.sprite, music_offset, note->getPerfectOffset());
         }
         break;
 
@@ -95,8 +76,7 @@ void EditorContext::update(ClassicArrowNote *note,
             element.animations[note->getState()]->update(music_offset);
 }
 
-std::shared_ptr<SelectionManager<ClassicNote>>
+std::shared_ptr<SelectionManager> EditorContext::getSelectionManager() const
-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,53 @@
 #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(),
+        if (!isSelected(note_id, element_id))
-                                         [&thing](const auto& selected_thing)
+            _selected_ids[note_id].emplace_back(element_id);
-                                         {
-                                             return thing == selected_thing;
-                                         });
-
-        if (!already_there)
-            _selected_things.emplace_back(thing);
     }
 
-    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());
+                elements_ids[i] = std::move(elements_ids.back());
-                _selected_things.pop_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 (_selected_ids.count(note_id) == 0)
-            if (thing == selected_thing)
+            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 +63,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/game/classicarrownote.cpp

@@ -2,9 +2,10 @@
 #include "classicmode/context.h"
 #include "graphics/classicgraphicsmanager.h"
 
-ClassicArrowNote::ClassicArrowNote(Init &&init)
+ClassicArrowNote::ClassicArrowNote(Init&& init) :
-    : ClassicNote(init.perfect_offset, init.id),
+    ClassicNote(init.perfect_offset, init.id),
-      _evaluator(init.intervals, init.perfect_offset), _context(init.context),
+    _evaluator(init.intervals, init.perfect_offset),
+    _context(init.context),
     _is_holding(init.is_holding)
 {
    _elements.resize(init.elements.size());
@@ -19,7 +20,8 @@ ClassicArrowNote::ClassicArrowNote(Init &&init)
 
 bool ClassicArrowNote::isActive(const kku::microsec& offset) const
 {
-    return _evaluator.isActive(offset) && _state != State::DYING;
+    return _evaluator.isActive(offset)
+        && _state != State::DYING;
 }
 
 void ClassicArrowNote::update(const kku::microsec &music_offset)
@@ -32,8 +34,7 @@ void ClassicArrowNote::input(kku::GameEvent &&input)
     _context->input(this, std::move(input));
 }
 
-void ClassicArrowNote::draw(
+void ClassicArrowNote::draw(const std::shared_ptr<const ClassicGraphicsManager>& graphics_manager) const
-    const std::shared_ptr<const ClassicGraphicsManager> &graphics_manager) const
 {
     graphics_manager->draw(this);
 }
@@ -53,8 +54,7 @@ const std::vector<ArrowElement> &ClassicArrowNote::getElements() const
     return _elements;
 }
 
-auto ClassicArrowNote::calculatePrecision(const kku::microsec &offset) const
+auto ClassicArrowNote::calculatePrecision(const kku::microsec& offset) const -> Grade
-    -> Grade
 {
     return _evaluator.calculatePrecision(offset);
 }
@@ -63,5 +63,7 @@ bool ClassicArrowNote::isPressedAs(kku::SystemEvent::Key::Code key) const
 {
     return std::any_of(_elements.begin(), _elements.end(),
            [key](const auto& element)
-                       { return key == element.pressed_as; });
+           {
+              return key == element.pressed_as;
+           });
 }

src/modes/classicmode/game/classicgame.cpp

@@ -1,16 +1,15 @@
 #include "classicgame.h"
-#include "classicmapcreator.h"
 #include "classicmode/classicnote.h"
+#include "classicmapcreator.h"
 #include "gamecontext.h"
-#include "graphics/classicgraphicsmanager.h"
 #include "holdmanager.h"
+#include "graphics/classicgraphicsmanager.h"
 
-ClassicGame::ClassicGame(
+ClassicGame::ClassicGame(const std::shared_ptr<kku::Timeline<ClassicNote>>& timeline,
-    const std::shared_ptr<kku::Timeline<ClassicNote>> &timeline,
+                         const std::shared_ptr<GameContext>& context) :
-    const std::shared_ptr<GameContext> &context)
+    _timeline(timeline),
-    : _timeline(timeline), _context(context)
+    _context(context)
-{
+{}
-}
 
 void ClassicGame::run()
 {
@@ -40,10 +39,10 @@ void ClassicGame::input(kku::GameEvent &&input)
 
     case kku::SystemEvent::Type::KeyRelease:
     {
-        _context->getHoldManager()->checkRelease(
+        _context->getHoldManager()->checkRelease(std::get<kku::SystemEvent::Key>(input.event.data).view);
-            std::get<kku::SystemEvent::Key>(input.event.data).view);
     }
     break;
+
     }
 }
 
@@ -52,12 +51,10 @@ void ClassicGame::update(kku::UpdateData &&updatedata)
     // UNCOMMENT TO TEST AUTOPLAY
     /*auto note_it = _timeline->getActiveNote(updatedata.timestamp);
 
-    if (!_timeline->isExpired(note_it) && updatedata.timestamp >=
+    if (!_timeline->isExpired(note_it) && updatedata.timestamp >= (*note_it)->getPerfectOffset())
-    (*note_it)->getPerfectOffset())
     {
         auto note = (*note_it);
-        note->input(kku::GameEvent{updatedata.timestamp,
+        note->input(kku::GameEvent{updatedata.timestamp, kku::SystemEvent{kku::SystemEvent::Type::None, kku::SystemEvent::Key{}}});
-    kku::SystemEvent{kku::SystemEvent::Type::None, kku::SystemEvent::Key{}}});
     }*/
 
     _timeline->update(updatedata.timestamp);

src/modes/classicmode/game/classicmapcreator.cpp

@@ -3,13 +3,11 @@
 #include "gamecontext.h"
 
 // Replace with interface by dependency injection
-#include "graphics/animations/classicdyinganimationscenario.h"
 #include "graphics/animations/classicflyinganimationscenario.h"
+#include "graphics/animations/classicdyinganimationscenario.h"
 //
 
-auto classic::createBeatmap(const std::string &filepath,
+auto classic::createBeatmap(const std::string& filepath, const std::shared_ptr<GameContext>& context) -> Beatmap
-                            const std::shared_ptr<GameContext> &context)
-    -> Beatmap
 {
     (void) filepath;
 
@@ -22,8 +20,7 @@ auto classic::createBeatmap(const std::string &filepath,
     kku::microsec bpm_iterator = starting_beat_offset;
     kku::microsec bpm_end = starting_beat_offset + (interval * amount_of_beats);
 
-    std::vector<kku::microsec> input_intervals = {
+    std::vector<kku::microsec> input_intervals = {note_input_offset / 3, note_input_offset / 3 * 2, note_input_offset};
-        note_input_offset / 3, note_input_offset / 3 * 2, note_input_offset};
     std::set<ClassicNote*, kku::NotePtrComparator> notes;
     input_intervals.shrink_to_fit();
 
@@ -62,8 +59,15 @@ auto classic::createBeatmap(const std::string &filepath,
 
         --counter;
 
-        ClassicArrowNote::Init init{
+        ClassicArrowNote::Init init
-            id++, context, bpm_iterator, input_intervals, {element}, hold};
+        {
+            id++,
+            context,
+            bpm_iterator,
+            input_intervals,
+            {element},
+            hold
+        };
 
         notes.insert(new ClassicArrowNote(std::move(init)));
 
@@ -76,3 +80,4 @@ auto classic::createBeatmap(const std::string &filepath,
 
     return {std::move(notes), note_input_offset * 8};
 }
+

src/modes/classicmode/game/gamecontext.cpp

@@ -4,29 +4,25 @@
 #include "graphics/animations/classicanimationscenario.h"
 #include "graphics/classicgraphicsmanager.h"
 
-GameContext::GameContext(
+GameContext::GameContext(const std::shared_ptr<HoldManager>& hold_manager,
-    const std::shared_ptr<HoldManager> &hold_manager,
+                         const std::shared_ptr<ClassicGraphicsManager>& graphics_manager) :
-    const std::shared_ptr<ClassicGraphicsManager> &graphics_manager)
+    _hold_manager(hold_manager),
-    : _hold_manager(hold_manager), _graphics_manager(graphics_manager)
+    _graphics_manager(graphics_manager)
-{
+{}
-}
 
 void GameContext::input(ClassicArrowNote *note, kku::GameEvent&& input) const
 {
     auto grade = ClassicArrowNote::Grade::BAD;
     auto& elements = note->getElements();
 
-    bool input_valid = std::any_of(
+    bool input_valid = std::any_of(elements.begin(), elements.end(),
-        elements.begin(), elements.end(),
                 [input=input](auto& element)
                 {
                     if (element.pressed)
                         return false;
 
-            const auto code =
+                    const auto code = std::get<kku::SystemEvent::Key>(input.event.data).view;
-                std::get<kku::SystemEvent::Key>(input.event.data).view;
+                    auto key_iterator = std::find(element.keys.begin(), element.keys.end(), code);
-            auto key_iterator =
-                std::find(element.keys.begin(), element.keys.end(), code);
 
                     bool found_key = key_iterator != element.keys.end();
                     if (found_key)
@@ -38,9 +34,11 @@ void GameContext::input(ClassicArrowNote *note, kku::GameEvent &&input) const
                     return found_key;
                 });
 
-    bool all_pressed =
+    bool all_pressed = std::all_of(elements.begin(), elements.end(),
-        std::all_of(elements.begin(), elements.end(),
+                                   [](const auto& element)
-                    [](const auto &element) { return element.pressed; });
+                                   {
+                                       return element.pressed;
+                                   });
 
     if (all_pressed)
     {
@@ -53,22 +51,19 @@ void GameContext::input(ClassicArrowNote *note, kku::GameEvent &&input) const
     {
         note->setState(ClassicArrowNote::State::DYING);
         for (auto& element : elements)
-            element.animations[note->getState()]->launch(
+            element.animations[note->getState()]->launch(element.sprite, input.timestamp, note->getPerfectOffset());
-                element.sprite, input.timestamp, note->getPerfectOffset());
     }
 
     std::cout << "User input: " << static_cast<int>(grade) << "\n";
 }
 
-void GameContext::update(ClassicArrowNote *note,
+void GameContext::update(ClassicArrowNote *note, const kku::microsec& music_offset) const
-                         const kku::microsec &music_offset) const
 {
     auto& elements = note->getElements();
 
     switch (note->getState())
     {
-    default:
+    default: return;
-        return;
         break;
 
     case ClassicArrowNote::State::INITIAL:
@@ -77,13 +72,11 @@ void GameContext::update(ClassicArrowNote *note,
         break;
 
     case ClassicArrowNote::State::FLYING:
-        if (!note->isActive(music_offset) &&
+        if (!note->isActive(music_offset) && music_offset > note->getPerfectOffset())
-            music_offset > note->getPerfectOffset())
         {
             note->setState(ClassicArrowNote::State::DYING);
             for (auto& element : elements)
-                element.animations[note->getState()]->launch(
+                element.animations[note->getState()]->launch(element.sprite, music_offset, note->getPerfectOffset());
-                    element.sprite, music_offset, note->getPerfectOffset());
         }
         break;
 

src/modes/classicmode/game/holdmanager.cpp

@@ -1,8 +1,8 @@
 #include "holdmanager.h"
 #include "classicarrownote.h"
 
-#include <algorithm>
 #include <iostream>
+#include <algorithm>
 
 void HoldManager::emplace(ClassicArrowNote* note)
 {
@@ -13,7 +13,9 @@ void HoldManager::checkRelease(kku::SystemEvent::Key::Code released_key)
 {
     bool key_match = std::any_of(_notes_on_hold.begin(), _notes_on_hold.end(),
                      [released_key](const auto& note)
-                                 { return note->isPressedAs(released_key); });
+                     {
+                         return note->isPressedAs(released_key);
+                     });
 
     if (key_match)
         _notes_on_hold.clear();

src/modes/classicmode/graphics/animations/classicdyinganimationscenario.cpp

@@ -1,9 +1,7 @@
 #include "classicdyinganimationscenario.h"
 #include "graphics/classicnotegraphics.h"
 
-void ClassicDyingAnimationScenario::launch(
+void ClassicDyingAnimationScenario::launch(const std::shared_ptr<ClassicNoteGraphics> sprite, const kku::microsec& time_begin, const kku::microsec &time_end)
-    const std::shared_ptr<ClassicNoteGraphics> sprite,
-    const kku::microsec &time_begin, const kku::microsec &time_end)
 {
     _sprite = sprite;
     _time_begin = time_begin;
@@ -27,8 +25,7 @@ void ClassicDyingAnimationScenario::update(const kku::microsec &music_offset)
         return;
     }
 
-    auto new_alpha =
+    auto new_alpha = (int(fill_color.alpha) - 15) < 0 ? 0 : int(fill_color.alpha) - 15;
-        (int(fill_color.alpha) - 15) < 0 ? 0 : int(fill_color.alpha) - 15;
     fill_color.alpha = new_alpha;
 
     _sprite->setColor(fill_color);

src/modes/classicmode/graphics/animations/classicflyinganimationscenario.cpp

@@ -1,9 +1,7 @@
 #include "classicflyinganimationscenario.h"
 #include "graphics/classicnotegraphics.h"
 
-void ClassicFlyingAnimationScenario::launch(
+void ClassicFlyingAnimationScenario::launch(const std::shared_ptr<ClassicNoteGraphics> sprite, const kku::microsec& time_begin, const kku::microsec &time_end)
-    const std::shared_ptr<ClassicNoteGraphics> sprite,
-    const kku::microsec &time_begin, const kku::microsec &time_end)
 {
     _sprite = sprite;
     _time_begin = time_begin;
@@ -14,8 +12,7 @@ void ClassicFlyingAnimationScenario::launch(
     _sprite->setTrailColor(_sprite->getColor());
 }
 
-float ClassicFlyingAnimationScenario::getPoint(const kku::Point &point,
+float ClassicFlyingAnimationScenario::getPoint(const kku::Point& point, float perc) const
-                                               float perc) const
 {
     return point.x + ((point.y - point.x) * perc);
 }
@@ -31,8 +28,7 @@ void ClassicFlyingAnimationScenario::update(const kku::microsec &music_offset)
     float xb = getPoint(kku::Point{crd.x + 90, crd.x}, i);
     float yb = getPoint(kku::Point{crd.y - 150, crd.y}, i);
 
-    _sprite->setTrailPosition(kku::Point(getPoint(kku::Point{xa, xb}, i),
+    _sprite->setTrailPosition(kku::Point(getPoint( kku::Point{xa, xb}, i ), getPoint( kku::Point{ya, yb}, i )));
-                                         getPoint(kku::Point{ya, yb}, i)));
 }
 
 bool ClassicFlyingAnimationScenario::isDone() const

src/modes/classicmode/graphics/classicgraphicsfactory.cpp

@@ -1,10 +1,8 @@
 #include "classicgraphicsfactory.h"
 
-ClassicGraphicsFactory::ClassicGraphicsFactory(
+ClassicGraphicsFactory::ClassicGraphicsFactory(const std::shared_ptr<kku::CoreFactory>& core_factory) :
-    const std::shared_ptr<kku::CoreFactory> &core_factory)
+    _core_factory(core_factory) 
-    : _core_factory(core_factory)
+{}
-{
-}
 
 auto ClassicGraphicsFactory::generate(Type type) const -> SpriteData
 {
@@ -43,20 +41,14 @@ auto ClassicGraphicsFactory::generate(Type type) const -> SpriteData
     return SpriteData{shape, trail, color};
 }
 
-std::shared_ptr<ClassicNoteGraphics>
+std::shared_ptr<ClassicNoteGraphics> ClassicGraphicsFactory::createSprite(Type type) const
-ClassicGraphicsFactory::createSprite(Type type) const
 {
     const auto data = generate(type);
-    return std::make_shared<ClassicNoteGraphics>(
+    return std::make_shared<ClassicNoteGraphics>(ClassicNoteGraphics::Init{data.shape, data.trail, data.color});
-        ClassicNoteGraphics::Init{data.shape, data.trail, data.color});
 }
 
-std::shared_ptr<ClassicSelectionGraphics>
+std::shared_ptr<ClassicSelectionGraphics> ClassicGraphicsFactory::createSelection() const
-ClassicGraphicsFactory::createSelection() const
 {
     const auto shape = _core_factory->getRectangle();
-    return std::make_shared<ClassicSelectionGraphics>(
+    return std::make_shared<ClassicSelectionGraphics>(ClassicSelectionGraphics::Init{shape, kku::Color{51, 153, 255, 120}});
-        ClassicSelectionGraphics::Init{
-            shape, kku::Color{51, 153, 255, 120}
-    });
 }

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/classicnotegraphics.cpp

@@ -1,7 +1,9 @@
 #include "classicnotegraphics.h"
 
-ClassicNoteGraphics::ClassicNoteGraphics(ClassicNoteGraphics::Init &&init)
+ClassicNoteGraphics::ClassicNoteGraphics(ClassicNoteGraphics::Init&& init) :
-    : _reset_color(init.color), _shape(init.shape), _trail(init.trail)
+    _reset_color(init.color),
+    _shape(init.shape),
+    _trail(init.trail)
 {
     _shape->setColor(init.color);
     _trail->setColor(init.color);

src/modes/classicmode/graphics/classicscenegraphicsmanager.cpp

@@ -3,14 +3,15 @@
 
 #include <iostream>
 
-ClassicSceneGraphicsManager::ClassicSceneGraphicsManager(
+ClassicSceneGraphicsManager::ClassicSceneGraphicsManager(const std::shared_ptr<kku::Timeline<ClassicNote>>& timeline,
-    const std::shared_ptr<kku::Timeline<ClassicNote>> &timeline,
                                          const std::shared_ptr<ClassicGraphicsFactory>& factory,
-    const kku::microsec &visibility_offset)
+                                         const kku::microsec& visibility_offset) :
-    : ClassicGraphicsManager(visibility_offset),
+    ClassicGraphicsManager(visibility_offset),
-      _sprite_container({Type::UP, Type::DOWN, Type::LEFT, Type::RIGHT},
+    _sprite_container({Type::UP, Type::DOWN,
+                       Type::LEFT, Type::RIGHT},
                       factory),
-      _factory(factory), _timeline(timeline)
+    _factory(factory),
+    _timeline(timeline)
 {
     _timeline->expire(_first);
     _timeline->expire(_last);
@@ -48,18 +49,14 @@ void ClassicSceneGraphicsManager::update(const kku::microsec &offset)
     updateVisibleNotes(offset);
 }
 
-void ClassicSceneGraphicsManager::update(const kku::microsec &offset,
+void ClassicSceneGraphicsManager::update(const kku::microsec& offset, ClassicArrowNote* note)
-                                         ClassicArrowNote *note)
 {
     bool hasGraphics = (note->getElements()[0].sprite != nullptr);
 
     if (isVisiblyClose(note, offset) && !hasGraphics)
     {
         std::cout << note->getId() << ": set graphics!\n" << std::flush;
-        setGraphics(
+        setGraphics(note->getElements(), kku::TimeRange{note->getPerfectOffset() - _visibility_offset, note->getPerfectOffset()});
-            note->getElements(),
-            kku::TimeRange{note->getPerfectOffset() - _visibility_offset,
-                           note->getPerfectOffset()});
     }
     else
     {
@@ -87,8 +84,18 @@ void ClassicSceneGraphicsManager::draw(const ClassicArrowNote *const note) const
     }
 }
 
-void ClassicSceneGraphicsManager::setGraphics(
+void ClassicSceneGraphicsManager::switchSelection(ArrowElement* element)
-    std::vector<ArrowElement> &elements, kku::TimeRange &&range)
+{
+    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)
 {
     for (auto& element : elements)
     {
@@ -97,19 +104,15 @@ void ClassicSceneGraphicsManager::setGraphics(
         element.sprite->setTrailPosition(kku::Point( 0.f, 9.f ));
 
         element.animations[ClassicNote::State::NONE] = nullptr;
-        element.animations[ClassicNote::State::FLYING] =
+        element.animations[ClassicNote::State::FLYING] = std::make_shared<ClassicFlyingAnimationScenario>();
-            std::make_shared<ClassicFlyingAnimationScenario>();
+        element.animations[ClassicNote::State::DYING] = std::make_shared<ClassicDyingAnimationScenario>();
-        element.animations[ClassicNote::State::DYING] =
-            std::make_shared<ClassicDyingAnimationScenario>();
         element.animations[ClassicNote::State::DEAD] = nullptr;
 
-        element.animations[ClassicNote::State::FLYING]->launch(
+        element.animations[ClassicNote::State::FLYING]->launch(element.sprite, range.begin, range.end);
-            element.sprite, range.begin, range.end);
     }
 }
 
-void ClassicSceneGraphicsManager::removeGraphics(
+void ClassicSceneGraphicsManager::removeGraphics(std::vector<ArrowElement>& elements)
-    std::vector<ArrowElement> &elements)
 {
     for (auto& element : elements)
     {
@@ -125,12 +128,11 @@ void ClassicSceneGraphicsManager::removeGraphics(
 
 bool ClassicSceneGraphicsManager::nothingToDraw() const noexcept
 {
-    return _timeline->isExpired(_first) || _timeline->isExpired(_last);
+    return _timeline->isExpired(_first)
+        || _timeline->isExpired(_last);
 }
 
-bool ClassicSceneGraphicsManager::isVisiblyClose(
+bool ClassicSceneGraphicsManager::isVisiblyClose(const ClassicNote * const note, const kku::microsec& music_offset) const noexcept
-    const ClassicNote *const note,
-    const kku::microsec &music_offset) const noexcept
 {
     return (note->getPerfectOffset() - _visibility_offset) <= music_offset;
 }
@@ -143,8 +145,7 @@ void ClassicSceneGraphicsManager::fetchFirstNote(const kku::microsec &offset)
     if (offset < (*_first)->getPerfectOffset())
     {
         Iterator note_iterator = _first;
-        while (note_iterator != _timeline->begin() &&
+        while (note_iterator != _timeline->begin() && isVisiblyClose(*note_iterator, offset))
-               isVisiblyClose(*note_iterator, offset))
         {
             --note_iterator;
         }
@@ -153,10 +154,10 @@ void ClassicSceneGraphicsManager::fetchFirstNote(const kku::microsec &offset)
 
         auto note = *_first;
         const auto state = note->getState();
-        if (state != ClassicNote::State::FLYING &&
+        if (state != ClassicNote::State::FLYING
-            state != ClassicNote::State::DYING &&
+        &&  state != ClassicNote::State::DYING
-            state != ClassicNote::State::INITIAL &&
+        &&  state != ClassicNote::State::INITIAL
-            offset <= note->getPerfectOffset())
+        &&  offset <= note->getPerfectOffset())
         {
             note->setState(ClassicNote::State::INITIAL);
         }
@@ -181,18 +182,17 @@ void ClassicSceneGraphicsManager::fetchFirstNote(const kku::microsec &offset)
 void ClassicSceneGraphicsManager::fetchLastNote(const kku::microsec& offset)
 {
     Iterator note_iterator = _timeline->getTopNote();
-    while (!_timeline->isExpired(note_iterator) &&
+    while (!_timeline->isExpired(note_iterator) && isVisiblyClose(*note_iterator, offset))
-           isVisiblyClose(*note_iterator, offset))
     {
         if (nothingToDraw())
             _first = note_iterator;
 
         auto note = *note_iterator;
         const auto state = note->getState();
-        if (state != ClassicNote::State::FLYING &&
+        if (state != ClassicNote::State::FLYING
-            state != ClassicNote::State::DYING &&
+        &&  state != ClassicNote::State::DYING
-            state != ClassicNote::State::INITIAL &&
+        &&  state != ClassicNote::State::INITIAL
-            offset <= note->getPerfectOffset())
+        &&  offset <= note->getPerfectOffset())
         {
             note->setState(ClassicNote::State::INITIAL);
         }
@@ -203,8 +203,7 @@ void ClassicSceneGraphicsManager::fetchLastNote(const kku::microsec &offset)
     _last = note_iterator;
 }
 
-void ClassicSceneGraphicsManager::updateVisibleNotes(
+void ClassicSceneGraphicsManager::updateVisibleNotes(const kku::microsec& offset)
-    const kku::microsec &offset)
 {
     for (auto it = _first; it != _last; ++it)
         (*it)->update(offset);

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/classicselectiongraphics.cpp

@@ -1,9 +1,9 @@
 #include "classicselectiongraphics.h"
 #include "classicnotegraphics.h"
 
-ClassicSelectionGraphics::ClassicSelectionGraphics(
+ClassicSelectionGraphics::ClassicSelectionGraphics(ClassicSelectionGraphics::Init&& init) :
-    ClassicSelectionGraphics::Init &&init)
+    _fill_color(init.color),
-    : _fill_color(init.color), _shape(init.shape)
+    _shape(init.shape)
 {
     _shape->setColor(init.color);
 }
@@ -19,8 +19,7 @@ void ClassicSelectionGraphics::display() const
     _shape->display();
 }
 
-void ClassicSelectionGraphics::adjustTo(
+void ClassicSelectionGraphics::adjustTo(const std::shared_ptr<ClassicNoteGraphics>& sprite)
-    const std::shared_ptr<ClassicNoteGraphics> &sprite)
 {
     _shape->setRect(sprite->getRectangle()->getRect());
 }

src/modes/classicmode/graphics/classictimelinegraphicsmanager.cpp

@@ -3,14 +3,15 @@
 
 #include <iostream>
 
-ClassicTimelineGraphicsManager::ClassicTimelineGraphicsManager(
+ClassicTimelineGraphicsManager::ClassicTimelineGraphicsManager(const std::shared_ptr<kku::Timeline<ClassicNote>>& timeline,
-    const std::shared_ptr<kku::Timeline<ClassicNote>> &timeline,
                                          const std::shared_ptr<ClassicGraphicsFactory>& factory,
-    const kku::microsec &visibility_offset)
+                                         const kku::microsec& visibility_offset) :
-    : ClassicGraphicsManager(visibility_offset),
+    ClassicGraphicsManager(visibility_offset),
-      _sprite_container({Type::UP, Type::DOWN, Type::LEFT, Type::RIGHT},
+    _sprite_container({Type::UP, Type::DOWN,
+                       Type::LEFT, Type::RIGHT},
                       factory),
-      _factory(factory), _timeline(timeline),
+    _factory(factory),
+    _timeline(timeline),
     _back_visibility_offset(static_cast<double>(visibility_offset) / 4.f),
     _last_offset(0)
 {
@@ -31,14 +32,12 @@ void ClassicTimelineGraphicsManager::input(kku::GameEvent &&input)
         if (key_data.view == kku::SystemEvent::Key::Code::Add)
         {
             _visibility_offset += 200000;
-            _back_visibility_offset =
+            _back_visibility_offset = static_cast<double>(_visibility_offset) / 4.f;
-                static_cast<double>(_visibility_offset) / 4.f;
         }
         else if (key_data.view == kku::SystemEvent::Key::Code::Subtract)
         {
             _visibility_offset -= 200000;
-            _back_visibility_offset =
+            _back_visibility_offset = static_cast<double>(_visibility_offset) / 4.f;
-                static_cast<double>(_visibility_offset) / 4.f;
         }
         break;
     }
@@ -67,8 +66,7 @@ void ClassicTimelineGraphicsManager::update(const kku::microsec &offset)
     fetchFirstNote(offset);
 }
 
-void ClassicTimelineGraphicsManager::update(const kku::microsec &offset,
+void ClassicTimelineGraphicsManager::update(const kku::microsec& offset, ClassicArrowNote* note)
-                                            ClassicArrowNote *note)
 {
     bool hasGraphics = (note->getElements()[0].sprite != nullptr);
 
@@ -82,17 +80,13 @@ void ClassicTimelineGraphicsManager::update(const kku::microsec &offset,
     }
 }
 
-void ClassicTimelineGraphicsManager::draw(
+void ClassicTimelineGraphicsManager::draw(const ClassicArrowNote * const note) const
-    const ClassicArrowNote *const note) const
 {
-    const double d_visibility_offset =
+    const double d_visibility_offset = static_cast<double>(_last_offset + _visibility_offset);
-        static_cast<double>(_last_offset + _visibility_offset);
+    const double d_back_visibility_offset = static_cast<double>(_last_offset - _back_visibility_offset);
-    const double d_back_visibility_offset =
-        static_cast<double>(_last_offset - _back_visibility_offset);
 
     const double span = d_visibility_offset - d_back_visibility_offset;
-    const double note_span =
+    const double note_span = static_cast<double>(note->getPerfectOffset()) - d_visibility_offset;
-        static_cast<double>(note->getPerfectOffset()) - d_visibility_offset;
 
     const double percent = note_span / (span / 100.f);
 
@@ -100,8 +94,7 @@ void ClassicTimelineGraphicsManager::draw(
     for (std::size_t i = 0; i < elements.size(); ++i)
     {
         auto timeline_sprite = _factory->createSprite(elements[i].type);
-        timeline_sprite->setPosition(
+        timeline_sprite->setPosition(kku::Point{static_cast<int>(850 + 1280.f / 100.f * percent), 700});
-            kku::Point{static_cast<int>(850 + 1280.f / 100.f * percent), 700});
 
         timeline_sprite->display();
     }
@@ -109,17 +102,16 @@ void ClassicTimelineGraphicsManager::draw(
 
 bool ClassicTimelineGraphicsManager::nothingToDraw() const noexcept
 {
-    return _timeline->isExpired(_first) || _timeline->isExpired(_last);
+    return _timeline->isExpired(_first)
+        || _timeline->isExpired(_last);
 }
 
-bool ClassicTimelineGraphicsManager::isVisiblyClose(
+bool ClassicTimelineGraphicsManager::isVisiblyClose(const ClassicNote * const note, const kku::microsec& music_offset) const noexcept
-    const ClassicNote *const note,
-    const kku::microsec &music_offset) const noexcept
 {
     const auto& perfect_offset = note->getPerfectOffset();
 
-    return ((perfect_offset - _visibility_offset) <= music_offset) ||
+    return ((perfect_offset - _visibility_offset) <= music_offset)
-           ((perfect_offset + (_visibility_offset / 4.)) >= music_offset);
+        || ((perfect_offset + (_visibility_offset / 4.)) >= music_offset);
 }
 
 void ClassicTimelineGraphicsManager::fetchFirstNote(const kku::microsec& offset)
@@ -128,8 +120,7 @@ void ClassicTimelineGraphicsManager::fetchFirstNote(const kku::microsec &offset)
         //return;
 
     Iterator note_iterator = _first;
-    while (note_iterator != _timeline->begin() &&
+    while (note_iterator != _timeline->begin() && isVisiblyClose(*note_iterator, offset))
-           isVisiblyClose(*note_iterator, offset))
     {
         --note_iterator;
     }
@@ -140,8 +131,7 @@ void ClassicTimelineGraphicsManager::fetchFirstNote(const kku::microsec &offset)
 void ClassicTimelineGraphicsManager::fetchLastNote(const kku::microsec& offset)
 {
     Iterator note_iterator = _timeline->getTopNote();
-    while (!_timeline->isExpired(note_iterator) &&
+    while (!_timeline->isExpired(note_iterator) && isVisiblyClose(*note_iterator, offset))
-           isVisiblyClose(*note_iterator, offset))
     {
         if (nothingToDraw())
             _first = note_iterator;

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;

src/tools/src/beatutils.cpp

@@ -1,21 +1,23 @@
 #include "tools/beatutils.h"
-#include <iostream>
 #include <numeric>
+#include <iostream>
 
-auto beat_utils::calculateBeatRateInfo(
+auto beat_utils::calculateBeatRateInfo(const std::vector<kku::microsec>& approximate_deltas) -> BeatInfo
-    const std::vector<kku::microsec> &approximate_deltas) -> BeatInfo
 {
     if (approximate_deltas.empty())
         return {};
 
-    const long double sum = std::accumulate(approximate_deltas.begin(),
+    const long double sum = std::accumulate(approximate_deltas.begin(), approximate_deltas.end(), 0);
-                                            approximate_deltas.end(), 0);
     const long double amount = approximate_deltas.size();
 
     long double average = sum / amount;
 
     const int bpm = static_cast<int>(60000000. / average);
 
-    return BeatInfo{bpm, static_cast<kku::microsec>(
+
-                             1. / static_cast<long double>(bpm) * 60000000.)};
+    return BeatInfo
+    {
+        bpm,
+        static_cast<kku::microsec>(1. / static_cast<long double>(bpm) * 60000000.)
+    };
 }

src/tools/src/bpmcalculator.cpp

@@ -1,8 +1,8 @@
 #include "tools/bpmcalculator.h"
 
 #include <cmath>
-#include <iostream>
 #include <numeric>
+#include <iostream>
 
 BPMCalculator::BPMCalculator()
 {