Merge branch 'master' into LevelSystemAndSuch

include/Game/FPSCounter.h

@@ -0,0 +1,43 @@
+#ifndef GUI_FPSCOUNTER_H__
+#define GUI_FPSCOUNTER_H__
+
+#include "GUI/Frame.h"
+#include "GUI/NumberFrame.h"
+
+namespace dd
+{
+namespace GUI
+{
+
+class FPSCounter : public Frame
+{
+public:
+	FPSCounter(Frame* parent, std::string name)
+		: Frame(parent, name)
+	{
+		m_FrameTimes.resize(m_MaxSamples);
+		m_Numbers = new GUI::NumberFrame(this, "FPSCounterNumberFrame");
+	}
+
+	virtual void Update(double dt)
+	{
+		m_FrameTimes[m_CurrentFrame % m_MaxSamples] = dt;
+		double sum = std::accumulate(m_FrameTimes.begin(), m_FrameTimes.end(), 0.0);
+		sum /= std::min(m_CurrentFrame, m_MaxSamples);
+		m_Numbers->SetNumber(std::round(1.0 / sum));
+
+		m_CurrentFrame++;
+	}
+
+private:
+	NumberFrame* m_Numbers = nullptr;
+
+	int m_MaxSamples = 100;
+	int m_CurrentFrame = 0;
+	std::vector<double> m_FrameTimes;
+};
+
+}
+}
+#endif
+

include/Game/HUD.h

@@ -6,6 +6,7 @@
 #include "GUI/NumberFrame.h"
 #include "Core/EKeyUp.h"
 #include "Game/EScoreEvent.h"
+#include "Game/FPSCounter.h"
 
 namespace dd
 {
@@ -24,6 +25,15 @@ public:
 		m_LevelIndicator = new GUI::TextureFrame(this, "HUDLevelIndicator");
 		m_LevelIndicator->SetTexture("Textures/GUI/HUD/LevelIndicatorBG.png");
 
+		m_AreaNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
+		m_AreaNumberFrame->X = 132;
+		m_AreaNumberFrame->Y = 19;
+		m_AreaNumberFrame->SetNumber(6);
+		m_StageNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
+		m_StageNumberFrame->X = 165;
+		m_StageNumberFrame->Y = 19;
+		m_StageNumberFrame->SetNumber(5);
+
 		m_ScoreIndicator = new GUI::TextureFrame(this, "HUDScoreIndicator");
 		m_ScoreIndicator->SetTexture("Textures/GUI/HUD/ScoreIndicatorBG.png");
 		m_ScoreIndicator->SetRight(Right());
@@ -31,13 +41,18 @@ public:
 		m_ScoreNumberFrame->X = 15;
 		m_ScoreNumberFrame->Y = 21;
 
+		m_FPSCounter = new GUI::FPSCounter(this, "FPSCounter");
+
 		EVENT_SUBSCRIBE_MEMBER(m_EScore, &HUD::OnScore);
 	}
 
 private:
 	TextureFrame* m_LevelIndicator = nullptr;
 	TextureFrame* m_ScoreIndicator = nullptr;
+	NumberFrame* m_AreaNumberFrame = nullptr;
+	NumberFrame* m_StageNumberFrame = nullptr;
 	NumberFrame* m_ScoreNumberFrame = nullptr;
+	FPSCounter* m_FPSCounter = nullptr;
 
 	EventRelay<Frame, Events::ScoreEvent> m_EScore;
 

include/Game/PadSystem.h

@@ -73,9 +73,11 @@ private:
     glm::vec3 m_Acceleration = glm::vec3(0.f, 0.f, 0.f);
     bool m_Left = false;
     bool m_Right = false;
+    bool m_ReplaceBall = false;
+    bool m_MultiBall = false;
     float m_Edge = 2.8f;
-    Components::Transform* m_Transform;
-    Components::Pad* m_Pad;
+    Components::Transform* m_Transform = nullptr;
+    Components::Pad* m_Pad = nullptr;
 
     bool m_Pause = false;