From 8c69bed6e2bf21cb9f4e1da4aa03f0e97f2a69b7 Mon Sep 17 00:00:00 2001
From: Stepland <16676308+Stepland@users.noreply.github.com>
Date: Sat, 2 May 2020 18:04:52 +0200
Subject: [PATCH] Move GradedNote to Data

---
 TODO.md                                       | 1 +
 meson.build                                   | 4 ++--
 src/{Screens/Gameplay => Data}/GradedNote.cpp | 2 +-
 src/{Screens/Gameplay => Data}/GradedNote.hpp | 6 +++---
 src/Screens/Gameplay/Gameplay.cpp             | 6 +++---
 src/Screens/Gameplay/Gameplay.hpp             | 6 +++---
 6 files changed, 13 insertions(+), 12 deletions(-)
 rename src/{Screens/Gameplay => Data}/GradedNote.cpp (98%)
 rename src/{Screens/Gameplay => Data}/GradedNote.hpp (91%)

diff --git a/TODO.md b/TODO.md
index a3d5084..fe5285c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,6 +11,7 @@
 - Combo
     - compute
     - display
+- Shutter
 
 ## Results Screen
 
diff --git a/meson.build b/meson.build
index 6e94a1e..e0dd3d0 100644
--- a/meson.build
+++ b/meson.build
@@ -14,6 +14,8 @@ sources = [
     'include/whereami/whereami++.cpp',
     'src/Data/Chart.cpp',
     'src/Data/Chart.hpp',
+    'src/Data/GradedNote.cpp',
+    'src/Data/GradedNote.hpp',
     'src/Data/Note.hpp',
     'src/Data/Preferences.hpp',
     'src/Data/Preferences.cpp',
@@ -66,8 +68,6 @@ sources = [
     'src/Screens/MusicSelect/SongInfo.cpp',
     'src/Screens/Gameplay/Gameplay.hpp',
     'src/Screens/Gameplay/Gameplay.cpp',
-    'src/Screens/Gameplay/GradedNote.cpp',
-    'src/Screens/Gameplay/GradedNote.hpp',
     'src/Screens/Gameplay/PreciseMusic.hpp',
     'src/Screens/Gameplay/PreciseMusic.cpp',
     'src/Screens/Gameplay/Silence.hpp',
diff --git a/src/Screens/Gameplay/GradedNote.cpp b/src/Data/GradedNote.cpp
similarity index 98%
rename from src/Screens/Gameplay/GradedNote.cpp
rename to src/Data/GradedNote.cpp
index d3801d7..73155f6 100644
--- a/src/Screens/Gameplay/GradedNote.cpp
+++ b/src/Data/GradedNote.cpp
@@ -1,6 +1,6 @@
 #include "GradedNote.hpp"
 
-namespace Gameplay {
+namespace Data {
     Resources::MarkerAnimation judgement_to_animation(const Judgement& j) {
         switch (j) {
         case Judgement::Perfect:
diff --git a/src/Screens/Gameplay/GradedNote.hpp b/src/Data/GradedNote.hpp
similarity index 91%
rename from src/Screens/Gameplay/GradedNote.hpp
rename to src/Data/GradedNote.hpp
index dc64260..a5ac68c 100644
--- a/src/Screens/Gameplay/GradedNote.hpp
+++ b/src/Data/GradedNote.hpp
@@ -4,10 +4,10 @@
 
 #include <SFML/System/Time.hpp>
 
-#include "../../Data/Note.hpp"
-#include "../../Resources/Marker.hpp"
+#include "../Resources/Marker.hpp"
+#include "Note.hpp"
 
-namespace Gameplay {
+namespace Data {
     enum class Judgement {
         Perfect,
         Great,
diff --git a/src/Screens/Gameplay/Gameplay.cpp b/src/Screens/Gameplay/Gameplay.cpp
index b305644..e0922c9 100644
--- a/src/Screens/Gameplay/Gameplay.cpp
+++ b/src/Screens/Gameplay/Gameplay.cpp
@@ -21,7 +21,7 @@ namespace Gameplay {
         marker(t_resources.shared.get_selected_marker())
     {
         for (auto&& note : chart.notes) {
-            notes.emplace_back(GradedNote{note});
+            notes.emplace_back(Data::GradedNote{note});
         }
         auto music_path = song_selection.song.full_audio_path();
         if (music_path) {
@@ -166,7 +166,7 @@ namespace Gameplay {
                 if (note.timed_judgment) {
                     continue;
                 }
-                notes[i].store(GradedNote{note, music_time-note.timing});
+                notes[i].store(Data::GradedNote{note, music_time-note.timing});
                 break;
             }
         }
@@ -179,7 +179,7 @@ namespace Gameplay {
                 note_index = i;
                 break;
             } else {
-                note.timed_judgment.emplace(sf::Time::Zero, Judgement::Miss);
+                note.timed_judgment.emplace(sf::Time::Zero, Data::Judgement::Miss);
                 notes[i].store(note);
             }
         }
diff --git a/src/Screens/Gameplay/Gameplay.hpp b/src/Screens/Gameplay/Gameplay.hpp
index a747d59..4182e7c 100644
--- a/src/Screens/Gameplay/Gameplay.hpp
+++ b/src/Screens/Gameplay/Gameplay.hpp
@@ -7,6 +7,7 @@
 #include <SFML/Graphics.hpp>
 
 #include "../../Data/Chart.hpp"
+#include "../../Data/GradedNote.hpp"
 #include "../../Data/Note.hpp"
 #include "../../Data/Song.hpp"
 #include "../../Data/Score.hpp"
@@ -15,7 +16,6 @@
 #include "../../Input/Events.hpp"
 #include "../../Toolkit/Debuggable.hpp"
 #include "AbstractMusic.hpp"
-#include "GradedNote.hpp"
 #include "Resources.hpp"
 
 namespace Gameplay {
@@ -35,9 +35,9 @@ namespace Gameplay {
         const Resources::Marker& marker;
         std::unique_ptr<AbstractMusic> music;
 
-        std::deque<std::atomic<GradedNote>> notes;
+        std::deque<std::atomic<Data::GradedNote>> notes;
         std::atomic<std::size_t> note_index;
-        // moves note_cursor forward to the first note that has to be conscidered for judging
+        // moves note_index forward to the first note that has to be conscidered for judging
         // marks every note between the old and the new position as missed
         void update_note_index(const sf::Time& music_time);