create indicator

onon1101 · Apr 25, 2024 · 661f571 · 661f571
1 parent 5bce29a
commit 661f571
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 10 deletions.
diff --git a/include/Display/BeatIndicator.h b/include/Display/BeatIndicator.h
@@ -0,0 +1,26 @@
+#ifndef I_LOVE_PTSD_BEATINDICATOR_H
+#define I_LOVE_PTSD_BEATINDICATOR_H
+
+#include <memory>
+
+#include "GameElement.h"
+
+namespace Display {
+class BeatIndicator {
+public:
+    static void Init();
+
+    static std::shared_ptr<GameElement> GetGameElement();
+
+    static void Update();
+
+private:
+    static std::string                  m_IndicatorImagePath;
+    static glm::vec2                    m_Position;
+    static glm::vec2                    m_Scale;
+    static float                        m_ZIndex;
+    static std::shared_ptr<GameElement> m_GameElement;
+};
+}  // namespace Display
+
+#endif  // I_LOVE_PTSD_BEATINDICATOR_H
diff --git a/include/Music/Tempo.h b/include/Music/Tempo.h
@@ -28,7 +28,8 @@ class Tempo {
     [[nodiscard]]
     static bool IsTempoInRange(
         const std::size_t triggerRange,
-        const float       time
+        const float       time,
+        const std::size_t MusicLoopCounter
     );
 
     [[nodiscard]]
@@ -39,7 +40,8 @@ class Tempo {
 
     static void Update(
         const float       musicPlaytTime,
-        const std::size_t triggerOffset
+        const std::size_t triggerOffset,
+        const std::size_t MusicLoopCounter
     );
 
     static std::size_t m_BeatListLen;

diff --git a/src/App.cpp b/src/App.cpp
@@ -122,7 +122,11 @@ void App::Update() {
          || Util::Input::IsKeyDown(Util::Keycode::D)
          || Util::Input::IsKeyDown(Util::Keycode::S)
          || Util::Input::IsKeyDown(Util::Keycode::A))
-        && Music::Tempo::IsTempoInRange(500, Util::Time::GetElapsedTimeMs())) {
+        && Music::Tempo::IsTempoInRange(
+            500,
+            Util::Time::GetElapsedTimeMs(),
+            Music::Player::LoopCounter()
+        )) {
         glm::vec2 playerDestination = m_MainCharacter->GetGamePosition();
 
         if (m_PlayerMoveDirect != Player::NONE) {
@@ -235,7 +239,7 @@ void App::Update() {
     auto musicTime = Music::Player::GetMusicTime() * 1000;
 
     Display::BeatHeart::Update();
-    Music::Tempo::Update(musicTime, 0u);
+    Music::Tempo::Update(musicTime, 0u, Music::Player::LoopCounter());
 
     m_MainCharacter->Update();
     m_Camera->Update();

diff --git a/src/Display/BeatIndicator.cpp b/src/Display/BeatIndicator.cpp
@@ -0,0 +1,3 @@
+// #include "Display/BeatIndicator.h"
+
+// Display::BeatIndicator::Init() {}
diff --git a/src/Music/Tempo.cpp b/src/Music/Tempo.cpp
@@ -51,10 +51,12 @@ void Music::Tempo::ReadTempoFile(const std::string& path) {
 
 bool Music::Tempo::IsTempoInRange(
     const std::size_t triggerRange,
-    const float       time
+    const float       time,
+    const std::size_t MusicLoopCounter
 ) {
-    if (m_CurrentBeatLopTimes != Music::Player::LoopCounter()) {
-        m_CurrentBeatLopTimes = Music::Player::LoopCounter();
+    // TODO: //
+    if (m_CurrentBeatLopTimes != MusicLoopCounter) {
+        m_CurrentBeatLopTimes = MusicLoopCounter;
         LopReset();
     }
 
@@ -121,10 +123,11 @@ void Music::Tempo::LopReset() {
 
 void Music::Tempo::Update(
     const float       musicPlaytTime,
-    const std::size_t triggerOffset
+    const std::size_t triggerOffset,
+    const std::size_t MusicLoopCounter
 ) {
-    if (m_CurrentBeatLopTimes != Music::Player::LoopCounter()) {
-        m_CurrentBeatLopTimes = Music::Player::LoopCounter();
+    if (m_CurrentBeatLopTimes != MusicLoopCounter) {
+        m_CurrentBeatLopTimes = MusicLoopCounter;
         LopReset();
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// #include "Display/BeatIndicator.h"

		// Display::BeatIndicator::Init() {}